[calcite] branch master updated: [CALCITE-2931] Mongo Adapter- Compare Bson (not string) query representation in tests

[kr...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

krisden pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/calcite.git


The following commit(s) were added to refs/heads/master by this push:
     new dd43e26  [CALCITE-2931] Mongo Adapter- Compare Bson (not string) query representation in tests
dd43e26 is described below

commit dd43e26eba409a5222ed458f877210090325b5e7
Author: Andrei Sereda <25...@users.noreply.github.com>
AuthorDate: Mon Mar 18 17:21:23 2019 -0400

    [CALCITE-2931] Mongo Adapter- Compare Bson (not string) query representation in tests
    
    Some tests currently fail because of wrong order of keys in Bson.
    
    ```text
    // Expected
    {$project: {POP: '$pop', STATE: '$state'}}
    
    // Actual
    {$project: {STATE: '$state', POP: '$pop'}}
    ```
    
    Signed-off-by: Kevin Risden <kr...@apache.org>
---
 .../calcite/adapter/mongodb/MongoAdapterTest.java  | 42 ++++++++++++++++------
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/mongodb/src/test/java/org/apache/calcite/adapter/mongodb/MongoAdapterTest.java b/mongodb/src/test/java/org/apache/calcite/adapter/mongodb/MongoAdapterTest.java
index 7e6d43a..306846d 100644
--- a/mongodb/src/test/java/org/apache/calcite/adapter/mongodb/MongoAdapterTest.java
+++ b/mongodb/src/test/java/org/apache/calcite/adapter/mongodb/MongoAdapterTest.java
@@ -37,6 +37,7 @@ import org.bson.BsonDocument;
 import org.bson.BsonInt32;
 import org.bson.BsonString;
 import org.bson.Document;
+import org.bson.json.JsonWriterSettings;
 import org.hamcrest.CoreMatchers;
 import org.junit.Assert;
 import org.junit.BeforeClass;
@@ -57,6 +58,7 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 import java.util.function.Consumer;
+import java.util.stream.Collectors;
 
 /**
  * Testing mongo adapter functionality. By default runs with
@@ -732,20 +734,40 @@ public class MongoAdapterTest implements SchemaFactory {
   }
 
   /**
-   * Returns a function that checks that a particular MongoDB pipeline is
-   * generated to implement a query.
+   * Returns a function that checks that a particular MongoDB query
+   * has been called.
    *
-   * @param strings Expected expressions
+   * @param expected Expected query (as array)
    * @return validation function
    */
-  private static Consumer<List> mongoChecker(final String... strings) {
+  private static Consumer<List> mongoChecker(final String... expected) {
     return actual -> {
-      Object[] actualArray =
-          actual == null || actual.isEmpty()
-              ? null
-              : ((List) actual.get(0)).toArray();
-      CalciteAssert.assertArrayEqual("expected MongoDB query not found",
-          strings, actualArray);
+      if (expected == null) {
+        Assert.assertThat("null mongo Query", actual, CoreMatchers.nullValue());
+        return;
+      }
+
+      if (expected.length == 0) {
+        CalciteAssert.assertArrayEqual("empty Mongo query", expected,
+            actual.toArray(new Object[0]));
+        return;
+      }
+
+      final BsonDocument expectedBson = BsonDocument.parse(String.join(",", expected));
+      final BsonDocument actualBson = BsonDocument.parse(((List<?>) actual.get(0))
+          .stream()
+          .map(Objects::toString)
+          .collect(Collectors.joining("\n")));
+
+      // compare Bson (not string) representation
+      if (!expectedBson.equals(actualBson)) {
+        final JsonWriterSettings settings = JsonWriterSettings.builder().indent(true).build();
+        // used to pretty print Assertion error
+        Assert.assertEquals("expected and actual Mongo queries do not match",
+            expectedBson.toJson(settings),
+            actualBson.toJson(settings));
+        Assert.fail("Should have failed previously because (expected != actual) is already known");
+      }
     };
   }
 }