Rename "cljs" in namespaces to "clojure"

This is a breaking change for anybody using CLJS, but is necessary for a few different reasons: - moving the codebase to cljc requires that our namespaces be the same, or else the filenames would be incorrect - users writing cljc test code can avoid lots of boilerplate reader conditionals in their namespace declarations - macros expanding to calls to test.check code will have less switching logic of that sort
clojure · Aug 9, 2015 · 1c749ed · 1c749ed
1 parent 5e81063
commit 1c749ed
Show file tree

Hide file tree

Showing 21 changed files with 68 additions and 139 deletions.
diff --git a/project.clj b/project.clj
@@ -16,8 +16,8 @@
             [lein-cljsbuild "1.0.4-SNAPSHOT"]]
   :codox {:defaults {:doc/format :markdown}
           :exclude [clojure.test.check.rose-tree
-                    cljs.test.check.cljs-test
-                    cljs.test.check.properties]}
+                    clojure.test.check.clojure-test
+                    clojure.test.check.properties]}
   :cljsbuild
   {:builds
    [{:id "node-dev"

diff --git a/resources/run.js b/resources/run.js
@@ -4,5 +4,5 @@ try {
 }
 require("../target/cljs/node_dev/out/goog/bootstrap/nodejs.js");
 require("../target/cljs/node_dev/tests.js");
-goog.require("cljs.test.check.test.runner");
+goog.require("clojure.test.check.test.runner");
 goog.require("cljs.nodejscli");
diff --git a/resources/run_tests_dev.html b/resources/run_tests_dev.html
@@ -5,7 +5,7 @@
         <script src="../target/cljs/browser_dev/out/goog/base.js" language="javascript"></script>
         <script src="../target/cljs/browser_dev/tests.js" language="javascript"></script>
         <script language="javascript">
-            goog.require("cljs.test.check.test.runner");
+            goog.require("clojure.test.check.test.runner");
         </script>
     </body>
 </html>

diff --git a/src/main/clojure/cljs/test/check/cljs_test.clj b/src/main/clojure/cljs/test/check/cljs_test.clj
diff --git a/src/main/clojure/cljs/test/check/properties.clj b/src/main/clojure/cljs/test/check/properties.clj
diff --git a/src/main/clojure/cljs/test/check.cljs → src/main/clojure/clojure/test/check.cljs b/src/main/clojure/cljs/test/check.cljs → src/main/clojure/clojure/test/check.cljs
@@ -7,11 +7,11 @@
 ;   the terms of this license.
 ;   You must not remove this notice, or any other, from this software.
 
-(ns cljs.test.check
-  (:require [cljs.test.check.generators :as gen]
-            [cljs.test.check.cljs-test :as ct]
-            [cljs.test.check.random :as random]
-            [cljs.test.check.rose-tree :as rose]))
+(ns clojure.test.check
+  (:require [clojure.test.check.generators :as gen]
+            [clojure.test.check.clojure-test :as ct]
+            [clojure.test.check.random :as random]
+            [clojure.test.check.rose-tree :as rose]))
 
 (declare shrink-loop failure)
 

diff --git a/src/main/clojure/clojure/test/check/clojure_test.clj b/src/main/clojure/clojure/test/check/clojure_test.clj
@@ -10,7 +10,7 @@
 (ns clojure.test.check.clojure-test
   (:require [clojure.test :as ct]))
 
-(defn- assert-check
+(defn assert-check
   [{:keys [result] :as m}]
   (prn m)
   (if (instance? Throwable result)
@@ -47,8 +47,8 @@
      (require 'clojure.test.check)
      `(defn ~(vary-meta name assoc
                         ::defspec true
-                        :test `#(#'assert-check (assoc (~name)
-                                                      :test-var (str '~name))))
+                        :test `#(clojure.test.check.clojure-test/assert-check
+                                   (assoc (~name) :test-var (str '~name))))
         ([] (let [options# (process-options ~options)]
               (apply ~name (:num-tests options#) (apply concat options#))))
         ([~'times & {:keys [~'seed ~'max-size] :as ~'quick-check-opts}]

diff --git a/...in/clojure/cljs/test/check/cljs_test.cljs → ...jure/clojure/test/check/clojure_test.cljs b/...in/clojure/cljs/test/check/cljs_test.cljs → ...jure/clojure/test/check/clojure_test.cljs
@@ -7,8 +7,8 @@
 ;   the terms of this license.
 ;   You must not remove this notice, or any other, from this software.
 
-(ns cljs.test.check.cljs-test
-  (:require-macros cljs.test.check.cljs-test)
+(ns clojure.test.check.clojure-test
+  (:require-macros clojure.test.check.clojure-test)
   (:require [cljs.test :as ct :include-macros true]))
 
 (defn- assert-check

diff --git a/...n/clojure/cljs/test/check/generators.cljs → ...lojure/clojure/test/check/generators.cljs b/...n/clojure/cljs/test/check/generators.cljs → ...lojure/clojure/test/check/generators.cljs
@@ -7,13 +7,13 @@
 ;   the terms of this license.
 ;   You must not remove this notice, or any other, from this software.
 
-(ns cljs.test.check.generators
+(ns clojure.test.check.generators
   (:refer-clojure :exclude [int vector list hash-map map keyword
                             char boolean byte bytes sequence
                             shuffle not-empty symbol namespace])
   (:require [cljs.core :as core]
-            [cljs.test.check.random :as random]
-            [cljs.test.check.rose-tree :as rose]
+            [clojure.test.check.random :as random]
+            [clojure.test.check.rose-tree :as rose]
             [goog.string :as gstring]
             [clojure.string])
   (:import [goog.testing PseudoRandom]))

diff --git a/...n/clojure/cljs/test/check/properties.cljs → ...lojure/clojure/test/check/properties.cljs b/...n/clojure/cljs/test/check/properties.cljs → ...lojure/clojure/test/check/properties.cljs
@@ -7,9 +7,9 @@
 ;   the terms of this license.
 ;   You must not remove this notice, or any other, from this software.
 
-(ns cljs.test.check.properties
-  (:require-macros cljs.test.check.properties)
-  (:require [cljs.test.check.generators :as gen]))
+(ns clojure.test.check.properties
+  (:require-macros clojure.test.check.properties)
+  (:require [clojure.test.check.generators :as gen]))
 
 (defn- apply-gen
   [function]

diff --git a/src/main/clojure/cljs/test/check/random.cljs → ...in/clojure/clojure/test/check/random.cljs b/src/main/clojure/cljs/test/check/random.cljs → ...in/clojure/clojure/test/check/random.cljs
@@ -9,11 +9,11 @@
 
 (ns ^{:author "Gary Fredericks"
       :doc "Purely functional and splittable pseudo-random number generators."}
-  cljs.test.check.random
+  clojure.test.check.random
   (:refer-clojure :exclude [+ * bit-xor bit-or bit-count
                             unsigned-bit-shift-right])
-  (:require [cljs.test.check.random.doubles :as doubles]
-            [cljs.test.check.random.longs :as longs
+  (:require [clojure.test.check.random.doubles :as doubles]
+            [clojure.test.check.random.longs :as longs
              :refer [+ * bit-xor bit-or bit-count unsigned-bit-shift-right]]))
 
 (defprotocol IRandom

diff --git a/...ojure/cljs/test/check/random/doubles.cljs → ...re/clojure/test/check/random/doubles.cljs b/...ojure/cljs/test/check/random/doubles.cljs → ...re/clojure/test/check/random/doubles.cljs
@@ -8,8 +8,8 @@
 ;   You must not remove this notice, or any other, from this software.
 
 (ns ^{:author "Gary Fredericks"}
-  cljs.test.check.random.doubles
-  (:require [cljs.test.check.random.longs :as longs]))
+  clojure.test.check.random.doubles
+  (:require [clojure.test.check.random.longs :as longs]))
 
 (def ^:private double-unit
   (loop [i 53 x 1]

diff --git a/...clojure/cljs/test/check/random/longs.cljs → ...jure/clojure/test/check/random/longs.cljs b/...clojure/cljs/test/check/random/longs.cljs → ...jure/clojure/test/check/random/longs.cljs
@@ -9,10 +9,10 @@
 
 (ns ^{:author "Gary Fredericks"
       :doc "Internal namespace, wrapping some goog.math.Long functionality."}
-  cljs.test.check.random.longs
+  clojure.test.check.random.longs
   (:refer-clojure :exclude [+ * bit-xor bit-or bit-count
                             unsigned-bit-shift-right])
-  (:require [cljs.test.check.random.longs.bit-count-impl :as bit-count]
+  (:require [clojure.test.check.random.longs.bit-count-impl :as bit-count]
             [goog.math.Long :as long]))
 
 

diff --git a/...st/check/random/longs/bit_count_impl.cljs → ...st/check/random/longs/bit_count_impl.cljs b/...st/check/random/longs/bit_count_impl.cljs → ...st/check/random/longs/bit_count_impl.cljs
@@ -8,7 +8,7 @@
 ;   You must not remove this notice, or any other, from this software.
 
 (ns ^{:author "Gary Fredericks"}
-  cljs.test.check.random.longs.bit-count-impl
+  clojure.test.check.random.longs.bit-count-impl
   (:refer-clojure :exclude [bit-count]))
 
 ;; Had to put this in a separate namespace because the + doesn't get

diff --git a/...in/clojure/cljs/test/check/rose_tree.cljs → ...clojure/clojure/test/check/rose_tree.cljs b/...in/clojure/cljs/test/check/rose_tree.cljs → ...clojure/clojure/test/check/rose_tree.cljs
@@ -7,7 +7,7 @@
 ;   the terms of this license.
 ;   You must not remove this notice, or any other, from this software.
 
-(ns cljs.test.check.rose-tree
+(ns clojure.test.check.rose-tree
   "A lazy tree data structure used for shrinking."
   (:refer-clojure :exclude [filter remove seq])
   (:require [cljs.core :as core]))

diff --git a/src/target/cljs/browser/cljs/test/check/test/runner.cljs b/src/target/cljs/browser/cljs/test/check/test/runner.cljs
@@ -1,16 +1,16 @@
-(ns cljs.test.check.test.runner
+(ns clojure.test.check.test.runner
   (:require [cljs.test :as test :refer-macros [run-tests]]
-            [cljs.test.check.generators :as gen]
-            [cljs.test.check.test]
-            [cljs.test.check.random-test]
-            [cljs.test.check.rose-tree-test]
-            [cljs.test.check.cljs-test-test]))
+            [clojure.test.check.generators :as gen]
+            [clojure.test.check.test]
+            [clojure.test.check.random-test]
+            [clojure.test.check.rose-tree-test]
+            [clojure.test.check.clojure-test-test]))
 
 (enable-console-print!)
 
 (run-tests
-  'cljs.test.check.test
-  'cljs.test.check.random-test
-  'cljs.test.check.rose-tree-test
-  'cljs.test.check.cljs-test-test)
+  'clojure.test.check.test
+  'clojure.test.check.random-test
+  'clojure.test.check.rose-tree-test
+  'clojure.test.check.clojure-test-test)
 
diff --git a/src/target/cljs/node/cljs/test/check/test/runner.cljs b/src/target/cljs/node/cljs/test/check/test/runner.cljs
@@ -1,19 +1,19 @@
-(ns cljs.test.check.test.runner
+(ns clojure.test.check.test.runner
   (:require [cljs.nodejs :as nodejs]
             [cljs.test :as test :refer-macros [run-tests]]
-            [cljs.test.check.test]
-            [cljs.test.check.random-test]
-            [cljs.test.check.rose-tree-test]
-            [cljs.test.check.cljs-test-test]
-            [cljs.test.check.generators :as gen]))
+            [clojure.test.check.test]
+            [clojure.test.check.random-test]
+            [clojure.test.check.rose-tree-test]
+            [clojure.test.check.clojure-test-test]
+            [clojure.test.check.generators :as gen]))
 
 (nodejs/enable-util-print!)
 
 (defn -main []
   (run-tests
-    'cljs.test.check.test
-    'cljs.test.check.random-test
-    'cljs.test.check.rose-tree-test
-    'cljs.test.check.cljs-test-test))
+    'clojure.test.check.test
+    'clojure.test.check.random-test
+    'clojure.test.check.rose-tree-test
+    'clojure.test.check.clojure-test-test))
 
 (set! *main-cli-fn* -main)
diff --git a/...ojure/cljs/test/check/cljs_test_test.cljs → ...re/cljs/test/check/clojure_test_test.cljs b/...ojure/cljs/test/check/cljs_test_test.cljs → ...re/cljs/test/check/clojure_test_test.cljs
@@ -7,11 +7,11 @@
 ;   the terms of this license.
 ;   You must not remove this notice, or any other, from this software.
 
-(ns cljs.test.check.cljs-test-test
+(ns clojure.test.check.clojure-test-test
   (:require [cljs.test :as test :refer [test-var] :refer-macros [is]]
-            [cljs.test.check.generators :as gen]
-            [cljs.test.check.properties :as prop :include-macros true]
-            [cljs.test.check.cljs-test :as ct :refer-macros [defspec]]
+            [clojure.test.check.generators :as gen]
+            [clojure.test.check.properties :as prop :include-macros true]
+            [clojure.test.check.clojure-test :as ct :refer-macros [defspec]]
             [cljs.reader :refer [read-string]]))
 
 (defspec default-trial-counts

diff --git a/src/test/clojure/cljs/test/check/random_test.cljs b/src/test/clojure/cljs/test/check/random_test.cljs
@@ -1,7 +1,7 @@
-(ns cljs.test.check.random-test
+(ns clojure.test.check.random-test
   "Testing that the cljs impl matches the clojure impl."
   (:require [cljs.test :refer-macros [deftest is]]
-            [cljs.test.check.random :as random]))
+            [clojure.test.check.random :as random]))
 
 (deftest longs-test
 

diff --git a/src/test/clojure/cljs/test/check/rose_tree_test.cljs b/src/test/clojure/cljs/test/check/rose_tree_test.cljs
@@ -7,13 +7,13 @@
 ;   the terms of this license.
 ;   You must not remove this notice, or any other, from this software.
 
-(ns cljs.test.check.rose-tree-test
+(ns clojure.test.check.rose-tree-test
   (:require [cljs.test :as test :include-macros true]
-            [cljs.test.check :as tc]
-            [cljs.test.check.generators :as gen]
-            [cljs.test.check.properties :as prop :include-macros true]
-            [cljs.test.check.rose-tree :as rose]
-            [cljs.test.check.cljs-test :as ct :refer-macros [defspec]]))
+            [clojure.test.check :as tc]
+            [clojure.test.check.generators :as gen]
+            [clojure.test.check.properties :as prop :include-macros true]
+            [clojure.test.check.rose-tree :as rose]
+            [clojure.test.check.clojure-test :as ct :refer-macros [defspec]]))
 
 (defn depth-one-children
   [rose]

diff --git a/src/test/clojure/cljs/test/check/test.cljs b/src/test/clojure/cljs/test/check/test.cljs
@@ -1,11 +1,11 @@
-(ns cljs.test.check.test
+(ns clojure.test.check.test
   (:require [cljs.test :as test :refer-macros [deftest testing is]]
-            [cljs.test.check :as tc]
-            [cljs.test.check.generators :as gen]
-            [cljs.test.check.properties :as prop :include-macros true]
-            [cljs.test.check.random :as random]
-            [cljs.test.check.rose-tree :as rose]
-            [cljs.test.check.cljs-test :as ct :refer-macros [defspec]]
+            [clojure.test.check :as tc]
+            [clojure.test.check.generators :as gen]
+            [clojure.test.check.properties :as prop :include-macros true]
+            [clojure.test.check.random :as random]
+            [clojure.test.check.rose-tree :as rose]
+            [clojure.test.check.clojure-test :as ct :refer-macros [defspec]]
             [cljs.reader :as edn]))
 
 (deftest generators-are-generators