Author: vhalbert(a)redhat.com Date: 2009-09-28 13:06:00 -0400 (Mon, 28 Sep 2009) New Revision: 1485 Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/ConfigPropertyLoader.java trunk/test-integration/db/src/main/java/org/teiid/test/framework/TransactionContainer.java trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/ConnectionStrategyFactory.java 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/transaction/JNDITransaction.java trunk/test-integration/db/src/main/java/org/teiid/test/framework/transaction/LocalTransaction.java trunk/test-integration/db/src/main/java/org/teiid/test/framework/transaction/TransactionFactory.java trunk/test-integration/db/src/main/java/org/teiid/test/framework/transaction/XATransaction.java Log: Teiid 773 - cleanup Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/ConfigPropertyLoader.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/framework/ConfigPropertyLoader.java 2009-09-28 17:03:37 UTC (rev 1484) +++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/ConfigPropertyLoader.java 2009-09-28 17:06:00 UTC (rev 1485) @@ -1,14 +1,13 @@ package org.teiid.test.framework; -import java.io.IOException; -import java.io.InputStream; import java.util.Properties; -import org.teiid.test.framework.connection.ConnectionStrategyFactory; import org.teiid.test.util.PropUtils; -public class ConfigPropertyLoader { - + +public class ConfigPropertyLoader { + + /** * The default config file to use when #CONFIG_FILE system property isn't set */ @@ -29,6 +28,9 @@ } public synchronized static Properties getProperties() { + if (props == null) { + loadConfigurationProperties(); + } return props; } Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/TransactionContainer.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/framework/TransactionContainer.java 2009-09-28 17:03:37 UTC (rev 1484) +++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/TransactionContainer.java 2009-09-28 17:06:00 UTC (rev 1485) @@ -4,9 +4,7 @@ */ package org.teiid.test.framework; -import java.sql.Connection; import java.util.Properties; -import java.util.Set; import org.teiid.test.framework.connection.ConnectionStrategy; import org.teiid.test.framework.connection.ConnectionStrategyFactory; @@ -14,8 +12,6 @@ import org.teiid.test.framework.exception.TransactionRuntimeException; - - public abstract class TransactionContainer { private boolean debug = false; @@ -23,18 +19,18 @@ protected Properties props; protected ConnectionStrategy connStrategy; - protected TransactionContainer(ConnectionStrategy strategy){ - this.connStrategy = strategy; - this.props = new Properties(); - this.props.putAll(this.connStrategy.getEnvironment()); - + protected TransactionContainer(){ } - protected void setupData(TransactionQueryTest test) { - test.setDataSources(connStrategy.getDataSources()); + protected void setUp(TransactionQueryTest test) throws QueryTestFailedException { + this.connStrategy = ConnectionStrategyFactory.getInstance().getConnectionStrategy(); + this.props = new Properties(); + this.props.putAll(this.connStrategy.getEnvironment()); + + test.setDataSources(connStrategy.getDataSources()); test.setupDataSources(); - + } protected void before(TransactionQueryTest test){} @@ -43,22 +39,23 @@ public void runTransaction(TransactionQueryTest test) { - try { - try { - - runIt(test); - - } finally { - debug(" test.cleanup"); + try { + + runIt(test); + + } finally { + debug(" test.cleanup"); + + try { + test.cleanup(); + } finally { + // cleanup all connections created for this test. + ConnectionStrategyFactory.destroyInstance(); + + } + } - test.cleanup(); - } - - } finally { - // cleanup all connections created for this test. - ConnectionStrategyFactory.destroyInstance(); - } } private void runIt(TransactionQueryTest test) { @@ -66,7 +63,7 @@ detail("Start transaction test: " + test.getTestName()); try { - setupData(test); + setUp(test); debug(" setConnection"); test.setConnection(this.connStrategy.getConnection()); @@ -98,8 +95,6 @@ e.printStackTrace(); } throw new TransactionRuntimeException(e.getMessage()); - }finally { - } if (test.exceptionExpected() && !test.exceptionOccurred()) { Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/ConnectionStrategyFactory.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/ConnectionStrategyFactory.java 2009-09-28 17:03:37 UTC (rev 1484) +++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/ConnectionStrategyFactory.java 2009-09-28 17:06:00 UTC (rev 1485) @@ -192,9 +192,9 @@ } - public static void main(String[] args) { - ConnectionStrategyFactory cf = ConnectionStrategyFactory.getInstance(); - - } +// public static void main(String[] args) { +// ConnectionStrategyFactory cf = ConnectionStrategyFactory.getInstance(); +// +// } } 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-28 17:03:37 UTC (rev 1484) +++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/ConnectionUtil.java 2009-09-28 17:06:00 UTC (rev 1485) @@ -50,68 +50,5 @@ identifier, ds.getProperties()).getXAConnection(); } - -// public static final Connection getSource(String identifier) -// throws QueryTestFailedException { -// if (identifier != null) { -// String mappedName = ConfigPropertyLoader.getProperty(identifier); -// -// if (mappedName == null) { -// throw new TransactionRuntimeException("Identifier mapping " -// + identifier -// + " is not defined in the config properties file"); -// } -// -// Properties sourceProps; -// try { -// sourceProps = DataSourceMgr.getInstance() -// .getDatasourceProperties(mappedName, identifier); -// } catch (QueryTestFailedException e) { -// throw new TransactionRuntimeException(e); -// } -// -// if (sourceProps == null) { -// throw new TransactionRuntimeException("Identifier " -// + identifier + " mapped to " + mappedName -// + " has no datasource properties"); -// } -// -// return ConnectionStrategyFactory.getInstance().createDriverStrategy(identifier, -// sourceProps).getConnection(); -// -// } -// throw new RuntimeException("No Connection by name :" + identifier); //$NON-NLS-1$ -// } -// -// public static final XAConnection getXASource(String identifier) -// throws QueryTestFailedException { -// if (identifier != null) { -// String mappedName = ConfigPropertyLoader.getProperty(identifier); -// -// if (mappedName == null) { -// throw new TransactionRuntimeException("Identifier mapping " -// + identifier -// + " is not defined in the config properties file"); -// } -// -// Properties sourceProps; -// try { -// sourceProps = DataSourceMgr.getInstance() -// .getDatasourceProperties(mappedName, identifier); -// } catch (QueryTestFailedException e) { -// throw new TransactionRuntimeException(e); -// } -// -// if (sourceProps == null) { -// throw new TransactionRuntimeException("Identifier " -// + identifier + " mapped to " + mappedName -// + " has no datasource properties"); -// } -// -// return ConnectionStrategyFactory.getInstance().createDataSourceStrategy( -// identifier, sourceProps).getXAConnection(); -// } -// throw new RuntimeException("No Connection by name :" + identifier); //$NON-NLS-1$ -// } } Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/transaction/JNDITransaction.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/framework/transaction/JNDITransaction.java 2009-09-28 17:03:37 UTC (rev 1484) +++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/transaction/JNDITransaction.java 2009-09-28 17:06:00 UTC (rev 1485) @@ -9,8 +9,8 @@ import org.teiid.test.framework.TransactionContainer; import org.teiid.test.framework.TransactionQueryTest; +import org.teiid.test.framework.connection.ConnectionStrategy; import org.teiid.test.framework.exception.TransactionRuntimeException; -import org.teiid.test.framework.connection.ConnectionStrategy; @@ -18,8 +18,8 @@ public class JNDITransaction extends TransactionContainer { UserTransaction userTxn = null; - public JNDITransaction(ConnectionStrategy strategy) { - super(strategy); + public JNDITransaction() { + super(); } protected void before(TransactionQueryTest test) { Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/transaction/LocalTransaction.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/framework/transaction/LocalTransaction.java 2009-09-28 17:03:37 UTC (rev 1484) +++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/transaction/LocalTransaction.java 2009-09-28 17:06:00 UTC (rev 1485) @@ -4,14 +4,11 @@ */ package org.teiid.test.framework.transaction; -import java.sql.Connection; import java.sql.SQLException; import org.teiid.test.framework.TransactionContainer; import org.teiid.test.framework.TransactionQueryTest; -import org.teiid.test.framework.exception.QueryTestFailedException; import org.teiid.test.framework.exception.TransactionRuntimeException; -import org.teiid.test.framework.connection.ConnectionStrategy; @@ -20,8 +17,8 @@ */ public class LocalTransaction extends TransactionContainer { - public LocalTransaction(ConnectionStrategy strategy) { - super(strategy); + public LocalTransaction() { + super(); } Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/transaction/TransactionFactory.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/framework/transaction/TransactionFactory.java 2009-09-28 17:03:37 UTC (rev 1484) +++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/transaction/TransactionFactory.java 2009-09-28 17:06:00 UTC (rev 1485) @@ -28,24 +28,28 @@ ConfigPropertyLoader.loadConfigurationProperties(); - ConnectionStrategy connstrategy = ConnectionStrategyFactory.getInstance().getConnectionStrategy(); + // ConnectionStrategy connstrategy = ConnectionStrategyFactory.getInstance().getConnectionStrategy(); + +// Properties props = ConfigPropertyLoader.getProperties(); - String type = connstrategy.getEnvironment().getProperty(ConfigPropertyNames.TRANSACTION_TYPE, ConfigPropertyNames.TRANSACTION_TYPES.LOCAL_TRANSACTION); + String type = ConfigPropertyLoader.getProperty(ConfigPropertyNames.TRANSACTION_TYPE); + //connstrategy.getEnvironment().getProperty(ConfigPropertyNames.TRANSACTION_TYPE, ConfigPropertyNames.TRANSACTION_TYPES.LOCAL_TRANSACTION); if (type == null) { - throw new RuntimeException("Property " + ConfigPropertyNames.TRANSACTION_TYPE + " was specified"); + type = ConfigPropertyNames.TRANSACTION_TYPES.LOCAL_TRANSACTION; +// throw new RuntimeException("Property " + ConfigPropertyNames.TRANSACTION_TYPE + " was specified"); } System.out.println("Create TransactionContainer: " + type); if (type.equalsIgnoreCase(ConfigPropertyNames.TRANSACTION_TYPES.LOCAL_TRANSACTION)) { - transacton = new LocalTransaction(connstrategy); + transacton = new LocalTransaction(); } else if (type.equalsIgnoreCase(ConfigPropertyNames.TRANSACTION_TYPES.XATRANSACTION)) { - transacton = new XATransaction(connstrategy); + transacton = new XATransaction(); } else if (type.equalsIgnoreCase(ConfigPropertyNames.TRANSACTION_TYPES.JNDI_TRANSACTION)) { - transacton = new JNDITransaction(connstrategy); + transacton = new JNDITransaction(); } else { throw new TransactionRuntimeException("Invalid property value of " + type + " for " + ConfigPropertyNames.TRANSACTION_TYPE ); Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/transaction/XATransaction.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/framework/transaction/XATransaction.java 2009-09-28 17:03:37 UTC (rev 1484) +++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/transaction/XATransaction.java 2009-09-28 17:06:00 UTC (rev 1485) @@ -11,7 +11,6 @@ import org.teiid.test.framework.TransactionContainer; import org.teiid.test.framework.TransactionQueryTest; -import org.teiid.test.framework.connection.ConnectionStrategy; import org.teiid.test.framework.exception.QueryTestFailedException; import org.teiid.test.framework.exception.TransactionRuntimeException; @@ -21,8 +20,8 @@ private static Random RANDOM = new Random(); private MMXid xid; - public XATransaction(ConnectionStrategy strategy) { - super(strategy); + public XATransaction() { + super(); } protected void before(TransactionQueryTest test) {