[teiid-commits] teiid SVN: r1856 - trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc.

[teiid-commits at lists.jboss.org]

Author: vhalbert at redhat.com
Date: 2010-02-19 14:18:45 -0500 (Fri, 19 Feb 2010)
New Revision: 1856

Modified:
   trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLExpectedResults.java
   trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLGenerateResults.java
Log:
Teiid-773 -  Per Warrens request, the error file generated using the xml file option will use the same logic to write an error file that the text file option uses.

Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLExpectedResults.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLExpectedResults.java	2010-02-19 18:57:27 UTC (rev 1855)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLExpectedResults.java	2010-02-19 19:18:45 UTC (rev 1856)
@@ -214,11 +214,16 @@
 			    // printResultSet(results));
 
 			    // Convert results to ResultsHolder
+ 			    actualResults = new ResultsHolder(TagNames.Elements.QUERY_RESULTS);
+		    		actualResults.setQueryID(expectedResults.getQueryID());
+
 		      		if (expectedResults.getRows().size() > 0) {
-        			    actualResults = new ResultsHolder(TagNames.Elements.QUERY_RESULTS);
-        			    actualResults.setQueryID(expectedResults.getQueryID());
-        			    convertResults(resultSet, batchSize,   actualResults);
+         			    convertResults(resultSet, batchSize,   actualResults);
         			    compareResults(actualResults, expectedResults, eMsg, isOrdered);
+		      		} else if (actualResults.getRows() != null &&  actualResults.getRows().size() > 0) {
+			                throw new QueryTestFailedException(eMsg + "Expected results indicated no results, but actual shows " + actualResults.getRows().size() + " rows."); //$NON-NLS-1$
+	      		    
+		      		    
 		      		}
 
 			    // DEBUG:
@@ -344,7 +349,7 @@
                 sortRecords(expectedRows, true);
                 expectedResults.setRows(expectedRows);
             }
-
+            
             compareResultSets(actualResults.getRows(),
                               actualResults.getTypes(),
                               actualResults.getIdentifiers(),
@@ -469,8 +474,8 @@
         }
 
         //      DEBUG:
-        //        debugOut.println("================== Compariing Rows ===================");
-
+        //       debugOut.println("================== Compariing Rows ===================");
+ 
         // Loop through rows
         for (int row = 0; row < actualRowCount; row++) {
 
@@ -491,7 +496,7 @@
                 final Object actualValue = actualRecord.get(col);
                 // Get expected value
                 final Object expectedValue = expectedRecord.get(col);
-
+ 
                 //              DEBUG:
                 //                debugOut.println(" Col: " +(col +1) + ": expectedValue:[" + expectedValue + "] actualValue:[" + actualValue +
                 // "]");
@@ -513,7 +518,8 @@
                         // DEBUG:
                         //                        debugOut.println(" ExpectedType: " + expectedValue.getClass() + " ActualType: " +
                         // actualValue.getClass());
-                        if (expectedValue instanceof String) {
+                	
+                         if (expectedValue instanceof String) {
                             final String expectedString = (String)expectedValue;
                             if (actualValue instanceof Blob || actualValue instanceof Clob || actualValue instanceof SQLXML) {
                                 // LOB types are special case - metadata says they're Object types so
@@ -536,6 +542,14 @@
                                 // Check for String difference
                                 assertStringsMatch(expectedString, (String)actualValue, (row + 1), (col + 1), eMsg);
                             }
+                        } else {
+                            
+                            throw new QueryTestFailedException(eMsg + "Value mismatch at row " + (row + 1) //$NON-NLS-1$
+                                    + " and column " + (col + 1) //$NON-NLS-1$
+                                    + ": expected = [" //$NON-NLS-1$
+                                    + expectedValue + "], actual = [" //$NON-NLS-1$
+                                    + actualValue + "]"); //$NON-NLS-1$
+              
                         }
                     }
                 }

Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLGenerateResults.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLGenerateResults.java	2010-02-19 18:57:27 UTC (rev 1855)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLGenerateResults.java	2010-02-19 19:18:45 UTC (rev 1856)
@@ -251,7 +251,7 @@
 	    resultSet.beforeFirst();
 
 	    generateErrorResults(querySetID, queryID, sql, errorFile,
-		    resultSet, (results != null ? (List) results : null));
+		    resultSet, (File) results);
 
 	} catch (Throwable e) {
 	    throw new QueryTestFailedException(e.getMessage());
@@ -276,7 +276,7 @@
      */
     private void generateErrorResults(String querySetID, String queryID,
 	    String sql, File resultsFile, ResultSet actualResult,
-	    List<String> results)
+	    File results)
 	    throws QueryTestFailedException {
 	
 	FileOutputStream actualOut = null;
@@ -379,7 +379,7 @@
 //			.currentTimeMillis())) + ".xml"; //$NON-NLS-1$
 //	return errorFileName;
 	
-	return  queryID + ".txt";
+	return  queryID + ".err";
     }
 
     /**