Fixed failing test cases

Author: suddendust

document-store/src/integrationTest/java/org/hypertrace/core/documentstore/DocStoreQueryV1Test.java

@@ -68,6 +68,7 @@
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -3219,7 +3220,7 @@ void testFlatPostgresCollectionFindAll(String dataStoreName) throws IOException
       iterator.close();
 
       // Should have 8 documents from the INSERT statements
-      assertEquals(10, count);
+      assertEquals(14, count);
     }
 
     @ParameterizedTest
@@ -3260,7 +3261,7 @@ void testFlatPostgresCollectionCount(String dataStoreName) {
 
       // Test count method - all documents
       long totalCount = flatCollection.count(Query.builder().build());
-      assertEquals(10, totalCount);
+      assertEquals(14, totalCount);
 
       // Test count with filter - soap documents only
       Query soapQuery =
@@ -3357,8 +3358,8 @@ void testFlatVsNestedCollectionConsistency(String dataStoreName) throws IOExcept
       Query countAllQuery = Query.builder().build();
       long nestedCount = nestedCollection.count(countAllQuery);
       long flatCount = flatCollection.count(countAllQuery);
-      assertEquals(8, nestedCount, "Nested collection should have 8 documents");
-      assertEquals(10, flatCount, "Flat collection should have 10 documents");
+      assertEquals(14, nestedCount, "Nested collection should have 14 documents");
+      assertEquals(14, flatCount, "Flat collection should have 14 documents");
 
       // Test 2: Filter by top-level field - item
       Query itemFilterQuery =
@@ -3385,16 +3386,16 @@ void testFlatVsNestedCollectionConsistency(String dataStoreName) throws IOExcept
 
       long nestedPriceCount = nestedCollection.count(priceFilterQuery);
       long flatPriceCount = flatCollection.count(priceFilterQuery);
-      assertEquals(2, nestedPriceCount, "Nested should have 2 docs with price > 10");
-      assertEquals(3, flatPriceCount, "Flat should have 3 docs with price > 10");
+      assertEquals(4, nestedPriceCount, "Nested should have 4 docs with price > 10");
+      assertEquals(4, flatPriceCount, "Flat should have 4 docs with price > 10");
 
       // Test 4: Compare actual document content for same filter
       CloseableIterator<Document> nestedIterator = nestedCollection.find(itemFilterQuery);
       CloseableIterator<Document> flatIterator = flatCollection.find(itemFilterQuery);
 
       // Collect documents from both collections
-      java.util.List<String> nestedDocs = new java.util.ArrayList<>();
-      java.util.List<String> flatDocs = new java.util.ArrayList<>();
+      List<String> nestedDocs = new ArrayList<>();
+      List<String> flatDocs = new ArrayList<>();
 
       while (nestedIterator.hasNext()) {
         nestedDocs.add(nestedIterator.next().toJson());
@@ -3503,7 +3504,7 @@ void testFlatPostgresCollectionUnnestTags(String dataStoreName) throws IOExcepti
 
       Iterator<Document> resultIterator = flatCollection.aggregate(unnestQuery);
       assertDocsAndSizeEqualWithoutOrder(
-          dataStoreName, resultIterator, "query/flat_unnest_tags_response.json", 17);
+          dataStoreName, resultIterator, "query/flat_unnest_tags_response.json", 19);
     }
 
     /**
@@ -3771,7 +3772,7 @@ void testFlatPostgresCollectionUnnestMixedCaseField(String dataStoreName) throws
       Iterator<Document> resultIterator = flatCollection.aggregate(unnestQuery);
       // Expected categories: Hygiene(3), PersonalCare(2), HairCare(2), HomeDecor(1), Grooming(2)
       assertDocsAndSizeEqualWithoutOrder(
-          dataStoreName, resultIterator, "query/flat_unnest_mixed_case_response.json", 5);
+          dataStoreName, resultIterator, "query/flat_unnest_mixed_case_response.json", 6);
     }
 
     @ParameterizedTest
@@ -3798,7 +3799,7 @@ void testFlatPostgresCollectionIntegerArrayFilter(String dataStoreName) throws I
 
       Iterator<Document> resultIterator = flatCollection.find(integerArrayQuery);
       assertDocsAndSizeEqualWithoutOrder(
-          dataStoreName, resultIterator, "query/flat_integer_array_filter_response.json", 1);
+          dataStoreName, resultIterator, "query/flat_integer_array_filter_response.json", 2);
     }
 
     @ParameterizedTest
@@ -3873,7 +3874,7 @@ void testFlatCollectionNestedJsonSelections(String dataStoreName) throws IOExcep
 
       Iterator<Document> brandIterator = flatCollection.find(brandSelectionQuery);
       assertDocsAndSizeEqualWithoutOrder(
-          dataStoreName, brandIterator, "query/flat_jsonb_brand_selection_response.json", 10);
+          dataStoreName, brandIterator, "query/flat_jsonb_brand_selection_response.json", 14);
 
       // Test 2: Select deeply nested STRING field from JSONB column (props.seller.address.city)
       Query citySelectionQuery =
@@ -3883,15 +3884,15 @@ void testFlatCollectionNestedJsonSelections(String dataStoreName) throws IOExcep
 
       Iterator<Document> cityIterator = flatCollection.find(citySelectionQuery);
       assertDocsAndSizeEqualWithoutOrder(
-          dataStoreName, cityIterator, "query/flat_jsonb_city_selection_response.json", 10);
+          dataStoreName, cityIterator, "query/flat_jsonb_city_selection_response.json", 14);
 
       // Test 3: Select STRING_ARRAY field from JSONB column (props.colors)
       Query colorsSelectionQuery =
           Query.builder().addSelection(JsonIdentifierExpression.of("props", "colors")).build();
 
       Iterator<Document> colorsIterator = flatCollection.find(colorsSelectionQuery);
       assertDocsAndSizeEqualWithoutOrder(
-          dataStoreName, colorsIterator, "query/flat_jsonb_colors_selection_response.json", 10);
+          dataStoreName, colorsIterator, "query/flat_jsonb_colors_selection_response.json", 14);
     }
 
     @ParameterizedTest

document-store/src/integrationTest/resources/query/collection_data.json

@@ -183,5 +183,47 @@
     "price": 10,
     "quantity": 5,
     "date": "2016-02-06T20:20:13Z"
+  },
+  {
+    "_id": 9,
+    "item": "Bottle",
+    "price": 15,
+    "quantity": 3,
+    "date": "2016-03-01T10:00:00Z"
+  },
+  {
+    "_id": 10,
+    "item": "Cup",
+    "price": 8,
+    "quantity": 2,
+    "date": "2016-04-01T10:00:00Z"
+  },
+  {
+    "_id": 11,
+    "item": "Pencil",
+    "price": 2,
+    "quantity": 50,
+    "date": "2016-05-01T10:00:00Z"
+  },
+  {
+    "_id": 12,
+    "item": "Eraser",
+    "price": 1,
+    "quantity": 100,
+    "date": "2016-06-01T10:00:00Z"
+  },
+  {
+    "_id": 13,
+    "item": "Notebook",
+    "price": 25,
+    "quantity": 10,
+    "date": "2016-07-01T10:00:00Z"
+  },
+  {
+    "_id": 14,
+    "item": "Pen",
+    "price": 5,
+    "quantity": 20,
+    "date": "2016-08-01T10:00:00Z"
   }
 ]

document-store/src/integrationTest/resources/query/flat_integer_array_filter_response.json

@@ -2,5 +2,9 @@
   {
     "item": "Mirror",
     "price": 20
+  },
+  {
+    "item": "Pen",
+    "price": 5
   }
-]
+]

document-store/src/integrationTest/resources/query/flat_jsonb_brand_selection_response.json

@@ -20,5 +20,9 @@
   {},
   {},
   {},
+  {},
+  {},
+  {},
+  {},
   {}
-]
+]

document-store/src/integrationTest/resources/query/flat_jsonb_city_selection_response.json

@@ -8,8 +8,7 @@
       }
     }
   },
-  {
-  },
+  {},
   {
     "props": {
       "seller": {
@@ -19,8 +18,7 @@
       }
     }
   },
-  {
-  },
+  {},
   {
     "props": {
       "seller": {
@@ -30,8 +28,7 @@
       }
     }
   },
-  {
-  },
+  {},
   {
     "props": {
       "seller": {
@@ -43,5 +40,9 @@
   },
   {},
   {},
+  {},
+  {},
+  {},
+  {},
   {}
-]
+]

document-store/src/integrationTest/resources/query/flat_jsonb_colors_selection_response.json

@@ -7,13 +7,15 @@
       ]
     }
   },
+  {},
   {
     "props": {
       "colors": [
         "Black"
       ]
     }
   },
+  {},
   {
     "props": {
       "colors": [
@@ -22,6 +24,7 @@
       ]
     }
   },
+  {},
   {
     "props": {
       "colors": []
@@ -32,5 +35,6 @@
   {},
   {},
   {},
+  {},
   {}
-]
+]

document-store/src/integrationTest/resources/query/flat_jsonb_group_by_brand_test_response.json

@@ -1,6 +1,6 @@
 [
   {
-    "count": 7
+    "count": 11
   },
   {
     "props": {

document-store/src/integrationTest/resources/query/flat_unnest_mixed_case_response.json

@@ -1,7 +1,26 @@
 [
-  {"categoryTags": "Hygiene", "count": 3},
-  {"categoryTags": "PersonalCare", "count": 2},
-  {"categoryTags": "HairCare", "count": 2},
-  {"categoryTags": "HomeDecor", "count": 1},
-  {"categoryTags": "Grooming", "count": 2}
-]
+  {
+    "categoryTags": "PersonalCare",
+    "count": 2
+  },
+  {
+    "categoryTags": "HomeDecor",
+    "count": 1
+  },
+  {
+    "categoryTags": "Hygiene",
+    "count": 3
+  },
+  {
+    "categoryTags": "Stationery",
+    "count": 1
+  },
+  {
+    "categoryTags": "HairCare",
+    "count": 2
+  },
+  {
+    "categoryTags": "Grooming",
+    "count": 2
+  }
+]

document-store/src/integrationTest/resources/query/flat_unnest_not_preserving_empty_array_response.json

@@ -1,5 +1,5 @@
 [
   {
-    "count": 25
+    "count": 28
   }
 ]

document-store/src/integrationTest/resources/query/flat_unnest_preserving_empty_array_response.json

@@ -1,5 +1,5 @@
 [
   {
-    "count": 27
+    "count": 32
   }
 ]