refactor tests, add working code for list

3 files changed, 86 insertions, 34 deletions

diff --git a/tests/list.scm b/tests/list.scm
new file mode 100644
index 0000000..02a0c52
--- /dev/null
+++ b/tests/list.scm
@@ -0,0 +1,32 @@
+#| Copyright 2024 Peter McGoron
+ |
+ | Licensed under the Apache License, Version 2.0 (the "License");
+ | you may not use this file except in compliance with the License.
+ | You may obtain a copy of the License at
+ |
+ |     http://www.apache.org/licenses/LICENSE-2.0
+ |
+ | Unless required by applicable law or agreed to in writing, software
+ | distributed under the License is distributed on an "AS IS" BASIS,
+ | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ | See the License for the specific language governing permissions and
+ | limitations under the License.
+ |#
+(import (mcgoron iterator list))
+
+(let ((itr (list-iterator-start '())))
+  (test-begin "empty list")
+  (test-assert "iterator-at-start?" (iterator-at-start? itr))
+  (test-assert "iterator-at-end?" (iterator-at-end? itr))
+  (test-assert "iterator-advance 1" (not (iterator-advance itr 1)))
+  (test-assert "iterator-advance -1" (not (iterator-advance itr -1)))
+  (test "iterator->index" 0 (iterator->index itr))
+  (test-assert "iterator=?" (iterator=? itr (list-iterator-end '())))
+  (test-error "iterator-ref" (iterator-ref itr))
+  (test-end "empty list"))
+
+(let* ((lst '(1 2))
+       (itr (list-iterator-start lst)))
+  ()
+  )
+
diff --git a/tests/run.scm b/tests/run.scm
index 6d7abfe..f62c232 100644
--- a/tests/run.scm
+++ b/tests/run.scm
@@ -19,40 +19,9 @@
 
 ;;; TODO: Make a custom SRFI-64 test runner that emulates CHICKEN test.
 
-(import (mcgoron iterator string) (mcgoron iterator base))
+(import (mcgoron iterator base))
 
-(let* ((str "")
-       (itr (string-iterator-start str)))
-  (test-group "empty-string"
-    (test-assert "iterator-at-start?" (iterator-at-start? itr))
-    (test-assert "iterator-at-end?" (iterator-at-end? itr))
-    (test-assert "iterator-advance 1" (not (iterator-advance itr 1)))
-    (test-assert "iterator-advance -1" (not (iterator-advance itr -1)))
-    (test "iterator->index" 0 (iterator->index itr))
-    (test-assert "iterator=?" (iterator=? itr (string-iterator-end str)))
-    (test-error "iterator-ref" (iterator-ref itr))))
+(include "string.scm")
+#;(include "list.scm")
 
-(let* ((str "a")
-       (itr (string-iterator-start str))
-       (itr-from-itr (string-iterator-start itr)))
-  (test-group "non empty string"
-    (test-assert "iterator-at-start?" (iterator-at-start? itr))
-    (test-assert "iterator-at-end?" (not (iterator-at-end? itr)))
-    (test-assert (iterator=? itr itr-from-itr))
-    (test "iterator-ref 0" #\a (iterator-ref itr))
-    (test-assert "iterator-advance start -1" (not (iterator-advance itr -1)))
-    (let ((next-itr (iterator-advance itr 1)))
-      (test-assert "iterator? advanced" (iterator? next-itr))
-      (test-assert "iterator-at-end? advanced" (iterator-at-end? next-itr))
-      (test-assert "iterator=? end advanced"
-                   (iterator=? next-itr (string-iterator-end str)))
-      (test-assert "iterator=? itr next-itr"
-                   (not (iterator=? itr next-itr)))
-      (test-assert "iterator<? itr next-itr"
-                   (iterator<? itr next-itr))
-      (test-assert "iterator=? itr previous"
-                   (iterator=? itr (iterator-advance next-itr -1)))
-      (test "iterator->index next-itr" 1
-            (iterator->index next-itr))
-      (test-error "iterator-ref next-itr" (iterator-ref next-itr)))))
 (test-exit)
diff --git a/tests/string.scm b/tests/string.scm
new file mode 100644
index 0000000..bf89662
--- /dev/null
+++ b/tests/string.scm
@@ -0,0 +1,51 @@
+#| Copyright 2024 Peter McGoron
+ |
+ | Licensed under the Apache License, Version 2.0 (the "License");
+ | you may not use this file except in compliance with the License.
+ | You may obtain a copy of the License at
+ |
+ |     http://www.apache.org/licenses/LICENSE-2.0
+ |
+ | Unless required by applicable law or agreed to in writing, software
+ | distributed under the License is distributed on an "AS IS" BASIS,
+ | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ | See the License for the specific language governing permissions and
+ | limitations under the License.
+ |#
+(import (mcgoron iterator string))
+
+(let* ((str "")
+       (itr (string-iterator-start str)))
+  (test-group "empty-string"
+    (test-assert "iterator-at-start?" (iterator-at-start? itr))
+    (test-assert "iterator-at-end?" (iterator-at-end? itr))
+    (test-assert "iterator-advance 1" (not (iterator-advance itr 1)))
+    (test-assert "iterator-advance -1" (not (iterator-advance itr -1)))
+    (test "iterator->index" 0 (iterator->index itr))
+    (test-assert "iterator=?" (iterator=? itr (string-iterator-end str)))
+    (test-error "iterator-ref" (iterator-ref itr))))
+
+(let* ((str "a")
+       (itr (string-iterator-start str))
+       (itr-from-itr (string-iterator-start itr)))
+  (test-group "non empty string"
+    (test-assert "iterator-at-start?" (iterator-at-start? itr))
+    (test-assert "iterator-at-end?" (not (iterator-at-end? itr)))
+    (test-assert (iterator=? itr itr-from-itr))
+    (test "iterator-ref 0" #\a (iterator-ref itr))
+    (test-assert "iterator-advance start -1" (not (iterator-advance itr -1)))
+    (let ((next-itr (iterator-advance itr 1)))
+      (test-assert "iterator? advanced" (iterator? next-itr))
+      (test-assert "iterator-at-end? advanced" (iterator-at-end? next-itr))
+      (test-assert "iterator=? end advanced"
+                   (iterator=? next-itr (string-iterator-end str)))
+      (test-assert "iterator=? itr next-itr"
+                   (not (iterator=? itr next-itr)))
+      (test-assert "iterator<? itr next-itr"
+                   (iterator<? itr next-itr))
+      (test-assert "iterator=? itr previous"
+                   (iterator=? itr (iterator-advance next-itr -1)))
+      (test "iterator->index next-itr" 1
+            (iterator->index next-itr))
+      (test-error "iterator-ref next-itr" (iterator-ref next-itr)))))
+