Test setup moved to fixtures

Author: nwittler

test/conftest.py

@@ -1,5 +1,10 @@
+import tensorflow as tf
 from typing import Any, Dict
 from qiskit import QuantumCircuit, ClassicalRegister, QuantumRegister
+from c3.parametermap import ParameterMap
+from c3.generator.generator import Generator
+from c3.generator.devices import Crosstalk
+from c3.c3objs import Quantity
 import pytest
 
 
@@ -101,3 +106,30 @@ def get_result_qiskit() -> Dict[str, Dict[str, Any]]:
         "c3_qasm_perfect_simulator": perfect_counts,
     }
     return counts_dict
+
+
+@pytest.fixture()
+def get_xtalk_pmap() -> ParameterMap:
+    xtalk = Crosstalk(
+        name="crosstalk",
+        channels=["TC1", "TC2"],
+        crosstalk_matrix=Quantity(
+            value=[[1, 0], [0, 1]],
+            min_val=[[0, 0], [0, 0]],
+            max_val=[[1, 1], [1, 1]],
+            unit="",
+        ),
+    )
+
+    gen = Generator(devices={"crosstalk": xtalk})
+    pmap = ParameterMap(generator=gen)
+    pmap.set_opt_map([[["crosstalk", "crosstalk_matrix"]]])
+    return pmap
+
+
+@pytest.fixture()
+def get_test_signal() -> Dict:
+    return {
+        "TC1": {"values": tf.linspace(0, 100, 101)},
+        "TC2": {"values": tf.linspace(100, 200, 101)},
+    }

test/test_crosstalk.py

@@ -1,57 +1,37 @@
 import pytest
 
 import numpy as np
-import tensorflow as tf
-
-from c3.generator.devices import Crosstalk
-from c3.generator.generator import Generator
-from c3.c3objs import Quantity as Qty
-from c3.parametermap import ParameterMap
-
-
-xtalk = Crosstalk(
-    name="crosstalk",
-    channels=["TC1", "TC2"],
-    crosstalk_matrix=Qty(
-        value=[[1, 0], [0, 1]],
-        min_val=[[0, 0], [0, 0]],
-        max_val=[[1, 1], [1, 1]],
-        unit="",
-    ),
-)
-
-signal = {
-    "TC1": {"values": tf.linspace(0, 100, 101)},
-    "TC2": {"values": tf.linspace(100, 200, 101)},
-}
-
-gen = Generator(devices={"crosstalk": xtalk})
-pmap = ParameterMap(generator=gen)
-pmap.set_opt_map([[["crosstalk", "crosstalk_matrix"]]])
 
 
 @pytest.mark.unit
-def test_crosstalk() -> None:
-    new_sig = xtalk.process(signal=signal)
-    assert new_sig == signal
+def test_crosstalk(get_xtalk_pmap, get_test_signal) -> None:
+    xtalk = get_xtalk_pmap.generator.devices["crosstalk"]
+    new_sig = xtalk.process(signal=get_test_signal)
+    assert new_sig == get_test_signal
 
 
 @pytest.mark.unit
-def test_crosstalk_flip() -> None:
+def test_crosstalk_flip(get_xtalk_pmap, get_test_signal) -> None:
+    xtalk = get_xtalk_pmap.generator.devices["crosstalk"]
     xtalk.params["crosstalk_matrix"].set_value([[0, 1], [1, 0]])
-    new_sig = xtalk.process(signal=signal)
+    new_sig = xtalk.process(signal=get_test_signal)
     assert (new_sig["TC2"]["values"].numpy() == np.linspace(0, 100, 101)).all()
     assert (new_sig["TC1"]["values"].numpy() == np.linspace(100, 200, 101)).all()
 
 
 @pytest.mark.unit
-def test_crosstalk_mix() -> None:
+def test_crosstalk_mix(get_xtalk_pmap, get_test_signal) -> None:
+    xtalk = get_xtalk_pmap.generator.devices["crosstalk"]
     xtalk.params["crosstalk_matrix"].set_value([[0.5, 0.5], [0.5, 0.5]])
-    new_sig = xtalk.process(signal=signal)
+    new_sig = xtalk.process(signal=get_test_signal)
     assert (new_sig["TC2"]["values"].numpy() == new_sig["TC1"]["values"].numpy()).all()
 
 
 @pytest.mark.unit
-def test_crosstalk_set_get_parameters() -> None:
-    pmap.set_parameters([[1, 1], [1, 1]], [[["crosstalk", "crosstalk_matrix"]]])
-    assert (pmap.get_parameters()[0].get_value().numpy() == [[1, 1], [1, 1]]).all()
+def test_crosstalk_set_get_parameters(get_xtalk_pmap) -> None:
+    get_xtalk_pmap.set_parameters(
+        [[1, 1], [1, 1]], [[["crosstalk", "crosstalk_matrix"]]]
+    )
+    assert (
+        get_xtalk_pmap.get_parameters()[0].get_value().numpy() == [[1, 1], [1, 1]]
+    ).all()