[teiid-commits] teiid SVN: r1804 - in trunk/test-integration/db/src/main/java/org/teiid/test/client: impl and 1 other directory.

[teiid-commits at lists.jboss.org]

Author: vhalbert at redhat.com
Date: 2010-02-08 14:45:46 -0500 (Mon, 08 Feb 2010)
New Revision: 1804

Modified:
   trunk/test-integration/db/src/main/java/org/teiid/test/client/TestResultsSummary.java
   trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/QueryScenarioImpl.java
Log:
Teiid-773 - the error files were being created, but the status wasnt being set so that the summary indicated the number of errors

Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/TestResultsSummary.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/client/TestResultsSummary.java	2010-02-06 02:00:21 UTC (rev 1803)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/client/TestResultsSummary.java	2010-02-08 19:45:46 UTC (rev 1804)
@@ -154,7 +154,7 @@
 		.println("Number Passed    : " + passFailGenMap.get("pass")); //$NON-NLS-1$ //$NON-NLS-2$
 	outputStream
 		.println("Number Failed    : " + passFailGenMap.get("fail")); //$NON-NLS-1$ //$NON-NLS-2$
-	outputStream.println("Number Generated : " + passFailGenMap.get("gen")); //$NON-NLS-1$ //$NON-NLS-2$
+//	outputStream.println("Number Generated : " + passFailGenMap.get("gen")); //$NON-NLS-1$ //$NON-NLS-2$
 
 	ResponseTimes responseTimes = calcQueryResponseTimes(results);
 	outputStream.println("QPS              : " + responseTimes.qps); //$NON-NLS-1$

Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/QueryScenarioImpl.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/QueryScenarioImpl.java	2010-02-06 02:00:21 UTC (rev 1803)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/QueryScenarioImpl.java	2010-02-08 19:45:46 UTC (rev 1804)
@@ -54,30 +54,36 @@
 	Throwable resultException = tr.getException();
 	if (getResultsMode().equalsIgnoreCase(
 		TestProperties.RESULT_MODES.COMPARE)) {
-		Object results = null;
+	    
+		Object error_results = null;
 		try {
-		    results = this.getExpectedResults(tr.getQuerySetID()).compareResults(tr.getQueryID(), 
+		    error_results = this.getExpectedResults(tr.getQuerySetID()).compareResults(tr.getQueryID(), 
 			    sql, 
 			    resultSet, 
 			    resultException, 
 			    tr.getStatus(), isOrdered(sql), updateCnt, resultFromQuery);
 		    
-		    tr.setStatus(TestResult.RESULT_STATE.TEST_SUCCESS);
-
+		    if (error_results == null) {
+			tr.setStatus(TestResult.RESULT_STATE.TEST_SUCCESS);
+		    } else {
+			tr.setStatus(TestResult.RESULT_STATE.TEST_EXCEPTION);
+		    }
+		    
+		    
 		} catch (QueryTestFailedException qtf) {
 		    resultException = (resultException != null ? resultException
 			    : qtf);
 		    tr.setException(resultException);
 		    tr.setStatus(TestResult.RESULT_STATE.TEST_EXCEPTION);
 
-
 		}
 		
-		if (results != null || tr.getStatus() == TestResult.RESULT_STATE.TEST_EXCEPTION) {
+		if (tr.getStatus() == TestResult.RESULT_STATE.TEST_EXCEPTION) {
 		    try {
     		    	this.getResultsGenerator().generateErrorFile(tr.getQuerySetID(),
     			    tr.getQueryID(), sql, resultSet, resultException,
-    			    results );		    
+    			    error_results );	
+    		    	
 		    } catch (QueryTestFailedException qtfe) {
 			    throw new TransactionRuntimeException(qtfe.getMessage());
 		    }
@@ -99,6 +105,7 @@
 	} else {
 	    // just create the error file for any failures
 	    if (tr.getException() != null) {
+		tr.setStatus(TestResult.RESULT_STATE.TEST_EXCEPTION);
 		try {
 		    this.getResultsGenerator().generateErrorFile(tr.getQuerySetID(),
 			    tr.getQueryID(), sql, resultSet, resultException, null);