4 files changed, 110 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index b439cb5..45ef197 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -101,7 +101,10 @@ SOURCES = 					\
 
 TESTS =						\
   tests/math/vector.scm				\
-  tests/data/quadtree.scm
+  tests/data/array-list.scm			\
+  tests/data/heap.scm				\
+  tests/data/quadtree.scm			\
+  tests/data/queue.scm
 
 TEST_EXTENSIONS = .scm
 SCM_LOG_COMPILER = $(top_builddir)/test-env $(GUILE)
diff --git a/tests/data/array-list.scm b/tests/data/array-list.scm
new file mode 100644
index 0000000..f93b6fa
--- /dev/null
+++ b/tests/data/array-list.scm
@@ -0,0 +1,42 @@
+;;; Chickadee Game Toolkit
+;;; Copyright © 2021 David Thompson <davet@gnu.org>
+;;;
+;;; Chickadee is free software: you can redistribute it and/or modify
+;;; it under the terms of the GNU General Public License as published
+;;; by the Free Software Foundation, either version 3 of the License,
+;;; or (at your option) any later version.
+;;;
+;;; Chickadee is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;;; General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with this program.  If not, see
+;;; <http://www.gnu.org/licenses/>.
+
+(define-module (tests data array-list)
+  #:use-module (tests utils)
+  #:use-module (srfi srfi-64)
+  #:use-module (chickadee data array-list))
+
+(with-tests "array-list"
+  ;; Using an initial capacity of 2 to force an expansion when adding
+  ;; the third element.
+  (let ((a (make-array-list 2)))
+    (array-list-push! a 'a)
+    (array-list-push! a 'b)
+    (array-list-push! a 'c)
+    (test-equal "array-list-fold"
+      (array-list-fold (lambda (i item prev)
+                         (cons item prev))
+                       '() a)
+      '(c b a))
+    (test-equal "array-list-push!" (array-list-size a) 3)
+    (test-equal "array-list-pop!" (array-list-pop! a) 'c)
+    (array-list-set! a 1 'd)
+    (test-equal "array-list-set!" (array-list-ref a 1) 'd)
+    (array-list-delete! a 'a)
+    (test-equal "array-list-delete!" (array-list-ref a 0) 'd)
+    (array-list-clear! a)
+    (test-assert "array-list-clear!" (array-list-empty? a))))
diff --git a/tests/data/heap.scm b/tests/data/heap.scm
new file mode 100644
index 0000000..351d20c
--- /dev/null
+++ b/tests/data/heap.scm
@@ -0,0 +1,33 @@
+;;; Chickadee Game Toolkit
+;;; Copyright © 2021 David Thompson <davet@gnu.org>
+;;;
+;;; Chickadee is free software: you can redistribute it and/or modify
+;;; it under the terms of the GNU General Public License as published
+;;; by the Free Software Foundation, either version 3 of the License,
+;;; or (at your option) any later version.
+;;;
+;;; Chickadee is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;;; General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with this program.  If not, see
+;;; <http://www.gnu.org/licenses/>.
+
+(define-module (tests data heap)
+  #:use-module (tests utils)
+  #:use-module (srfi srfi-64)
+  #:use-module (chickadee data heap))
+
+(with-tests "heap"
+  (let ((h (make-heap)))
+    (heap-insert! h 3)
+    (heap-insert! h 1)
+    (heap-insert! h 2)
+    (test-equal "heap-insert!" (heap-size h) 3)
+    (test-equal "heap-min!" (heap-min h) 1)
+    (heap-remove! h)
+    (test-equal "heap-remove!" (heap-min h) 2)
+    (heap-clear! h)
+    (test-assert "heap-clear!" (heap-empty? h))))
diff --git a/tests/data/queue.scm b/tests/data/queue.scm
new file mode 100644
index 0000000..0ccc808
--- /dev/null
+++ b/tests/data/queue.scm
@@ -0,0 +1,31 @@
+;;; Chickadee Game Toolkit
+;;; Copyright © 2021 David Thompson <davet@gnu.org>
+;;;
+;;; Chickadee is free software: you can redistribute it and/or modify
+;;; it under the terms of the GNU General Public License as published
+;;; by the Free Software Foundation, either version 3 of the License,
+;;; or (at your option) any later version.
+;;;
+;;; Chickadee is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;;; General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with this program.  If not, see
+;;; <http://www.gnu.org/licenses/>.
+
+(define-module (tests data queue)
+  #:use-module (tests utils)
+  #:use-module (srfi srfi-64)
+  #:use-module (chickadee data queue))
+
+(with-tests "queue"
+  (let ((q (make-queue)))
+    (enqueue! q 'a)
+    (enqueue! q 'b)
+    (enqueue! q 'c)
+    (test-equal "enqueue!" (queue-length q) 3)
+    (test-equal "dequeue!" (dequeue! q) 'a)
+    (queue-clear! q)
+    (test-assert "queue-clear!" (queue-empty? q))))