Merge pull request #318 from lambdaisland/alys/update-ci-jdk

Add Java 17 and 19 to test matrix

Author: alysbrooks

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2.1
 
 orbs:
   kaocha: lambdaisland/[email protected]
-  clojure: lambdaisland/[email protected].4
+  clojure: lambdaisland/[email protected].8
   win: circleci/[email protected]
 
 jobs:

test/features/command_line/print_config.feature

@@ -11,20 +11,20 @@ Feature: CLI: Print the Kaocha configuration
 
   Scenario: Using `--print-config`
     When I run `bin/kaocha --print-config`
-    Then the output should contain:
+    Then the EDN output should contain:
       """ clojure
       {:kaocha.plugin.randomize/randomize? false,
        :kaocha/reporter [kaocha.report/dots],
        :kaocha/color? false,
-       :kaocha/fail-fast? false,
+       :kaocha/fail-fast? false}
       """
-    And the output should contain:
+    And the EDN output should contain:
       """ clojure
-       :kaocha/tests
+       {:kaocha/tests
        [{:kaocha.testable/type :kaocha.type/clojure.test,
          :kaocha.testable/id :unit,
          :kaocha/ns-patterns ["-test$"],
          :kaocha/source-paths ["src"],
          :kaocha/test-paths ["test"],
-         :kaocha.filter/skip-meta [:kaocha/skip]}],
+         :kaocha.filter/skip-meta [:kaocha/skip]}]}
       """

test/step_definitions/kaocha_integration.clj

@@ -1,7 +1,8 @@
 (ns features.steps.kaocha-integration
   ^{:clojure.tools.namespace.repl/load false
     :clojure.tools.namespace.repl/unload false}
-  (:require [clojure.java.io :as io]
+  (:require [clojure.edn :as edn]
+            [clojure.java.io :as io]
             [clojure.java.shell :as shell]
             [clojure.string :as str]
             [clojure.test :as t :refer :all]
@@ -64,6 +65,13 @@
   (is (not (str/includes? (:out m) output)))
   m)
 
+(Then "the EDN output should contain:" [m output]
+      (let  [actual (edn/read-string (:out m))
+             expected (edn/read-string output)]
+        (is (= (select-keys actual (keys expected)) expected)))
+      m)
+
+
 (Then "stderr should contain" [m output]
   (is (substring? output (:err m)))
   m)