[teiid-commits] teiid SVN: r1821 - 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-12 10:54:16 -0500 (Fri, 12 Feb 2010)
New Revision: 1821

Modified:
   trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLExpectedResults.java
Log:
Teiid-773 - changed/fixed for warren so that he can still generate results using the xml format

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-11 16:03:41 UTC (rev 1820)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLExpectedResults.java	2010-02-12 15:54:16 UTC (rev 1821)
@@ -45,6 +45,7 @@
 import org.teiid.test.client.QueryTest;
 import org.teiid.test.client.QueryScenario;
 import org.teiid.test.client.ResultsGenerator;
+import org.teiid.test.client.TestProperties;
 import org.teiid.test.client.TestResult;
 import org.teiid.test.framework.ConfigPropertyLoader;
 import org.teiid.test.framework.ConfigPropertyNames;
@@ -59,7 +60,7 @@
 public class XMLExpectedResults implements ExpectedResults {
      
     protected Properties props;
-    protected int resultMode = -1;
+    protected String resultMode = TestProperties.RESULT_MODES.NONE;
     protected String generateDir = null;
     protected String querySetIdentifier = null;
     protected String results_dir_loc = null;
@@ -81,17 +82,44 @@
 	    File dir = new File(expected_root_loc, results_dir_loc);
 	    this.results_dir_loc = dir.getAbsolutePath();
 	}
+	
+	validateResultsMode(this.props);
 
     	
     	TestLogger.logInfo("Expected results loc: " + this.results_dir_loc);
     }
+    
+    protected void validateResultsMode(Properties props) {
+	// Determine from property what to do with query results
+	String resultModeStr = props.getProperty(
+		TestProperties.PROP_RESULT_MODE, "");
+	// No need to check for null prop here since we've just checked for this
+	// required property
 
+	if (resultModeStr.equalsIgnoreCase(TestProperties.RESULT_MODES.NONE)
+		|| resultModeStr
+			.equalsIgnoreCase(TestProperties.RESULT_MODES.COMPARE)
+		|| resultModeStr
+			.equalsIgnoreCase(TestProperties.RESULT_MODES.GENERATE)) { //$NON-NLS-1$
+	    resultMode = resultModeStr;
+	}
+	// otherwise use default of NONE
 
+	TestLogger.log("\nResults mode: " + resultMode); //$NON-NLS-1$
+
+    }
+
+
 	@Override
 	public boolean isExceptionExpected(String queryidentifier) throws QueryTestFailedException {
-       		ResultsHolder expectedResults = (ResultsHolder) getResults(queryidentifier);
+		if (resultMode.equalsIgnoreCase(
+			TestProperties.RESULT_MODES.COMPARE)) {
 
-		return (expectedResults.getExceptionMsg() == null ? false : true);
+       			ResultsHolder expectedResults = (ResultsHolder) getResults(queryidentifier);
+
+       			return (expectedResults.getExceptionMsg() == null ? false : true);
+		} 
+		return false;
 	}