Skip to content

Commit 85bc391

Browse files
committed
is this test identical for all java versions?
1 parent 27d3af9 commit 85bc391

File tree

1 file changed

+10
-29
lines changed

1 file changed

+10
-29
lines changed

test/java_time_test.clj

Lines changed: 10 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1006,12 +1006,12 @@
10061006
test-langs ["en" "tr" "cn"]]
10071007
(testing "locale specific rules for lower-case can cause formatters to not be found"
10081008
(doseq [lang test-langs]
1009-
(testing lang
1010-
(try
1011-
(Locale/setDefault (Locale/forLanguageTag lang))
1012-
(is (some? (j/formatter :rfc-1123-date-time)))
1013-
(finally
1014-
(Locale/setDefault current-locale))))))))
1009+
(testing lang
1010+
(try
1011+
(Locale/setDefault (Locale/forLanguageTag lang))
1012+
(is (some? (j/formatter :rfc-1123-date-time)))
1013+
(finally
1014+
(Locale/setDefault current-locale))))))))
10151015

10161016
(deftest formatter-test
10171017
(testing "case-insensitive formatter"
@@ -1021,26 +1021,7 @@
10211021
(j/local-time fmt "00:34AM")))))
10221022

10231023
(testing "case-sensitive formatter"
1024-
;; Java version detection:
1025-
;; java.lang.Runtime.Version class exists from Java 9 onwards, hence
1026-
;; the need to detect the Java version from the java.version string returned
1027-
;; by System/getProperty. In versions before 9, java.version has the format
1028-
;; 1.x.y, e.g., 1.8.0_255, but from version 9 onwards, the initial 1 element
1029-
;; is dropped.
1030-
;; Refer to JEP 223 for information on the change.
1031-
;; https://openjdk.java.net/jeps/223
1032-
(let [java-version (->> (System/getProperty "java.version")
1033-
(re-find #"^\d+")
1034-
Integer/parseInt)]
1035-
(if (> java-version 11)
1036-
(testing "Java 12 and above treats AM as invalid"
1037-
(let [fmt (java-time/formatter "hh:mma" {:case :sensitive})]
1038-
(is (= (j/local-time 0 34 0 0)
1039-
(j/local-time fmt "12:34AM")))
1040-
(is (thrown? Exception (j/local-time fmt "12:34am")))))
1041-
1042-
(testing "Java 8 and 11 treats am as invalid"
1043-
(let [fmt (java-time/formatter "hh:mma" {:case :sensitive})]
1044-
(is (= (j/local-time 0 34 0 0)
1045-
(j/local-time fmt "12:34AM")))
1046-
(is (thrown? Exception (j/local-time fmt "12:34am")))))))))
1024+
(let [fmt (java-time/formatter "hh:mma" {:case :sensitive})]
1025+
(is (= (j/local-time 0 34 0 0)
1026+
(j/local-time fmt "12:34AM")))
1027+
(is (thrown? Exception (j/local-time fmt "12:34am"))))))

0 commit comments

Comments
 (0)