From 7097edcc77e58bb71d688dd307bb5e2e0df35226 Mon Sep 17 00:00:00 2001 From: jem Date: Wed, 29 May 2019 19:12:51 +0200 Subject: [PATCH] refactor input spec --- main/src/data_test.clj | 2 +- main/src/data_test/loader.clj | 2 +- .../data_test_test/should-test-with-data-explicit-version.edn | 2 +- test/resources/data_test_test/should_test_multiple_specs.1.edn | 2 +- test/resources/data_test_test/should_test_multiple_specs.2.edn | 2 +- .../data_test_test/should_test_with_data_macro_version.edn | 2 +- .../data_test_test/should_test_with_data_record_version.edn | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/main/src/data_test.clj b/main/src/data_test.clj index 5847a8f..a48ac22 100644 --- a/main/src/data_test.clj +++ b/main/src/data_test.clj @@ -28,7 +28,7 @@ :test `(fn [] (doseq [data-spec# (loader/load-data-test-specs ~namespaced-test-key#)] (let [~(symbol (first bindings)) (:input data-spec#) - ~(symbol (second bindings)) (:expectation data-spec#) + ~(symbol (second bindings)) (:expected data-spec#) data-spec-file# (:data-spec-file data-spec#) message# (new java.io.StringWriter)] (binding [t/*testing-contexts* diff --git a/main/src/data_test/loader.clj b/main/src/data_test/loader.clj index 065bd7e..30cd372 100644 --- a/main/src/data_test/loader.clj +++ b/main/src/data_test/loader.clj @@ -23,7 +23,7 @@ ;TODO: replace schema with spec (def TestDataSpec {:input s/Any - :expectation s/Any}) + :expected s/Any}) (def RuntimeTestDataSpec (merge diff --git a/test/resources/data_test_test/should-test-with-data-explicit-version.edn b/test/resources/data_test_test/should-test-with-data-explicit-version.edn index 030c81f..b7ccc1d 100644 --- a/test/resources/data_test_test/should-test-with-data-explicit-version.edn +++ b/test/resources/data_test_test/should-test-with-data-explicit-version.edn @@ -1,2 +1,2 @@ {:input 1 - :expectation 1} \ No newline at end of file + :expected 1} \ No newline at end of file diff --git a/test/resources/data_test_test/should_test_multiple_specs.1.edn b/test/resources/data_test_test/should_test_multiple_specs.1.edn index 030c81f..b7ccc1d 100644 --- a/test/resources/data_test_test/should_test_multiple_specs.1.edn +++ b/test/resources/data_test_test/should_test_multiple_specs.1.edn @@ -1,2 +1,2 @@ {:input 1 - :expectation 1} \ No newline at end of file + :expected 1} \ No newline at end of file diff --git a/test/resources/data_test_test/should_test_multiple_specs.2.edn b/test/resources/data_test_test/should_test_multiple_specs.2.edn index fecaa2f..809cfb4 100644 --- a/test/resources/data_test_test/should_test_multiple_specs.2.edn +++ b/test/resources/data_test_test/should_test_multiple_specs.2.edn @@ -1,2 +1,2 @@ {:input 2 - :expectation 2} \ No newline at end of file + :expected 2} \ No newline at end of file diff --git a/test/resources/data_test_test/should_test_with_data_macro_version.edn b/test/resources/data_test_test/should_test_with_data_macro_version.edn index 030c81f..b7ccc1d 100644 --- a/test/resources/data_test_test/should_test_with_data_macro_version.edn +++ b/test/resources/data_test_test/should_test_with_data_macro_version.edn @@ -1,2 +1,2 @@ {:input 1 - :expectation 1} \ No newline at end of file + :expected 1} \ No newline at end of file diff --git a/test/resources/data_test_test/should_test_with_data_record_version.edn b/test/resources/data_test_test/should_test_with_data_record_version.edn index 030c81f..b7ccc1d 100644 --- a/test/resources/data_test_test/should_test_with_data_record_version.edn +++ b/test/resources/data_test_test/should_test_with_data_record_version.edn @@ -1,2 +1,2 @@ {:input 1 - :expectation 1} \ No newline at end of file + :expected 1} \ No newline at end of file