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

[teiid-commits at lists.jboss.org]

Author: vhalbert at redhat.com
Date: 2010-02-16 16:19:19 -0500 (Tue, 16 Feb 2010)
New Revision: 1834

Modified:
   trunk/test-integration/db/src/main/java/org/teiid/test/client/TestClient.java
   trunk/test-integration/db/src/main/java/org/teiid/test/client/TestResultsSummary.java
Log:
Teiid-773 -  print the result-mode (compare,generate, none) in the heading of the summary files to know what selected

Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/TestClient.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/client/TestClient.java	2010-02-16 21:04:26 UTC (rev 1833)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/client/TestClient.java	2010-02-16 21:19:19 UTC (rev 1834)
@@ -165,7 +165,7 @@
 	
 	Iterator<String> qsetIt = queryset.getQuerySetIDs().iterator();
 	
-	TestResultsSummary summary = new TestResultsSummary();
+	TestResultsSummary summary = new TestResultsSummary(queryset.getResultsMode());
 
 	// iterate over the query set ID's, which there
 	// should be 1 for each file to be processed

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-16 21:04:26 UTC (rev 1833)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/client/TestResultsSummary.java	2010-02-16 21:19:19 UTC (rev 1834)
@@ -41,7 +41,6 @@
 import org.teiid.test.framework.ConfigPropertyLoader;
 import org.teiid.test.framework.TestLogger;
 
-import com.metamatrix.core.util.StringUtilities;
 
 public class TestResultsSummary  {
     
@@ -52,6 +51,7 @@
     private static final String NL = System.getProperty("line.separator"); //$NON-NLS-1$
     
     // totals for scenario
+    private String resultMode = "NotSet";
     private int total_queries = 0;
     private int total_pass = 0;
     private int total_fail = 0;
@@ -61,6 +61,10 @@
     
     private Map<String, Collection<TestResult>> testResults = Collections.synchronizedMap(new HashMap<String, Collection<TestResult>>());
     
+    public TestResultsSummary(String resultMode) {
+	this.resultMode = resultMode;
+    }
+   
     public void cleanup() {
 	failed_queries.clear();
 	query_sets.clear();
@@ -138,10 +142,10 @@
 	return summaryFile;
     }
 
-    private static void printQueryTestResults(PrintStream outputStream,
+    private void printQueryTestResults(PrintStream outputStream,
 	    long testStartTS, long endTS, int numberOfClients,
 	    SimpleDateFormat formatter, Collection results) {
-	outputStream.println("Query Test Results"); //$NON-NLS-1$
+	outputStream.println("Query Test Results [" + this.resultMode  + "]"); //$NON-NLS-1$
 	outputStream.println("=================="); //$NON-NLS-1$
 	outputStream.println("Start        Time: " + new Date(testStartTS)); //$NON-NLS-1$
 	outputStream.println("End          Time: " + new Date(endTS)); //$NON-NLS-1$
@@ -376,7 +380,7 @@
 	    }
 	    
 	    	
-		outputStream.println("Scenario " + scenario_name + " Summary"); //$NON-NLS-1$
+		outputStream.println("Scenario " + scenario_name + " Summary [" + this.resultMode  + "]"); //$NON-NLS-1$
 		outputStream.println("Query Set Name " + querysetname); //$NON-NLS-1$
 		outputStream.println("=================="); //$NON-NLS-1$