From ce25f94fc35aa89d4b837ff81d65949e943434a6 Mon Sep 17 00:00:00 2001 From: jem Date: Wed, 29 May 2019 19:09:01 +0200 Subject: [PATCH] improved encapsulation --- main/src/data_test/loader.clj | 4 ++++ main/src/data_test/reporter.clj | 10 +++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/main/src/data_test/loader.clj b/main/src/data_test/loader.clj index d522816..065bd7e 100644 --- a/main/src/data_test/loader.clj +++ b/main/src/data_test/loader.clj @@ -30,6 +30,10 @@ TestDataSpec {:data-spec-file s/Str})) +(s/defn data-spec-file :- s/Str + [runtime-test-data-spec :- RuntimeTestDataSpec] + (:data-spec-file runtime-test-data-spec)) + (s/defn read-test-data-spec :- TestDataSpec [resource-url :- s/Str] (aero/read-config resource-url)) diff --git a/main/src/data_test/reporter.clj b/main/src/data_test/reporter.clj index e61d2fe..6a3b098 100644 --- a/main/src/data_test/reporter.clj +++ b/main/src/data_test/reporter.clj @@ -18,15 +18,19 @@ [clojure.test :as t] [clojure.java.io :as io] [clojure.stacktrace :as stack] - [schema.core :as s])) + [schema.core :as s] + [data-test.loader :as loader])) (def ^:dynamic *data-test-report-context* nil) +(def ^:dynamic + *target-dir* "target/datatest/") + (s/defn write-data-test-output [m] - (let [data-spec-file (:data-spec-file *data-test-report-context*) - output-file (str "target/datatest/" data-spec-file)] + (let [data-spec-file (loader/data-spec-file *data-test-report-context*) + output-file (str *target-dir* data-spec-file)] (io/make-parents output-file) (spit output-file (merge {:test-event m}