Author: vhalbert(a)redhat.com
Date: 2009-09-22 15:08:41 -0400 (Tue, 22 Sep 2009)
New Revision: 1454
Modified:
trunk/test-integration/db/src/test/java/org/teiid/test/framework/AbstractQueryTransactionTest.java
trunk/test-integration/db/src/test/java/org/teiid/test/testcases/SingleSourceTransactionScenarios.java
trunk/test-integration/db/src/test/java/org/teiid/test/testcases/TwoSourceTransactionScenarios.java
trunk/test-integration/db/src/test/java/org/teiid/test/testcases/XATransactionDatasourceFalseOffTest.java
Log:
Teiid 773 - setting up the xa transaction tests
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-22
19:08:03 UTC (rev 1453)
+++
trunk/test-integration/db/src/test/java/org/teiid/test/framework/AbstractQueryTransactionTest.java 2009-09-22
19:08:41 UTC (rev 1454)
@@ -138,10 +138,14 @@
}
+ /**
+ * At end of each test, clean up the connection factory so that it can be
+ * established at the start of the next test.
+ */
public void cleanup() {
ConnectionStrategyFactory.destroyInstance();
- this.closeConnection();
+ // this.closeConnection();
}
@Override
Modified:
trunk/test-integration/db/src/test/java/org/teiid/test/testcases/SingleSourceTransactionScenarios.java
===================================================================
---
trunk/test-integration/db/src/test/java/org/teiid/test/testcases/SingleSourceTransactionScenarios.java 2009-09-22
19:08:03 UTC (rev 1453)
+++
trunk/test-integration/db/src/test/java/org/teiid/test/testcases/SingleSourceTransactionScenarios.java 2009-09-22
19:08:41 UTC (rev 1454)
@@ -45,11 +45,7 @@
// run test
getTransactionContainter().runTransaction(userTxn);
-
- // there is nothing to verify here..
-
- System.out.println("Complete testSingleSourceSelect");
-
+
}
@@ -76,9 +72,6 @@
// run test
getTransactionContainter().runTransaction(userTxn);
-
-
- System.out.println("Complete testSingleSourceUpdate");
}
@@ -105,10 +98,7 @@
// run test
getTransactionContainter().runTransaction(userTxn);
-
-
- System.out.println("Complete testSingleSourcePreparedUpdate");
-
+
}
/**
@@ -147,9 +137,6 @@
// run test
getTransactionContainter().runTransaction(userTxn);
-
- System.out.println("Complete testSingleSourceMultipleCommands");
-
}
/**
@@ -171,8 +158,6 @@
// run test
getTransactionContainter().runTransaction(userTxn);
-
- System.out.println("Complete testSingleSourcePartialProcessing");
}
@@ -223,9 +208,7 @@
// run test
getTransactionContainter().runTransaction(userTxn);
-
- System.out.println("Complete
testSingleSourceMultipleCommandsExplicitRollback");
-
+
}
/**
@@ -264,8 +247,6 @@
// run test
getTransactionContainter().runTransaction(userTxn);
-
- System.out.println("Complete
testSingleSourceMultipleCommandsReferentialIntegrityRollback");
}
Modified:
trunk/test-integration/db/src/test/java/org/teiid/test/testcases/TwoSourceTransactionScenarios.java
===================================================================
---
trunk/test-integration/db/src/test/java/org/teiid/test/testcases/TwoSourceTransactionScenarios.java 2009-09-22
19:08:03 UTC (rev 1453)
+++
trunk/test-integration/db/src/test/java/org/teiid/test/testcases/TwoSourceTransactionScenarios.java 2009-09-22
19:08:41 UTC (rev 1454)
@@ -52,9 +52,7 @@
// run test
getTransactionContainter().runTransaction(userTxn);
-
- System.out.println("Complete testMultipleSourceSelect");
-
+
}
/**
@@ -64,7 +62,7 @@
* result = commit
*/
public void testMultipleSourceViewSelect() throws Exception {
- AbstractQueryTransactionTest userTxn = new
AbstractQueryTransactionTest("testMultipleSourceVirtualSelect") {
+ AbstractQueryTransactionTest userTxn = new
AbstractQueryTransactionTest("testMultipleSourceViewSelect") {
public void testCase() throws Exception {
execute("select * from vm.g1 where vm.g1.pm1e1 < 100");
assertRowCount(100);
@@ -80,9 +78,7 @@
// run test
getTransactionContainter().runTransaction(userTxn);
-
- System.out.println("Complete testMultipleSourceVirtualSelect");
-
+
}
/**
@@ -92,7 +88,7 @@
* result = commit
*/
public void testMultipleSourceViewUpdate() throws Exception {
- AbstractQueryTransactionTest userTxn = new
AbstractQueryTransactionTest("testMultipleSourceUpdate") {
+ AbstractQueryTransactionTest userTxn = new
AbstractQueryTransactionTest("testMultipleSourceViewUpdate") {
public void testCase() throws Exception {
execute("insert into vm.g1 (pm1e1, pm1e2, pm2e1, pm2e2) values(500,
'500', 500, '500')");
}
@@ -120,9 +116,7 @@
// run test
getTransactionContainter().runTransaction(userTxn);
-
- System.out.println("Complete testMultipleSourceUpdate");
-
+
}
/**
@@ -161,8 +155,6 @@
// run test
getTransactionContainter().runTransaction(userTxn);
-
- System.out.println("Complete testMultipleSourceViewSelectInto");
}
@@ -209,10 +201,7 @@
// run test
getTransactionContainter().runTransaction(userTxn);
-
- System.out.println("Complete testMultipleSourceViewBulkRowInsert");
-
- }
+ }
/**
* Sources = 2
@@ -261,10 +250,7 @@
// run test
getTransactionContainter().runTransaction(userTxn);
-
-
- System.out.println("Complete
testMultipleSourceViewBulkRowInsertRollback");
-
+
}
@@ -303,9 +289,7 @@
// run test
getTransactionContainter().runTransaction(userTxn);
-
- System.out.println("Complete testMultipleSourceViewPreparedUpdate");
-
+
}
@@ -368,10 +352,7 @@
// run test
getTransactionContainter().runTransaction(userTxn);
-
- System.out.println("Complete testMultipleSourceMultipleCommands");
-
-
+
}
/**
@@ -421,9 +402,7 @@
// run test
getTransactionContainter().runTransaction(userTxn);
- System.out.println("Complete testMultipleSourceViewMultipleCommands");
-
}
/**
@@ -484,9 +463,6 @@
// run test
getTransactionContainter().runTransaction(userTxn);
-
- System.out.println("Complete
testMultipleSourceViewMultipleCommandsRollback");
-
}
@@ -544,8 +520,6 @@
};
getTransactionContainter().runTransaction(userTxn);
-
- System.out.println("Complete
testMultipleSourceMultipleCommandsCancel");
}
@@ -604,8 +578,6 @@
// run test
getTransactionContainter().runTransaction(userTxn);
- System.out.println("Complete
testMultipleSourceMultipleCommandsExplicitRollback");
-
}
/**
@@ -658,9 +630,6 @@
// run test
getTransactionContainter().runTransaction(userTxn);
-
- System.out.println("Complete
testMultipleSourceMultipleCommandsReferentialIntegrityRollback");
-
}
@@ -713,10 +682,7 @@
};
getTransactionContainter().runTransaction(userTxn);
-
-
- System.out.println("Complete testMultipleSourceTimeout");
-
+
}
@@ -769,9 +735,7 @@
// run test
getTransactionContainter().runTransaction(userTxn);
-
- System.out.println("Complete
testMultipleSourceViewPartialProcessingUsingLimit");
-
+
}
/**
@@ -801,9 +765,7 @@
// run test
getTransactionContainter().runTransaction(userTxn);
-
- System.out.println("Complete
testMultipleSourcePartialProcessingUsingMakedep");
-
+
}
Modified:
trunk/test-integration/db/src/test/java/org/teiid/test/testcases/XATransactionDatasourceFalseOffTest.java
===================================================================
---
trunk/test-integration/db/src/test/java/org/teiid/test/testcases/XATransactionDatasourceFalseOffTest.java 2009-09-22
19:08:03 UTC (rev 1453)
+++
trunk/test-integration/db/src/test/java/org/teiid/test/testcases/XATransactionDatasourceFalseOffTest.java 2009-09-22
19:08:41 UTC (rev 1454)
@@ -18,19 +18,28 @@
* - Autocommit = True
* - TxnAutoWrap = Off
*/
-public class XATransactionDatasourceFalseOffTest extends TwoSourceTransactionScenarios {
-
+//public class XATransactionDatasourceFalseOffTest extends
SingleSourceTransactionScenarios {
+
+ public class XATransactionDatasourceFalseOffTest extends TwoSourceTransactionScenarios
{
+
+
+
public XATransactionDatasourceFalseOffTest(String name) {
super(name);
}
@Override
protected void setUp() throws Exception {
+
+ //XATransactions currently doesn't support using sqlserver
+ //{@see TEIID-559}
+ System.setProperty(ConfigPropertyNames.EXCLUDE_DATASBASE_TYPES_PROP,
"sqlserver");
+
System.setProperty(ConfigPropertyNames.CONFIG_FILE,
"xa-config.properties");
System.setProperty(ConfigPropertyNames.CONNECTION_TYPE,
ConfigPropertyNames.CONNECTION_TYPES.DATASOURCE_CONNECTION);
System.setProperty(ConnectionStrategy.AUTOCOMMIT, "false");
- System.setProperty(ConnectionStrategy.TXN_AUTO_WRAP, "off");
+ // System.setProperty(ConnectionStrategy.TXN_AUTO_WRAP, "on");
}