测试

Author: masx200

test/zigzag_iterator/ZigzagIteratorTest.kt

@@ -0,0 +1,32 @@
+package com.github.masx200.leetcode_test.zigzag_iterator
+
+
+import org.junit.jupiter.api.Test
+import kotlin.test.assertContentEquals
+import kotlin.test.junit5.JUnit5Asserter.assertEquals
+
+class ZigzagIteratorTest {
+
+
+    @Test
+    fun nextTest() {
+
+        val v1 = listOf<Int>(1, 2);
+        val v2 = listOf<Int>(3, 4, 5, 6);
+        val OUTPUT = listOf<Int>(1, 3, 2, 4, 5, 6);
+
+
+        val zzit =  ZigzagIterator(v1, v2);
+
+        val res: MutableList<Int> = mutableListOf<Int>();
+
+        while (zzit.hasNext()) {
+            res.add(zzit.next());
+        }
+        assertContentEquals(res, OUTPUT);
+    }
+
+    @Test
+    fun hasNextTest() {
+    }
+}

zigzag-iterator/ZigzagIterator.kt

@@ -1,22 +1,7 @@
-package com.github.masx200.leetcode_test.com.github.leetcode_test.zigzag_iterator
+package com.github.masx200.leetcode_test.zigzag_iterator
 
 
-private fun ZigzagGenerator(v1: List<Int>, v2: List<Int>): Sequence<Int> = sequence<Int> {
-    if (v1.size < v2.size) {
-        for (i in 0 until v1.size) {
-            yield(v1[i])
-
-            yield(v2[i])
-        }
-        for (i in v1.size until v2.size) {
-            yield(v2[i])
-
-        }
-    } else {
-        yieldAll(ZigzagGenerator(v2, v1))
-    }
 
-}
 
 class ZigzagIterator(v1: List<Int>, v2: List<Int>) {
 
@@ -32,4 +17,21 @@ class ZigzagIterator(v1: List<Int>, v2: List<Int>) {
     fun hasNext(): Boolean {
         return iterator.hasNext()
     }
+}
+
+private fun ZigzagGenerator(v1: List<Int>, v2: List<Int>): Sequence<Int> = sequence<Int> {
+    if (v1.size < v2.size) {
+        for (i in 0 until v1.size) {
+            yield(v1[i])
+
+            yield(v2[i])
+        }
+        for (i in v1.size until v2.size) {
+            yield(v2[i])
+
+        }
+    } else {
+        yieldAll(ZigzagGenerator(v2, v1))
+    }
+
 }