Ditch the Optionals.

Fixes #47.

2 files changed, 23 insertions, 21 deletions

diff --git a/test/sca/test_combine.py b/test/sca/test_combine.py
index 7e62780..5c4285b 100644
--- a/test/sca/test_combine.py
+++ b/test/sca/test_combine.py
@@ -24,7 +24,8 @@ def data():
 
 
 def test_average(data):
-    assert average() is None
+    with pytest.raises(ValueError):
+        average()
     result = average(data.a, data.b)
     assert result is not None
     assert isinstance(result, CombinedTrace)
@@ -42,21 +43,24 @@ def test_conditional_average(data):
 
 
 def test_standard_deviation(data):
-    assert standard_deviation() is None
+    with pytest.raises(ValueError):
+        standard_deviation()
     result = standard_deviation(data.a, data.b)
     assert isinstance(result, CombinedTrace)
     assert len(result.samples) == 2
 
 
 def test_variance(data):
-    assert variance() is None
+    with pytest.raises(ValueError):
+        variance()
     result = variance(data.a, data.b)
     assert isinstance(result, CombinedTrace)
     assert len(result.samples) == 2
 
 
 def test_average_and_variance(data):
-    assert average_and_variance() is None
+    with pytest.raises(ValueError):
+        average_and_variance()
     mean, var = average_and_variance(data.a, data.b)
     assert isinstance(mean, CombinedTrace)
     assert isinstance(var, CombinedTrace)
@@ -67,7 +71,8 @@ def test_average_and_variance(data):
 
 
 def test_add(data):
-    assert add() is None
+    with pytest.raises(ValueError):
+        add()
     result = add(data.a, data.b)
     assert isinstance(result, CombinedTrace)
     assert result.samples[0] == 50
diff --git a/test/sca/test_test.py b/test/sca/test_test.py
index 256e77d..6925eb0 100644
--- a/test/sca/test_test.py
+++ b/test/sca/test_test.py
@@ -8,34 +8,31 @@ from pyecsca.sca import Trace, welch_ttest, student_ttest, ks_test
 @pytest.fixture()
 def data():
     Data = namedtuple("Data", ["a", "b", "c", "d"])
-    return Data(a=Trace(np.array([20, 80], dtype=np.dtype("i1"))),
-                b=Trace(np.array([30, 42], dtype=np.dtype("i1"))),
-                c=Trace(np.array([78, 56], dtype=np.dtype("i1"))),
-                d=Trace(np.array([98, 36], dtype=np.dtype("i1"))))
+    return Data(
+        a=Trace(np.array([20, 80], dtype=np.dtype("i1"))),
+        b=Trace(np.array([30, 42], dtype=np.dtype("i1"))),
+        c=Trace(np.array([78, 56], dtype=np.dtype("i1"))),
+        d=Trace(np.array([98, 36], dtype=np.dtype("i1"))),
+    )
 
 
 def test_welch_ttest(data):
     assert welch_ttest([data.a, data.b], [data.c, data.d]) is not None
-    a = Trace(
-        np.array([19.8, 20.4, 19.6, 17.8, 18.5, 18.9, 18.3, 18.9, 19.5, 22.0])
-    )
-    b = Trace(
-        np.array([28.2, 26.6, 20.1, 23.3, 25.2, 22.1, 17.7, 27.6, 20.6, 13.7])
-    )
-    c = Trace(
-        np.array([20.2, 21.6, 27.1, 13.3, 24.2, 20.1, 11.7, 25.6, 26.6, 21.4])
-    )
+    a = Trace(np.array([19.8, 20.4, 19.6, 17.8, 18.5, 18.9, 18.3, 18.9, 19.5, 22.0]))
+    b = Trace(np.array([28.2, 26.6, 20.1, 23.3, 25.2, 22.1, 17.7, 27.6, 20.6, 13.7]))
+    c = Trace(np.array([20.2, 21.6, 27.1, 13.3, 24.2, 20.1, 11.7, 25.6, 26.6, 21.4]))
 
     result = welch_ttest([a, b], [b, c], dof=True, p_value=True)
     assert result is not None
 
 
 def test_students_ttest(data):
-    assert student_ttest([], []) is None
+    with pytest.raises(ValueError):
+        student_ttest([], [])
     assert student_ttest([data.a, data.b], [data.c, data.d]) is not None
 
 
 def test_ks_test(data):
-    assert ks_test([], []) is None
-
+    with pytest.raises(ValueError):
+        assert ks_test([], [])
     assert ks_test([data.a, data.b], [data.c, data.d]) is not None