Correct test structure and assertions

Author: erral

src/plone/restapi/tests/test_services_querystringsearch.py

@@ -338,84 +338,6 @@ def test_querystringsearch_sort(self):
             f"{self.portal.absolute_url()}/testdocument9",
         )
 
-
-class TestVHMPathCorrectionUnit(unittest.TestCase):
-
-    def test_path_correction_string(self):
-        from plone.restapi.services.querystringsearch.get import QuerystringSearch
-        request = mock.Mock()
-        request.get.return_value = ("Plone", "en")
-        # Mock json_body to return our query
-        with mock.patch("plone.restapi.services.querystringsearch.get.json_body") as mock_json_body:
-            mock_json_body.return_value = {
-                "query": [
-                    {"i": "path", "o": "op", "v": "/folder::1"}
-                ]
-            }
-            context = mock.Mock()
-            service = QuerystringSearch(context, request)
-
-            # We only want to test the path correction part, so we'll mock the rest of __call__
-            # by causing it to fail after the correction
-            with mock.patch("plone.restapi.services.querystringsearch.get.getMultiAdapter") as mock_adapter:
-                mock_adapter.side_effect = Exception("Stop here")
-                try:
-                    service()
-                except Exception as e:
-                    if str(e) != "Stop here":
-                        raise
-
-            # Check if query was modified in place (since it's a list of dicts)
-            query = mock_json_body.return_value["query"]
-            self.assertEqual(query[0]["v"], "/Plone/en/folder::1")
-
-    def test_path_correction_list(self):
-        from plone.restapi.services.querystringsearch.get import QuerystringSearch
-        request = mock.Mock()
-        request.get.return_value = ("Plone", "en")
-        with mock.patch("plone.restapi.services.querystringsearch.get.json_body") as mock_json_body:
-            mock_json_body.return_value = {
-                "query": [
-                    {"i": "path", "o": "op", "v": ["/folder1", "/folder2::2", "some-uid"]}
-                ]
-            }
-            context = mock.Mock()
-            service = QuerystringSearch(context, request)
-
-            with mock.patch("plone.restapi.services.querystringsearch.get.getMultiAdapter") as mock_adapter:
-                mock_adapter.side_effect = Exception("Stop here")
-                try:
-                    service()
-                except Exception:
-                    pass
-
-            query = mock_json_body.return_value["query"]
-            self.assertEqual(query[0]["v"], ["/Plone/en/folder1", "/Plone/en/folder2::2", "some-uid"])
-
-    def test_no_path_correction_without_vhm(self):
-        from plone.restapi.services.querystringsearch.get import QuerystringSearch
-        request = mock.Mock()
-        request.get.return_value = None
-        with mock.patch("plone.restapi.services.querystringsearch.get.json_body") as mock_json_body:
-            mock_json_body.return_value = {
-                "query": [
-                    {"i": "path", "o": "op", "v": "/folder::1"}
-                ]
-            }
-            context = mock.Mock()
-            service = QuerystringSearch(context, request)
-
-            with mock.patch("plone.restapi.services.querystringsearch.get.getMultiAdapter") as mock_adapter:
-                mock_adapter.side_effect = Exception("Stop here")
-                try:
-                    service()
-                except Exception:
-                    pass
-
-            query = mock_json_body.return_value["query"]
-            self.assertEqual(query[0]["v"], "/folder::1")
-
-
     def test_querystringsearch__bad_json(self):
         response = self.api_session.get("/@querystring-search?query={")
         self.assertEqual(response.status_code, 400)
@@ -584,3 +506,89 @@ def test_querystringsearch_vhm_multiple_paths(self):
         items = {item["@id"] for item in response.json().get("items", [])}
         self.assertIn(f"{self.portal.absolute_url()}/folder", items)
         self.assertIn(f"{self.portal.absolute_url()}/folder2", items)
+
+
+class TestVHMPathCorrectionUnit(unittest.TestCase):
+
+    def test_path_correction_string(self):
+        from plone.restapi.services.querystringsearch.get import QuerystringSearch
+
+        request = mock.Mock()
+        request.get.return_value = ("Plone", "en")
+        # Mock json_body to return our query
+        with mock.patch(
+            "plone.restapi.services.querystringsearch.get.json_body"
+        ) as mock_json_body:
+            mock_json_body.return_value = {"query": [{"i": "path", "o": "op", "v": "/folder::1"}]}
+            context = mock.Mock()
+            service = QuerystringSearch(context, request)
+
+            # We only want to test the path correction part, so we'll mock the rest of __call__
+            # by causing it to fail after the correction
+            with mock.patch(
+                "plone.restapi.services.querystringsearch.get.getMultiAdapter"
+            ) as mock_adapter:
+                mock_adapter.side_effect = Exception("Stop here")
+                try:
+                    service()
+                except Exception as e:
+                    if str(e) != "Stop here":
+                        raise
+
+            # Check if query was modified in place (since it's a list of dicts)
+            query = mock_json_body.return_value["query"]
+            self.assertEqual(query[0]["v"], "/Plone/en/folder::1")
+
+    def test_path_correction_list(self):
+        from plone.restapi.services.querystringsearch.get import QuerystringSearch
+
+        request = mock.Mock()
+        request.get.return_value = ("Plone", "en")
+        with mock.patch(
+            "plone.restapi.services.querystringsearch.get.json_body"
+        ) as mock_json_body:
+            mock_json_body.return_value = {
+                "query": [
+                    {"i": "path", "o": "op", "v": ["/folder1", "/folder2::2", "some-uid"]}
+                ]
+            }
+            context = mock.Mock()
+            service = QuerystringSearch(context, request)
+
+            with mock.patch(
+                "plone.restapi.services.querystringsearch.get.getMultiAdapter"
+            ) as mock_adapter:
+                mock_adapter.side_effect = Exception("Stop here")
+                try:
+                    service()
+                except Exception:
+                    pass
+
+            query = mock_json_body.return_value["query"]
+            self.assertEqual(
+                query[0]["v"], ["/Plone/en/folder1", "/Plone/en/folder2::2", "some-uid"]
+            )
+
+    def test_no_path_correction_without_vhm(self):
+        from plone.restapi.services.querystringsearch.get import QuerystringSearch
+
+        request = mock.Mock()
+        request.get.return_value = None
+        with mock.patch(
+            "plone.restapi.services.querystringsearch.get.json_body"
+        ) as mock_json_body:
+            mock_json_body.return_value = {"query": [{"i": "path", "o": "op", "v": "/folder::1"}]}
+            context = mock.Mock()
+            service = QuerystringSearch(context, request)
+
+            with mock.patch(
+                "plone.restapi.services.querystringsearch.get.getMultiAdapter"
+            ) as mock_adapter:
+                mock_adapter.side_effect = Exception("Stop here")
+                try:
+                    service()
+                except Exception:
+                    pass
+
+            query = mock_json_body.return_value["query"]
+            self.assertEqual(query[0]["v"], "/folder::1")