[jboss-svn-commits] JBL Code SVN: r28246 - labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Jul 20 12:07:30 EDT 2009
Author: jhalliday
Date: 2009-07-20 12:07:30 -0400 (Mon, 20 Jul 2009)
New Revision: 28246
Modified:
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jdbcresources01_mssqlserver_jndi.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jdbcresources02_abstract.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jdbcresources02_mssqlserver_jndi.java
Log:
Fix broken JDBC tests. JBTM-390
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jdbcresources01_mssqlserver_jndi.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jdbcresources01_mssqlserver_jndi.java 2009-07-20 15:09:40 UTC (rev 28245)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jdbcresources01_mssqlserver_jndi.java 2009-07-20 16:07:30 UTC (rev 28246)
@@ -27,10 +27,10 @@
}
public String getDBName1() {
- return "DB1_SQL_JNDI";
+ return "DB_SQL1_JNDI";
}
public String getDBName2() {
- return "DB2_SQL_JNDI";
+ return "DB_SQL2_JNDI";
}
}
\ No newline at end of file
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jdbcresources02_abstract.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jdbcresources02_abstract.java 2009-07-20 15:09:40 UTC (rev 28245)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jdbcresources02_abstract.java 2009-07-20 16:07:30 UTC (rev 28246)
@@ -414,13 +414,13 @@
Task setup1 = createTask("setup1", org.jboss.jbossts.qa.Utils.JNDIManager.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
setup1.perform(getDBName2());
Task setup2 = createTask("setup2", org.jboss.jbossts.qa.JDBCResources02Setups.Setup02.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- setup2.perform("DB1_THIN_JNDI");
+ setup2.perform(getDBName1());
Task setup3 = createTask("setup3", org.jboss.jbossts.qa.JDBCResources02Setups.Setup02.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
setup3.perform(getDBName2());
Task server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
server0.start("-test");
Task server1 = createTask("server1", org.jboss.jbossts.qa.JDBCResources02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
- server1.start("DB1_THIN_JNDI", "$(1)");
+ server1.start(getDBName1(), "$(1)");
Task server2 = createTask("server2", org.jboss.jbossts.qa.JDBCResources02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
server2.start(getDBName2(), "$(2)");
Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCResources02Clients.Client12.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
@@ -439,13 +439,13 @@
Task setup1 = createTask("setup1", org.jboss.jbossts.qa.Utils.JNDIManager.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
setup1.perform(getDBName2());
Task setup2 = createTask("setup2", org.jboss.jbossts.qa.JDBCResources02Setups.Setup02.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- setup2.perform("DB1_THIN_JNDI");
+ setup2.perform(getDBName1());
Task setup3 = createTask("setup3", org.jboss.jbossts.qa.JDBCResources02Setups.Setup02.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
setup3.perform(getDBName2());
Task server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
server0.start("-test");
Task server1 = createTask("server1", org.jboss.jbossts.qa.JDBCResources02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
- server1.start("DB1_THIN_JNDI", "$(1)");
+ server1.start(getDBName1(), "$(1)");
Task server2 = createTask("server2", org.jboss.jbossts.qa.JDBCResources02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
server2.start(getDBName2(), "$(2)");
Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCResources02Clients.Client13.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
@@ -464,13 +464,13 @@
Task setup1 = createTask("setup1", org.jboss.jbossts.qa.Utils.JNDIManager.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
setup1.perform(getDBName2());
Task setup2 = createTask("setup2", org.jboss.jbossts.qa.JDBCResources02Setups.Setup02.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- setup2.perform("DB1_THIN_JNDI");
+ setup2.perform(getDBName1());
Task setup3 = createTask("setup3", org.jboss.jbossts.qa.JDBCResources02Setups.Setup02.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
setup3.perform(getDBName2());
Task server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
server0.start("-test");
Task server1 = createTask("server1", org.jboss.jbossts.qa.JDBCResources02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
- server1.start("DB1_THIN_JNDI", "$(1)");
+ server1.start(getDBName1(), "$(1)");
Task server2 = createTask("server2", org.jboss.jbossts.qa.JDBCResources02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
server2.start(getDBName2(), "$(2)");
Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCResources02Clients.Client14.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
@@ -489,13 +489,13 @@
Task setup1 = createTask("setup1", org.jboss.jbossts.qa.Utils.JNDIManager.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
setup1.perform(getDBName2());
Task setup2 = createTask("setup2", org.jboss.jbossts.qa.JDBCResources02Setups.Setup02.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- setup2.perform("DB1_THIN_JNDI");
+ setup2.perform(getDBName1());
Task setup3 = createTask("setup3", org.jboss.jbossts.qa.JDBCResources02Setups.Setup02.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
setup3.perform(getDBName2());
Task server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
server0.start("-test");
Task server1 = createTask("server1", org.jboss.jbossts.qa.JDBCResources02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
- server1.start("DB1_THIN_JNDI", "$(1)");
+ server1.start(getDBName1(), "$(1)");
Task server2 = createTask("server2", org.jboss.jbossts.qa.JDBCResources02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
server2.start(getDBName2(), "$(2)");
Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCResources02Clients.Client15.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
@@ -514,13 +514,13 @@
Task setup1 = createTask("setup1", org.jboss.jbossts.qa.Utils.JNDIManager.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
setup1.perform(getDBName2());
Task setup2 = createTask("setup2", org.jboss.jbossts.qa.JDBCResources02Setups.Setup02.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- setup2.perform("DB1_THIN_JNDI");
+ setup2.perform(getDBName1());
Task setup3 = createTask("setup3", org.jboss.jbossts.qa.JDBCResources02Setups.Setup02.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
setup3.perform(getDBName2());
Task server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
server0.start("-test");
Task server1 = createTask("server1", org.jboss.jbossts.qa.JDBCResources02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
- server1.start("DB1_THIN_JNDI", "$(1)");
+ server1.start(getDBName1(), "$(1)");
Task server2 = createTask("server2", org.jboss.jbossts.qa.JDBCResources02Servers.Server01.class, Task.TaskType.EXPECT_READY, 480);
server2.start(getDBName2(), "$(2)");
Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCResources02Clients.Client16.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
@@ -539,13 +539,13 @@
Task setup1 = createTask("setup1", org.jboss.jbossts.qa.Utils.JNDIManager.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
setup1.perform(getDBName2());
Task setup2 = createTask("setup2", org.jboss.jbossts.qa.JDBCResources02Setups.Setup02.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- setup2.perform("DB1_THIN_JNDI");
+ setup2.perform(getDBName1());
Task setup3 = createTask("setup3", org.jboss.jbossts.qa.JDBCResources02Setups.Setup02.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
setup3.perform(getDBName2());
Task server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
server0.start("-test");
Task server1 = createTask("server1", org.jboss.jbossts.qa.JDBCResources02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
- server1.start("DB1_THIN_JNDI", "$(1)");
+ server1.start(getDBName1(), "$(1)");
Task server2 = createTask("server2", org.jboss.jbossts.qa.JDBCResources02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
server2.start(getDBName2(), "$(2)");
Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCResources02Clients.Client12.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
@@ -564,13 +564,13 @@
Task setup1 = createTask("setup1", org.jboss.jbossts.qa.Utils.JNDIManager.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
setup1.perform(getDBName2());
Task setup2 = createTask("setup2", org.jboss.jbossts.qa.JDBCResources02Setups.Setup02.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- setup2.perform("DB1_THIN_JNDI");
+ setup2.perform(getDBName1());
Task setup3 = createTask("setup3", org.jboss.jbossts.qa.JDBCResources02Setups.Setup02.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
setup3.perform(getDBName2());
Task server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
server0.start("-test");
Task server1 = createTask("server1", org.jboss.jbossts.qa.JDBCResources02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
- server1.start("DB1_THIN_JNDI", "$(1)");
+ server1.start(getDBName1(), "$(1)");
Task server2 = createTask("server2", org.jboss.jbossts.qa.JDBCResources02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
server2.start(getDBName2(), "$(2)");
Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCResources02Clients.Client13.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
@@ -589,13 +589,13 @@
Task setup1 = createTask("setup1", org.jboss.jbossts.qa.Utils.JNDIManager.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
setup1.perform(getDBName2());
Task setup2 = createTask("setup2", org.jboss.jbossts.qa.JDBCResources02Setups.Setup02.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- setup2.perform("DB1_THIN_JNDI");
+ setup2.perform(getDBName1());
Task setup3 = createTask("setup3", org.jboss.jbossts.qa.JDBCResources02Setups.Setup02.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
setup3.perform(getDBName2());
Task server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
server0.start("-test");
Task server1 = createTask("server1", org.jboss.jbossts.qa.JDBCResources02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
- server1.start("DB1_THIN_JNDI", "$(1)");
+ server1.start(getDBName1(), "$(1)");
Task server2 = createTask("server2", org.jboss.jbossts.qa.JDBCResources02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
server2.start(getDBName2(), "$(2)");
Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCResources02Clients.Client14.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
@@ -614,13 +614,13 @@
Task setup1 = createTask("setup1", org.jboss.jbossts.qa.Utils.JNDIManager.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
setup1.perform(getDBName2());
Task setup2 = createTask("setup2", org.jboss.jbossts.qa.JDBCResources02Setups.Setup02.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- setup2.perform("DB1_THIN_JNDI");
+ setup2.perform(getDBName1());
Task setup3 = createTask("setup3", org.jboss.jbossts.qa.JDBCResources02Setups.Setup02.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
setup3.perform(getDBName2());
Task server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
server0.start("-test");
Task server1 = createTask("server1", org.jboss.jbossts.qa.JDBCResources02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
- server1.start("DB1_THIN_JNDI", "$(1)");
+ server1.start(getDBName1(), "$(1)");
Task server2 = createTask("server2", org.jboss.jbossts.qa.JDBCResources02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
server2.start(getDBName2(), "$(2)");
Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCResources02Clients.Client15.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
@@ -639,13 +639,13 @@
Task setup1 = createTask("setup1", org.jboss.jbossts.qa.Utils.JNDIManager.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
setup1.perform(getDBName2());
Task setup2 = createTask("setup2", org.jboss.jbossts.qa.JDBCResources02Setups.Setup02.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- setup2.perform("DB1_THIN_JNDI");
+ setup2.perform(getDBName1());
Task setup3 = createTask("setup3", org.jboss.jbossts.qa.JDBCResources02Setups.Setup02.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
setup3.perform(getDBName2());
Task server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
server0.start("-test");
Task server1 = createTask("server1", org.jboss.jbossts.qa.JDBCResources02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
- server1.start("DB1_THIN_JNDI", "$(1)");
+ server1.start(getDBName1(), "$(1)");
Task server2 = createTask("server2", org.jboss.jbossts.qa.JDBCResources02Servers.Server02.class, Task.TaskType.EXPECT_READY, 480);
server2.start(getDBName2(), "$(2)");
Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCResources02Clients.Client16.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jdbcresources02_mssqlserver_jndi.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jdbcresources02_mssqlserver_jndi.java 2009-07-20 15:09:40 UTC (rev 28245)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jdbcresources02_mssqlserver_jndi.java 2009-07-20 16:07:30 UTC (rev 28246)
@@ -27,10 +27,10 @@
}
public String getDBName1() {
- return "DB1_SQL_JNDI";
+ return "DB_SQL1_JNDI";
}
public String getDBName2() {
- return "DB2_SQL_JNDI";
+ return "DB_SQL2_JNDI";
}
}
\ No newline at end of file
More information about the jboss-svn-commits
mailing list