Merge pull request #94 from darioghilardi/test-filename-conventions

Use the _test suffix for test files and reorganise the test directory.
yogthos · Mar 11, 2016 · d828c3f · d828c3f
2 parents 4dea2bb + e0bc915
commit d828c3f
Show file tree

Hide file tree

Showing 16 changed files with 19 additions and 19 deletions.
diff --git a/project.clj b/project.clj
@@ -33,7 +33,7 @@
             {:source-paths ["src/cljc" "src/cljs" "test"]
              :compiler {:output-to "target/unit-test.js"
                         :output-dir "target"
-                        :main mdtest.runner
+                        :main mdrunner.test
                         :optimizations :whitespace}}}}
   :profiles
   {:dev

diff --git a/test/bench.md → test/files/bench.md b/test/bench.md → test/files/bench.md
diff --git a/test/footnotes.html → test/files/footnotes.html b/test/footnotes.html → test/files/footnotes.html
diff --git a/test/footnotes.md → test/files/footnotes.md b/test/footnotes.md → test/files/footnotes.md
diff --git a/test/metadata.md → test/files/metadata.md b/test/metadata.md → test/files/metadata.md
diff --git a/test/references.html → test/files/references.html b/test/references.html → test/files/references.html
diff --git a/test/references.md → test/files/references.md b/test/references.md → test/files/references.md
diff --git a/test/tables.html → test/files/tables.html b/test/tables.html → test/files/tables.html
diff --git a/test/tables.md → test/files/tables.md b/test/tables.md → test/files/tables.md
diff --git a/test/test.html → test/files/test.html b/test/test.html → test/files/test.html
diff --git a/test/test.md → test/files/test.md b/test/test.md → test/files/test.md
diff --git a/test/benchmark.clj → test/markdown/benchmark.clj b/test/benchmark.clj → test/markdown/benchmark.clj
@@ -1,4 +1,4 @@
-(ns benchmark
+(ns markdown.benchmark
   (:require [clojure.test :refer :all]
             [markdown.core :as markdown]
             [criterium.core :as criterium]))
@@ -12,4 +12,4 @@
 
 (deftest ^:benchmark bench-file []
   (criterium/bench
-    (markdown/md-to-html (str "test" java.io.File/separator "bench.md") (java.io.StringWriter.))))
+    (markdown/md-to-html (str "test/files" java.io.File/separator "bench.md") (java.io.StringWriter.))))
diff --git a/test/mdtests_file.clj → test/markdown/md_file_test.clj b/test/mdtests_file.clj → test/markdown/md_file_test.clj
@@ -1,32 +1,32 @@
-(ns mdtests-file
+(ns markdown.md-file-test
   (:require [markdown.core :as markdown]
             [markdown.transformers :as transformers]
             [markdown.tables :as tables]
             [clojure.test :refer :all]))
 
 (deftest references
   (let [wrt (java.io.StringWriter.)]
-    (markdown/md-to-html (str "test" java.io.File/separator "references.md") wrt :reference-links? true)
-    (is (= (slurp (str "test" java.io.File/separator "references.html")) (.toString wrt)))))
+    (markdown/md-to-html (str "test/files" java.io.File/separator "references.md") wrt :reference-links? true)
+    (is (= (slurp (str "test/files" java.io.File/separator "references.html")) (.toString wrt)))))
 
 (deftest footnotes
   (let [wrt (java.io.StringWriter.)]
-    (markdown/md-to-html (str "test" java.io.File/separator "footnotes.md") wrt :footnotes? true)
-    (is (= (slurp (str "test" java.io.File/separator "footnotes.html")) (.toString wrt)))))
+    (markdown/md-to-html (str "test/files" java.io.File/separator "footnotes.md") wrt :footnotes? true)
+    (is (= (slurp (str "test/files" java.io.File/separator "footnotes.html")) (.toString wrt)))))
 
 (deftest all-together
   (let [wrt (java.io.StringWriter.)]
-    (markdown/md-to-html (str "test" java.io.File/separator "test.md") wrt)
-    (is (= (slurp (str "test" java.io.File/separator "test.html")) (.toString wrt)))))
+    (markdown/md-to-html (str "test/files" java.io.File/separator "test.md") wrt)
+    (is (= (slurp (str "test/files" java.io.File/separator "test.html")) (.toString wrt)))))
 
 (deftest tables
   (let [wrt (java.io.StringWriter.)]
-    (markdown/md-to-html (str "test" java.io.File/separator "tables.md") wrt)
-    (is (= (slurp (str "test" java.io.File/separator "tables.html")) (.toString wrt)))))
+    (markdown/md-to-html (str "test/files" java.io.File/separator "tables.md") wrt)
+    (is (= (slurp (str "test/files" java.io.File/separator "tables.html")) (.toString wrt)))))
 
 (deftest md-metadata
   (testing "Finds all metadata and correctly parses rest of file."
-    (let [md (slurp (str "test/metadata.md"))
+    (let [md (slurp (str "test/files/metadata.md"))
           {:keys [metadata html]} (markdown/md-to-html-string-with-meta md)]
       (is (= "<h1>The Document</h1>" html))
       (is (= {:title       ["My Document"]

diff --git a/test/markdown/md_runner_test.cljs b/test/markdown/md_runner_test.cljs
@@ -0,0 +1,5 @@
+(ns markdown.mdrunner-test
+  (:require [doo.runner :refer-macros [doo-tests]]
+            [markdown.md-test]))
+
+(doo-tests 'markdown.md-test)
diff --git a/test/mdtests.cljc → test/markdown/md_test.cljc b/test/mdtests.cljc → test/markdown/md_test.cljc
@@ -1,4 +1,4 @@
-(ns mdtests
+(ns markdown.md-test
   (:require [markdown.core :as markdown]
             [markdown.transformers :as transformers]
             [markdown.tables :as tables]

diff --git a/test/mdtest_runner.cljs b/test/mdtest_runner.cljs