From 8a85a2d814c2b567fbceba7284c5375e5dca6e0f Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Wed, 24 Feb 2016 21:34:29 +0100
Subject: [PATCH] Move macro from tests into correct namespace

---
 src/pjstadig/macro.cljc                          |  2 +-
 test/fixtures/test_output                        | 16 ++++++++--------
 test/pjstadig/{ => fixtures}/macro.clj           |  2 +-
 .../humane_test_output/formatting_test.cljc      |  9 +++++----
 4 files changed, 15 insertions(+), 14 deletions(-)
 rename test/pjstadig/{ => fixtures}/macro.clj (79%)

diff --git a/src/pjstadig/macro.cljc b/src/pjstadig/macro.cljc
index 7f91324..c3a7cdd 100644
--- a/src/pjstadig/macro.cljc
+++ b/src/pjstadig/macro.cljc
@@ -6,6 +6,6 @@
   (apply data/diff args))
 
 (defn do-report [& args]
-  (apply cljs.test/do-report args))
+  #?(:cljs (apply cljs.test/do-report args)))
 
 
diff --git a/test/fixtures/test_output b/test/fixtures/test_output
index 30bd55c..7842cd3 100644
--- a/test/fixtures/test_output
+++ b/test/fixtures/test_output
@@ -1,9 +1,11 @@
 
+lein test pjstadig.fixtures.macro
+
 lein test pjstadig.humane-test-output.formatting-test
 
 lein test :only pjstadig.humane-test-output.formatting-test/t-formatting
 
-FAIL in (t-formatting) (formatting_test.cljc:9)
+FAIL in (t-formatting) (formatting_test.cljc:10)
 FIXME, I fail.
 expected: {:foo :bar,
            :baz :quux,
@@ -18,7 +20,7 @@ expected: {:foo :bar,
 
 lein test :only pjstadig.humane-test-output.formatting-test/t-formatting
 
-FAIL in (t-formatting) (formatting_test.cljc:12)
+FAIL in (t-formatting) (formatting_test.cljc:13)
 FIXME, I fail.
 expected: {:foo :bar,
            :baz :quux,
@@ -31,7 +33,7 @@ expected: {:foo :bar,
 
 lein test :only pjstadig.humane-test-output.formatting-test/t-formatting
 
-FAIL in (t-formatting) (formatting_test.cljc:15)
+FAIL in (t-formatting) (formatting_test.cljc:16)
 FIXME, I fail.
 expected: {:foo :bar}
   actual: {:foo :bar,
@@ -44,7 +46,7 @@ expected: {:foo :bar}
 
 lein test :only pjstadig.humane-test-output.formatting-test/t-formatting
 
-FAIL in (t-formatting) (formatting_test.cljc:18)
+FAIL in (t-formatting) (formatting_test.cljc:19)
 FIXME, I fail.
 expected: {:foo :bar, :baz :quux}
   actual: {:foo :bar, :baz :quux}
@@ -59,7 +61,7 @@ expected: {:foo :bar, :baz :quux}
 
 lein test :only pjstadig.humane-test-output.formatting-test/t-formatting
 
-FAIL in (t-formatting) (formatting_test.cljc:22)
+FAIL in (t-formatting) (formatting_test.cljc:23)
 FIXME, I fail.
 expected: (list? foo)
   actual: (not
@@ -71,7 +73,7 @@ expected: (list? foo)
 
 lein test :only pjstadig.humane-test-output.formatting-test/t-macro-wrapping
 
-FAIL in (t-macro-wrapping) (formatting_test.cljc:24)
+FAIL in (t-macro-wrapping) (formatting_test.cljc:25)
 expected: 1
   actual: 2
     diff: - 1
@@ -102,7 +104,5 @@ and here
 expected: #pjstadig.humane_test_output.records_test.ARecord{:foo :foo}
   actual: #pjstadig.humane_test_output.records_test.BRecord{:foo :foo}
 
-lein test pjstadig.macro
-
 Ran 3 tests containing 9 assertions.
 9 failures, 0 errors.
diff --git a/test/pjstadig/macro.clj b/test/pjstadig/fixtures/macro.clj
similarity index 79%
rename from test/pjstadig/macro.clj
rename to test/pjstadig/fixtures/macro.clj
index c7392e0..358b1f1 100644
--- a/test/pjstadig/macro.clj
+++ b/test/pjstadig/fixtures/macro.clj
@@ -1,4 +1,4 @@
-(ns pjstadig.macro)
+(ns pjstadig.fixtures.macro)
 
 (defmacro deftest+
   [test-name expected actual]
diff --git a/test/pjstadig/humane_test_output/formatting_test.cljc b/test/pjstadig/humane_test_output/formatting_test.cljc
index 98b51c5..3fe88a7 100644
--- a/test/pjstadig/humane_test_output/formatting_test.cljc
+++ b/test/pjstadig/humane_test_output/formatting_test.cljc
@@ -1,8 +1,9 @@
 (ns pjstadig.humane-test-output.formatting-test
-  #?(:clj  (:use [clojure.test]
-                 [pjstadig.macro])
-     :cljs (:require-macros [cljs.test :refer [deftest testing is]]
-                            [pjstadig.macro :refer [deftest+]])))
+  #?@(:clj  [(:use [clojure.test]
+                   [pjstadig.fixtures.macro])]
+      :cljs [(:require [cljs.test :refer [do-report]])
+             (:require-macros [cljs.test :refer [deftest testing is]]
+                              [pjstadig.fixtures.macro :refer [deftest+]])]))
 
 (deftest t-formatting
   (testing "FIXME, I fail."