[jboss-svn-commits] JBL Code SVN: r30179 - in labs/jbosstm/trunk/qa: tests/src/org/jboss/jbossts/qa/Utils and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Nov 16 10:01:08 EST 2009
Author: jhalliday
Date: 2009-11-16 10:01:07 -0500 (Mon, 16 Nov 2009)
New Revision: 30179
Added:
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jdbclocals01_abstract.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jdbclocals01_mssqlserver_jndi.java
Removed:
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jdbclocals01_ms_sql_jndi.java
Modified:
labs/jbosstm/trunk/qa/TaskImpl.properties
labs/jbosstm/trunk/qa/run-tests.xml
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/JNDIManager.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/TaskImpl.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jdbclocals01_ibmdb2_jndi.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jdbclocals01_mysql_jndi.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jdbclocals01_oracle_jndi.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jdbclocals01_postgresql_jndi.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jdbclocals01_sybase_jndi.java
Log:
Clean up jdbc tests. JBTM-390
Modified: labs/jbosstm/trunk/qa/TaskImpl.properties
===================================================================
--- labs/jbosstm/trunk/qa/TaskImpl.properties 2009-11-16 13:22:38 UTC (rev 30178)
+++ labs/jbosstm/trunk/qa/TaskImpl.properties 2009-11-16 15:01:07 UTC (rev 30179)
@@ -52,8 +52,8 @@
# properties used by the tests or test framework:
#
COMMAND_LINE_3=-Dqa.debug=true
-COMMAND_LINE_4=-DContext.PROVIDER_URL=file:///tmp
-COMMAND_LINE_5=-DContext.INITIAL_CONTEXT_FACTORY=com.sun.jndi.fscontext.RefFSContextFactory
+COMMAND_LINE_4=-Djava.naming.provider.url=file:///tmp
+COMMAND_LINE_5=-Djava.naming.factory.initial=com.sun.jndi.fscontext.RefFSContextFactory
COMMAND_LINE_6=-Dperformanceprofilestore.dir=config/perf_profiles/
COMMAND_LINE_7=-Djdbcprofilestore.dir=config/jdbc_profiles
COMMAND_LINE_8=-Dmemorytestprofilestore.dir=config/memory_profiles/
Modified: labs/jbosstm/trunk/qa/run-tests.xml
===================================================================
--- labs/jbosstm/trunk/qa/run-tests.xml 2009-11-16 13:22:38 UTC (rev 30178)
+++ labs/jbosstm/trunk/qa/run-tests.xml 2009-11-16 15:01:07 UTC (rev 30179)
@@ -250,8 +250,11 @@
</target>
<target name="jta">
- <property name="use_jta_mode" value="true"/>
+ <!-- override the config file, so that we can run jta mode tests even with jts binaries -->
+ <property name="additional.elements"
+ value="-Dcom.arjuna.ats.arjuna.common.propertiesFile=../ArjunaJTA/jbossts-properties-arjunajta.xml"/>
+
<!-- txcore: 352 tests, 3.5 hrs
Some memory tests fail, see JBTM-555 -->
<!-- <antcall target="junit-tests"><param name="tests" value="txcore"/></antcall> -->
@@ -262,7 +265,7 @@
<!-- jdbclocals01 : 6 tests, 2 minutes for each db -->
<antcall target="install-dbdriver"><param name="files" value="ojdbc14.jar"/></antcall>
- <antcall target="junit-tests"><param name="tests" value="jdbclocals01-oracle_jndi"/></antcall>
+ <antcall target="junit-tests"><param name="tests" value="jdbclocals01_oracle_jndi"/></antcall>
<!-- mssql needs different .jar for jdk 1.5 vs. 1.6 runtime -->
<condition property="mssql.driver" value="sqljdbc4.jar">
@@ -270,20 +273,20 @@
</condition>
<property name="mssql.driver" value="sqljdbc.jar"/>
<antcall target="install-dbdriver"><param name="files" value="${mssql.driver}"/></antcall>
- <antcall target="junit-tests"><param name="tests" value="jdbclocals01-mssql_jndi"/></antcall>
+ <antcall target="junit-tests"><param name="tests" value="jdbclocals01_mssqlserver_jndi"/></antcall>
- <antcall target="install-dbdriver"><param name="files" value="db2*"/></antcall>
- <antcall target="junit-tests"><param name="tests" value="jdbclocals01-ibmdb2_jndi"/></antcall>
-
<antcall target="install-dbdriver"><param name="files" value="postgresql-8.3-603.jdbc3.jar"/></antcall>
- <antcall target="junit-tests"><param name="tests" value="jdbclocals01-pgsql_jndi"/></antcall>
+ <antcall target="junit-tests"><param name="tests" value="jdbclocals01_pgsql_jndi"/></antcall>
<antcall target="install-dbdriver"><param name="files" value="mysql-connector-java-5.1.7-bin.jar"/></antcall>
- <antcall target="junit-tests"><param name="tests" value="jdbclocals01-mysql_jndi"/></antcall>
+ <antcall target="junit-tests"><param name="tests" value="jdbclocals01_mysql_jndi"/></antcall>
<antcall target="install-dbdriver"><param name="files" value="jconn3.jar"/></antcall>
- <antcall target="junit-tests"><param name="tests" value="jdbclocals01-sybase_jndi"/></antcall>
+ <antcall target="junit-tests"><param name="tests" value="jdbclocals01_sybase_jndi"/></antcall>
+ <antcall target="install-dbdriver"><param name="files" value="db2*"/></antcall>
+ <antcall target="junit-tests"><param name="tests" value="jdbclocals01_ibmdb2_jndi"/></antcall>
+
</target>
<target name="performance">
@@ -306,6 +309,9 @@
<!-- pass in a param to override this. by default run everything. -->
<property name="names" value=".*"/>
+ <!-- pass in param to override this. By default, the TaskImpl.properties are not modified -->
+ <property name="additional.elements" value=""/>
+
<!-- TODO support JTA mode testing of JTS .jar files? -
would need classpath munging for props file in TaskImpl.properties -->
@@ -347,6 +353,7 @@
<test name="org.jboss.jbossts.qa.junit.testgroup.TestGroup_${tests}"/>
<sysproperty key="names" value="${names}"/>
+ <sysproperty key="additional.elements" value="${additional.elements}"/>
<!--<jvmarg value="-Xdebug"/>-->
<!--<jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006"/>-->
@@ -363,13 +370,6 @@
aitresources01.java
crashrecovery13.java
-jdbclocals01_ibmdb2_jndi.java
-jdbclocals01_ms_sql_jndi.java
-jdbclocals01_mysql_jndi.java
-jdbclocals01_oracle_jndi.java
-jdbclocals01_postgresql_jndi.java
-jdbclocals01_sybase_jndi.java
-
jdbcresources03_oracle_thin_jndi.java
jdbcresources04_oracle_thin_jndi.java
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/JNDIManager.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/JNDIManager.java 2009-11-16 13:22:38 UTC (rev 30178)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/JNDIManager.java 2009-11-16 15:01:07 UTC (rev 30179)
@@ -167,18 +167,10 @@
//
try
{
- Hashtable env = new Hashtable();
- String initialCtx = System.getProperty("Context.INITIAL_CONTEXT_FACTORY");
- String bindingsLocation = System.getProperty("Context.PROVIDER_URL");
+ // expect suitable java.naming.provider.url and java.naming.factory.initial
+ // system properties have been set.
+ InitialContext ctx = new InitialContext();
- if (bindingsLocation != null)
- {
- env.put(Context.PROVIDER_URL, bindingsLocation);
- }
-
- env.put(Context.INITIAL_CONTEXT_FACTORY, initialCtx);
- InitialContext ctx = new InitialContext(env);
-
ctx.rebind(binding, xaDataSourceToBind);
System.out.println("bound "+binding);
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/TaskImpl.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/TaskImpl.java 2009-11-16 13:22:38 UTC (rev 30178)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/TaskImpl.java 2009-11-16 15:01:07 UTC (rev 30179)
@@ -44,6 +44,8 @@
private final static String PROPERTIES_FILE = "TaskImpl.properties";
+ private final static List<String> additionalCommandLineElements = new LinkedList<String>();
+
private static Properties properties = new Properties();
static {
try {
@@ -70,6 +72,18 @@
properties.setProperty(name, mungedvalue);
}
+ // in addition to the props file, we allow properties via. "additional.properties" var
+
+ String additionalElementString = System.getProperty("additional.elements");
+ if(additionalElementString != null) {
+ String[] additionalElements = additionalElementString.split("\\s+");
+ for(String element : additionalElements) {
+ if(element.length() > 0) {
+ addCommandLineElement(element);
+ }
+ }
+ }
+
} catch(Exception e) {
throw new ExceptionInInitializerError(e);
}
@@ -132,9 +146,6 @@
*/
private TaskErrorReaderThread taskErrorReaderThread;
- // allow appending to the command line on a per-instance basis for e.g. extra "-Dcom.arjuna.foo=bar" statements.
- private List<String> additionalCommandLineElements = new LinkedList<String>();
-
/**
* create a new task
* @param clazz the task whose main method is to be executed in a JVM running in a subprocess
@@ -504,7 +515,7 @@
// private implementation
/**
- * construct an execable command line to execute the supplied java class with the arguments in params,
+ * construct an executable command line to execute the supplied java class with the arguments in params,
* substituting those in the form $(...) with corresponding values derived from the properties file.
* @param classname
* @param params
@@ -539,7 +550,7 @@
return list.toArray(new String[list.size()]);
}
- public void addCommandLineElement(String additionalCommandLineElement)
+ public static void addCommandLineElement(String additionalCommandLineElement)
{
additionalCommandLineElements.add(additionalCommandLineElement);
}
Copied: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jdbclocals01_abstract.java (from rev 30165, labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jdbclocals01_oracle_jndi.java)
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jdbclocals01_abstract.java (rev 0)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jdbclocals01_abstract.java 2009-11-16 15:01:07 UTC (rev 30179)
@@ -0,0 +1,110 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2009,
+ * @author JBoss Inc.
+ */
+package org.jboss.jbossts.qa.junit.testgroup;
+
+import org.jboss.jbossts.qa.junit.*;
+import org.junit.*;
+
+// Automatically generated by XML2JUnit
+public class TestGroup_jdbclocals01_abstract extends TestGroupBase
+{
+ public String getTestGroupName()
+ {
+ return "jdbclocals01_abstract";
+ }
+
+ public String getDBName1() {
+ return "THIS_DB_NAME_MUST_BE_OVERRIDDEN";
+ }
+
+ protected Task server0 = null;
+
+ @Before public void setUp()
+ {
+ super.setUp();
+ Task task0 = createTask("task0", org.jboss.jbossts.qa.Utils.JNDIManager.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+ task0.perform(getDBName1());
+ Task setup = createTask("setup", org.jboss.jbossts.qa.JDBCLocals01Setups.Setup01.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+ setup.perform(getDBName1());
+ server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
+ server0.start("-test");
+ }
+
+ @After public void tearDown()
+ {
+ try {
+ server0.terminate();
+ Task cleanup = createTask("cleanup", org.jboss.jbossts.qa.JDBCLocals01Cleanups.Cleanup01.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+ cleanup.perform(getDBName1());
+ } finally {
+ super.tearDown();
+ }
+ }
+
+ @Test public void JDBCLocals01_abstract_Test001()
+ {
+ setTestName("Test001");
+ Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCLocals01.Client01.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+ client0.start(getDBName1());
+ client0.waitFor();
+ }
+
+ @Test public void JDBCLocals01_abstract_Test002()
+ {
+ setTestName("Test002");
+ Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCLocals01.Client02.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+ client0.start(getDBName1());
+ client0.waitFor();
+ }
+
+ @Test public void JDBCLocals01_abstract_Test003()
+ {
+ setTestName("Test003");
+ Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCLocals01.Client03.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+ client0.start(getDBName1());
+ client0.waitFor();
+ }
+
+ @Test public void JDBCLocals01_abstract_Test004()
+ {
+ setTestName("Test004");
+ Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCLocals01.Client04.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+ client0.start(getDBName1());
+ client0.waitFor();
+ }
+
+ @Test public void JDBCLocals01_abstract_Test005()
+ {
+ setTestName("Test005");
+ Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCLocals01.Client05.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+ client0.start(getDBName1());
+ client0.waitFor();
+ }
+
+ @Test public void JDBCLocals01_abstract_Test006()
+ {
+ setTestName("Test006");
+ Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCLocals01.Client06.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+ client0.start(getDBName1());
+ client0.waitFor();
+ }
+
+}
\ No newline at end of file
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jdbclocals01_ibmdb2_jndi.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jdbclocals01_ibmdb2_jndi.java 2009-11-16 13:22:38 UTC (rev 30178)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jdbclocals01_ibmdb2_jndi.java 2009-11-16 15:01:07 UTC (rev 30179)
@@ -24,83 +24,14 @@
import org.junit.*;
// Automatically generated by XML2JUnit
-public class TestGroup_jdbclocals01_ibmdb2_jndi extends TestGroupBase
+public class TestGroup_jdbclocals01_ibmdb2_jndi extends TestGroup_jdbclocals01_abstract
{
public String getTestGroupName()
{
return "jdbclocals01_ibmdb2_jndi";
}
- protected Task server0 = null;
-
- @Before public void setUp()
- {
- super.setUp();
- Task task0 = createTask("task0", org.jboss.jbossts.qa.Utils.JNDIManager.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- task0.perform("DB_IBMDB2_JNDI");
- Task setup = createTask("setup", org.jboss.jbossts.qa.JDBCLocals01Setups.Setup01.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- setup.perform("DB_IBMDB2_JNDI");
- server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
- server0.start("-test");
- }
-
- @After public void tearDown()
- {
- try {
- server0.terminate();
- Task cleanup = createTask("cleanup", org.jboss.jbossts.qa.JDBCLocals01Cleanups.Cleanup01.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- cleanup.perform("DB_IBMDB2_JNDI");
- } finally {
- super.tearDown();
- }
- }
-
- @Test public void JDBCLocals01_ibmdb2_JNDI_Test001()
- {
- setTestName("Test001");
- Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCLocals01.Client01.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- client0.start("DB_IBMDB2_JNDI");
- client0.waitFor();
- }
-
- @Test public void JDBCLocals01_ibmdb2_JNDI_Test002()
- {
- setTestName("Test002");
- Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCLocals01.Client02.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- client0.start("DB_IBMDB2_JNDI");
- client0.waitFor();
- }
-
- @Test public void JDBCLocals01_ibmdb2_JNDI_Test003()
- {
- setTestName("Test003");
- Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCLocals01.Client03.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- client0.start("DB_IBMDB2_JNDI");
- client0.waitFor();
- }
-
- @Test public void JDBCLocals01_ibmdb2_JNDI_Test004()
- {
- setTestName("Test004");
- Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCLocals01.Client04.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- client0.start("DB_IBMDB2_JNDI");
- client0.waitFor();
- }
-
- @Test public void JDBCLocals01_ibmdb2_JNDI_Test005()
- {
- setTestName("Test005");
- Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCLocals01.Client05.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- client0.start("DB_IBMDB2_JNDI");
- client0.waitFor();
- }
-
- @Test public void JDBCLocals01_ibmdb2_JNDI_Test006()
- {
- setTestName("Test006");
- Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCLocals01.Client06.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- client0.start("DB_IBMDB2_JNDI");
- client0.waitFor();
- }
-
+ public String getDBName1() {
+ return "DB_IBMDB2_JNDI";
+ }
}
\ No newline at end of file
Deleted: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jdbclocals01_ms_sql_jndi.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jdbclocals01_ms_sql_jndi.java 2009-11-16 13:22:38 UTC (rev 30178)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jdbclocals01_ms_sql_jndi.java 2009-11-16 15:01:07 UTC (rev 30179)
@@ -1,106 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2009,
- * @author JBoss Inc.
- */
-package org.jboss.jbossts.qa.junit.testgroup;
-
-import org.jboss.jbossts.qa.junit.*;
-import org.junit.*;
-
-// Automatically generated by XML2JUnit
-public class TestGroup_jdbclocals01_ms_sql_jndi extends TestGroupBase
-{
- public String getTestGroupName()
- {
- return "jdbclocals01_ms_sql_jndi";
- }
-
- protected Task server0 = null;
-
- @Before public void setUp()
- {
- super.setUp();
- Task task0 = createTask("task0", org.jboss.jbossts.qa.Utils.JNDIManager.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- task0.perform("DB_SQL_JNDI");
- Task setup = createTask("setup", org.jboss.jbossts.qa.JDBCLocals01Setups.Setup01.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- setup.perform("DB_SQL_JNDI");
- server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
- server0.start("-test");
- }
-
- @After public void tearDown()
- {
- try {
- server0.terminate();
- Task cleanup = createTask("cleanup", org.jboss.jbossts.qa.JDBCLocals01Cleanups.Cleanup01.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- cleanup.perform("DB_SQL_JNDI");
- } finally {
- super.tearDown();
- }
- }
-
- @Test public void JDBCLocals01_MS_SQL_JNDI_Test001()
- {
- setTestName("Test001");
- Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCLocals01.Client01.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- client0.start("DB_SQL_JNDI");
- client0.waitFor();
- }
-
- @Test public void JDBCLocals01_MS_SQL_JNDI_Test002()
- {
- setTestName("Test002");
- Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCLocals01.Client02.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- client0.start("DB_SQL_JNDI");
- client0.waitFor();
- }
-
- @Test public void JDBCLocals01_MS_SQL_JNDI_Test003()
- {
- setTestName("Test003");
- Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCLocals01.Client03.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- client0.start("DB_SQL_JNDI");
- client0.waitFor();
- }
-
- @Test public void JDBCLocals01_MS_SQL_JNDI_Test004()
- {
- setTestName("Test004");
- Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCLocals01.Client04.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- client0.start("DB_SQL_JNDI");
- client0.waitFor();
- }
-
- @Test public void JDBCLocals01_MS_SQL_JNDI_Test005()
- {
- setTestName("Test005");
- Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCLocals01.Client05.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- client0.start("DB_SQL_JNDI");
- client0.waitFor();
- }
-
- @Test public void JDBCLocals01_MS_SQL_JNDI_Test006()
- {
- setTestName("Test006");
- Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCLocals01.Client06.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- client0.start("DB_SQL_JNDI");
- client0.waitFor();
- }
-
-}
\ No newline at end of file
Copied: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jdbclocals01_mssqlserver_jndi.java (from rev 30165, labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jdbclocals01_ms_sql_jndi.java)
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jdbclocals01_mssqlserver_jndi.java (rev 0)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jdbclocals01_mssqlserver_jndi.java 2009-11-16 15:01:07 UTC (rev 30179)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2009,
+ * @author JBoss Inc.
+ */
+package org.jboss.jbossts.qa.junit.testgroup;
+
+import org.jboss.jbossts.qa.junit.*;
+import org.junit.*;
+
+// Automatically generated by XML2JUnit
+public class TestGroup_jdbclocals01_mssqlserver_jndi extends TestGroup_jdbclocals01_abstract
+{
+ public String getTestGroupName()
+ {
+ return "jdbclocals01_ms_sql_jndi";
+ }
+
+ public String getDBName1() {
+ return "DB_SQL_JNDI";
+ }
+}
\ No newline at end of file
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jdbclocals01_mysql_jndi.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jdbclocals01_mysql_jndi.java 2009-11-16 13:22:38 UTC (rev 30178)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jdbclocals01_mysql_jndi.java 2009-11-16 15:01:07 UTC (rev 30179)
@@ -24,83 +24,14 @@
import org.junit.*;
// Automatically generated by XML2JUnit
-public class TestGroup_jdbclocals01_mysql_jndi extends TestGroupBase
+public class TestGroup_jdbclocals01_mysql_jndi extends TestGroup_jdbclocals01_abstract
{
public String getTestGroupName()
{
return "jdbclocals01_mysql_jndi";
}
- protected Task server0 = null;
-
- @Before public void setUp()
- {
- super.setUp();
- Task task0 = createTask("task0", org.jboss.jbossts.qa.Utils.JNDIManager.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- task0.perform("DB_MYSQL_JNDI");
- Task setup = createTask("setup", org.jboss.jbossts.qa.JDBCLocals01Setups.Setup01.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- setup.perform("DB_MYSQL_JNDI");
- server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
- server0.start("-test");
- }
-
- @After public void tearDown()
- {
- try {
- server0.terminate();
- Task cleanup = createTask("cleanup", org.jboss.jbossts.qa.JDBCLocals01Cleanups.Cleanup01.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- cleanup.perform("DB_MYSQL_JNDI");
- } finally {
- super.tearDown();
- }
- }
-
- @Test public void JDBCLocals01_MySQL_JNDI_Test001()
- {
- setTestName("Test001");
- Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCLocals01.Client01.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- client0.start("DB_MYSQL_JNDI");
- client0.waitFor();
- }
-
- @Test public void JDBCLocals01_MySQL_JNDI_Test002()
- {
- setTestName("Test002");
- Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCLocals01.Client02.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- client0.start("DB_MYSQL_JNDI");
- client0.waitFor();
- }
-
- @Test public void JDBCLocals01_MySQL_JNDI_Test003()
- {
- setTestName("Test003");
- Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCLocals01.Client03.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- client0.start("DB_MYSQL_JNDI");
- client0.waitFor();
- }
-
- @Test public void JDBCLocals01_MySQL_JNDI_Test004()
- {
- setTestName("Test004");
- Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCLocals01.Client04.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- client0.start("DB_MYSQL_JNDI");
- client0.waitFor();
- }
-
- @Test public void JDBCLocals01_MySQL_JNDI_Test005()
- {
- setTestName("Test005");
- Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCLocals01.Client05.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- client0.start("DB_MYSQL_JNDI");
- client0.waitFor();
- }
-
- @Test public void JDBCLocals01_MySQL_JNDI_Test006()
- {
- setTestName("Test006");
- Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCLocals01.Client06.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- client0.start("DB_MYSQL_JNDI");
- client0.waitFor();
- }
-
+ public String getDBName1() {
+ return "DB_MYSQL_JNDI";
+ }
}
\ No newline at end of file
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jdbclocals01_oracle_jndi.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jdbclocals01_oracle_jndi.java 2009-11-16 13:22:38 UTC (rev 30178)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jdbclocals01_oracle_jndi.java 2009-11-16 15:01:07 UTC (rev 30179)
@@ -24,83 +24,14 @@
import org.junit.*;
// Automatically generated by XML2JUnit
-public class TestGroup_jdbclocals01_oracle_jndi extends TestGroupBase
+public class TestGroup_jdbclocals01_oracle_jndi extends TestGroup_jdbclocals01_abstract
{
public String getTestGroupName()
{
return "jdbclocals01_oracle_jndi";
}
- protected Task server0 = null;
-
- @Before public void setUp()
- {
- super.setUp();
- Task task0 = createTask("task0", org.jboss.jbossts.qa.Utils.JNDIManager.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- task0.perform("DB_THIN_JNDI");
- Task setup = createTask("setup", org.jboss.jbossts.qa.JDBCLocals01Setups.Setup01.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- setup.perform("DB_THIN_JNDI");
- server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
- server0.start("-test");
- }
-
- @After public void tearDown()
- {
- try {
- server0.terminate();
- Task cleanup = createTask("cleanup", org.jboss.jbossts.qa.JDBCLocals01Cleanups.Cleanup01.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- cleanup.perform("DB_THIN_JNDI");
- } finally {
- super.tearDown();
- }
- }
-
- @Test public void JDBCLocals01_Oracle_JNDI_Test001()
- {
- setTestName("Test001");
- Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCLocals01.Client01.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- client0.start("DB_THIN_JNDI");
- client0.waitFor();
- }
-
- @Test public void JDBCLocals01_Oracle_JNDI_Test002()
- {
- setTestName("Test002");
- Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCLocals01.Client02.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- client0.start("DB_THIN_JNDI");
- client0.waitFor();
- }
-
- @Test public void JDBCLocals01_Oracle_JNDI_Test003()
- {
- setTestName("Test003");
- Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCLocals01.Client03.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- client0.start("DB_THIN_JNDI");
- client0.waitFor();
- }
-
- @Test public void JDBCLocals01_Oracle_JNDI_Test004()
- {
- setTestName("Test004");
- Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCLocals01.Client04.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- client0.start("DB_THIN_JNDI");
- client0.waitFor();
- }
-
- @Test public void JDBCLocals01_Oracle_JNDI_Test005()
- {
- setTestName("Test005");
- Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCLocals01.Client05.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- client0.start("DB_THIN_JNDI");
- client0.waitFor();
- }
-
- @Test public void JDBCLocals01_Oracle_JNDI_Test006()
- {
- setTestName("Test006");
- Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCLocals01.Client06.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- client0.start("DB_THIN_JNDI");
- client0.waitFor();
- }
-
+ public String getDBName1() {
+ return "DB1_THIN_JNDI";
+ }
}
\ No newline at end of file
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jdbclocals01_postgresql_jndi.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jdbclocals01_postgresql_jndi.java 2009-11-16 13:22:38 UTC (rev 30178)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jdbclocals01_postgresql_jndi.java 2009-11-16 15:01:07 UTC (rev 30179)
@@ -24,83 +24,14 @@
import org.junit.*;
// Automatically generated by XML2JUnit
-public class TestGroup_jdbclocals01_postgresql_jndi extends TestGroupBase
+public class TestGroup_jdbclocals01_postgresql_jndi extends TestGroup_jdbclocals01_abstract
{
public String getTestGroupName()
{
return "jdbclocals01_postgresql_jndi";
}
- protected Task server0 = null;
-
- @Before public void setUp()
- {
- super.setUp();
- Task task0 = createTask("task0", org.jboss.jbossts.qa.Utils.JNDIManager.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- task0.perform("DB_PGSQL_JNDI");
- Task setup = createTask("setup", org.jboss.jbossts.qa.JDBCLocals01Setups.Setup01.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- setup.perform("DB_PGSQL_JNDI");
- server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
- server0.start("-test");
- }
-
- @After public void tearDown()
- {
- try {
- server0.terminate();
- Task cleanup = createTask("cleanup", org.jboss.jbossts.qa.JDBCLocals01Cleanups.Cleanup01.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- cleanup.perform("DB_PGSQL_JNDI");
- } finally {
- super.tearDown();
- }
- }
-
- @Test public void JDBCLocals01_PostgreSQL_JNDI_Test001()
- {
- setTestName("Test001");
- Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCLocals01.Client01.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- client0.start("DB_PGSQL_JNDI");
- client0.waitFor();
- }
-
- @Test public void JDBCLocals01_PostgreSQL_JNDI_Test002()
- {
- setTestName("Test002");
- Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCLocals01.Client02.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- client0.start("DB_PGSQL_JNDI");
- client0.waitFor();
- }
-
- @Test public void JDBCLocals01_PostgreSQL_JNDI_Test003()
- {
- setTestName("Test003");
- Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCLocals01.Client03.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- client0.start("DB_PGSQL_JNDI");
- client0.waitFor();
- }
-
- @Test public void JDBCLocals01_PostgreSQL_JNDI_Test004()
- {
- setTestName("Test004");
- Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCLocals01.Client04.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- client0.start("DB_PGSQL_JNDI");
- client0.waitFor();
- }
-
- @Test public void JDBCLocals01_PostgreSQL_JNDI_Test005()
- {
- setTestName("Test005");
- Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCLocals01.Client05.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- client0.start("DB_PGSQL_JNDI");
- client0.waitFor();
- }
-
- @Test public void JDBCLocals01_PostgreSQL_JNDI_Test006()
- {
- setTestName("Test006");
- Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCLocals01.Client06.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- client0.start("DB_PGSQL_JNDI");
- client0.waitFor();
- }
-
+ public String getDBName1() {
+ return "DB_PGSQL_JNDI";
+ }
}
\ No newline at end of file
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jdbclocals01_sybase_jndi.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jdbclocals01_sybase_jndi.java 2009-11-16 13:22:38 UTC (rev 30178)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_jdbclocals01_sybase_jndi.java 2009-11-16 15:01:07 UTC (rev 30179)
@@ -24,83 +24,14 @@
import org.junit.*;
// Automatically generated by XML2JUnit
-public class TestGroup_jdbclocals01_sybase_jndi extends TestGroupBase
+public class TestGroup_jdbclocals01_sybase_jndi extends TestGroup_jdbclocals01_abstract
{
public String getTestGroupName()
{
return "jdbclocals01_sybase_jndi";
}
- protected Task server0 = null;
-
- @Before public void setUp()
- {
- super.setUp();
- Task task0 = createTask("task0", org.jboss.jbossts.qa.Utils.JNDIManager.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- task0.perform("DB_SYBASE_JNDI");
- Task setup = createTask("setup", org.jboss.jbossts.qa.JDBCLocals01Setups.Setup01.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- setup.perform("DB_SYBASE_JNDI");
- server0 = createTask("server0", com.arjuna.ats.arjuna.recovery.RecoveryManager.class, Task.TaskType.EXPECT_READY, 480);
- server0.start("-test");
- }
-
- @After public void tearDown()
- {
- try {
- server0.terminate();
- Task cleanup = createTask("cleanup", org.jboss.jbossts.qa.JDBCLocals01Cleanups.Cleanup01.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- cleanup.perform("DB_SYBASE_JNDI");
- } finally {
- super.tearDown();
- }
- }
-
- @Test public void JDBCLocals01_sybase_JNDI_Test001()
- {
- setTestName("Test001");
- Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCLocals01.Client01.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- client0.start("DB_SYBASE_JNDI");
- client0.waitFor();
- }
-
- @Test public void JDBCLocals01_sybase_JNDI_Test002()
- {
- setTestName("Test002");
- Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCLocals01.Client02.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- client0.start("DB_SYBASE_JNDI");
- client0.waitFor();
- }
-
- @Test public void JDBCLocals01_sybase_JNDI_Test003()
- {
- setTestName("Test003");
- Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCLocals01.Client03.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- client0.start("DB_SYBASE_JNDI");
- client0.waitFor();
- }
-
- @Test public void JDBCLocals01_sybase_JNDI_Test004()
- {
- setTestName("Test004");
- Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCLocals01.Client04.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- client0.start("DB_SYBASE_JNDI");
- client0.waitFor();
- }
-
- @Test public void JDBCLocals01_sybase_JNDI_Test005()
- {
- setTestName("Test005");
- Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCLocals01.Client05.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- client0.start("DB_SYBASE_JNDI");
- client0.waitFor();
- }
-
- @Test public void JDBCLocals01_sybase_JNDI_Test006()
- {
- setTestName("Test006");
- Task client0 = createTask("client0", org.jboss.jbossts.qa.JDBCLocals01.Client06.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
- client0.start("DB_SYBASE_JNDI");
- client0.waitFor();
- }
-
+ public String getDBName1() {
+ return "DB_PGSQL_JNDI";
+ }
}
\ No newline at end of file
More information about the jboss-svn-commits
mailing list