[teiid-commits] teiid SVN: r1480 - in trunk/test-integration/db/src/test/java/org/teiid/test: framework/datasource and 1 other directories.

[teiid-commits at lists.jboss.org]

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

Modified:
   trunk/test-integration/db/src/test/java/org/teiid/test/framework/AbstractQueryTransactionTest.java
   trunk/test-integration/db/src/test/java/org/teiid/test/framework/datasource/TwoDataSourceSetup.java
   trunk/test-integration/db/src/test/java/org/teiid/test/testcases/BaseAbstractTransactionTestCase.java
Log:
Teiid 773 - working on a hudson timeout issue, not seeing it locally

Modified: trunk/test-integration/db/src/test/java/org/teiid/test/framework/AbstractQueryTransactionTest.java
===================================================================
--- trunk/test-integration/db/src/test/java/org/teiid/test/framework/AbstractQueryTransactionTest.java	2009-09-24 14:45:26 UTC (rev 1479)
+++ trunk/test-integration/db/src/test/java/org/teiid/test/framework/AbstractQueryTransactionTest.java	2009-09-24 15:21:27 UTC (rev 1480)
@@ -174,13 +174,12 @@
     
     
     /**
-     * At end of each test, clean up the connection factory so that it can be 
-     * established at the start of the next test.
+     * At end of each test, perfrom any cleanup that your test requires.
+     * Note:  Do not cleanup any connections.   That is performed by
+     * the {@link TransactionContainer#runTransaction(TransactionQueryTest)} at the end of the test.
      */
     public void cleanup() {
-        ConnectionStrategyFactory.destroyInstance();
-
- //    	this.closeConnection();
+ 
     }
     
 	@Override

Modified: trunk/test-integration/db/src/test/java/org/teiid/test/framework/datasource/TwoDataSourceSetup.java
===================================================================
--- trunk/test-integration/db/src/test/java/org/teiid/test/framework/datasource/TwoDataSourceSetup.java	2009-09-24 14:45:26 UTC (rev 1479)
+++ trunk/test-integration/db/src/test/java/org/teiid/test/framework/datasource/TwoDataSourceSetup.java	2009-09-24 15:21:27 UTC (rev 1480)
@@ -33,12 +33,9 @@
      	
        System.out.println("Run TwoSource Setup...");
 
-       System.out.println("perform source pm1 set...");
+       System.out.println("perform source pm1 set");
    	
         AbstractQueryTest test1 = new QueryExecution(ConnectionUtil.getConnection("pm1", ds));//$NON-NLS-1$
-        		
-        
-        System.out.println("perform source pm1 set...");
 
         test1.execute("delete from g2"); //$NON-NLS-1$
         test1.execute("delete from g1");         //$NON-NLS-1$

Modified: trunk/test-integration/db/src/test/java/org/teiid/test/testcases/BaseAbstractTransactionTestCase.java
===================================================================
--- trunk/test-integration/db/src/test/java/org/teiid/test/testcases/BaseAbstractTransactionTestCase.java	2009-09-24 14:45:26 UTC (rev 1479)
+++ trunk/test-integration/db/src/test/java/org/teiid/test/testcases/BaseAbstractTransactionTestCase.java	2009-09-24 15:21:27 UTC (rev 1480)
@@ -6,14 +6,9 @@
 
 
 
-import java.sql.Connection;
-
-import javax.sql.XAConnection;
-
 import junit.framework.TestCase;
 
 import org.teiid.test.framework.TransactionContainer;
-import org.teiid.test.framework.connection.ConnectionUtil;
 import org.teiid.test.framework.datasource.DataSourceMgr;
 import org.teiid.test.framework.exception.QueryTestFailedException;
 import org.teiid.test.framework.transaction.TransactionFactory;