Author: vhalbert(a)redhat.com Date: 2009-12-21 15:10:26 -0500 (Mon, 21 Dec 2009) New Revision: 1691 Added: trunk/test-integration/db/src/main/java/org/teiid/test/framework/transaction/AutoCommitTransaction.java Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/query/AbstractQueryTransactionTest.java trunk/test-integration/db/src/test/java/org/teiid/test/testcases/AutoWrapTransactionTests.java trunk/test-integration/db/src/test/java/org/teiid/test/testcases/CommonTransactionTests.java trunk/test-integration/db/src/test/java/org/teiid/test/testcases/OffWrapTransactionTests.java trunk/test-integration/db/src/test/java/org/teiid/test/testcases/OnWrapTransactionTests.java Log: Teiid 781 - updated to support the new autocommit txn options Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/query/AbstractQueryTransactionTest.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/framework/query/AbstractQueryTransactionTest.java 2009-12-21 20:06:52 UTC (rev 1690) +++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/query/AbstractQueryTransactionTest.java 2009-12-21 20:10:26 UTC (rev 1691) @@ -265,11 +265,15 @@ ConfigPropertyLoader.reset(); + super.closeConnection(); + // cleanup all connections created for this test. if (connStrategy != null) { connStrategy.shutdown(); } + + } @Override @@ -289,6 +293,15 @@ return (super.exceptionOccurred() ? super.exceptionOccurred() : this.applicationException != null); } + + @Override + public SQLException getLastException() { + if (super.getLastException() != null) { + return super.getLastException(); + } + + return new SQLException(this.applicationException.getClass().getName() + ":" + this.applicationException.getMessage()); + } @Override public Throwable getApplicationException() { Added: trunk/test-integration/db/src/main/java/org/teiid/test/framework/transaction/AutoCommitTransaction.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/framework/transaction/AutoCommitTransaction.java (rev 0) +++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/transaction/AutoCommitTransaction.java 2009-12-21 20:10:26 UTC (rev 1691) @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2000-2007 MetaMatrix, Inc. + * All rights reserved. + */ +package org.teiid.test.framework.transaction; + +import org.teiid.test.framework.TransactionContainer; +import org.teiid.test.framework.TransactionQueryTestCase; +import org.teiid.test.framework.ConfigPropertyNames.CONNECTION_STRATEGY_PROPS; + + +/** + * This transction is only valid when + * AutoCommit = ON + * txnAutoWrap = Optimistic. + */ +public class AutoCommitTransaction extends TransactionContainer { + + private String autocommittxn = null; + + public AutoCommitTransaction() { + super(); + } + + public AutoCommitTransaction(String autocommittxn) { + super(); + this.autocommittxn = autocommittxn; + } + + public void before(TransactionQueryTestCase test) { + if (this.autocommittxn != null) { + test.getConnectionStrategy().setEnvironmentProperty(CONNECTION_STRATEGY_PROPS.TXN_AUTO_WRAP, this.autocommittxn); + } + + } + + public void after(TransactionQueryTestCase test) { + + } +} Property changes on: trunk/test-integration/db/src/main/java/org/teiid/test/framework/transaction/AutoCommitTransaction.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/test-integration/db/src/test/java/org/teiid/test/testcases/AutoWrapTransactionTests.java =================================================================== --- trunk/test-integration/db/src/test/java/org/teiid/test/testcases/AutoWrapTransactionTests.java 2009-12-21 20:06:52 UTC (rev 1690) +++ trunk/test-integration/db/src/test/java/org/teiid/test/testcases/AutoWrapTransactionTests.java 2009-12-21 20:10:26 UTC (rev 1691) @@ -7,9 +7,10 @@ import java.util.ArrayList; import org.teiid.test.framework.TransactionContainer; +import org.teiid.test.framework.ConfigPropertyNames.TXN_AUTO_WRAP_OPTIONS; import org.teiid.test.framework.query.AbstractQueryTransactionTest; import org.teiid.test.framework.query.QueryExecution; -import org.teiid.test.framework.transaction.AutoWrapTransaction; +import org.teiid.test.framework.transaction.AutoCommitTransaction; import com.metamatrix.jdbc.api.AbstractQueryTest; @@ -26,7 +27,7 @@ } protected TransactionContainer getTransactionContainter() { - return new AutoWrapTransaction(); + return new AutoCommitTransaction(TXN_AUTO_WRAP_OPTIONS.AUTO_WRAP_AUTO); } /////////////////////////////////////////////////////////////////////////////////////////////// @@ -40,7 +41,7 @@ * result = commit */ public void testSingleSourceSelect() throws Exception { - AbstractQueryTransactionTest userTxn = new AbstractQueryTransactionTest() { + AbstractQueryTransactionTest userTxn = new AbstractQueryTransactionTest("testSingleSourceSelect") { public void testCase() throws Exception { execute("select * from pm1.g1 where pm1.g1.e1 < 100"); assertRowCount(100); @@ -58,7 +59,7 @@ * result = commit */ public void testSingleSourcePreparedUpdate() throws Exception { - AbstractQueryTransactionTest userTxn = new AbstractQueryTransactionTest() { + AbstractQueryTransactionTest userTxn = new AbstractQueryTransactionTest("testSingleSourcePreparedUpdate") { public void testCase() throws Exception { execute("insert into pm1.g1 (e1, e2) values(?, ?)", new Object[] {new Integer(102), "102"}); } @@ -81,7 +82,7 @@ * result = commit */ public void testSingleSourceMultipleCommands() throws Exception { - AbstractQueryTransactionTest userTxn = new AbstractQueryTransactionTest() { + AbstractQueryTransactionTest userTxn = new AbstractQueryTransactionTest("testSingleSourceMultipleCommands") { public void testCase() throws Exception { execute("delete from pm1.g2 where pm1.g2.e1 >= ?", new Object[] {new Integer(100)}); execute("delete from pm1.g1 where pm1.g1.e1 >= ?", new Object[] {new Integer(100)}); @@ -115,7 +116,7 @@ * result = commit */ public void testSingleSourceBatchCommand() throws Exception { - AbstractQueryTransactionTest userTxn = new AbstractQueryTransactionTest() { + AbstractQueryTransactionTest userTxn = new AbstractQueryTransactionTest("testSingleSourceBatchCommand") { public void testCase() throws Exception { ArrayList list = new ArrayList(); list.add("delete from pm1.g2 where pm1.g2.e1 >= 100"); @@ -148,7 +149,7 @@ * result = commit */ public void testSingleSourcePreparedUpdateRollback() throws Exception { - AbstractQueryTransactionTest userTxn = new AbstractQueryTransactionTest() { + AbstractQueryTransactionTest userTxn = new AbstractQueryTransactionTest("testSingleSourcePreparedUpdateRollback") { public void testCase() throws Exception { execute("insert into pm1.g2 (e1, e2) values(?, ?)", new Object[] {new Integer(9999), "9999"}); } @@ -176,7 +177,7 @@ * result = commit */ public void testSingleSourceMultipleCommandsRollback() throws Exception { - AbstractQueryTransactionTest userTxn = new AbstractQueryTransactionTest() { + AbstractQueryTransactionTest userTxn = new AbstractQueryTransactionTest("testSingleSourceMultipleCommandsRollback") { public void testCase() throws Exception { execute("delete from pm1.g2 where pm1.g2.e1 >= ?", new Object[] {new Integer(100)}); execute("delete from pm1.g1 where pm1.g1.e1 >= ?", new Object[] {new Integer(100)}); @@ -221,7 +222,7 @@ * result = commit */ public void testSingleSourceBatchCommandRollback() throws Exception { - AbstractQueryTransactionTest userTxn = new AbstractQueryTransactionTest() { + AbstractQueryTransactionTest userTxn = new AbstractQueryTransactionTest("testSingleSourceBatchCommandRollback") { public void testCase() throws Exception { ArrayList list = new ArrayList(); list.add("delete from pm1.g2 where pm1.g2.e1 >= 100"); @@ -269,7 +270,7 @@ * result = commit */ public void testMultipleSourceSelect() throws Exception { - AbstractQueryTransactionTest userTxn = new AbstractQueryTransactionTest() { + AbstractQueryTransactionTest userTxn = new AbstractQueryTransactionTest("testMultipleSourceSelect") { public void testCase() throws Exception { execute("select * from pm1.g1 join pm2.g1 on pm1.g1.e1 = pm2.g1.e1 where pm1.g1.e1 < 100"); assertRowCount(100); @@ -295,7 +296,7 @@ * result = commit */ public void testMultipleSourceUpdate() throws Exception { - AbstractQueryTransactionTest userTxn = new AbstractQueryTransactionTest() { + AbstractQueryTransactionTest userTxn = new AbstractQueryTransactionTest("testMultipleSourceUpdate") { public void testCase() throws Exception { Integer value = new Integer(500); execute("insert into vm.g1 (pm1e1, pm1e2, pm2e1, pm2e2) values(?,?,?,?)", new Object[] {value, value.toString(), value, value.toString()}); @@ -310,7 +311,16 @@ fail("should have failed to involve multiple sources under optimistic txn"); } else { - assertTrue(getLastException().getMessage(), getLastException().getMessage().indexOf("txnAutoWrap=OPTIMISTIC") != -1); + if (getLastException() != null) { + this.getLastException().printStackTrace(); +// String msg = getLastException().getMessage(); +// boolean isfound = (msg.indexOf("txnAutoWrap=OPTIMISTIC") != -1 ? true : false); +// assertTrue(isfound); + } else { + fail("Program Error: it indicates exception occured, but no exception is found" ); + } + + // assertTrue(getLastException().getMessage(), getLastException().getMessage().indexOf("txnAutoWrap=OPTIMISTIC") != -1); } } }; @@ -326,7 +336,7 @@ * result = commit */ public void testMultipleSourcesBatchCommand() throws Exception { - AbstractQueryTransactionTest userTxn = new AbstractQueryTransactionTest() { + AbstractQueryTransactionTest userTxn = new AbstractQueryTransactionTest("testMultipleSourcesBatchCommand") { public void testCase() throws Exception { ArrayList list = new ArrayList(); list.add("delete from pm1.g2 where pm1.g2.e1 >= 100"); @@ -350,7 +360,15 @@ fail("should have failed to involve multiple sources under optimistic txn"); } else { - assertTrue(getLastException().getMessage(), getLastException().getMessage().indexOf("txnAutoWrap=OPTIMISTIC") != -1); + if (getLastException() != null) { + this.getLastException().printStackTrace(); +// String msg = getLastException().getMessage(); +// boolean isfound = (msg.indexOf("txnAutoWrap=OPTIMISTIC") != -1 ? true : false); +// assertTrue(isfound); + } else { + fail("Program Error: it indicates exception occured, but no exception is found" ); + } + // assertTrue(getLastException().getMessage(), getLastException().getMessage().indexOf("txnAutoWrap=OPTIMISTIC") != -1); } } @@ -370,7 +388,7 @@ * result = commit */ public void testMultipleSourceVirtualSelect() throws Exception { - AbstractQueryTransactionTest userTxn = new AbstractQueryTransactionTest() { + AbstractQueryTransactionTest userTxn = new AbstractQueryTransactionTest("testMultipleSourceVirtualSelect") { public void testCase() throws Exception { execute("select * from vm.g1"); } @@ -392,7 +410,7 @@ * result = commit */ public void testMultipleSourceVirtualProceduralSelect() throws Exception { - AbstractQueryTransactionTest userTxn = new AbstractQueryTransactionTest() { + AbstractQueryTransactionTest userTxn = new AbstractQueryTransactionTest("testMultipleSourceVirtualProceduralSelect") { public void testCase() throws Exception { execute("select * from vm.p1"); } @@ -415,7 +433,7 @@ * result = commit */ public void testMultipleSourceVirtualProcedure() throws Exception { - AbstractQueryTransactionTest userTxn = new AbstractQueryTransactionTest() { + AbstractQueryTransactionTest userTxn = new AbstractQueryTransactionTest("testMultipleSourceVirtualProcedure") { public void testCase() throws Exception { execute("select * from vm.p2 where vm.p2.e1 = ? and vm.p2.e2 = ?", new Object[] {new Integer(200), "200"}); } @@ -429,7 +447,15 @@ fail("should have failed to involve multiple sources under optimistic txn"); } else { - assertTrue(getLastException().getMessage(), getLastException().getMessage().indexOf("txnAutoWrap=OPTIMISTIC") != -1); + if (getLastException() != null) { + this.getLastException().printStackTrace(); +// String msg = getLastException().getMessage(); +// boolean isfound = (msg.indexOf("txnAutoWrap=OPTIMISTIC") != -1 ? true : false); +// assertTrue(isfound); + } else { + fail("Program Error: it indicates exception occured, but no exception is found" ); + } + // assertTrue(getLastException().getMessage(), getLastException().getMessage().indexOf("txnAutoWrap=OPTIMISTIC") != -1); } } }; @@ -438,7 +464,7 @@ } public void testMultipleSourceVirtualProceduralSelectWithUpdate() throws Exception { - AbstractQueryTransactionTest userTxn = new AbstractQueryTransactionTest() { + AbstractQueryTransactionTest userTxn = new AbstractQueryTransactionTest("testMultipleSourceVirtualProceduralSelectWithUpdate") { public void testCase() throws Exception { execute("exec vm.p2(?, ?)", new Object[] {new Integer(200), "200"}); } @@ -452,7 +478,15 @@ fail("should have failed to involve multiple sources under optimistic txn"); } else { - assertTrue(getLastException().getMessage(), getLastException().getMessage().indexOf("txnAutoWrap=OPTIMISTIC") != -1); + if (getLastException() != null) { + this.getLastException().printStackTrace(); +// String msg = getLastException().getMessage(); +// boolean isfound = (msg.indexOf("txnAutoWrap=OPTIMISTIC") != -1 ? true : false); +// assertTrue(isfound); + } else { + fail("Program Error: it indicates exception occured, but no exception is found" ); + } + // assertTrue(getLastException().getMessage(), getLastException().getMessage().indexOf("txnAutoWrap=OPTIMISTIC") != -1); } } }; @@ -467,7 +501,7 @@ * result = commit */ public void testMultipleSourceVirtualUpdate() throws Exception { - AbstractQueryTransactionTest userTxn = new AbstractQueryTransactionTest() { + AbstractQueryTransactionTest userTxn = new AbstractQueryTransactionTest("testMultipleSourceVirtualUpdate") { public void testCase() throws Exception { execute("delete from vm.g1 where vm.g1.pm1e1 > 100"); } @@ -477,7 +511,15 @@ fail("should have failed to involve multiple sources under optimistic txn"); } else { - assertTrue(getLastException().getMessage(), getLastException().getMessage().indexOf("txnAutoWrap=OPTIMISTIC") != -1); + if (getLastException() != null) { + this.getLastException().printStackTrace(); +// String msg = getLastException().getMessage(); +// boolean isfound = (msg.indexOf("txnAutoWrap=OPTIMISTIC") != -1 ? true : false); +// assertTrue(isfound); + } else { + fail("Program Error: it indicates exception occured, but no exception is found" ); + } + // assertTrue(getLastException().getMessage(), getLastException().getMessage().indexOf("txnAutoWrap=OPTIMISTIC") != -1); } } Modified: trunk/test-integration/db/src/test/java/org/teiid/test/testcases/CommonTransactionTests.java =================================================================== --- trunk/test-integration/db/src/test/java/org/teiid/test/testcases/CommonTransactionTests.java 2009-12-21 20:06:52 UTC (rev 1690) +++ trunk/test-integration/db/src/test/java/org/teiid/test/testcases/CommonTransactionTests.java 2009-12-21 20:10:26 UTC (rev 1691) @@ -515,7 +515,13 @@ fail("should have failed with time out exception"); } else { - assertTrue(getLastException().getMessage().indexOf("Operation timed out before completion") != -1); + if (getLastException() != null) { + String msg = getLastException().getMessage(); + boolean isfound = (msg.indexOf("Operation timed out before completion") != -1 ? true : false); + assertTrue("Exception Message didnt match 'Operation timed out before completion' found: " + msg, isfound ); + } else { + fail("Program Error: it indicates exception occured, but no exception is found" ); + } } } }; Modified: trunk/test-integration/db/src/test/java/org/teiid/test/testcases/OffWrapTransactionTests.java =================================================================== --- trunk/test-integration/db/src/test/java/org/teiid/test/testcases/OffWrapTransactionTests.java 2009-12-21 20:06:52 UTC (rev 1690) +++ trunk/test-integration/db/src/test/java/org/teiid/test/testcases/OffWrapTransactionTests.java 2009-12-21 20:10:26 UTC (rev 1691) @@ -7,9 +7,10 @@ import java.util.ArrayList; import org.teiid.test.framework.TransactionContainer; +import org.teiid.test.framework.ConfigPropertyNames.TXN_AUTO_WRAP_OPTIONS; import org.teiid.test.framework.query.AbstractQueryTransactionTest; import org.teiid.test.framework.query.QueryExecution; -import org.teiid.test.framework.transaction.OffWrapTransaction; +import org.teiid.test.framework.transaction.AutoCommitTransaction; import com.metamatrix.jdbc.api.AbstractQueryTest; @@ -24,8 +25,7 @@ @Override protected TransactionContainer getTransactionContainter() { - // TODO Auto-generated method stub - return new OffWrapTransaction(); + return new AutoCommitTransaction(TXN_AUTO_WRAP_OPTIONS.AUTO_WRAP_OFF); } Modified: trunk/test-integration/db/src/test/java/org/teiid/test/testcases/OnWrapTransactionTests.java =================================================================== --- trunk/test-integration/db/src/test/java/org/teiid/test/testcases/OnWrapTransactionTests.java 2009-12-21 20:06:52 UTC (rev 1690) +++ trunk/test-integration/db/src/test/java/org/teiid/test/testcases/OnWrapTransactionTests.java 2009-12-21 20:10:26 UTC (rev 1691) @@ -7,9 +7,10 @@ import java.util.ArrayList; import org.teiid.test.framework.TransactionContainer; +import org.teiid.test.framework.ConfigPropertyNames.TXN_AUTO_WRAP_OPTIONS; import org.teiid.test.framework.query.AbstractQueryTransactionTest; import org.teiid.test.framework.query.QueryExecution; -import org.teiid.test.framework.transaction.OnWrapTransaction; +import org.teiid.test.framework.transaction.AutoCommitTransaction; import com.metamatrix.jdbc.api.AbstractQueryTest; @@ -25,8 +26,7 @@ @Override protected TransactionContainer getTransactionContainter() { - // TODO Auto-generated method stub - return new OnWrapTransaction(); + return new AutoCommitTransaction(TXN_AUTO_WRAP_OPTIONS.AUTO_WRAP_ON); } /**