Test on cljs 1.9.473; simplify cljs tests

Author: bendlas

pom.xml

@@ -45,7 +45,7 @@
     <dependency>
       <groupId>org.clojure</groupId>
       <artifactId>clojurescript</artifactId>
-      <version>1.9.293</version>
+      <version>1.9.473</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

project.clj

@@ -3,7 +3,7 @@
   :test-paths ["src/test/clojure" "src/test/clojurescript"]
   :resource-paths ["src/test/resources" "target/gen-resources"]
   :dependencies [[org.clojure/clojure "1.8.0"]
-                 [org.clojure/clojurescript "1.9.293"]
+                 [org.clojure/clojurescript "1.9.473"]
                  [com.cemerick/piggieback "0.2.1"]
                  [org.clojure/tools.nrepl "0.2.12"]
                  [org.clojure/test.check "0.9.0"]

src/test/resources/clojure/data/xml/cljs_testsuite.clj

@@ -16,28 +16,24 @@
         "cljs-nashorn-" (into-array FileAttribute []))))
 
 (defn compile-testsuite! [dir]
-  (let [out (io/file dir "tests.js")]
-    (println "Building in" dir)
-    (bapi/build (bapi/inputs "src/main/clojure" "src/test/clojure" "src/test/clojurescript")
+  (let [out (io/file dir "tests.js")
+        inputs ["src/main/clojure" "src/test/clojure" "src/test/clojurescript"]]
+    (println "INFO" "Compiling cljs testsuite from" inputs "into" (str out))
+    (bapi/build (apply bapi/inputs inputs)
                 {:output-to (str out)
                  :output-dir dir
                  :main 'clojure.data.xml.test-cljs
                  :optimizations :advanced
                  :pseudo-names true
-                 :preamble ["dxml-nashorn.generated.js"]})
-    (spit (io/file dir "tests.reopt.js")
-          (closure/optimize {:optimizations :simple
-                             :pretty-print true
-                             :closure-warnings
-                             {:non-standard-jsdoc :off}}
-                            (slurp out)))))
+                 :pretty-print true
+                 :preamble ["dxml-nashorn.generated.js"]})))
 
 (defn run-testsuite! [dir]
   (System/setProperty "nashorn.persistent.code.cache" "target/nashorn_code_cache")
   (let [engine (repl-nh/create-engine)]
-    (println "INFO" "Running nashorn-repl with" (System/getProperty "nashorn.persistent.code.cache"))
     (compile-testsuite! dir)
-    (.eval engine (io/reader (io/file dir "tests.reopt.js")))
+    (println "INFO" "Running cljs tests in nashorn with persistent code cache in" (System/getProperty "nashorn.persistent.code.cache"))
+    (.eval engine (io/reader (io/file dir "tests.js")))
     (let [{:as res :keys [fail error]} (read-string (.eval engine "clojure.data.xml.test_cljs._main_nashorn()"))]
       (is (and (zero? fail) (zero? error))
           (pr-str res)))))