[teiid-commits] teiid SVN: r1822 - in trunk/test-integration/db/src/main/java/org/teiid/test/client: ctc and 1 other directories.

[teiid-commits at lists.jboss.org]

Author: vhalbert at redhat.com
Date: 2010-02-12 16:28:39 -0500 (Fri, 12 Feb 2010)
New Revision: 1822

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/ctc/XMLGenerateResults.java
   trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/ResultsGeneratorImpl.java
Log:
Teiid-773 - changed print all the exception messages in the summary file and changed the error files to only be the queryid (do not prefix by ERROR)

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-12 15:54:16 UTC (rev 1821)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/client/TestResultsSummary.java	2010-02-12 21:28:39 UTC (rev 1822)
@@ -41,6 +41,8 @@
 import org.teiid.test.framework.ConfigPropertyLoader;
 import org.teiid.test.framework.TestLogger;
 
+import com.metamatrix.core.util.StringUtilities;
+
 public class TestResultsSummary  {
     
     private static final String PROP_SUMMARY_PRT_DIR="summarydir";
@@ -220,7 +222,7 @@
 	    case TestResult.RESULT_STATE.TEST_EXCEPTION:
 		++fail;
 		
-		this.failed_queries.add(stat.getQueryID());
+		this.failed_queries.add(stat.getQueryID() + "," + StringUtilities.replaceWhitespace(stat.getExceptionMsg(), "", true));
 		break;
 	    case TestResult.RESULT_STATE.TEST_SUCCESS:
 		++pass;
@@ -250,7 +252,6 @@
             try {
         	printResults(scenario, querySetID, beginTS, endTS, 1, 1);
             } catch (Exception e) {
-        	// TODO Auto-generated catch block
         	e.printStackTrace();
             }
     }

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-12 15:54:16 UTC (rev 1821)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLGenerateResults.java	2010-02-12 21:28:39 UTC (rev 1822)
@@ -251,14 +251,16 @@
     // }
 
     private String generateErrorFileName(String queryID, String querySetID) {
-	String errorFileName = "ERROR_"
+//	String errorFileName = "ERROR_"
 		// configID + "_" //$NON-NLS-1$ //$NON-NLS-2$
 		//                               + querySetID + "_" //$NON-NLS-1$
-		+ queryID
-		+ "_" //$NON-NLS-1$
-		+ FILE_NAME_DATE_FORMATER.format(new Date(System
-			.currentTimeMillis())) + ".xml"; //$NON-NLS-1$
-	return errorFileName;
+//	    String errorFileName = queryID +
+//		+ "_" //$NON-NLS-1$
+//		+ FILE_NAME_DATE_FORMATER.format(new Date(System
+//			.currentTimeMillis())) + ".xml"; //$NON-NLS-1$
+//	return errorFileName;
+	
+	return  queryID + ".xml";
     }
 
     /**

Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/ResultsGeneratorImpl.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/ResultsGeneratorImpl.java	2010-02-12 15:54:16 UTC (rev 1821)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/client/impl/ResultsGeneratorImpl.java	2010-02-12 21:28:39 UTC (rev 1822)
@@ -218,14 +218,17 @@
 
 
     private String generateErrorFileName(String queryID, String querySetID) {
-	String errorFileName = "ERROR_"
-		// configID + "_" //$NON-NLS-1$ //$NON-NLS-2$
-		//                               + querySetID + "_" //$NON-NLS-1$
-		+ queryID
-		+ "_" //$NON-NLS-1$
-		+ FILE_NAME_DATE_FORMATER.format(new Date(System
-			.currentTimeMillis())) + ".txt"; //$NON-NLS-1$
-	return errorFileName;
+//	String errorFileName = "ERROR_"
+//		// configID + "_" //$NON-NLS-1$ //$NON-NLS-2$
+//		//                               + querySetID + "_" //$NON-NLS-1$
+//		+ queryID
+//		+ "_" //$NON-NLS-1$
+//		+ FILE_NAME_DATE_FORMATER.format(new Date(System
+//			.currentTimeMillis())) + ".txt"; //$NON-NLS-1$
+//	return errorFileName;
+	
+	return  queryID + ".txt";
+
     }
 
     /**