DXML-67 support cljs tests on JDK [15,17]

ikappaki · fogus · commit 86fe09126ccf · 2022-06-10T15:40:52.000-04:00
- Also fixes newline test errors on MS-Windows.
diff --git a/pom.xml b/pom.xml
@@ -35,6 +35,23 @@
     <version>1.1.0</version>
   </parent>
 
+  <profiles>
+    <profile>
+      <id>openjdk-nashorn</id>
+      <activation>
+	<jdk>[15,18)</jdk>
+      </activation>
+      <dependencies>
+	<dependency>
+	  <groupId>org.openjdk.nashorn</groupId>
+	  <artifactId>nashorn-core</artifactId>
+	  <version>15.3</version>
+	  <scope>test</scope>
+	</dependency>
+      </dependencies>
+    </profile>
+  </profiles>
+
   <dependencies>
     <dependency>
       <groupId>org.clojure</groupId>
@@ -64,7 +81,7 @@
   <properties>
     <!-- set clojure.version to >= 1.8.0 to run cljs test suite
          (and make sure to run on jdk >= 1.8 for nashorn support) -->
-    <clojure.version>1.7.0</clojure.version>
+    <clojure.version>1.8.0</clojure.version>
   </properties>
 
   <pluginRepositories>
diff --git a/project.clj b/project.clj
@@ -4,9 +4,10 @@
   :resource-paths ["src/main/resources" "src/test/resources" "target/gen-resources"]
   :dependencies [[org.clojure/clojure "1.10.0-beta8"]
                  [org.clojure/clojurescript "1.10.439"]
-                 [com.cemerick/piggieback "0.2.2"]
+                 [cider/piggieback "0.5.3"]
                  [org.clojure/tools.nrepl "0.2.13"]
                  [org.clojure/test.check "0.9.0"]
                  [figwheel-sidecar "0.5.17"]
-                 [binaryage/devtools "0.9.10"]]
-  :repl-options {:nrepl-middleware [cemerick.piggieback/wrap-cljs-repl]})
+                 [binaryage/devtools "0.9.10"]
+                 [org.openjdk.nashorn/nashorn-core "15.3"]]
+  :repl-options {:nrepl-middleware [cider.piggieback/wrap-cljs-repl]})
diff --git a/src/test/clojure/clojure/data/xml/test_emit.clj b/src/test/clojure/clojure/data/xml/test_emit.clj
@@ -10,6 +10,7 @@
       :author "Chris Houser"}
     clojure.data.xml.test-emit
   (:require
+   [clojure.string :as str]
    [clojure.test :refer :all]
    [clojure.data.xml :refer :all]
    [clojure.data.xml.test-utils :refer [test-stream lazy-parse*]]
@@ -137,7 +138,8 @@
 
 (deftest test-indent
   (let [nested-xml (lazy-parse* (str "<a><b><c><d>foo</d></c></b></a>"))
-        expect (str "<a>\n  <b>\n    <c>\n      <d>foo</d>\n    </c>\n  </b>\n</a>\n")
+        expect (-> "<a>\n  <b>\n    <c>\n      <d>foo</d>\n    </c>\n  </b>\n</a>\n"
+                   (str/replace  #"\n" (System/lineSeparator)))
         sw (java.io.StringWriter.)
         _ (indent nested-xml sw)
         result (.toString sw)]
@@ -146,14 +148,16 @@
 
 (deftest test-indent-str
   (let [nested-xml (lazy-parse* (str "<a><b><c><d>foo</d></c></b></a>"))
-        expect (str "<a>\n  <b>\n    <c>\n      <d>foo</d>\n    </c>\n  </b>\n</a>\n")
+        expect (-> "<a>\n  <b>\n    <c>\n      <d>foo</d>\n    </c>\n  </b>\n</a>\n"
+                   (str/replace  #"\n" (System/lineSeparator)))
         result (indent-str nested-xml)]
     (is (= expect (subs result (.indexOf result "<a>"))))))
 
 (deftest test-indent-str-with-doctype
   (let [nested-xml (lazy-parse* (str "<a><b><c><d>foo</d></c></b></a>"))
         doctype "<!DOCTYPE html>"
-        expect "\n<a>\n  <b>\n    <c>\n      <d>foo</d>\n    </c>\n  </b>\n</a>\n"
+        expect (-> "\n<a>\n  <b>\n    <c>\n      <d>foo</d>\n    </c>\n  </b>\n</a>\n"
+                   (str/replace  #"\n" (System/lineSeparator)))
         result (indent-str nested-xml :doctype doctype)
         offset-dt (.indexOf result "<!DOCTYPE")
         offset-res (inc (.indexOf result ">" offset-dt))]
diff --git a/src/test/clojure/clojure/data/xml/test_pprint.clj b/src/test/clojure/clojure/data/xml/test_pprint.clj
@@ -10,6 +10,7 @@
       :author "Herwig Hochleitner"}
   clojure.data.xml.test-pprint
   (:require
+   [clojure.string :as str]
    [clojure.test :refer :all]
    [clojure.data.xml :refer :all]))
 
@@ -26,5 +27,6 @@
 "))
 
 (deftest test-indent
-  (is (= indented-xml (indent-str (parse-str xml)))))
+  (is (= (str/replace indented-xml #"\n" (System/lineSeparator))
+         (indent-str (parse-str xml)))))
 
diff --git a/src/test/clojurescript/clojure/data/xml/cljs_repls.clj b/src/test/clojurescript/clojure/data/xml/cljs_repls.clj
@@ -1,8 +1,8 @@
 (ns clojure.data.xml.cljs-repls
   (:require
    [cljs.repl :as repl]
-   [cljs.repl.nashorn :as repl-nh]
-   [cemerick.piggieback :as pback]
+   [clojure.data.xml.cljs-repl-nashorn :as repl-nh]
+   [cider.piggieback :as pback]
    [cljs.closure :as closure]
    [figwheel-sidecar.repl-api :refer [start-figwheel! stop-figwheel! cljs-repl]]))
 
diff --git a/src/test/resources/clojure/data/xml/cljs_repl_nashorn.clj b/src/test/resources/clojure/data/xml/cljs_repl_nashorn.clj
@@ -6,7 +6,13 @@
 ;; the terms of this license.
 ;; You must not remove this notice, or any other, from this software.
 
-(ns cljs.repl.nashorn
+;; cljs repl nashorn update to support the openjdk nashorn package in
+;; JDK versions greater than 15.
+;;
+;; Adapted from
+;; https://raw.githubusercontent.com/clojure/clojurescript/r1.10.439/src/main/clojure/cljs/repl/nashorn.clj.
+
+(ns clojure.data.xml.cljs-repl-nashorn
   (:require [clojure.java.io :as io]
             [clojure.string :as string]
             [clojure.stacktrace]
@@ -21,17 +27,25 @@
             [cljs.stacktrace :as st])
   (:import [javax.script ScriptEngine ScriptEngineManager ScriptException ScriptEngineFactory]))
 
-(util/compile-if (Class/forName "jdk.nashorn.api.scripting.NashornException")
+(def engine-name
+  (util/compile-if (Class/forName "org.openjdk.nashorn.api.scripting.NashornException")
+                   (do
+                     (import 'org.openjdk.nashorn.api.scripting.NashornException)
+                     "OpenJDK Nashorn")
+                   (do
+                     (import 'jdk.nashorn.api.scripting.NashornException)
+                     "Oracle Nashorn")))
+
+(do
   (do
-    (import 'jdk.nashorn.api.scripting.NashornException)
     ;; Implementation
 
     (defn create-engine
       ([] (create-engine nil))
       ([{:keys [code-cache] :or {code-cache true}}]
        (let [args (when code-cache ["-pcc"])
              factories (.getEngineFactories (ScriptEngineManager.))
-             factory (get (zipmap (map #(.getEngineName %) factories) factories) "Oracle Nashorn")]
+             factory (get (zipmap (map #(.getEngineName %) factories) factories) engine-name)]
          (if-let [engine (if-not (empty? args)
                            (.getScriptEngine ^ScriptEngineFactory factory (into-array args))
                            (.getScriptEngine ^ScriptEngineFactory factory))]
@@ -180,14 +194,4 @@
     (defn -main [& args]
       (apply cli/main repl-env args)))
 
-  (do
-    (defn repl-env* [{:keys [debug] :as opts}]
-      (throw (ex-info "Nashorn not supported" {:type :repl-error})))
-
-    (defn repl-env
-      "Create a Nashorn repl-env for use with the repl/repl* method in Clojurescript."
-      [& {:as opts}]
-      (throw (ex-info "Nashorn not available under this Java runtime" {:type :repl-error})))
-
-    (defn -main []
-      (throw (ex-info "Nashorn not available under this Java runtime" {:type :repl-error})))))
+)
diff --git a/src/test/resources/clojure/data/xml/cljs_testsuite.clj b/src/test/resources/clojure/data/xml/cljs_testsuite.clj
@@ -2,7 +2,7 @@
   (:require
    [clojure.test :refer :all]
    [cljs.repl :as repl]
-   [cljs.repl.nashorn :as repl-nh]
+   [clojure.data.xml.cljs-repl-nashorn :as repl-nh]
    [cljs.closure :as closure]
    [cljs.build.api :as bapi]
    [clojure.string :as str]
