Merge pull request #44 from dgr/dgr-coarsen-exceptions

jeaye · web-flow · commit 967ea8448a40 · 2025-01-20T11:20:30.000-08:00
Coarsen exceptions
diff --git a/test/clojure/core_test/abs.cljc b/test/clojure/core_test/abs.cljc
@@ -19,7 +19,7 @@
            :default
            [-1/5           1/5]))
      (is (NaN? (abs ##NaN)))
-     (is (thrown? #?(:cljs :default :clj NullPointerException) (abs nil))))
+     (is (thrown? #?(:cljs :default :clj Exception) (abs nil))))
 
     (testing "unboxed"
       (let [a  42
diff --git a/test/clojure/core_test/bit_and.cljc b/test/clojure/core_test/bit_and.cljc
@@ -5,10 +5,10 @@
 
 (when-var-exists clojure.core/bit-and
   (deftest test-bit-and
-    #?(:clj (is (thrown? NullPointerException (bit-and nil 1)))
-       :cljs (is (bit-and nil 1)))
-    #?(:clj (is (thrown? NullPointerException (bit-and 1 nil)))
-       :cljs (is (bit-and 1 nil)))
+    #?(:clj (is (thrown? Exception (bit-and nil 1)))
+       :cljs (is (= 0 (bit-and nil 1))))
+    #?(:clj (is (thrown? Exception (bit-and 1 nil)))
+       :cljs (is (= 0 (bit-and 1 nil))))
 
     (are [ex a b] (= ex (bit-and a b))
       8                        12                       9
diff --git a/test/clojure/core_test/bit_and_not.cljc b/test/clojure/core_test/bit_and_not.cljc
@@ -5,10 +5,10 @@
 
 (when-var-exists clojure.core/bit-and-not
   (deftest test-bit-and-not
-    #?(:clj (is (thrown? NullPointerException (bit-and-not nil 1)))
-       :cljs (is (bit-and-not nil 1)))
-    #?(:clj (is (thrown? NullPointerException (bit-and-not 1 nil)))
-       :cljs (is (bit-and-not 1 nil)))
+    #?(:clj (is (thrown? Exception (bit-and-not nil 1)))
+       :cljs (is (= 0 (bit-and-not nil 1))))
+    #?(:clj (is (thrown? Exception (bit-and-not 1 nil)))
+       :cljs (is (= 1 (bit-and-not 1 nil))))
 
     (are [ex a b] (= ex (bit-and-not a b))
       0                        0                        0
diff --git a/test/clojure/core_test/bit_clear.cljc b/test/clojure/core_test/bit_clear.cljc
@@ -4,10 +4,10 @@
 
 (when-var-exists clojure.core/bit-clear
   (deftest test-bit-clear
-    #?(:clj (is (thrown? NullPointerException (bit-clear nil 1)))
-       :cljs (is (bit-clear nil 1)))
-    #?(:clj (is (thrown? NullPointerException (bit-clear 1 nil)))
-       :cljs (is (bit-clear 1 nil)))
+    #?(:clj (is (thrown? Exception (bit-clear nil 1)))
+       :cljs (is (= 0 (bit-clear nil 1))))
+    #?(:clj (is (thrown? Exception (bit-clear 1 nil)))
+       :cljs (is (= 0 (bit-clear 1 nil))))
 
     (are [ex a b] (= ex (bit-clear a b))
       3 11 3)))
diff --git a/test/clojure/core_test/bit_flip.cljc b/test/clojure/core_test/bit_flip.cljc
@@ -4,10 +4,10 @@
 
 (when-var-exists clojure.core/bit-flip
   (deftest test-bit-flip
-    #?(:clj (is (thrown? NullPointerException (bit-flip nil 1)))
-       :cljs (is (bit-flip nil 1)))
-    #?(:clj (is (thrown? NullPointerException (bit-flip 1 nil)))
-       :cljs (is (bit-flip 1 nil)))
+    #?(:clj (is (thrown? Exception (bit-flip nil 1)))
+       :cljs (is (= 2 (bit-flip nil 1))))
+    #?(:clj (is (thrown? Exception (bit-flip 1 nil)))
+       :cljs (is (= 0 (bit-flip 1 nil))))
 
     (are [ex a b] (= ex (bit-flip a b))
       2r1111 2r1011 2
diff --git a/test/clojure/core_test/bit_not.cljc b/test/clojure/core_test/bit_not.cljc
@@ -4,8 +4,8 @@
 
 (when-var-exists clojure.core/bit-not
   (deftest test-bit-not
-    #?(:clj (is (thrown? NullPointerException (bit-not nil)))
-       :cljs (is (bit-not nil)))
+    #?(:clj (is (thrown? Exception (bit-not nil)))
+       :cljs (is (= -1 (bit-not nil))))
 
     (are [ex a] (= ex (bit-not a))
       -2r1000 2r0111
diff --git a/test/clojure/core_test/bit_or.cljc b/test/clojure/core_test/bit_or.cljc
@@ -5,9 +5,9 @@
 
 (when-var-exists clojure.core/bit-or
   (deftest test-bit-or
-    #?(:clj (is (thrown? NullPointerException (bit-or nil 1)))
+    #?(:clj (is (thrown? Exception (bit-or nil 1)))
        :cljs (is (bit-or nil 1)))
-    #?(:clj (is (thrown? NullPointerException (bit-or 1 nil)))
+    #?(:clj (is (thrown? Exception (bit-or 1 nil)))
        :cljs (is (bit-or 1 nil)))
 
     (are [ex a b] (= ex (bit-or a b))
diff --git a/test/clojure/core_test/bit_set.cljc b/test/clojure/core_test/bit_set.cljc
@@ -4,9 +4,9 @@
 
 (when-var-exists clojure.core/bit-set
   (deftest test-bit-set
-    #?(:clj (is (thrown? NullPointerException (bit-set nil 1)))
+    #?(:clj (is (thrown? Exception (bit-set nil 1)))
        :cljs (is (bit-set nil 1)))
-    #?(:clj (is (thrown? NullPointerException (bit-set 1 nil)))
+    #?(:clj (is (thrown? Exception (bit-set 1 nil)))
        :cljs (is (bit-set 1 nil)))
 
     (are [ex a b] (= ex (bit-set a b))
diff --git a/test/clojure/core_test/bit_shift_left.cljc b/test/clojure/core_test/bit_shift_left.cljc
@@ -4,10 +4,10 @@
 
 (when-var-exists clojure.core/bit-shift-left
   (deftest test-bit-shift-left
-    #?(:clj (is (thrown? NullPointerException (bit-shift-left nil 1)))
-       :cljs (is (bit-shift-left nil 1)))
-    #?(:clj (is (thrown? NullPointerException (bit-shift-left 1 nil)))
-       :cljs (is (bit-shift-left 1 nil)))
+    #?(:clj (is (thrown? Exception (bit-shift-left nil 1)))
+       :cljs (is (= 0 (bit-shift-left nil 1))))
+    #?(:clj (is (thrown? Exception (bit-shift-left 1 nil)))
+       :cljs (is (= 1 (bit-shift-left 1 nil))))
 
     (are [ex a b] (= ex (bit-shift-left a b))
       1024     1      10
diff --git a/test/clojure/core_test/bit_shift_right.cljc b/test/clojure/core_test/bit_shift_right.cljc
@@ -4,9 +4,9 @@
 
 (when-var-exists clojure.core/bit-shift-right
   (deftest test-bit-shift-right
-    #?(:clj (is (thrown? NullPointerException (bit-shift-right nil 1)))
+    #?(:clj (is (thrown? Exception (bit-shift-right nil 1)))
        :cljs (is (bit-shift-right nil 1)))
-    #?(:clj (is (thrown? NullPointerException (bit-shift-right 1 nil)))
+    #?(:clj (is (thrown? Exception (bit-shift-right 1 nil)))
        :cljs (is (bit-shift-right 1 nil)))
 
     (are [ex a b] (= ex (bit-shift-right a b))
diff --git a/test/clojure/core_test/bit_test.cljc b/test/clojure/core_test/bit_test.cljc
@@ -4,9 +4,9 @@
 
 (when-var-exists clojure.core/bit-test
   (deftest test-bit-test
-    #?(:clj (is (thrown? NullPointerException (bit-test nil 1)))
+    #?(:clj (is (thrown? Exception (bit-test nil 1)))
        :cljs (is (bit-test nil 1)))
-    #?(:clj (is (thrown? NullPointerException (bit-test 1 nil)))
+    #?(:clj (is (thrown? Exception (bit-test 1 nil)))
        :cljs (is (bit-test 1 nil)))
 
     (are [ex a b] (= ex (bit-test a b))
diff --git a/test/clojure/core_test/bit_xor.cljc b/test/clojure/core_test/bit_xor.cljc
@@ -5,9 +5,9 @@
 
 (when-var-exists clojure.core/bit-xor
   (deftest test-bit-xor
-    #?(:clj (is (thrown? NullPointerException (bit-xor nil 1)))
+    #?(:clj (is (thrown? Exception (bit-xor nil 1)))
        :cljs (is (bit-xor nil 1)))
-    #?(:clj (is (thrown? NullPointerException (bit-xor 1 nil)))
+    #?(:clj (is (thrown? Exception (bit-xor 1 nil)))
        :cljs (is (bit-xor 1 nil)))
 
     (are [ex a b] (= ex (bit-xor a b))
diff --git a/test/clojure/core_test/byte.cljc b/test/clojure/core_test/byte.cljc
@@ -37,13 +37,13 @@
      -1   -1.1M)
 
    ;; `byte` throws outside the range of 127 ... -128.
-   (is (thrown? #?(:cljs :default :clj IllegalArgumentException) (byte -128.000001)))
-   (is (thrown? #?(:cljs :default :clj IllegalArgumentException) (byte -129)))
-   (is (thrown? #?(:cljs :default :clj IllegalArgumentException) (byte 128)))
-   (is (thrown? #?(:cljs :default :clj IllegalArgumentException) (byte 127.000001)))
+   (is (thrown? #?(:cljs :default :clj Exception) (byte -128.000001)))
+   (is (thrown? #?(:cljs :default :clj Exception) (byte -129)))
+   (is (thrown? #?(:cljs :default :clj Exception) (byte 128)))
+   (is (thrown? #?(:cljs :default :clj Exception) (byte 127.000001)))
 
    ;; Check handling of other types
-   (is (thrown? #?(:cljs :default :clj ClassCastException) (byte "0")))
-   (is (thrown? #?(:cljs :default :clj ClassCastException) (byte :0)))
-   (is (thrown? #?(:cljs :default :clj ClassCastException) (byte [0])))
+   (is (thrown? #?(:cljs :default :clj Exception) (byte "0")))
+   (is (thrown? #?(:cljs :default :clj Exception) (byte :0)))
+   (is (thrown? #?(:cljs :default :clj Exception) (byte [0])))
    (is (thrown? #?(:cljs :default :clj Exception) (byte nil)))))
diff --git a/test/clojure/core_test/char.cljc b/test/clojure/core_test/char.cljc
@@ -13,5 +13,5 @@
      ;; TODO: Add Unicode tests
      )
 
-   (is (thrown? IllegalArgumentException (char -1)))
+   #?(:default (is (thrown? Exception (char -1)))) ; TODO: include CLJS test. CLJS returns string with just NULL byte
    (is (thrown? #?(:cljs :default :default Exception) (char nil)))))
diff --git a/test/clojure/core_test/dec.cljc b/test/clojure/core_test/dec.cljc
@@ -23,10 +23,10 @@
       (is (NaN? (dec ##NaN))))
 
     (testing "underflow"
-      #?(:clj (is (thrown? ArithmeticException (dec Long/MIN_VALUE)))
+      #?(:clj (is (thrown? Exception (dec Long/MIN_VALUE)))
          :cljs (is (= (dec js/Number.MIN_SAFE_INTEGER) (- js/Number.MIN_SAFE_INTEGER 2)))))
 
     (testing "dec-nil"
       ;; ClojureScript says (= -1 (dec nil)) because JavaScript casts null to 0
-      #?(:clj (is (thrown? NullPointerException (dec #_:clj-kondo/ignore nil)))
+      #?(:clj (is (thrown? Exception (dec #_:clj-kondo/ignore nil)))
          :cljs (is (= -1 (dec #_:clj-kondo/ignore nil)))))))
diff --git a/test/clojure/core_test/double.cljc b/test/clojure/core_test/double.cljc
@@ -19,11 +19,14 @@
      (double -1.0) -1.0M)
    (is (NaN? (double ##NaN)))
 
-   #?@(:cljs []
+   #?@(:cljs
+       ;; In cljs, `double` is just returns the argument unchanged (dummy fn)
+       [(is (= "0" (double "0")))
+        (is (= :0 (double :0)))]
        :default
        [(is (instance? java.lang.Double (double 0)))
         (is (instance? java.lang.Double (double 0.0)))
         (is (instance? java.lang.Double (double 0N)))
-        (is (instance? java.lang.Double (double 0.0M)))])
-   (is (thrown? ClassCastException (double "0")))
-   (is (thrown? ClassCastException (double :0)))))
+        (is (instance? java.lang.Double (double 0.0M)))
+        (is (thrown? Exception (double "0")))
+        (is (thrown? Exception (double :0)))])))
diff --git a/test/clojure/core_test/even_questionmark.cljc b/test/clojure/core_test/even_questionmark.cljc
@@ -18,7 +18,7 @@
         -120N true))
 
     (testing "invalid"
-      (are [x] (thrown? #?(:clj IllegalArgumentException :cljs js/Error) (even? x))
+      (are [x] (thrown? #?(:cljs :default :clj Exception) (even? x))
         #_:clj-kondo/ignore nil
         ##Inf
         ##-Inf
diff --git a/test/clojure/core_test/float.cljc b/test/clojure/core_test/float.cljc
@@ -4,32 +4,36 @@
             [clojure.core-test.portability #?(:cljs :refer-macros :default :refer)  [when-var-exists]]))
 
 (when-var-exists clojure.core/float
- (deftest test-float
-   (are [expected x] (= expected (float x))
-     (float 1.0) 1
-     (float 0.0) 0
-     (float -1.0) -1
-     (float 1.0) 1N
-     (float 0.0) 0N
-     (float -1.0) -1N
-     (float 1.0) 12/12
-     (float 0.0) 0/12
-     (float -1.0) -12/12
-     (float 1.0) 1.0M
-     (float 0.0) 0.0M
-     (float -1.0) -1.0M
-     (float 0.0) r/min-double)
-   (is (NaN? (float ##NaN)))
+  (deftest test-float
+    (are [expected x] (= expected (float x))
+      (float 1.0) 1
+      (float 0.0) 0
+      (float -1.0) -1
+      (float 1.0) 1N
+      (float 0.0) 0N
+      (float -1.0) -1N
+      (float 1.0) 12/12
+      (float 0.0) 0/12
+      (float -1.0) -12/12
+      (float 1.0) 1.0M
+      (float 0.0) 0.0M
+      (float -1.0) -1.0M
+      (float 0.0) r/min-double)
+    (is (NaN? (float ##NaN)))
 
-   #?@(:cljs []
-       :default
-       [(is (instance? java.lang.Float (float 0)))
-        (is (instance? java.lang.Float (float 0.0)))
-        (is (instance? java.lang.Float (float 0N)))
-        (is (instance? java.lang.Float (float 0.0M)))])
-
-   (is (thrown? IllegalArgumentException (float r/max-double)))
-   (is (thrown? IllegalArgumentException (float ##Inf)))
-   (is (thrown? IllegalArgumentException (float ##-Inf)))
-   (is (thrown? ClassCastException (float "0")))
-   (is (thrown? ClassCastException (float :0)))))
+    #?@(:cljs
+        [(is (= r/max-double (float r/max-double)))
+         (is (= ##Inf (float ##Inf)))
+         (is (= ##-Inf (float ##-Inf)))
+         (is (= "0" (float "0")))
+         (is (= :0 (float :0)))]
+        :default
+        [(is (instance? java.lang.Float (float 0)))
+         (is (instance? java.lang.Float (float 0.0)))
+         (is (instance? java.lang.Float (float 0N)))
+         (is (instance? java.lang.Float (float 0.0M)))
+         (is (thrown? Exception (float r/max-double)))
+         (is (thrown? Exception (float ##Inf)))
+         (is (thrown? Exception (float ##-Inf)))
+         (is (thrown? Exception (float "0")))
+         (is (thrown? Exception (float :0)))])))
diff --git a/test/clojure/core_test/inc.cljc b/test/clojure/core_test/inc.cljc
@@ -24,11 +24,11 @@
       (is (NaN? (inc ##NaN))))
 
     (testing "overflow"
-      #?(:clj (is (thrown? ArithmeticException (inc Long/MAX_VALUE)))
+      #?(:clj (is (thrown? Exception (inc Long/MAX_VALUE)))
          :cljs (is (= (inc js/Number.MAX_SAFE_INTEGER) (+ 2 js/Number.MAX_SAFE_INTEGER)))))
 
     (testing "inc-nil"
       ;; ClojureScript says (= 1 (inc nil)) because JavaScript casts null to 0
       ;; https://clojuredocs.org/clojure.core/inc#example-6156a59ee4b0b1e3652d754f
-      #?(:clj (is (thrown? NullPointerException (inc #_:clj-kondo/ignore nil)))
+      #?(:clj (is (thrown? Exception (inc #_:clj-kondo/ignore nil)))
          :cljs (is (= 1 (inc #_:clj-kondo/ignore nil)))))))
diff --git a/test/clojure/core_test/int.cljc b/test/clojure/core_test/int.cljc
@@ -39,13 +39,13 @@
      -1   -1.1M)
 
    ;; `int` throws outside the range of 32767 ... -32768.
-   (is (thrown? #?(:cljs :default :clj IllegalArgumentException) (int -2147483648.000001)))
-   (is (thrown? #?(:cljs :default :clj ArithmeticException) (int -2147483649)))
-   (is (thrown? #?(:cljs :default :clj ArithmeticException) (int 2147483648)))
-   (is (thrown? #?(:cljs :default :clj IllegalArgumentException) (int 2147483647.000001)))
+   (is (thrown? #?(:cljs :default :clj Exception) (int -2147483648.000001)))
+   (is (thrown? #?(:cljs :default :clj Exception) (int -2147483649)))
+   (is (thrown? #?(:cljs :default :clj Exception) (int 2147483648)))
+   (is (thrown? #?(:cljs :default :clj Exception) (int 2147483647.000001)))
 
    ;; Check handling of other types
-   (is (thrown? #?(:cljs :default :clj ClassCastException) (int "0")))
-   (is (thrown? #?(:cljs :default :clj ClassCastException) (int :0)))
-   (is (thrown? #?(:cljs :default :clj ClassCastException) (int [0])))
+   (is (thrown? #?(:cljs :default :clj Exception) (int "0")))
+   (is (thrown? #?(:cljs :default :clj Exception) (int :0)))
+   (is (thrown? #?(:cljs :default :clj Exception) (int [0])))
    (is (thrown? #?(:cljs :default :clj Exception) (int nil)))))
diff --git a/test/clojure/core_test/long.cljc b/test/clojure/core_test/long.cljc
@@ -37,11 +37,11 @@
      -1   -1.1M)
 
    ;; `long` throws outside the range of 9223372036854775807 ... -9223372036854775808
-   (is (thrown? #?(:cljs :default :clj IllegalArgumentException) (long -9223372036854775809)))
-   (is (thrown? #?(:cljs :default :clj IllegalArgumentException) (long 9223372036854775808)))
+   (is (thrown? #?(:cljs :default :clj Exception) (long -9223372036854775809)))
+   (is (thrown? #?(:cljs :default :clj Exception) (long 9223372036854775808)))
 
    ;; Check handling of other types
-   (is (thrown? #?(:cljs :default :clj ClassCastException) (long "0")))
-   (is (thrown? #?(:cljs :default :clj ClassCastException) (long :0)))
-   (is (thrown? #?(:cljs :default :clj ClassCastException) (long [0])))
+   (is (thrown? #?(:cljs :default :clj Exception) (long "0")))
+   (is (thrown? #?(:cljs :default :clj Exception) (long :0)))
+   (is (thrown? #?(:cljs :default :clj Exception) (long [0])))
    (is (thrown? #?(:cljs :default :clj Exception) (long nil)))))
diff --git a/test/clojure/core_test/odd_questionmark.cljc b/test/clojure/core_test/odd_questionmark.cljc
@@ -18,7 +18,7 @@
         -120N false))
 
     (testing "invalid"
-      (are [x] (thrown? #?(:clj IllegalArgumentException :cljs js/Error) (odd? x))
+      (are [x] (thrown? #?(:clj Exception :cljs js/Error) (odd? x))
         #_:clj-kondo/ignore nil
         ##Inf
         ##-Inf
diff --git a/test/clojure/core_test/seq.cljc b/test/clojure/core_test/seq.cljc
@@ -28,8 +28,8 @@
        (is (= input-hash-map (into (hash-map) (seq input-hash-map))))
        (is (= input-map (into {} (seq input-map))))))
    (testing "nonseqables"
-     (is (thrown? #?(:cljs :default :clj IllegalArgumentException) (seq 1)))
-     (is (thrown? #?(:cljs :default :clj IllegalArgumentException) (seq (fn [])))))
+     (is (thrown? #?(:cljs :default :clj Exception) (seq 1)))
+     (is (thrown? #?(:cljs :default :clj Exception) (seq (fn [])))))
    (testing "infinite sequences are produced by seq"
      (let [infinite-seq (seq (range))]
        (is (seq? infinite-seq))
diff --git a/test/clojure/core_test/short.cljc b/test/clojure/core_test/short.cljc
@@ -37,13 +37,13 @@
      -1   -1.1M)
 
    ;; `short` throws outside the range of 32767 ... -32768.
-   (is (thrown? #?(:cljs :default :clj IllegalArgumentException) (short -32768.000001)))
-   (is (thrown? #?(:cljs :default :clj IllegalArgumentException) (short -32769)))
-   (is (thrown? #?(:cljs :default :clj IllegalArgumentException) (short 32768)))
-   (is (thrown? #?(:cljs :default :clj IllegalArgumentException) (short 32767.000001)))
+   (is (thrown? #?(:cljs :default :clj Exception) (short -32768.000001)))
+   (is (thrown? #?(:cljs :default :clj Exception) (short -32769)))
+   (is (thrown? #?(:cljs :default :clj Exception) (short 32768)))
+   (is (thrown? #?(:cljs :default :clj Exception) (short 32767.000001)))
 
    ;; Check handling of other types
-   (is (thrown? #?(:cljs :default :clj ClassCastException) (short "0")))
-   (is (thrown? #?(:cljs :default :clj ClassCastException) (short :0)))
-   (is (thrown? #?(:cljs :default :clj ClassCastException) (short [0])))
+   (is (thrown? #?(:cljs :default :clj Exception) (short "0")))
+   (is (thrown? #?(:cljs :default :clj Exception) (short :0)))
+   (is (thrown? #?(:cljs :default :clj Exception) (short [0])))
    (is (thrown? #?(:cljs :default :clj Exception) (short nil)))))
diff --git a/test/clojure/core_test/subs.cljc b/test/clojure/core_test/subs.cljc
diff --git a/test/clojure/core_test/unsigned_bit_shift_right.cljc b/test/clojure/core_test/unsigned_bit_shift_right.cljc
