test: update tests since jax-galsim now raises expectations

Author: beckermr

tests/test_random.py

@@ -324,17 +324,12 @@ def test_uniform():
     assert u1 != u2, "Consecutive UniformDeviate(None) compared equal!"
     # We shouldn't be able to construct a UniformDeviate from anything but a BaseDeviate, int, str,
     # or None.
-    # FIXME: galsim raises
-    if is_jax_galsim():
-        # jax galsim doesn't test this
-        pass
-    else:
-        assert_raises(TypeError, galsim.UniformDeviate, dict())
-        assert_raises(TypeError, galsim.UniformDeviate, list())
-        assert_raises(TypeError, galsim.UniformDeviate, set())
+    assert_raises(TypeError, galsim.UniformDeviate, dict())
+    assert_raises(TypeError, galsim.UniformDeviate, list())
+    assert_raises(TypeError, galsim.UniformDeviate, set())
 
-        assert_raises(TypeError, u.seed, '123')
-        assert_raises(TypeError, u.seed, 12.3)
+    assert_raises(TypeError, u.seed, '123')
+    assert_raises(TypeError, u.seed, 12.3)
 
 
 @timer
@@ -393,7 +388,6 @@ def test_gaussian():
 
     # If don't explicitly suppress the warning, then a warning is emitted when n is odd.
     g2 = galsim.GaussianDeviate(testseed, mean=gMean, sigma=gSigma)
-    # FIXME: galsim raises
     if is_jax_galsim():
         pass
     else:
@@ -583,16 +577,11 @@ def test_gaussian():
     assert g1 != g2, "Consecutive GaussianDeviate(None) compared equal!"
     # We shouldn't be able to construct a GaussianDeviate from anything but a BaseDeviate, int, str,
     # or None.
-    # FIXME: galsim raises
-    if is_jax_galsim():
-        pass
-    else:
-        # jax-galsim doesn't test for these things
-        assert_raises(TypeError, galsim.GaussianDeviate, dict())
-        assert_raises(TypeError, galsim.GaussianDeviate, list())
-        assert_raises(TypeError, galsim.GaussianDeviate, set())
+    assert_raises(TypeError, galsim.GaussianDeviate, dict())
+    assert_raises(TypeError, galsim.GaussianDeviate, list())
+    assert_raises(TypeError, galsim.GaussianDeviate, set())
 
-        assert_raises(ValueError, galsim.GaussianDeviate, testseed, mean=1, sigma=-1)
+    assert_raises(ValueError, galsim.GaussianDeviate, testseed, mean=1, sigma=-1)
 
 
 @timer
@@ -767,14 +756,9 @@ def test_binomial():
     assert b1 != b2, "Consecutive BinomialDeviate(None) compared equal!"
     # We shouldn't be able to construct a BinomialDeviate from anything but a BaseDeviate, int, str,
     # or None.
-    # FIXME: galsim raises
-    if is_jax_galsim():
-        pass
-    else:
-        # jax does not raise for this
-        assert_raises(TypeError, galsim.BinomialDeviate, dict())
-        assert_raises(TypeError, galsim.BinomialDeviate, list())
-        assert_raises(TypeError, galsim.BinomialDeviate, set())
+    assert_raises(TypeError, galsim.BinomialDeviate, dict())
+    assert_raises(TypeError, galsim.BinomialDeviate, list())
+    assert_raises(TypeError, galsim.BinomialDeviate, set())
 
 
 @timer
@@ -994,13 +978,9 @@ def test_poisson():
     assert p1 != p2, "Consecutive PoissonDeviate(None) compared equal!"
     # We shouldn't be able to construct a PoissonDeviate from anything but a BaseDeviate, int, str,
     # or None.
-    # FIXME: galsim raises
-    if is_jax_galsim():
-        pass
-    else:
-        assert_raises(TypeError, galsim.PoissonDeviate, dict())
-        assert_raises(TypeError, galsim.PoissonDeviate, list())
-        assert_raises(TypeError, galsim.PoissonDeviate, set())
+    assert_raises(TypeError, galsim.PoissonDeviate, dict())
+    assert_raises(TypeError, galsim.PoissonDeviate, list())
+    assert_raises(TypeError, galsim.PoissonDeviate, set())
 
 
 @timer
@@ -1157,21 +1137,16 @@ def test_poisson_zeromean():
     assert test_array[2] != 0
 
     # Error raised if mean<0
-    # jax doesn't raise here
-    # FIXME: galsim raises
-    if is_jax_galsim():
-        pass
-    else:
-        with assert_raises(ValueError):
-            p = galsim.PoissonDeviate(testseed, mean=-0.1)
-        with assert_raises(ValueError):
-            p = galsim.PoissonDeviate(testseed, mean=-10)
-        test_array = np.array([-1,1,4])
-        with assert_raises(ValueError):
-            p.generate_from_expectation(test_array)
-        test_array = np.array([1,-1,-4])
-        with assert_raises(ValueError):
-            p.generate_from_expectation(test_array)
+    with assert_raises(ValueError):
+        p = galsim.PoissonDeviate(testseed, mean=-0.1)
+    with assert_raises(ValueError):
+        p = galsim.PoissonDeviate(testseed, mean=-10)
+    test_array = np.array([-1,1,4])
+    with assert_raises((ValueError, Exception)):
+        p.generate_from_expectation(test_array)
+    test_array = np.array([1,-1,-4])
+    with assert_raises((ValueError, Exception)):
+        p.generate_from_expectation(test_array)
 
 @timer
 def test_weibull():
@@ -1345,13 +1320,9 @@ def test_weibull():
     assert w1 != w2, "Consecutive WeibullDeviate(None) compared equal!"
     # We shouldn't be able to construct a WeibullDeviate from anything but a BaseDeviate, int, str,
     # or None.
-    # FIXME: galsim raises
-    if is_jax_galsim():
-        pass
-    else:
-        assert_raises(TypeError, galsim.WeibullDeviate, dict())
-        assert_raises(TypeError, galsim.WeibullDeviate, list())
-        assert_raises(TypeError, galsim.WeibullDeviate, set())
+    assert_raises(TypeError, galsim.WeibullDeviate, dict())
+    assert_raises(TypeError, galsim.WeibullDeviate, list())
+    assert_raises(TypeError, galsim.WeibullDeviate, set())
 
 
 @timer
@@ -1510,13 +1481,9 @@ def test_gamma():
     assert g1 != g2, "Consecutive GammaDeviate(None) compared equal!"
     # We shouldn't be able to construct a GammaDeviate from anything but a BaseDeviate, int, str,
     # or None.
-    # FIXME: galsim raises
-    if is_jax_galsim():
-        pass
-    else:
-        assert_raises(TypeError, galsim.GammaDeviate, dict())
-        assert_raises(TypeError, galsim.GammaDeviate, list())
-        assert_raises(TypeError, galsim.GammaDeviate, set())
+    assert_raises(TypeError, galsim.GammaDeviate, dict())
+    assert_raises(TypeError, galsim.GammaDeviate, list())
+    assert_raises(TypeError, galsim.GammaDeviate, set())
 
 
 @timer
@@ -1675,13 +1642,9 @@ def test_chi2():
     assert c1 != c2, "Consecutive Chi2Deviate(None) compared equal!"
     # We shouldn't be able to construct a Chi2Deviate from anything but a BaseDeviate, int, str,
     # or None.
-    # FIXME: galsim raises
-    if is_jax_galsim():
-        pass
-    else:
-        assert_raises(TypeError, galsim.Chi2Deviate, dict())
-        assert_raises(TypeError, galsim.Chi2Deviate, list())
-        assert_raises(TypeError, galsim.Chi2Deviate, set())
+    assert_raises(TypeError, galsim.Chi2Deviate, dict())
+    assert_raises(TypeError, galsim.Chi2Deviate, list())
+    assert_raises(TypeError, galsim.Chi2Deviate, set())
 
 
 @timer