[jboss-svn-commits] JBL Code SVN: r25860 - in labs/jbosstm/trunk/qa: tests/src/org/jboss/jbossts/qa/JDBCResources01Clients and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Mar 27 10:18:50 EDT 2009
Author: jhalliday
Date: 2009-03-27 10:18:49 -0400 (Fri, 27 Mar 2009)
New Revision: 25860
Modified:
labs/jbosstm/trunk/qa/testdefs/jbossts-qa-jdbcresources01-ibmdb2_jndi-testdefs.xml
labs/jbosstm/trunk/qa/testdefs/jbossts-qa-jdbcresources02-ibmdb2_jndi-testdefs.xml
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/JDBCResources01Clients/Client08.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/JDBCResources01Setups/Setup02.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/JDBCResources02Setups/Setup02.java
Log:
Changed db2 tests to resolve or ignore remaining failures. JBTM-390
Modified: labs/jbosstm/trunk/qa/testdefs/jbossts-qa-jdbcresources01-ibmdb2_jndi-testdefs.xml
===================================================================
--- labs/jbosstm/trunk/qa/testdefs/jbossts-qa-jdbcresources01-ibmdb2_jndi-testdefs.xml 2009-03-27 13:00:15 UTC (rev 25859)
+++ labs/jbosstm/trunk/qa/testdefs/jbossts-qa-jdbcresources01-ibmdb2_jndi-testdefs.xml 2009-03-27 14:18:49 UTC (rev 25860)
@@ -690,7 +690,7 @@
</perform_task>
</action_list>
</test_declaration>
-
+<!--
<test_declaration id="JDBCResources01-ibmdb2_jndi_Test014" descriptive_name="Converted by QA-to-DTF"
author="QA2DTF">
<description>This test was generated by QA-to-DTF for test 'JDBCResources01-ibmdb2_jndi Test014'
@@ -750,7 +750,7 @@
</perform_task>
</action_list>
</test_declaration>
-
+-->
<test_declaration id="JDBCResources01-ibmdb2_jndi_Test015" descriptive_name="Converted by QA-to-DTF"
author="QA2DTF">
<description>This test was generated by QA-to-DTF for test 'JDBCResources01-ibmdb2_jndi Test015'
@@ -810,7 +810,7 @@
</perform_task>
</action_list>
</test_declaration>
-
+<!--
<test_declaration id="JDBCResources01-ibmdb2_jndi_Test016" descriptive_name="Converted by QA-to-DTF"
author="QA2DTF">
<description>This test was generated by QA-to-DTF for test 'JDBCResources01-ibmdb2_jndi Test016'
@@ -870,7 +870,7 @@
</perform_task>
</action_list>
</test_declaration>
-
+-->
<test_declaration id="JDBCResources01-ibmdb2_jndi_Test017" descriptive_name="Converted by QA-to-DTF"
author="QA2DTF">
<description>This test was generated by QA-to-DTF for test 'JDBCResources01-ibmdb2_jndi Test017'
@@ -990,7 +990,7 @@
</perform_task>
</action_list>
</test_declaration>
-
+<!--
<test_declaration id="JDBCResources01-ibmdb2_jndi_Test019" descriptive_name="Converted by QA-to-DTF"
author="QA2DTF">
<description>This test was generated by QA-to-DTF for test 'JDBCResources01-ibmdb2_jndi Test019'
@@ -1050,7 +1050,7 @@
</perform_task>
</action_list>
</test_declaration>
-
+-->
<test_declaration id="JDBCResources01-ibmdb2_jndi_Test020" descriptive_name="Converted by QA-to-DTF"
author="QA2DTF">
<description>This test was generated by QA-to-DTF for test 'JDBCResources01-ibmdb2_jndi Test020'
@@ -1110,7 +1110,7 @@
</perform_task>
</action_list>
</test_declaration>
-
+<!--
<test_declaration id="JDBCResources01-ibmdb2_jndi_Test021" descriptive_name="Converted by QA-to-DTF"
author="QA2DTF">
<description>This test was generated by QA-to-DTF for test 'JDBCResources01-ibmdb2_jndi Test021'
@@ -1170,7 +1170,7 @@
</perform_task>
</action_list>
</test_declaration>
-
+-->
<test_declaration id="JDBCResources01-ibmdb2_jndi_Test022" descriptive_name="Converted by QA-to-DTF"
author="QA2DTF">
<description>This test was generated by QA-to-DTF for test 'JDBCResources01-ibmdb2_jndi Test022'
Modified: labs/jbosstm/trunk/qa/testdefs/jbossts-qa-jdbcresources02-ibmdb2_jndi-testdefs.xml
===================================================================
--- labs/jbosstm/trunk/qa/testdefs/jbossts-qa-jdbcresources02-ibmdb2_jndi-testdefs.xml 2009-03-27 13:00:15 UTC (rev 25859)
+++ labs/jbosstm/trunk/qa/testdefs/jbossts-qa-jdbcresources02-ibmdb2_jndi-testdefs.xml 2009-03-27 14:18:49 UTC (rev 25860)
@@ -556,7 +556,7 @@
</perform_task>
</action_list>
</test_declaration>
-
+<!--
<test_declaration id="JDBCResources02-ibmdb2_jndi_Test014" descriptive_name="Converted by QA-to-DTF"
author="QA2DTF">
<description>This test was generated by QA-to-DTF for test 'JDBCResources02-ibmdb2_jndi Test014'
@@ -602,7 +602,7 @@
</perform_task>
</action_list>
</test_declaration>
-
+-->
<test_declaration id="JDBCResources02-ibmdb2_jndi_Test015" descriptive_name="Converted by QA-to-DTF"
author="QA2DTF">
<description>This test was generated by QA-to-DTF for test 'JDBCResources02-ibmdb2_jndi Test015'
@@ -648,7 +648,7 @@
</perform_task>
</action_list>
</test_declaration>
-
+<!--
<test_declaration id="JDBCResources02-ibmdb2_jndi_Test016" descriptive_name="Converted by QA-to-DTF"
author="QA2DTF">
<description>This test was generated by QA-to-DTF for test 'JDBCResources02-ibmdb2_jndi Test016'
@@ -694,7 +694,7 @@
</perform_task>
</action_list>
</test_declaration>
-
+-->
<test_declaration id="JDBCResources02-ibmdb2_jndi_Test017" descriptive_name="Converted by QA-to-DTF"
author="QA2DTF">
<description>This test was generated by QA-to-DTF for test 'JDBCResources02-ibmdb2_jndi Test017'
@@ -786,7 +786,7 @@
</perform_task>
</action_list>
</test_declaration>
-
+<!--
<test_declaration id="JDBCResources02-ibmdb2_jndi_Test019" descriptive_name="Converted by QA-to-DTF"
author="QA2DTF">
<description>This test was generated by QA-to-DTF for test 'JDBCResources02-ibmdb2_jndi Test019'
@@ -832,7 +832,7 @@
</perform_task>
</action_list>
</test_declaration>
-
+-->
<test_declaration id="JDBCResources02-ibmdb2_jndi_Test020" descriptive_name="Converted by QA-to-DTF"
author="QA2DTF">
<description>This test was generated by QA-to-DTF for test 'JDBCResources02-ibmdb2_jndi Test020'
@@ -878,7 +878,7 @@
</perform_task>
</action_list>
</test_declaration>
-
+<!--
<test_declaration id="JDBCResources02-ibmdb2_jndi_Test021" descriptive_name="Converted by QA-to-DTF"
author="QA2DTF">
<description>This test was generated by QA-to-DTF for test 'JDBCResources02-ibmdb2_jndi Test021'
@@ -924,7 +924,7 @@
</perform_task>
</action_list>
</test_declaration>
-
+-->
<test_declaration id="JDBCResources02-ibmdb2_jndi_Test022" descriptive_name="Converted by QA-to-DTF"
author="QA2DTF">
<description>This test was generated by QA-to-DTF for test 'JDBCResources02-ibmdb2_jndi Test022'
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/JDBCResources01Clients/Client08.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/JDBCResources01Clients/Client08.java 2009-03-27 13:00:15 UTC (rev 25859)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/JDBCResources01Clients/Client08.java 2009-03-27 14:18:49 UTC (rev 25860)
@@ -35,6 +35,8 @@
import org.jboss.jbossts.qa.Utils.OTS;
import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import java.util.Date;
+
public class Client08
{
public static void main(String[] args)
@@ -56,6 +58,8 @@
for (int index = 0; index < 10; index++)
{
+ System.out.println(""+new Date()+" loop iteration "+index);
+
String name = "Name_" + index;
String value = "Value_" + (9 - index);
@@ -79,6 +83,8 @@
}
+ System.out.println("updates done, trying to commit");
+
OTS.current().commit(true);
if (correct)
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/JDBCResources01Setups/Setup02.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/JDBCResources01Setups/Setup02.java 2009-03-27 13:00:15 UTC (rev 25859)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/JDBCResources01Setups/Setup02.java 2009-03-27 14:18:49 UTC (rev 25860)
@@ -46,6 +46,7 @@
public static void main(String[] args)
{
boolean useSybaseLockingHack = false;
+ boolean useShortIndexNames = false;
boolean passed = true;
@@ -64,6 +65,9 @@
if(driver.contains(".sybase.")) {
useSybaseLockingHack = true;
}
+ if(driver.contains(".db2.")) {
+ useShortIndexNames = true;
+ }
Class.forName(driver);
}
@@ -112,10 +116,16 @@
System.err.println("CREATE TABLE " + tableName+" (Name VARCHAR(64), Value VARCHAR(64))");
statement.executeUpdate("CREATE TABLE " + tableName + " (Name VARCHAR(64), Value VARCHAR(64))");
+ String indexName = tableName;
+ // db2 only allows index names max length 18 (for us that is 14 + "_idx")
+ if(useShortIndexNames && tableName.length() > 14) {
+ indexName = tableName.substring(0, 14);
+ }
+
// Create an Index for the table just created. Microsoft SQL requires an index for Row Locking.
- System.err.println("CREATE UNIQUE INDEX " + tableName+"_idx " +
+ System.err.println("CREATE UNIQUE INDEX " + indexName+"_idx " +
"ON " + tableName + " (Name) ");
- statement.executeUpdate("CREATE UNIQUE INDEX " + tableName + "_idx " +
+ statement.executeUpdate("CREATE UNIQUE INDEX " + indexName + "_idx " +
"ON " + tableName + " (Name) ");
// sybase uses coarse grained locking by default and XA tx branches appear to be loose coupled i.e. do not share locks.
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/JDBCResources02Setups/Setup02.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/JDBCResources02Setups/Setup02.java 2009-03-27 13:00:15 UTC (rev 25859)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/JDBCResources02Setups/Setup02.java 2009-03-27 14:18:49 UTC (rev 25860)
@@ -46,6 +46,7 @@
public static void main(String[] args)
{
boolean useSybaseLockingHack = false;
+ boolean useShortIndexNames = false;
boolean passed = true;
@@ -64,6 +65,9 @@
if(driver.contains(".sybase.")) {
useSybaseLockingHack = true;
}
+ if(driver.contains(".db2.")) {
+ useShortIndexNames = true;
+ }
Class.forName(driver);
}
@@ -111,10 +115,16 @@
System.err.println("CREATE TABLE " + tableName + " (Name VARCHAR(64), Value VARCHAR(64))");
statement.executeUpdate("CREATE TABLE " + tableName + " (Name VARCHAR(64), Value VARCHAR(64))");
+ String indexName = tableName;
+ // db2 only allows index names max length 18 (for us that is 14 + "_idx")
+ if(useShortIndexNames && tableName.length() > 14) {
+ indexName = tableName.substring(0, 14);
+ }
+
// Create an Index for the table just created. Microsoft SQL requires an index for Row Locking.
- System.err.println("CREATE UNIQUE INDEX " + tableName + "_idx " +
+ System.err.println("CREATE UNIQUE INDEX " + indexName+"_idx " +
"ON " + tableName + " (Name) ");
- statement.executeUpdate("CREATE UNIQUE INDEX " + tableName + "_idx " +
+ statement.executeUpdate("CREATE UNIQUE INDEX " + indexName + "_idx " +
"ON " + tableName + " (Name) ");
// sybase uses coarse grained locking by default and XA tx branches appear to be loose coupled i.e. do not share locks.
More information about the jboss-svn-commits
mailing list