From b5d09dba20573c431a9f21795ac90547631caae7 Mon Sep 17 00:00:00 2001
From: Marius Peter <dev@marius-peter.com>
Date: Sat, 1 Nov 2025 13:00:05 +0100
Subject: Test directory should mirror top-level hierarchy.

---
 tests/models/nutrient-measurement.rkt | 69 +++++++++++++++++++++++++++++++
 tests/models/nutrient.rkt             | 76 +++++++++++++++++++++++++++++++++++
 tests/nutrient-measurement-model.rkt  | 69 -------------------------------
 tests/nutrient-model.rkt              | 76 -----------------------------------
 4 files changed, 145 insertions(+), 145 deletions(-)
 create mode 100644 tests/models/nutrient-measurement.rkt
 create mode 100644 tests/models/nutrient.rkt
 delete mode 100644 tests/nutrient-measurement-model.rkt
 delete mode 100644 tests/nutrient-model.rkt

diff --git a/tests/models/nutrient-measurement.rkt b/tests/models/nutrient-measurement.rkt
new file mode 100644
index 0000000..010c812
--- /dev/null
+++ b/tests/models/nutrient-measurement.rkt
@@ -0,0 +1,69 @@
+#lang racket
+
+(module+ test
+  (require rackunit
+           rackunit/text-ui
+           "../db/conn.rkt"
+           "../db/migrations.rkt"
+           "../models/nutrient.rkt"
+           "../models/nutrient-measurement.rkt")
+
+  (define measurement-date "2025-09-01")
+
+  (run-tests
+   (test-suite
+    "Nutrient measurement model"
+    #:before (λ ()
+               (connect! #:path 'memory)
+               ;; (connect! #:path "test.sqlite3")
+               (migrate-all!)
+               (create-nutrient! "Nitrogen" "N")
+               (create-nutrient! "Phosphorus" "P")
+               (create-nutrient! "Potassium" "K"))
+    #:after (λ ()
+              (disconnect!))
+
+    (test-case "Create measurement with date and values"
+      (define nitrogen (get-nutrient #:name "Nitrogen"))
+      (define phosphorus (get-nutrient #:name "Phosphorus"))
+      (create-nutrient-measurement! measurement-date
+                                    `((,nitrogen . 12.3)
+                                      (,phosphorus . 4.5)))
+      (check-equal? (length (get-nutrient-measurements)) 1)
+      (define nm (get-nutrient-measurement #:measured-on measurement-date))
+      (check-true (nutrient-measurement? nm))
+      (check-equal? (nutrient-measurement-date nm) measurement-date))
+
+    (test-case "Check all measurement values"
+      (define nitrogen (get-nutrient #:name "Nitrogen"))
+      (define phosphorus (get-nutrient #:name "Phosphorus"))
+
+      (define nm (get-nutrient-measurement #:measured-on measurement-date))
+      (check-equal? (get-nutrient-measurement-value nm nitrogen) 12.3)
+      (check-equal? (get-nutrient-measurement-value nm phosphorus) 4.5)
+
+      (define nmv (nutrient-measurement-values nm))
+      (check-equal? (get-nutrient-measurement-values nm) nmv
+                    "return value of get-nutrient-measurement-values ≠ nutrient-measurement-values struct accessor")
+      (check-equal? (length nmv) 2)
+      (check-equal? (cdr (assoc nitrogen nmv)) 12.3)
+      (check-equal? (cdr (assoc phosphorus nmv)) 4.5))
+
+    (test-case "Retrieve latest measurement values"
+      (define nitrogen (get-nutrient #:name "Nitrogen"))
+      (define phosphorus (get-nutrient #:name "Phosphorus"))
+      (define second-measurement-date "2025-09-02")
+      (create-nutrient-measurement! second-measurement-date
+                                    `((,nitrogen . 6.7)
+                                      (,phosphorus . 8.9)))
+
+      (check-equal? (get-latest-nutrient-measurement-value nitrogen) 6.7)
+      (check-equal? (get-latest-nutrient-measurement-value phosphorus) 8.9))
+
+    (test-case "Delete measurement and cascade to measurement values"
+      (define nm (get-nutrient-measurement #:measured-on measurement-date))
+      (delete-nutrient-measurement! nm)
+      (check-false (get-nutrient-measurement #:id (nutrient-measurement-id nm)))
+      (check-equal? (length (get-nutrient-measurements)) 1
+                    "wrong number of nutrient measurements were deleted")
+      (check-true (null? (get-nutrient-measurement-values nm)))))))
diff --git a/tests/models/nutrient.rkt b/tests/models/nutrient.rkt
new file mode 100644
index 0000000..39a574c
--- /dev/null
+++ b/tests/models/nutrient.rkt
@@ -0,0 +1,76 @@
+#lang racket
+
+(module+ test
+  (require rackunit
+           rackunit/text-ui
+           "../db/conn.rkt"
+           "../db/migrations.rkt"
+           "../models/nutrient.rkt")
+
+  (run-tests
+   (test-suite
+    "Nutrient model"
+    #:before (λ ()
+               (connect! #:path 'memory)
+               (migrate-all!))
+    #:after (λ ()
+              (disconnect!))
+
+    (test-case "Create nutrients"
+      (create-nutrient! "Examplium" "Ex")
+      (check-equal? (length (get-nutrients)) 1)
+      (create-nutrient! "Ignorium" "Ig")
+      (check-equal? (length (get-nutrients)) 2))
+
+    (test-case "Read nutrient"
+      (define examplium (get-nutrient #:id 1))
+      (check-true (nutrient? examplium))
+      (check-equal? (nutrient-id examplium) 1))
+    
+    (test-case "Read nutrient by name"
+      (define examplium (get-nutrient #:name "Examplium"))
+      (check-true (nutrient? examplium))
+      (check-equal? (nutrient-name examplium) "Examplium"))
+
+    (test-case "Read nutrient by formula"
+      (define examplium (get-nutrient #:formula "Ex"))
+      (check-true (nutrient? examplium))
+      (check-equal? (nutrient-formula examplium) "Ex"))
+    
+    (test-case "Read inexisting nutrient"
+      (check-false (get-nutrient #:name "Inexistium")))
+
+    (test-case "Update nutrient name"
+      (define examplium (get-nutrient #:name "Examplium"))
+      (define examplium-nitrate
+        (update-nutrient! examplium #:name "Examplium Nitrate"))
+      (check-equal? (length (get-nutrients)) 2)
+      (check-equal? (nutrient-name examplium-nitrate) "Examplium Nitrate")
+      (check-equal? (nutrient-formula examplium-nitrate) "Ex"))
+
+    (test-case "Update nutrient formula"
+      (define examplium-nitrate (get-nutrient #:name "Examplium Nitrate"))
+      (define examplium-sulfate
+        (update-nutrient! examplium-nitrate #:formula "ExSO4"))
+      (check-equal? (length (get-nutrients)) 2)
+      (check-equal? (nutrient-name examplium-sulfate) "Examplium Nitrate")
+      (check-equal? (nutrient-formula examplium-sulfate) "ExSO4"))
+
+    (test-case "Update nutrient name and formula"
+      (define examplium-nitrate
+        (get-nutrient #:name "Examplium Nitrate"))
+      (define examplium-sulfate
+        (update-nutrient! examplium-nitrate
+                          #:name "Examplium Sulfate"
+                          #:formula "ExNO3"))
+      (check-equal? (length (get-nutrients)) 2)
+      (check-equal? (nutrient-name examplium-sulfate) "Examplium Sulfate")
+      (check-equal? (nutrient-formula examplium-sulfate) "ExNO3"))
+
+    (test-case "Delete nutrient"
+      (define examplium-sulfate (get-nutrient #:name "Examplium Sulfate"))
+      (delete-nutrient! examplium-sulfate)
+      (check-equal? (length (get-nutrients)) 1)
+      (define ignorium (get-nutrient #:name "Ignorium"))
+      (delete-nutrient! ignorium)
+      (check-equal? (length (get-nutrients)) 0)))))
diff --git a/tests/nutrient-measurement-model.rkt b/tests/nutrient-measurement-model.rkt
deleted file mode 100644
index 010c812..0000000
--- a/tests/nutrient-measurement-model.rkt
+++ /dev/null
@@ -1,69 +0,0 @@
-#lang racket
-
-(module+ test
-  (require rackunit
-           rackunit/text-ui
-           "../db/conn.rkt"
-           "../db/migrations.rkt"
-           "../models/nutrient.rkt"
-           "../models/nutrient-measurement.rkt")
-
-  (define measurement-date "2025-09-01")
-
-  (run-tests
-   (test-suite
-    "Nutrient measurement model"
-    #:before (λ ()
-               (connect! #:path 'memory)
-               ;; (connect! #:path "test.sqlite3")
-               (migrate-all!)
-               (create-nutrient! "Nitrogen" "N")
-               (create-nutrient! "Phosphorus" "P")
-               (create-nutrient! "Potassium" "K"))
-    #:after (λ ()
-              (disconnect!))
-
-    (test-case "Create measurement with date and values"
-      (define nitrogen (get-nutrient #:name "Nitrogen"))
-      (define phosphorus (get-nutrient #:name "Phosphorus"))
-      (create-nutrient-measurement! measurement-date
-                                    `((,nitrogen . 12.3)
-                                      (,phosphorus . 4.5)))
-      (check-equal? (length (get-nutrient-measurements)) 1)
-      (define nm (get-nutrient-measurement #:measured-on measurement-date))
-      (check-true (nutrient-measurement? nm))
-      (check-equal? (nutrient-measurement-date nm) measurement-date))
-
-    (test-case "Check all measurement values"
-      (define nitrogen (get-nutrient #:name "Nitrogen"))
-      (define phosphorus (get-nutrient #:name "Phosphorus"))
-
-      (define nm (get-nutrient-measurement #:measured-on measurement-date))
-      (check-equal? (get-nutrient-measurement-value nm nitrogen) 12.3)
-      (check-equal? (get-nutrient-measurement-value nm phosphorus) 4.5)
-
-      (define nmv (nutrient-measurement-values nm))
-      (check-equal? (get-nutrient-measurement-values nm) nmv
-                    "return value of get-nutrient-measurement-values ≠ nutrient-measurement-values struct accessor")
-      (check-equal? (length nmv) 2)
-      (check-equal? (cdr (assoc nitrogen nmv)) 12.3)
-      (check-equal? (cdr (assoc phosphorus nmv)) 4.5))
-
-    (test-case "Retrieve latest measurement values"
-      (define nitrogen (get-nutrient #:name "Nitrogen"))
-      (define phosphorus (get-nutrient #:name "Phosphorus"))
-      (define second-measurement-date "2025-09-02")
-      (create-nutrient-measurement! second-measurement-date
-                                    `((,nitrogen . 6.7)
-                                      (,phosphorus . 8.9)))
-
-      (check-equal? (get-latest-nutrient-measurement-value nitrogen) 6.7)
-      (check-equal? (get-latest-nutrient-measurement-value phosphorus) 8.9))
-
-    (test-case "Delete measurement and cascade to measurement values"
-      (define nm (get-nutrient-measurement #:measured-on measurement-date))
-      (delete-nutrient-measurement! nm)
-      (check-false (get-nutrient-measurement #:id (nutrient-measurement-id nm)))
-      (check-equal? (length (get-nutrient-measurements)) 1
-                    "wrong number of nutrient measurements were deleted")
-      (check-true (null? (get-nutrient-measurement-values nm)))))))
diff --git a/tests/nutrient-model.rkt b/tests/nutrient-model.rkt
deleted file mode 100644
index 39a574c..0000000
--- a/tests/nutrient-model.rkt
+++ /dev/null
@@ -1,76 +0,0 @@
-#lang racket
-
-(module+ test
-  (require rackunit
-           rackunit/text-ui
-           "../db/conn.rkt"
-           "../db/migrations.rkt"
-           "../models/nutrient.rkt")
-
-  (run-tests
-   (test-suite
-    "Nutrient model"
-    #:before (λ ()
-               (connect! #:path 'memory)
-               (migrate-all!))
-    #:after (λ ()
-              (disconnect!))
-
-    (test-case "Create nutrients"
-      (create-nutrient! "Examplium" "Ex")
-      (check-equal? (length (get-nutrients)) 1)
-      (create-nutrient! "Ignorium" "Ig")
-      (check-equal? (length (get-nutrients)) 2))
-
-    (test-case "Read nutrient"
-      (define examplium (get-nutrient #:id 1))
-      (check-true (nutrient? examplium))
-      (check-equal? (nutrient-id examplium) 1))
-    
-    (test-case "Read nutrient by name"
-      (define examplium (get-nutrient #:name "Examplium"))
-      (check-true (nutrient? examplium))
-      (check-equal? (nutrient-name examplium) "Examplium"))
-
-    (test-case "Read nutrient by formula"
-      (define examplium (get-nutrient #:formula "Ex"))
-      (check-true (nutrient? examplium))
-      (check-equal? (nutrient-formula examplium) "Ex"))
-    
-    (test-case "Read inexisting nutrient"
-      (check-false (get-nutrient #:name "Inexistium")))
-
-    (test-case "Update nutrient name"
-      (define examplium (get-nutrient #:name "Examplium"))
-      (define examplium-nitrate
-        (update-nutrient! examplium #:name "Examplium Nitrate"))
-      (check-equal? (length (get-nutrients)) 2)
-      (check-equal? (nutrient-name examplium-nitrate) "Examplium Nitrate")
-      (check-equal? (nutrient-formula examplium-nitrate) "Ex"))
-
-    (test-case "Update nutrient formula"
-      (define examplium-nitrate (get-nutrient #:name "Examplium Nitrate"))
-      (define examplium-sulfate
-        (update-nutrient! examplium-nitrate #:formula "ExSO4"))
-      (check-equal? (length (get-nutrients)) 2)
-      (check-equal? (nutrient-name examplium-sulfate) "Examplium Nitrate")
-      (check-equal? (nutrient-formula examplium-sulfate) "ExSO4"))
-
-    (test-case "Update nutrient name and formula"
-      (define examplium-nitrate
-        (get-nutrient #:name "Examplium Nitrate"))
-      (define examplium-sulfate
-        (update-nutrient! examplium-nitrate
-                          #:name "Examplium Sulfate"
-                          #:formula "ExNO3"))
-      (check-equal? (length (get-nutrients)) 2)
-      (check-equal? (nutrient-name examplium-sulfate) "Examplium Sulfate")
-      (check-equal? (nutrient-formula examplium-sulfate) "ExNO3"))
-
-    (test-case "Delete nutrient"
-      (define examplium-sulfate (get-nutrient #:name "Examplium Sulfate"))
-      (delete-nutrient! examplium-sulfate)
-      (check-equal? (length (get-nutrients)) 1)
-      (define ignorium (get-nutrient #:name "Ignorium"))
-      (delete-nutrient! ignorium)
-      (check-equal? (length (get-nutrients)) 0)))))
-- 
cgit v1.2.3