From dafe1aaa54d41999b4c81f4904ae1f0e7cc9de11 Mon Sep 17 00:00:00 2001 From: Marius Peter Date: Sat, 29 Nov 2025 15:50:36 +0100 Subject: Move tests to concerned modules. --- models/nutrient-measurement.rkt | 64 ++++++++++++++++++++++++++++ models/nutrient.rkt | 80 ++++++++++++++++++++++++++++++++--- tests/models/nutrient-measurement.rkt | 66 ----------------------------- tests/models/nutrient.rkt | 69 ------------------------------ 4 files changed, 137 insertions(+), 142 deletions(-) delete mode 100644 tests/models/nutrient-measurement.rkt delete mode 100644 tests/models/nutrient.rkt diff --git a/models/nutrient-measurement.rkt b/models/nutrient-measurement.rkt index 5b5f93d..913e402 100644 --- a/models/nutrient-measurement.rkt +++ b/models/nutrient-measurement.rkt @@ -174,3 +174,67 @@ (define (delete-nutrient-measurement! nutrient-measurement) (define id (nutrient-measurement-id nutrient-measurement)) (query-exec (current-conn) (delete #:from nutrient_measurements #:where (= id ,id)))) + +(module+ test + (require rackunit + rackunit/text-ui + "../db/conn.rkt" + "../db/migrations.rkt" + "../models/nutrient.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 (hash 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-measured-on 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-nutrient-values nm)) + (check-equal? + (get-nutrient-measurement-values nm) + nmv + "return value of get-nutrient-measurement-values ≠ nutrient-measurement-values struct accessor") + (check-equal? (hash-count nmv) 2) + (check-equal? (hash-ref nmv nitrogen) 12.3) + (check-equal? (hash-ref nmv phosphorus) 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 (hash 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 (hash-empty? (get-nutrient-measurement-values nm))))))) diff --git a/models/nutrient.rkt b/models/nutrient.rkt index 07fb4fd..dd8d677 100644 --- a/models/nutrient.rkt +++ b/models/nutrient.rkt @@ -47,13 +47,12 @@ (define (create-nutrient! canonical-name french-name formula) (or (get-nutrient #:name canonical-name #:formula formula) - (with-tx - (query-exec (current-conn) - (insert #:into nutrients - #:set [canonical_name ,canonical-name] - [french_name ,french-name] - [formula ,formula])) - (get-nutrient #:name canonical-name)))) + (with-tx (query-exec (current-conn) + (insert #:into nutrients + #:set [canonical_name ,canonical-name] + [french_name ,french-name] + [formula ,formula])) + (get-nutrient #:name canonical-name)))) ;; READ @@ -110,3 +109,70 @@ (define (delete-nutrient! nutrient) (query-exec (current-conn) (delete #:from nutrients #:where (= id ,(nutrient-id nutrient))))) + +(module+ test + (require rackunit + rackunit/text-ui + "../db/conn.rkt" + "../db/migrations.rkt") + + (run-tests (test-suite "Nutrient model" + #:before (λ () + (connect! #:path 'memory) + (migrate-all!)) + #:after (λ () (disconnect!)) + + (test-case "Create nutrients" + (check-equal? (length (get-nutrients)) 0) + (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-canonical-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-canonical-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-canonical-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-canonical-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/models/nutrient-measurement.rkt b/tests/models/nutrient-measurement.rkt deleted file mode 100644 index f64f9cd..0000000 --- a/tests/models/nutrient-measurement.rkt +++ /dev/null @@ -1,66 +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 (hash 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? (hash-count nmv) 2) - (check-equal? (hash-ref nmv nitrogen) 12.3) - (check-equal? (hash-ref nmv phosphorus) 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 (hash 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 (hash-empty? (get-nutrient-measurement-values nm))))))) diff --git a/tests/models/nutrient.rkt b/tests/models/nutrient.rkt deleted file mode 100644 index 525ef66..0000000 --- a/tests/models/nutrient.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") - - (run-tests (test-suite "Nutrient model" - #:before (λ () - (connect! #:path 'memory) - (migrate-all!)) - #:after (λ () (disconnect!)) - - (test-case "Create nutrients" - (check-equal? (length (get-nutrients)) 0) - (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-canonical-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-canonical-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-canonical-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-canonical-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