[teiid-commits] teiid SVN: r1510 - trunk/test-integration/db/src/test/java/org/teiid/test/testcases.

[teiid-commits at lists.jboss.org]

Author: vhalbert at redhat.com
Date: 2009-10-01 09:56:55 -0400 (Thu, 01 Oct 2009)
New Revision: 1510

Modified:
   trunk/test-integration/db/src/test/java/org/teiid/test/testcases/LocalTransactionDriverFalseOffTest.java
   trunk/test-integration/db/src/test/java/org/teiid/test/testcases/LocalTransactionDriverTrueOffTest.java
Log:
Teiid 773 -  since the ConfigPropertyLoader is now only valid per test, need to remove the logic that removes the system properties.   Any system properties that are set at the VM level, need to be maintained for the duration of the process and are considered valid for all those tests at that time.

Modified: trunk/test-integration/db/src/test/java/org/teiid/test/testcases/LocalTransactionDriverFalseOffTest.java
===================================================================
--- trunk/test-integration/db/src/test/java/org/teiid/test/testcases/LocalTransactionDriverFalseOffTest.java	2009-10-01 13:55:33 UTC (rev 1509)
+++ trunk/test-integration/db/src/test/java/org/teiid/test/testcases/LocalTransactionDriverFalseOffTest.java	2009-10-01 13:56:55 UTC (rev 1510)
@@ -4,6 +4,7 @@
  */
 package org.teiid.test.testcases;
 
+import org.teiid.test.framework.ConfigPropertyLoader;
 import org.teiid.test.framework.ConfigPropertyNames;
 import org.teiid.test.framework.ConfigPropertyNames.CONNECTION_STRATEGY_PROPS;
 
@@ -27,13 +28,12 @@
 	protected void setUp() throws Exception {
 		super.setUp();
 		
-//		this.addProperty(ConfigPropertyNames.USE_DATASOURCES_PROP, "oracle,sqlserver");
-    	
 		this.addProperty(ConfigPropertyNames.CONNECTION_TYPE, ConfigPropertyNames.CONNECTION_TYPES.DRIVER_CONNECTION);
 		
 		this.addProperty(CONNECTION_STRATEGY_PROPS.AUTOCOMMIT, "false");
 		this.addProperty(CONNECTION_STRATEGY_PROPS.TXN_AUTO_WRAP, "off");
-    	
+		this.addProperty(ConfigPropertyNames.CONFIG_FILE, ConfigPropertyLoader.DEFAULT_CONFIG_FILE_NAME);
+
 		
 	}
 	

Modified: trunk/test-integration/db/src/test/java/org/teiid/test/testcases/LocalTransactionDriverTrueOffTest.java
===================================================================
--- trunk/test-integration/db/src/test/java/org/teiid/test/testcases/LocalTransactionDriverTrueOffTest.java	2009-10-01 13:55:33 UTC (rev 1509)
+++ trunk/test-integration/db/src/test/java/org/teiid/test/testcases/LocalTransactionDriverTrueOffTest.java	2009-10-01 13:56:55 UTC (rev 1510)
@@ -4,6 +4,7 @@
  */
 package org.teiid.test.testcases;
 
+import org.teiid.test.framework.ConfigPropertyLoader;
 import org.teiid.test.framework.ConfigPropertyNames;
 import org.teiid.test.framework.ConfigPropertyNames.CONNECTION_STRATEGY_PROPS;
 
@@ -30,7 +31,8 @@
 		this.addProperty(ConfigPropertyNames.CONNECTION_TYPE, ConfigPropertyNames.CONNECTION_TYPES.DRIVER_CONNECTION);
 		this.addProperty(CONNECTION_STRATEGY_PROPS.AUTOCOMMIT, "true");
 		this.addProperty(CONNECTION_STRATEGY_PROPS.TXN_AUTO_WRAP, "off");
-    	
+		this.addProperty(ConfigPropertyNames.CONFIG_FILE, ConfigPropertyLoader.DEFAULT_CONFIG_FILE_NAME);
+   	
 		
 	}