Remove xor

gramps-project · Feb 14, 2025 · 6e6c39d · 6e6c39d
1 parent 027091c
commit 6e6c39d
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 55 deletions.
diff --git a/gramps_webapi/api/resources/filters.py b/gramps_webapi/api/resources/filters.py
@@ -195,7 +195,7 @@ class FilterSchema(Schema):
     function = fields.Str(
         required=False,
         load_default="and",
-        validate=validate.OneOf(["and", "or", "xor", "one"]),
+        validate=validate.OneOf(["and", "or", "one"]),
     )
     invert = fields.Boolean(required=False, load_default=False)
     rules = fields.List(

diff --git a/tests/test_endpoints/test_citations.py b/tests/test_endpoints/test_citations.py
@@ -248,15 +248,6 @@ def test_get_citations_parameter_rules_expected_response_or_function(self):
         )
         self.assertEqual(len(rv), 2854)
 
-    def test_get_citations_parameter_rules_expected_response_xor_function(self):
-        """Test rules parameter expected response for xor function."""
-        rv = check_success(
-            self,
-            TEST_URL
-            + '?keys=handle&rules={"function":"xor","rules":[{"name":"HasNote"},{"name":"HasCitation","values":["", "", 2]}]}',
-        )
-        self.assertEqual(len(rv), 2853)
-
     def test_get_citations_parameter_rules_expected_response_one_function(self):
         """Test rules parameter expected response for one function."""
         rv = check_success(

diff --git a/tests/test_endpoints/test_events.py b/tests/test_endpoints/test_events.py
@@ -288,15 +288,6 @@ def test_get_events_parameter_rules_expected_response_or_function(self):
         )
         self.assertEqual(len(rv), 657)
 
-    def test_get_events_parameter_rules_expected_response_xor_function(self):
-        """Test rules parameter expected response for xor function."""
-        rv = check_success(
-            self,
-            TEST_URL
-            + '?keys=handle&rules={"function":"xor","rules":[{"name":"HasType","values":["Death"]},{"name":"HasNote"}]}',
-        )
-        self.assertEqual(len(rv), 656)
-
     def test_get_events_parameter_rules_expected_response_one_function(self):
         """Test rules parameter expected response for one function."""
         rv = check_success(

diff --git a/tests/test_endpoints/test_media.py b/tests/test_endpoints/test_media.py
@@ -270,15 +270,6 @@ def test_get_media_parameter_rules_expected_response_or_function(self):
         self.assertEqual(rv[0]["handle"], "238CGQ939HG18SS5MG")
         self.assertEqual(rv[1]["handle"], "F8JYGQFL2PKLSYH79X")
 
-    def test_get_media_parameter_rules_expected_response_xor_function(self):
-        """Test rules parameter expected response for xor function."""
-        rv = check_success(
-            self,
-            TEST_URL
-            + '?keys=handle&rules={"function":"xor","rules":[{"name":"HasTag","values":["ToDo"]},{"name":"HasIdOf","values":["O0007"]}]}',
-        )
-        self.assertEqual(len(rv), 2)
-
     def test_get_media_parameter_rules_expected_response_one_function(self):
         """Test rules parameter expected response for one function."""
         rv = check_success(

diff --git a/tests/test_endpoints/test_places.py b/tests/test_endpoints/test_places.py
@@ -284,15 +284,6 @@ def test_get_places_parameter_rules_expected_response_or_function(self):
         )
         self.assertEqual(len(rv), 1294)
 
-    def test_get_places_parameter_rules_expected_response_xor_function(self):
-        """Test rules parameter expected response for xor function."""
-        rv = check_success(
-            self,
-            TEST_URL
-            + '?keys=handle&rules={"function":"xor","rules":[{"name":"HasData","values":["","City","",""]},{"name":"HasNoLatOrLon"}]}',
-        )
-        self.assertEqual(len(rv), 810)
-
     def test_get_places_parameter_rules_expected_response_one_function(self):
         """Test rules parameter expected response for one function."""
         rv = check_success(

diff --git a/tests/test_endpoints/test_repositories.py b/tests/test_endpoints/test_repositories.py
@@ -271,15 +271,6 @@ def test_get_repositories_parameter_rules_expected_response_or_function(self):
         )
         self.assertEqual(len(rv), 3)
 
-    def test_get_repositories_parameter_rules_expected_response_xor_function(self):
-        """Test rules parameter expected response for xor function."""
-        rv = check_success(
-            self,
-            TEST_URL
-            + '?rules={"function":"xor","rules":[{"name":"MatchesNameSubstringOf","values":["Library"]},{"name":"MatchesNameSubstringOf","values":["Attic"]}]}',
-        )
-        self.assertEqual(len(rv), 3)
-
     def test_get_repositories_parameter_rules_expected_response_one_function(self):
         """Test rules parameter expected response for one function."""
         rv = check_success(

diff --git a/tests/test_endpoints/test_sources.py b/tests/test_endpoints/test_sources.py
@@ -279,15 +279,6 @@ def test_get_sources_parameter_rules_expected_response_or_function(self):
         )
         self.assertEqual(len(rv), 2)
 
-    def test_get_sources_parameter_rules_expected_response_xor_function(self):
-        """Test rules parameter expected response for xor function."""
-        rv = check_success(
-            self,
-            TEST_URL
-            + '?rules={"function":"xor","rules":[{"name":"MatchesTitleSubstringOf","values":["Church"]},{"name":"MatchesTitleSubstringOf","values":["World"]}]}',
-        )
-        self.assertEqual(len(rv), 2)
-
     def test_get_sources_parameter_rules_expected_response_one_function(self):
         """Test rules parameter expected response for one function."""
         rv = check_success(