Fix query to pipeline logic.

Author: tom-andersen

firebase-firestore/src/androidTest/java/com/google/firebase/firestore/QueryToPipelineTest.java

@@ -356,7 +356,7 @@ public void testQueriesCanUseNotEqualFilters() {
     expectedDocsMap.remove("i");
     expectedDocsMap.remove("j");
     snapshot =
-        waitFor(db.pipeline().convertFrom(collection.whereEqualTo("zip", Double.NaN)).execute());
+        waitFor(db.pipeline().convertFrom(collection.whereNotEqualTo("zip", Double.NaN)).execute());
     assertEquals(Lists.newArrayList(expectedDocsMap.values()), pipelineSnapshotToValues(snapshot));
   }
 

firebase-firestore/src/androidTest/java/com/google/firebase/firestore/testutil/IntegrationTestUtil.java

@@ -567,9 +567,18 @@ public static void checkOnlineAndOfflineResultsMatch(Query query, String... expe
    * @param expectedDocs Ordered list of document keys that are expected to match the query
    */
   public static void checkQueryAndPipelineResultsMatch(Query query, String... expectedDocs) {
-    QuerySnapshot docsFromQuery = waitFor(query.get(Source.SERVER));
-    PipelineSnapshot docsFromPipeline =
-        waitFor(query.getFirestore().pipeline().convertFrom(query).execute());
+    QuerySnapshot docsFromQuery;
+    try {
+      docsFromQuery = waitFor(query.get(Source.SERVER));
+    } catch (Exception e) {
+      throw new RuntimeException("Classic Query FAILED", e);
+    }
+    PipelineSnapshot docsFromPipeline;
+    try {
+        docsFromPipeline = waitFor(query.getFirestore().pipeline().convertFrom(query).execute());
+    } catch (Exception e) {
+      throw new RuntimeException("Pipeline FAILED", e);
+    }
 
     assertEquals(querySnapshotToIds(docsFromQuery), pipelineSnapshotToIds(docsFromPipeline));
     List<String> expected = asList(expectedDocs);