More tidy of test cases

Author: jg-rp

tests/_cts_case.py

@@ -10,6 +10,8 @@
 from typing import Sequence
 from typing import Union
 
+from jsonpath import NodeList
+
 
 @dataclass
 class Case:
@@ -45,3 +47,14 @@ def as_dict(self) -> Dict[str, Any]:
         rv["tags"] = self.tags
 
         return rv
+
+    def assert_nodes(self, nodes: NodeList) -> None:
+        """Assert that `nodes` matches this test case."""
+        if self.results is not None:
+            assert self.results_paths is not None
+            assert nodes.values() in self.results
+            assert nodes.paths() in self.results_paths
+        else:
+            assert self.result_paths is not None
+            assert nodes.values() == self.result
+            assert nodes.paths() == self.result_paths

tests/consensus.py

@@ -8,6 +8,7 @@
 We've deliberately named this file so as to exclude it when running `pytest` or
 `hatch run test`. Target it specifically using `pytest tests/consensus.py`.
 """
+
 import operator
 import unittest
 from dataclasses import dataclass
@@ -44,7 +45,7 @@ class Query:
 }
 
 SKIP = {
-    "bracket_notation_with_number_on_object": "We support unquoted property names",
+    # "bracket_notation_with_number_on_object": "We support unquoted property names",
     "dot_notation_with_number_-1": "conflict with compliance",
     "dot_notation_with_number_on_object": "conflict with compliance",
 }

tests/query_intersection.json

@@ -0,0 +1,28 @@
+{
+  "tests": [
+    {
+      "name": "intersection of two paths, no common items",
+      "selector": "$.some & $.thing",
+      "document": {
+        "some": [1, 2, 3],
+        "thing": [4, 5, 6],
+        "other": ["a", "b", "c"]
+      },
+      "result": [],
+      "result_paths": [],
+      "tags": ["extra"]
+    },
+    {
+      "name": "intersection of two paths, with common items",
+      "selector": "$.some & $.thing",
+      "document": {
+        "some": [1, 2, 3],
+        "thing": [1, 2, 3],
+        "other": ["a", "b", "c"]
+      },
+      "result": [[1, 2, 3]],
+      "result_paths": ["$['some']"],
+      "tags": ["extra"]
+    }
+  ]
+}

tests/query_union.json

@@ -0,0 +1,35 @@
+{
+  "tests": [
+    {
+      "name": "union of two paths",
+      "selector": "$.some | $.thing",
+      "document": {
+        "some": [1, 2, 3],
+        "thing": [4, 5, 6],
+        "other": ["a", "b", "c"]
+      },
+      "result": [
+        [1, 2, 3],
+        [4, 5, 6]
+      ],
+      "result_paths": ["$['some']", "$['thing']"],
+      "tags": ["extra"]
+    },
+    {
+      "name": "union of three paths",
+      "selector": "$.some | $.thing | $.other",
+      "document": {
+        "some": [1, 2, 3],
+        "thing": [4, 5, 6],
+        "other": ["a", "b", "c"]
+      },
+      "result": [
+        [1, 2, 3],
+        [4, 5, 6],
+        ["a", "b", "c"]
+      ],
+      "result_paths": ["$['some']", "$['thing']", "$['other']"],
+      "tags": ["extra"]
+    }
+  ]
+}

tests/regex_operator.json

@@ -0,0 +1,36 @@
+{
+  "tests": [
+    {
+      "name": "regex literal, match",
+      "selector": "$.some[?(@.thing =~ /fo[a-z]/)]",
+      "document": { "some": [{ "thing": "foo" }] },
+      "result": [{ "thing": "foo" }],
+      "result_paths": ["$['some'][0]"],
+      "tags": ["extra"]
+    },
+    {
+      "name": "regex literal, no match",
+      "selector": "$.some[?(@.thing =~ /fo[a-z]/)]",
+      "document": { "some": [{ "thing": "foO" }] },
+      "result": [],
+      "result_paths": [],
+      "tags": ["extra"]
+    },
+    {
+      "name": "regex literal, case insensitive match",
+      "selector": "$.some[?(@.thing =~ /fo[a-z]/i)]",
+      "document": { "some": [{ "thing": "foO" }] },
+      "result": [{ "thing": "foO" }],
+      "result_paths": ["$['some'][0]"],
+      "tags": ["extra"]
+    },
+    {
+      "name": "regex literal, escaped slash",
+      "selector": "$.some[?(@.thing =~ /fo\\\\[a-z]/)]",
+      "document": { "some": [{ "thing": "fo\\b" }] },
+      "result": [{ "thing": "fo\\b" }],
+      "result_paths": ["$['some'][0]"],
+      "tags": ["extra"]
+    }
+  ]
+}

tests/test_concrete_path.py

@@ -24,15 +24,7 @@ def env() -> JSONPathEnvironment:
 def test_current_key_identifier(env: JSONPathEnvironment, case: Case) -> None:
     assert case.document is not None
     nodes = NodeList(env.finditer(case.selector, case.document))
-
-    if case.results is not None:
-        assert case.results_paths is not None
-        assert nodes.values() in case.results
-        assert nodes.paths() in case.results_paths
-    else:
-        assert case.result_paths is not None
-        assert nodes.values() == case.result
-        assert nodes.paths() == case.result_paths
+    case.assert_nodes(nodes)
 
 
 @pytest.mark.parametrize("case", data, ids=operator.attrgetter("name"))
@@ -43,15 +35,7 @@ async def coro() -> NodeList:
         return NodeList([node async for node in it])
 
     nodes = asyncio.run(coro())
-
-    if case.results is not None:
-        assert case.results_paths is not None
-        assert nodes.values() in case.results
-        assert nodes.paths() in case.results_paths
-    else:
-        assert case.result_paths is not None
-        assert nodes.values() == case.result
-        assert nodes.paths() == case.result_paths
+    case.assert_nodes(nodes)
 
 
 @pytest.mark.parametrize("case", data, ids=operator.attrgetter("name"))

tests/test_current_key_identifier.py

@@ -24,15 +24,7 @@ def env() -> JSONPathEnvironment:
 def test_key_selector(env: JSONPathEnvironment, case: Case) -> None:
     assert case.document is not None
     nodes = NodeList(env.finditer(case.selector, case.document))
-
-    if case.results is not None:
-        assert case.results_paths is not None
-        assert nodes.values() in case.results
-        assert nodes.paths() in case.results_paths
-    else:
-        assert case.result_paths is not None
-        assert nodes.values() == case.result
-        assert nodes.paths() == case.result_paths
+    case.assert_nodes(nodes)
 
 
 @pytest.mark.parametrize("case", data, ids=operator.attrgetter("name"))
@@ -43,15 +35,7 @@ async def coro() -> NodeList:
         return NodeList([node async for node in it])
 
     nodes = asyncio.run(coro())
-
-    if case.results is not None:
-        assert case.results_paths is not None
-        assert nodes.values() in case.results
-        assert nodes.paths() in case.results_paths
-    else:
-        assert case.result_paths is not None
-        assert nodes.values() == case.result
-        assert nodes.paths() == case.result_paths
+    case.assert_nodes(nodes)
 
 
 @pytest.mark.parametrize("case", data, ids=operator.attrgetter("name"))

tests/test_find_compound_path.py

@@ -24,15 +24,7 @@ def env() -> JSONPathEnvironment:
 def test_keys_filter_selector(env: JSONPathEnvironment, case: Case) -> None:
     assert case.document is not None
     nodes = NodeList(env.finditer(case.selector, case.document))
-
-    if case.results is not None:
-        assert case.results_paths is not None
-        assert nodes.values() in case.results
-        assert nodes.paths() in case.results_paths
-    else:
-        assert case.result_paths is not None
-        assert nodes.values() == case.result
-        assert nodes.paths() == case.result_paths
+    case.assert_nodes(nodes)
 
 
 @pytest.mark.parametrize("case", data, ids=operator.attrgetter("name"))
@@ -43,15 +35,7 @@ async def coro() -> NodeList:
         return NodeList([node async for node in it])
 
     nodes = asyncio.run(coro())
-
-    if case.results is not None:
-        assert case.results_paths is not None
-        assert nodes.values() in case.results
-        assert nodes.paths() in case.results_paths
-    else:
-        assert case.result_paths is not None
-        assert nodes.values() == case.result
-        assert nodes.paths() == case.result_paths
+    case.assert_nodes(nodes)
 
 
 @pytest.mark.parametrize("case", data, ids=operator.attrgetter("name"))