Corrected test cases

- Corrected test cases delx/4 and delx/5 after slightly changing the corresponding examples in commit df46ea2
- Replaced superset comparison by equality in the tests based on the examples.
- Corrected wrong variable in library case leading to safety error in explain mode.

deolingo/examples/delxx/example5.1.lp

@@ -26,7 +26,7 @@ fence :- white_fence.
 fence.
 
 % The fence is white.
--white_fence.
+white_fence.
 
 %!show_trace &obligatory{X}.
 %!show_trace &permitted{X}.

deolingo/examples/real/udc_library.case1.lp

@@ -55,7 +55,7 @@ violated(Person, curfew) :- &violated_prohibition{go_out(Person)}, curfew.
 %!trace_rule {"It is obligatory to call the police if someone violated the curfew"}
 &obligatory{call_the_police} :- &violated_prohibition{go_out(Person)}, curfew.
 
-%!trace_rule {"% violated the curfew",Person}
+%!trace_rule {"% violated the curfew",User}
 violated(User, max_loan_policy) :- &violated_prohibition{exceed_max_docs_loan(User)}.
 
 %!trace_rule {"% must notify the library since she violated the return policy during the curfew",User}

tests/test_delx_examples.py

@@ -19,7 +19,7 @@ def test_delx_example_1_1(self):
         # Assert
         assert len(actual_answer_sets) == 1
         actual_answer_set = set(actual_answer_sets[0])
-        assert actual_answer_set.issuperset(expected_answer_set)
+        assert actual_answer_set == expected_answer_set
 
     def test_delx_example_1_2(self):
         # Arrange
@@ -30,7 +30,7 @@ def test_delx_example_1_2(self):
         # Assert
         assert len(actual_answer_sets) == 1
         actual_answer_set = set(actual_answer_sets[0])
-        assert actual_answer_set.issuperset(expected_answer_set)
+        assert actual_answer_set == expected_answer_set
 
     def test_delx_example_2(self):
         # Arrange
@@ -41,7 +41,7 @@ def test_delx_example_2(self):
         # Assert
         assert len(actual_answer_sets) == 1
         actual_answer_set = set(actual_answer_sets[0])
-        assert actual_answer_set.issuperset(expected_answer_set)
+        assert actual_answer_set == expected_answer_set
 
     def test_delx_example_3(self):
         # Arrange
@@ -52,26 +52,29 @@ def test_delx_example_3(self):
         # Assert
         assert len(actual_answer_sets) == 1
         actual_answer_set = set(actual_answer_sets[0])
-        assert actual_answer_set.issuperset(expected_answer_set)
+        assert actual_answer_set == expected_answer_set
 
     def test_delx_example_4(self):
         # Arrange
         example = ExampleReader().read_example("delx/example4.lp")
-        expected_answer_set = {'&forbidden{f}'}
+        expected_answer_set = {'&permitted{f}', 'f', 's'}
         # Act
         actual_answer_sets = self.get_sut().solve(example.contents)
         # Assert
         assert len(actual_answer_sets) == 1
         actual_answer_set = set(actual_answer_sets[0])
-        assert actual_answer_set.issuperset(expected_answer_set)
+        assert actual_answer_set == expected_answer_set
 
     def test_delx_example_5_1(self):
         # Arrange
         example = ExampleReader().read_example("delx/example5.1.lp")
+        expected_answer_set = {'&forbidden{f}', '&forbidden{w}', 'f', '&obligatory{w}', '&obligatory{f}', 'w'}
         # Act
         actual_answer_sets = self.get_sut().solve(example.contents)
         # Assert
-        assert actual_answer_sets == []
+        assert len(actual_answer_sets) == 1
+        actual_answer_set = set(actual_answer_sets[0])
+        assert actual_answer_set == expected_answer_set
 
     def test_delx_example_5_2(self):
         # Arrange
@@ -82,7 +85,7 @@ def test_delx_example_5_2(self):
         # Assert
         assert len(actual_answer_sets) == 1
         actual_answer_set = set(actual_answer_sets[0])
-        assert actual_answer_set.issuperset(expected_answer_set)
+        assert actual_answer_set == expected_answer_set
 
     def test_delx_example_6_1(self):
         # Arrange
@@ -99,8 +102,8 @@ def test_delx_example_6_1(self):
         assert len(actual_answer_sets) == 2
         actual_answer_set_0 = set(actual_answer_sets[0])
         actual_answer_set_1 = set(actual_answer_sets[1])
-        assert actual_answer_set_0.issuperset(expected_answer_sets[0])
-        assert actual_answer_set_1.issuperset(expected_answer_sets[1])
+        assert actual_answer_set_0 == expected_answer_sets[0]
+        assert actual_answer_set_1 == expected_answer_sets[1]
 
     def test_delx_example_6_2(self):
         # Arrange
@@ -117,8 +120,8 @@ def test_delx_example_6_2(self):
         assert len(actual_answer_sets) == 2
         actual_answer_set_0 = set(actual_answer_sets[0])
         actual_answer_set_1 = set(actual_answer_sets[1])
-        assert actual_answer_set_0.issuperset(expected_answer_sets[0])
-        assert actual_answer_set_1.issuperset(expected_answer_sets[1])
+        assert actual_answer_set_0 == expected_answer_sets[0]
+        assert actual_answer_set_1 == expected_answer_sets[1]
 
 
 class DeolingoDELXExamplesOptimizedTestCase(DeolingoDELXExamplesTestCase):

tests/test_preliminary_examples.py

@@ -20,7 +20,7 @@ def test_preliminary_example_1(self):
         # Assert
         assert len(actual_answer_sets) == 1
         actual_answer_set = set(actual_answer_sets[0])
-        assert actual_answer_set.issuperset(expected_answer_set)
+        assert actual_answer_set == expected_answer_set
 
     def test_preliminary_example_2(self):
         # Arrange
@@ -31,7 +31,7 @@ def test_preliminary_example_2(self):
         # Assert
         assert len(actual_answer_sets) == 1
         actual_answer_set = set(actual_answer_sets[0])
-        assert actual_answer_set.issuperset(expected_answer_set)
+        assert actual_answer_set == expected_answer_set
 
     def test_preliminary_example_3(self):
         # Arrange
@@ -51,7 +51,7 @@ def test_preliminary_example_4(self):
         # Assert
         assert len(actual_answer_sets) == 1
         actual_answer_set = set(actual_answer_sets[0])
-        assert actual_answer_set.issuperset(expected_answer_set)
+        assert actual_answer_set == expected_answer_set
 
     def test_preliminary_example_5(self):
         # Arrange
@@ -62,7 +62,7 @@ def test_preliminary_example_5(self):
         # Assert
         assert len(actual_answer_sets) == 1
         actual_answer_set = set(actual_answer_sets[0])
-        assert actual_answer_set.issuperset(expected_answer_set)
+        assert actual_answer_set == expected_answer_set
 
 
 class DeolingoPreliminaryExamplesOptimizedTestCase(DeolingoPreliminaryExamplesTestCase):