Make tests more explicit

Author: cthoyt

tests/test_dsl.py

@@ -68,23 +68,21 @@ def test_stop_the_madness(self):
 
     def test_intervention(self):
         """Test the invervention DSL object."""
-        self.assert_text("W*", Intervention("W", True))
-        self.assert_text("W", Intervention("W", False))
-        self.assert_text("W", Intervention("W"))  # False is the default
+        self.assert_text("W*", Intervention("W", star=True))
+        self.assert_text("W", Intervention("W", star=False))
         self.assert_text("W", W)  # shorthand for testing purposes
         self.assert_text("W", -W)  # An intervention from variable W
 
         # inversions using the unary ~ operator
-        self.assert_text("W", ~Intervention("W", True))
-        self.assert_text("W*", ~Intervention("W", False))  # False is still the default
-        self.assert_text("W*", ~Intervention("W"))
+        self.assert_text("W", ~Intervention("W", star=True))
+        self.assert_text("W*", ~Intervention("W", star=False))
         self.assert_text("W*", ~W)
 
     def test_counterfactual_variable(self):
         """Test the Counterfactual Variable DSL object."""
         # Normal instantiation
-        self.assert_text("Y_{W}", CounterfactualVariable("Y", (-W,)))
-        self.assert_text("Y_{W*}", CounterfactualVariable("Y", (~W,)))
+        self.assert_text("Y_{W}", CounterfactualVariable("Y", interventions=(-W,)))
+        self.assert_text("Y_{W*}", CounterfactualVariable("Y", interventions=(~W,)))
 
         # Instantiation with list-based operand to matmul @ operator
         self.assert_text("Y_{W}", Variable("Y") @ [W])
@@ -95,12 +93,14 @@ def test_counterfactual_variable(self):
         # Instantiation with two variables
         self.assert_text(
             "Y_{X, W*}",
-            CounterfactualVariable("Y", (Intervention("X"), ~Intervention("W"))),
+            CounterfactualVariable(
+                "Y", interventions=(Intervention("X", star=False), ~Intervention("W", star=False))
+            ),
         )
 
         # Instantiation with matmul @ operator and single operand
-        self.assert_text("Y_{W}", Y @ Intervention("W"))
-        self.assert_text("Y_{W*}", Y @ ~Intervention("W"))
+        self.assert_text("Y_{W}", Y @ Intervention("W", star=False))
+        self.assert_text("Y_{W*}", Y @ ~Intervention("W", star=False))
 
         # Instantiation with matmul @ operator and list operand
         self.assert_text("Y_{X, W*}", Y @ [X, ~W])
@@ -139,7 +139,7 @@ def test_conditional_distribution(self):
         self.assert_text("Y_{W} | B", Y @ W | B)
         self.assert_text("Y_{W} | B, C", Y @ W | B | C)
         self.assert_text("Y_{W, X*} | B, C", Y @ W @ ~X | B | C)
-        self.assert_text("Y_{W, X*} | B_{N*}, C", Y @ W @ ~X | B @ Intervention("N", True) | C)
+        self.assert_text("Y_{W, X*} | B_{N*}, C", Y @ W @ ~X | B @ Intervention("N", star=True) | C)
 
     def test_joint_distribution(self):
         """Test the JointProbability DSL object."""