Bucket Group changes - Bucketed to higher values and typo correction

Author: georgeajit

marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestOpticOnLexicons.java

@@ -416,7 +416,7 @@ public void testJoinInnerWithInnerDocfromLexicons() throws KeyManagementExceptio
     assertEquals("Element 3 (myCity) in date incorrect", "1999-04-22", jsonInnerDocNodes.get(2).path("myCity.date").path("value").asText());
     assertEquals("Element 4 (myCity) in date incorrect", "2006-06-23", jsonInnerDocNodes.get(3).path("myCity.date").path("value").asText());
 
-    // Verify lasst result, since records are ordered.
+    // Verify last result, since records are ordered.
     assertEquals("Element 5 (myCity) in date incorrect", "2007-01-01", jsonInnerDocNodes.get(4).path("myCity.date").path("value").asText());
     assertEquals("Element 5 (myCity) in URI1 incorrect", "/optic/lexicon/test/doc1.json", jsonInnerDocNodes.get(4).path("myCity.uri1").path("value").asText());
     assertEquals("Element 5 (myCity) in distance incorrect", "50.4", jsonInnerDocNodes.get(4).path("myCity.distance").path("value").asText());

marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestOpticOnLiterals.java

@@ -1915,9 +1915,9 @@ public void testFacetByWithBucketGroups() throws KeyManagementException, NoSuchA
 
     rowMgr.resultDoc(output1, jacksonHandle);
     JsonNode colorBucketNodes = jacksonHandle.get().path("rows");
-    assertEquals("Bucket group 1 count value incorrect", "9", colorBucketNodes.path(0).path("colorBucket").path("value").path(0).path("count").asText());
-    assertEquals("Bucket group 2 count value incorrect", "5", colorBucketNodes.path(0).path("colorBucket").path("value").path(1).path("count").asText());
-    assertEquals("Bucket group 3 count value incorrect", "3", colorBucketNodes.path(0).path("colorBucket").path("value").path(2).path("count").asText());
+    assertEquals("Bucket group 1 count value incorrect", "7", colorBucketNodes.path(0).path("colorBucket").path("value").path(0).path("count").asText());
+    assertEquals("Bucket group 2 count value incorrect", "6", colorBucketNodes.path(0).path("colorBucket").path("value").path(1).path("count").asText());
+    assertEquals("Bucket group 3 count value incorrect", "4", colorBucketNodes.path(0).path("colorBucket").path("value").path(2).path("count").asText());
 
     // outside range
     ModifyPlan output2 = plan1.joinInner(plan2)
@@ -1939,9 +1939,8 @@ public void testFacetByWithBucketGroups() throws KeyManagementException, NoSuchA
 
     rowMgr.resultDoc(output3, jacksonHandle);
     JsonNode descBucketNodesStringRange = jacksonHandle.get().path("rows");
-    assertEquals("Bucket group 1 count value incorrect", "1", descBucketNodesStringRange.path(0).path("descBucket").path("value").path(0).path("count").asText());
-    assertEquals("Bucket group 2 count value incorrect", "9", descBucketNodesStringRange.path(0).path("descBucket").path("value").path(1).path("count").asText());
-    assertEquals("Bucket group 3 count value incorrect", "7", descBucketNodesStringRange.path(0).path("descBucket").path("value").path(2).path("count").asText());
+    assertEquals("Bucket group 1 count value incorrect", "9", descBucketNodesStringRange.path(0).path("descBucket").path("value").path(0).path("count").asText());
+    assertEquals("Bucket group 2 count value incorrect", "8", descBucketNodesStringRange.path(0).path("descBucket").path("value").path(1).path("count").asText());
 
     //bucket group negative test
     ModifyPlan output4 = plan1.joinInner(plan2)
@@ -1972,10 +1971,10 @@ public void testLiteralsWithColumnInfo() throws KeyManagementException, NoSuchAl
 
     String colInfo = rowMgr.columnInfoAs(output, String.class);
     //System.out.println("In testLiteralsWithColumnInfo method" + colInfo);
-    assertTrue("Element 1 desc value incorrect", colInfo.contains("{\"schema\":\"\", \"view\":\"\", \"column\":\"desc\", \"type\":\"unknown\", \"nullable\":false"));
-    assertTrue("Element 2 colorId value incorrect", colInfo.contains("{\"schema\":\"\", \"view\":\"\", \"column\":\"colorId\", \"type\":\"unknown\", \"nullable\":false}"));
-    assertTrue("Element 3 rowId value incorrect", colInfo.contains("{\"schema\":\"\", \"view\":\"\", \"column\":\"rowId\", \"type\":\"unknown\", \"nullable\":false}"));
-    assertTrue("Element 4 colorDesc value incorrect", colInfo.contains("{\"schema\":\"\", \"view\":\"\", \"column\":\"colorDesc\", \"type\":\"unknown\", \"nullable\":false}"));
+    assertTrue("Element 1 desc value incorrect", colInfo.contains("{\"schema\":\"\", \"view\":\"\", \"column\":\"desc\", \"type\":\"string\", \"nullable\":false"));
+    assertTrue("Element 2 colorId value incorrect", colInfo.contains("{\"schema\":\"\", \"view\":\"\", \"column\":\"colorId\", \"type\":\"integer\", \"nullable\":false}"));
+    assertTrue("Element 3 rowId value incorrect", colInfo.contains("{\"schema\":\"\", \"view\":\"\", \"column\":\"rowId\", \"type\":\"integer\", \"nullable\":false}"));
+    assertTrue("Element 4 colorDesc value incorrect", colInfo.contains("{\"schema\":\"\", \"view\":\"\", \"column\":\"colorDesc\", \"type\":\"string\", \"nullable\":false}"));
   }
 
     @AfterClass