[teiid-commits] teiid SVN: r1866 - 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-22 13:48:13 -0500 (Mon, 22 Feb 2010)
New Revision: 1866

Modified:
   trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLGenerateResults.java
Log:
Teiid-773 - (reversing for the time being) 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/XMLGenerateResults.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLGenerateResults.java	2010-02-19 23:36:36 UTC (rev 1865)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLGenerateResults.java	2010-02-22 18:48:13 UTC (rev 1866)
@@ -203,7 +203,7 @@
 //  Begin New from Impl
     
     
-    public String generateErrorFile(final String querySetID,
+    public String generateErrorFile_keep(final String querySetID,
 	    final String queryID, final String sql, final ResultSet resultSet,
 	    final Throwable queryError, final Object results)
 	    throws QueryTestFailedException {
@@ -285,18 +285,8 @@
 	    PrintStream filePrintStream = new PrintStream(actualOut);
 	    
 	    TestResultSetUtil.printResultSet(actualResult, sql, MAX_COL_WIDTH, true, filePrintStream);
+    	    
 
-//	    if (results != null) {
-//        	    for (Iterator<String> it=results.iterator(); it.hasNext();) {
-//        		String line = it.next();
-//        		filePrintStream.print(line);
-//        	    }
-//	    } else {
-//	    
-//		ResultSetUtil.printResultSet(actualResult, MAX_COL_WIDTH, true, filePrintStream);
-//	    }
-	    	    
-
 	} catch (Exception e) {
 	    e.printStackTrace();
 	    throw new QueryTestFailedException(e);
@@ -313,7 +303,7 @@
     }
 //  End of copy from impl 
    
-    public String generateErrorFilex(final String querySetID,
+    public String generateErrorFile(final String querySetID,
 	    final String queryID, final String sql, final ResultSet resultSet,
 	    final Throwable queryError, final Object expectedResultsFile)
 	    throws QueryTestFailedException {