Refactor tests

Author: aclark4life

tests/mql_panel/test_forms.py

@@ -7,7 +7,7 @@
 from django_mongodb_extensions.mql_panel.forms import MQLQueryForm
 
 
-class ConvertDocumentsToTableTests(TestCase):
+class MQLPanelFormTests(TestCase):
     def setUp(self):
         self.form = MQLQueryForm()
 
@@ -17,31 +17,6 @@ def test_empty_documents(self):
         self.assertEqual(rows, [])
         self.assertEqual(headers, [])
 
-    def test_handle_operation_error_format(self):
-        """Error return format matches convert_documents_to_table format."""
-        error = ValueError("Test error")
-        mql_string = "db.test.aggregate([])"
-        rows, headers = self.form._handle_operation_error(
-            error, mql_string, "aggregate"
-        )
-
-        # Should return one row with one cell
-        self.assertEqual(len(rows), 1)
-        self.assertEqual(len(rows[0]), 1)
-
-        # Cell should be a dict with 'value' and 'is_json' keys
-        cell = rows[0][0]
-        self.assertIsInstance(cell["value"], str)
-        self.assertIs(cell["is_json"], False)
-
-        # Should have one header
-        self.assertEqual(headers[0], "Query Parsing Error")
-
-
-class FormatCellValueTests(TestCase):
-    def setUp(self):
-        self.form = MQLQueryForm()
-
     def test_simple_fields(self):
         """Primitive field values like in model query output."""
         cases = [
@@ -71,19 +46,20 @@ def test_datetime(self):
         self.assertEqual(result["value"], str(json.loads(json_util.dumps(dt))["$date"]))
 
     def test_embedded_document(self):
-        """Nested dict with multiple keys (JSON formatting)."""
         embedded_doc = {
             "name": "Alice",
             "age": 30,
             "created": datetime.datetime(2024, 2, 1, 18, 0),
         }
         result = self.form._format_cell_value(embedded_doc)
+        self.assertEqual(result["type"], "dict")
         self.assertIs(result["is_json"], False)
-        parsed_back = json.loads(result["value"])
-        # Datetime will still be JSON date dict
-        self.assertEqual(parsed_back["name"], "Alice")
-        self.assertEqual(parsed_back["age"], 30)
-        self.assertIn("$date", parsed_back["created"])
+        value_map = {item["key"]: item["value"] for item in result["value"]}
+        self.assertEqual(value_map["name"], "Alice")
+        self.assertEqual(value_map["age"], "30")
+        self.assertEqual(value_map["created"], "2024-02-01T18:00:00Z")
+        for item in result["value"]:
+            self.assertIs(item["is_json"], False)
 
     def test_list_field(self):
         """A list of values as might appear in MongoDB array field."""

tests/mql_panel/test_panel.py

@@ -4,7 +4,6 @@
 from django.test import RequestFactory, TestCase, override_settings
 
 from django_mongodb_extensions.mql_panel import MQLPanel
-from django_mongodb_extensions.mql_panel.forms import MQLQueryForm
 
 rf = RequestFactory()
 
@@ -139,32 +138,3 @@ def test_query_width_ratio(self):
         self.panel.generate_stats(self.request, response)
         total_width = sum(q["width_ratio"] for q in self.panel._queries)
         self.assertAlmostEqual(total_width, 100, places=5)
-
-
-class ConvertDocumentsToTableTests(TestCase):
-    def setUp(self):
-        self.form = MQLQueryForm()
-
-    def test_empty_documents(self):
-        """Empty document list returns empty rows and headers."""
-        rows, headers = self.form.convert_documents_to_table([])
-        self.assertEqual(rows, [])
-        self.assertEqual(headers, [])
-
-    def test_handle_operation_error_format(self):
-        """Error return format matches convert_documents_to_table format."""
-        error = ValueError("Test error")
-        mql_string = "db.test.aggregate([])"
-        rows, headers = self.form._handle_operation_error(error, mql_string, "query")
-
-        # Should return one row with one cell
-        self.assertEqual(len(rows), 1)
-        self.assertEqual(len(rows[0]), 1)
-
-        # Cell should be a dict with 'value' and 'is_json' keys
-        cell = rows[0][0]
-        self.assertIsInstance(cell["value"], str)
-        self.assertIs(cell["is_json"], False)
-
-        # Should have one header
-        self.assertEqual(headers[0], "Query Parsing Error")