[teiid-commits] teiid SVN: r1476 - in trunk/test-integration/db/src/main/java/org/teiid/test: util and 1 other directory.

[teiid-commits at lists.jboss.org]

Author: vhalbert at redhat.com
Date: 2009-09-24 09:21:28 -0400 (Thu, 24 Sep 2009)
New Revision: 1476

Modified:
   trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/ConnectionUtil.java
   trunk/test-integration/db/src/main/java/org/teiid/test/util/PropUtils.java
Log:
Teiid 773 - working on a hudson timeout issue, not seeing it locally

Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/ConnectionUtil.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/ConnectionUtil.java	2009-09-24 12:29:34 UTC (rev 1475)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/ConnectionUtil.java	2009-09-24 13:21:28 UTC (rev 1476)
@@ -2,13 +2,10 @@
 
 import java.sql.Connection;
 import java.util.Map;
-import java.util.Properties;
 
 import javax.sql.XAConnection;
 
-import org.teiid.test.framework.ConfigPropertyLoader;
 import org.teiid.test.framework.datasource.DataSource;
-import org.teiid.test.framework.datasource.DataSourceMgr;
 import org.teiid.test.framework.exception.QueryTestFailedException;
 import org.teiid.test.framework.exception.TransactionRuntimeException;
 
@@ -25,8 +22,16 @@
 				
 		}
 		
-		return ConnectionStrategyFactory.getInstance().createDriverStrategy(identifier,
+		Connection conn = ConnectionStrategyFactory.getInstance().createDriverStrategy(identifier,
 				ds.getProperties()).getConnection();
+		// force autocommit back to true, just in case the last user didnt
+		try {
+			conn.setAutoCommit(true);
+		} catch (Exception sqle) {
+			throw new QueryTestFailedException(sqle);
+		}
+		
+		return conn;
 
 	}
 	
@@ -40,7 +45,7 @@
 			}
 				
 		}
-		
+
 		return ConnectionStrategyFactory.getInstance().createDataSourceStrategy(
 				identifier, ds.getProperties()).getXAConnection();
 

Modified: trunk/test-integration/db/src/main/java/org/teiid/test/util/PropUtils.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/util/PropUtils.java	2009-09-24 12:29:34 UTC (rev 1475)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/util/PropUtils.java	2009-09-24 13:21:28 UTC (rev 1476)
@@ -4,11 +4,34 @@
 import java.io.InputStream;
 import java.util.Properties;
 
-import org.teiid.test.framework.connection.ConnectionStrategyFactory;
+import org.teiid.test.framework.ConfigPropertyLoader;
 
 public class PropUtils {
 	
 
 
-
+	public static Properties loadProperties(String filename, Properties defaults) {
+		Properties props = null;
+		if (defaults != null) {
+			props = new Properties(defaults);
+		} else {
+			props = new Properties();
+		}
+	    try {
+	        InputStream in = ConfigPropertyLoader.class.getResourceAsStream(filename);
+	        if (in != null) {
+	        	Properties lprops = new Properties();
+	        	lprops.load(in);
+	        	props.putAll(lprops);
+	        	
+	        }
+	        else {
+	        	throw new RuntimeException("Failed to load properties from file '"+filename+ "' configuration file");
+	        }
+	    } catch (IOException e) {
+	        throw new RuntimeException("Error loading properties from file '"+filename+ "'" + e.getMessage());
+	    }
+	    
+	    return props;
+	}
 }