1 files changed, 37 insertions, 81 deletions
diff --git a/test/ec/test_configuration.py b/test/ec/test_configuration.py
index a90f3ce..17fb6f7 100644
--- a/test/ec/test_configuration.py
+++ b/test/ec/test_configuration.py
@@ -1,5 +1,3 @@
-from unittest import TestCase
-
 import pytest
 
 from pyecsca.ec.configuration import (
@@ -15,86 +13,44 @@ from pyecsca.ec.model import ShortWeierstrassModel
 from pyecsca.ec.mult import LTRMultiplier
 
 
-class ConfigurationTests(TestCase):
-    def base_independents(self):
-        return {
-            "hash_type": HashType.SHA1,
-            "mod_rand": RandomMod.SAMPLE,
-            "mult": Multiplication.BASE,
-            "sqr": Squaring.BASE,
-            "red": Reduction.BASE,
-            "inv": Inversion.GCD,
-        }
+@pytest.fixture(scope="module")
+def base_independents():
+    return {"hash_type": HashType.SHA1, "mod_rand": RandomMod.SAMPLE, "mult": Multiplication.BASE, "sqr": Squaring.BASE,
+            "red": Reduction.BASE, "inv": Inversion.GCD, }
+
+
+@pytest.mark.slow
+def test_all():
+    j = 0
+    for _ in all_configurations(model=ShortWeierstrassModel()):
+        j += 1
+
+
+def test_weierstrass_projective(base_independents):
+    model = ShortWeierstrassModel()
+    coords = model.coordinates["projective"]
+    configs = list(all_configurations(model=model, coords=coords, **base_independents))
+    assert len(configs) == 1960
 
-    @pytest.mark.slow
-    def test_all(self):
-        j = 0
-        for _ in all_configurations(model=ShortWeierstrassModel()):
-            j += 1
 
-    def test_weierstrass_projective(self):
-        model = ShortWeierstrassModel()
-        coords = model.coordinates["projective"]
-        configs = list(
-            all_configurations(model=model, coords=coords, **self.base_independents())
-        )
-        self.assertEqual(len(configs), 1960)
+def test_mult_class(base_independents):
+    model = ShortWeierstrassModel()
+    coords = model.coordinates["projective"]
+    scalarmult = LTRMultiplier
+    configs = list(all_configurations(model=model, coords=coords, scalarmult=scalarmult, **base_independents))
+    assert len(configs) == 560
 
-    def test_mult_class(self):
-        model = ShortWeierstrassModel()
-        coords = model.coordinates["projective"]
-        scalarmult = LTRMultiplier
-        configs = list(
-            all_configurations(
-                model=model,
-                coords=coords,
-                scalarmult=scalarmult,
-                **self.base_independents()
-            )
-        )
-        self.assertEqual(len(configs), 560)
 
-    def test_one(self):
-        model = ShortWeierstrassModel()
-        coords = model.coordinates["projective"]
-        scalarmult = {
-            "cls": LTRMultiplier,
-            "add": coords.formulas["add-1998-cmo"],
-            "dbl": coords.formulas["dbl-1998-cmo"],
-            "scl": None,
-            "always": True,
-            "complete": False,
-            "short_circuit": True,
-        }
-        configs = list(
-            all_configurations(
-                model=model,
-                coords=coords,
-                scalarmult=scalarmult,
-                **self.base_independents()
-            )
-        )
-        self.assertEqual(len(configs), 1)
-        scalarmult = LTRMultiplier(
-            coords.formulas["add-1998-cmo"],
-            coords.formulas["dbl-1998-cmo"],
-            None,
-            True,
-            False,
-            True,
-        )
-        configs = list(
-            all_configurations(
-                model=model,
-                coords=coords,
-                scalarmult=scalarmult,
-                **self.base_independents()
-            )
-        )
-        self.assertEqual(len(configs), 1)
-        configs = list(
-            all_configurations(
-                model=model, scalarmult=scalarmult, **self.base_independents()
-            )
-        )
-        self.assertEqual(len(configs), 1)
+def test_one(base_independents):
+    model = ShortWeierstrassModel()
+    coords = model.coordinates["projective"]
+    scalarmult = {"cls": LTRMultiplier, "add": coords.formulas["add-1998-cmo"], "dbl": coords.formulas["dbl-1998-cmo"],
+                  "scl": None, "always": True, "complete": False, "short_circuit": True, }
+    configs = list(all_configurations(model=model, coords=coords, scalarmult=scalarmult, **base_independents))
+    assert len(configs) == 1
+    scalarmult = LTRMultiplier(coords.formulas["add-1998-cmo"], coords.formulas["dbl-1998-cmo"], None, True, False,
+                               True, )
+    configs = list(all_configurations(model=model, coords=coords, scalarmult=scalarmult, **base_independents))
+    assert len(configs) == 1
+    configs = list(all_configurations(model=model, scalarmult=scalarmult, **base_independents))
+    assert len(configs) == 1