provide multi-file-loading

main/src/data_test/file_loader.clj

@@ -43,15 +43,21 @@
           (map #(str prefix "." % ".edn")
                 (range 10)))))
 
-(s/defn load-data-test-specs :- '(TestDataSpec)
+(s/defn load-data-test-spec
-  [file-prefix :- s/Str]
+  [file-path :- s/Str]
-  (let [file-path (str file-prefix ".edn")]
+  (let [file-resource (io/resource file-path)]
-    (try
+    (when file-resource
-      (read-test-data-spec (io/resource file-path))
+      (read-test-data-spec file-resource))))
-      (catch IllegalArgumentException e
+
-        (throw (ex-info (str "Could not find test spec on " file-path)
+(s/defn load-data-test-specs :- [TestDataSpec]
-                        {:message "Could not find test spec"
+  [name-key :- s/Keyword]
-                         :file-path file-prefix} e))))))
+  (let [data-test-specs (filter some?
+                                (map load-data-test-spec (data-test-spec-file-names name-key)))]
+    (if (empty? data-test-specs)
+      (throw (ex-info (str "Could not find test spec on " name-key)
+                      {:message "Could not find test spec"
+                       :name-key name-key}))
+      (into [] data-test-specs))))
 
 (s/defn load-test-data
   [file-prefix :- s/Str]

test/resources/data_test/file_loader_test/test_it.1.edn

@@ -1 +1 @@
-{:test "data"}
+{:test "data1"}

test/resources/data_test/file_loader_test/test_it.9.edn

@@ -0,0 +1 @@
+{:test "data9"}

test/resources/data_test/file_loader_test/test_it.99.edn

@@ -1 +0,0 @@
-{:test "data"}

test/src/data_test/file_loader_test.clj

@@ -47,8 +47,16 @@
 
 (deftest should-load-data
   (is (= {:test "data"}
-         (sut/load-test-data (sut/data-test-spec-file-prefix ::test-it)))))
+         (sut/load-data-test-spec (str (sut/data-test-spec-file-prefix ::test-it) ".edn")))))
+
+(deftest should-not-load-non-existing-data
+  (is (= nil
+         (sut/load-data-test-spec (str (sut/data-test-spec-file-prefix ::not-existing) ".edn")))))
+
+(deftest should-load-data-test-specs
+  (is (= [{:test "data"} {:test "data1"} {:test "data9"}]
+         (sut/load-data-test-specs ::test-it))))
 
 (deftest should-throw-exception
   (is (thrown? RuntimeException
-               (sut/load-test-data (sut/data-test-spec-file-prefix ::not-existing)))))
+               (sut/load-data-test-specs ::not-existing))))