Ian Maxon has uploaded a new change for review.

  https://asterix-gerrit.ics.uci.edu/524

Change subject: Fix for ASTERIXDB-1200
......................................................................

Fix for ASTERIXDB-1200

Fixes an issue where in the Hyracks integration tests,
if the result size is 0, a NPE is thrown instead of
an assert passing or failing.

Change-Id: Ib519882b9cbca941addcd66232c176a2eaeecc4b
---
M 
hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/AbstractIntegrationTest.java
1 file changed, 4 insertions(+), 2 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/hyracks refs/changes/24/524/1

diff --git 
a/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/AbstractIntegrationTest.java
 
b/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/AbstractIntegrationTest.java
index 44dc231..415a88f 100644
--- 
a/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/AbstractIntegrationTest.java
+++ 
b/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/AbstractIntegrationTest.java
@@ -145,7 +145,6 @@
         hcc.waitForCompletion(jobId);
     }
 
-
     protected List<String> readResults(JobSpecification spec, JobId jobId, 
ResultSetId resultSetId) throws Exception {
         int nReaders = 1;
 
@@ -197,6 +196,9 @@
                 Assert.assertEquals(expectedLine, actualLine);
                 j++;
             }
+            //We expect some sort of result.
+            Assert.assertTrue(j > 0);
+            //We also expect the same amount of results.
             Assert.assertEquals(j, results.size());
             expectedFile.close();
         }
@@ -212,7 +214,7 @@
         List<String> results;
         for (int i = 0; i < spec.getResultSetIds().size(); i++) {
             results = readResults(spec, jobId, spec.getResultSetIds().get(i));
-            for(String str : results) {
+            for (String str : results) {
                 output.write(str);
             }
         }

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/524
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib519882b9cbca941addcd66232c176a2eaeecc4b
Gerrit-PatchSet: 1
Gerrit-Project: hyracks
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon <[email protected]>

Reply via email to