[jboss-svn-commits] JBL Code SVN: r28859 - in labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa: ArjunaCore/Utils and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Aug 6 11:28:30 EDT 2009
Author: jhalliday
Date: 2009-08-06 11:28:29 -0400 (Thu, 06 Aug 2009)
New Revision: 28859
Modified:
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/Stats/Client001.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/Stats/Client002.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/Stats/Client003.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/Stats/Client004.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/Utils/EmptyObjectStore.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery11Utils/Delays.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/AssertCleanEnvironment.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/EmptyObjectStore.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_rawresources01_1.java
Log:
Update qa file to use new bean based config. JBTM-596
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/Stats/Client001.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/Stats/Client001.java 2009-08-06 14:56:26 UTC (rev 28858)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/Stats/Client001.java 2009-08-06 15:28:29 UTC (rev 28859)
@@ -61,27 +61,27 @@
//abort transaction
abort();
- if (mStats.numberOfAbortedTransactions() != 1)
+ if (mStats.getNumberOfAbortedTransactions() != 1)
{
- Debug("error in number of aborted transactions: " + mStats.numberOfAbortedTransactions());
+ Debug("error in number of aborted transactions: " + mStats.getNumberOfAbortedTransactions());
mCorrect = false;
}
- if (mStats.numberOfCommittedTransactions() != 1)
+ if (mStats.getNumberOfCommittedTransactions() != 1)
{
- Debug("error in number of commited transactions: " + mStats.numberOfCommittedTransactions());
+ Debug("error in number of commited transactions: " + mStats.getNumberOfCommittedTransactions());
mCorrect = false;
}
- if (mStats.numberOfNestedTransactions() != 0)
+ if (mStats.getNumberOfNestedTransactions() != 0)
{
- Debug("error in number of nested transactions: " + mStats.numberOfNestedTransactions());
+ Debug("error in number of nested transactions: " + mStats.getNumberOfNestedTransactions());
mCorrect = false;
}
- if (mStats.numberOfTransactions() != 2)
+ if (mStats.getNumberOfTransactions() != 2)
{
- Debug("error in number of transactions: " + mStats.numberOfTransactions());
+ Debug("error in number of transactions: " + mStats.getNumberOfTransactions());
mCorrect = false;
}
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/Stats/Client002.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/Stats/Client002.java 2009-08-06 14:56:26 UTC (rev 28858)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/Stats/Client002.java 2009-08-06 15:28:29 UTC (rev 28859)
@@ -59,27 +59,27 @@
abort();
//test what the final stat values are
- if (mStats.numberOfAbortedTransactions() != 1)
+ if (mStats.getNumberOfAbortedTransactions() != 1)
{
- Debug("error in number of aborted transactions: " + mStats.numberOfAbortedTransactions());
+ Debug("error in number of aborted transactions: " + mStats.getNumberOfAbortedTransactions());
mCorrect = false;
}
- if (mStats.numberOfCommittedTransactions() != 3)
+ if (mStats.getNumberOfCommittedTransactions() != 3)
{
- Debug("error in number of commited transactions: " + mStats.numberOfCommittedTransactions());
+ Debug("error in number of commited transactions: " + mStats.getNumberOfCommittedTransactions());
mCorrect = false;
}
- if (mStats.numberOfNestedTransactions() != 2)
+ if (mStats.getNumberOfNestedTransactions() != 2)
{
- Debug("error in number of nested transactions: " + mStats.numberOfNestedTransactions());
+ Debug("error in number of nested transactions: " + mStats.getNumberOfNestedTransactions());
mCorrect = false;
}
- if (mStats.numberOfTransactions() != 4)
+ if (mStats.getNumberOfTransactions() != 4)
{
- Debug("error in number of transactions: " + mStats.numberOfTransactions());
+ Debug("error in number of transactions: " + mStats.getNumberOfTransactions());
mCorrect = false;
}
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/Stats/Client003.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/Stats/Client003.java 2009-08-06 14:56:26 UTC (rev 28858)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/Stats/Client003.java 2009-08-06 15:28:29 UTC (rev 28859)
@@ -48,27 +48,27 @@
Service02 mService = new Service02(mNumberOfResources);
mService.dowork(mMaxIteration * 2);
- if (mStats.numberOfAbortedTransactions() != mMaxIteration)
+ if (mStats.getNumberOfAbortedTransactions() != mMaxIteration)
{
- Debug("error in number of aborted transactions: " + mStats.numberOfAbortedTransactions());
+ Debug("error in number of aborted transactions: " + mStats.getNumberOfAbortedTransactions());
mCorrect = false;
}
- if (mStats.numberOfCommittedTransactions() != mMaxIteration)
+ if (mStats.getNumberOfCommittedTransactions() != mMaxIteration)
{
- Debug("error in number of commited transactions: " + mStats.numberOfCommittedTransactions());
+ Debug("error in number of commited transactions: " + mStats.getNumberOfCommittedTransactions());
mCorrect = false;
}
- if (mStats.numberOfNestedTransactions() != 0)
+ if (mStats.getNumberOfNestedTransactions() != 0)
{
- Debug("error in number of nested transactions: " + mStats.numberOfNestedTransactions());
+ Debug("error in number of nested transactions: " + mStats.getNumberOfNestedTransactions());
mCorrect = false;
}
- if (mStats.numberOfTransactions() != mMaxIteration * 2)
+ if (mStats.getNumberOfTransactions() != mMaxIteration * 2)
{
- Debug("error in number of transactions: " + mStats.numberOfTransactions());
+ Debug("error in number of transactions: " + mStats.getNumberOfTransactions());
mCorrect = false;
}
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/Stats/Client004.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/Stats/Client004.java 2009-08-06 14:56:26 UTC (rev 28858)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/Stats/Client004.java 2009-08-06 15:28:29 UTC (rev 28859)
@@ -72,27 +72,27 @@
System.err.println("Number of iterations = " + mMaxIteration);
//test what the final stat values are
- if (mStats.numberOfAbortedTransactions() != expectedRolledback)
+ if (mStats.getNumberOfAbortedTransactions() != expectedRolledback)
{
- Debug("error in number of aborted transactions: " + mStats.numberOfAbortedTransactions() + " expected = " + expectedRolledback);
+ Debug("error in number of aborted transactions: " + mStats.getNumberOfAbortedTransactions() + " expected = " + expectedRolledback);
mCorrect = false;
}
- if (mStats.numberOfCommittedTransactions() != expectedCommitted)
+ if (mStats.getNumberOfCommittedTransactions() != expectedCommitted)
{
- Debug("error in number of commited transactions: " + mStats.numberOfCommittedTransactions() + " expected = " + expectedCommitted);
+ Debug("error in number of commited transactions: " + mStats.getNumberOfCommittedTransactions() + " expected = " + expectedCommitted);
mCorrect = false;
}
- if (mStats.numberOfNestedTransactions() != expectedNested)
+ if (mStats.getNumberOfNestedTransactions() != expectedNested)
{
- Debug("error in number of nested transactions: " + mStats.numberOfNestedTransactions() + " expected = " + expectedNested);
+ Debug("error in number of nested transactions: " + mStats.getNumberOfNestedTransactions() + " expected = " + expectedNested);
mCorrect = false;
}
- if (mStats.numberOfTransactions() != expectedTx)
+ if (mStats.getNumberOfTransactions() != expectedTx)
{
- Debug("error in number of transactions: " + mStats.numberOfTransactions() + " expected = " + expectedTx);
+ Debug("error in number of transactions: " + mStats.getNumberOfTransactions() + " expected = " + expectedTx);
mCorrect = false;
}
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/Utils/EmptyObjectStore.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/Utils/EmptyObjectStore.java 2009-08-06 14:56:26 UTC (rev 28858)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/Utils/EmptyObjectStore.java 2009-08-06 15:28:29 UTC (rev 28859)
@@ -29,7 +29,6 @@
package org.jboss.jbossts.qa.ArjunaCore.Utils;
-import com.arjuna.ats.arjuna.common.Environment;
import com.arjuna.ats.arjuna.common.arjPropertyManager;
import com.arjuna.ats.arjuna.objectstore.jdbc.JDBCAccess;
@@ -43,8 +42,8 @@
{
try
{
- if (arjPropertyManager.getPropertyManager().getProperty(Environment.OBJECTSTORE_TYPE) != null &&
- arjPropertyManager.getPropertyManager().getProperty(Environment.OBJECTSTORE_TYPE).startsWith("JDBCStore"))
+ if (arjPropertyManager.getObjectStoreEnvironmentBean().getObjectStoreType() != null &&
+ arjPropertyManager.getObjectStoreEnvironmentBean().getObjectStoreType().startsWith("JDBCStore"))
{
JDBCAccess mJDBC = (JDBCAccess) Class.forName(System.getProperty("JDBC2_USER_DB_ACCESS")).newInstance();
Connection mConnection = mJDBC.getConnection();
@@ -53,7 +52,7 @@
}
else
{
- String objectStoreDirName = arjPropertyManager.getPropertyManager().getProperty(Environment.OBJECTSTORE_DIR, com.arjuna.ats.arjuna.common.Configuration.objectStoreRoot());
+ String objectStoreDirName = arjPropertyManager.getObjectStoreEnvironmentBean().getObjectStoreDir();
System.out.println("Emptying " + objectStoreDirName);
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery11Utils/Delays.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery11Utils/Delays.java 2009-08-06 14:56:26 UTC (rev 28858)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery11Utils/Delays.java 2009-08-06 15:28:29 UTC (rev 28859)
@@ -31,32 +31,16 @@
package org.jboss.jbossts.qa.CrashRecovery11Utils;
-import com.arjuna.ats.arjuna.common.Environment;
-import com.arjuna.ats.arjuna.common.arjPropertyManager;
+import com.arjuna.ats.arjuna.common.recoveryPropertyManager;
public class Delays
{
public static int recoveryDelay()
{
- //
- // get from the propertyManager
- //
- String backoffPeriodString = arjPropertyManager.getPropertyManager().getProperty(Environment.RECOVERY_BACKOFF_PERIOD);
- String recoveryPeriodString = arjPropertyManager.getPropertyManager().getProperty(Environment.PERIODIC_RECOVERY_PERIOD);
+ int _recoveryPeriod = recoveryPropertyManager.getRecoveryEnvironmentBean().getPeriodicRecoveryPeriod();
- try
- {
- Integer recoveryPeriodInteger = new Integer(recoveryPeriodString);
- int _recoveryPeriod = recoveryPeriodInteger.intValue();
+ int _backoffPeriod = recoveryPropertyManager.getRecoveryEnvironmentBean().getRecoveryBackoffPeriod();
- Integer backoffPeriodInteger = new Integer(backoffPeriodString);
- int _backoffPeriod = backoffPeriodInteger.intValue();
-
return (_backoffPeriod + _recoveryPeriod + (5 * 1000) /*5 secs for processing*/);
- }
- catch (NumberFormatException e)
- {
- return 30 * 1000;
- }
}
}
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/AssertCleanEnvironment.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/AssertCleanEnvironment.java 2009-08-06 14:56:26 UTC (rev 28858)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/AssertCleanEnvironment.java 2009-08-06 15:28:29 UTC (rev 28859)
@@ -29,7 +29,6 @@
package org.jboss.jbossts.qa.Utils;
-import com.arjuna.ats.arjuna.common.Environment;
import com.arjuna.ats.arjuna.common.arjPropertyManager;
import java.io.BufferedReader;
@@ -88,9 +87,7 @@
ORBInterface.initORB(args, null);
OAInterface.initOA();
- objectStoreDirName = arjPropertyManager.getPropertyManager().getProperty(
- Environment.OBJECTSTORE_DIR,
- com.arjuna.ats.arjuna.common.Configuration.objectStoreRoot());
+ objectStoreDirName = arjPropertyManager.getObjectStoreEnvironmentBean().getObjectStoreDir();
}
finally
{
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/EmptyObjectStore.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/EmptyObjectStore.java 2009-08-06 14:56:26 UTC (rev 28858)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/EmptyObjectStore.java 2009-08-06 15:28:29 UTC (rev 28859)
@@ -31,7 +31,6 @@
package org.jboss.jbossts.qa.Utils;
-import com.arjuna.ats.arjuna.common.Environment;
import com.arjuna.ats.arjuna.common.arjPropertyManager;
import com.arjuna.ats.arjuna.objectstore.jdbc.JDBCAccess;
@@ -66,10 +65,10 @@
orbClass.start(args);
}
- if (arjPropertyManager.getPropertyManager().getProperty(Environment.OBJECTSTORE_TYPE) != null &&
- arjPropertyManager.getPropertyManager().getProperty(Environment.OBJECTSTORE_TYPE).startsWith("JDBCStore"))
+ if (arjPropertyManager.getObjectStoreEnvironmentBean().getObjectStoreType() != null &&
+ arjPropertyManager.getObjectStoreEnvironmentBean().getObjectStoreType().startsWith("JDBCStore"))
{
- JDBCAccess mJDBC = (JDBCAccess) Class.forName(arjPropertyManager.getPropertyManager().getProperty(Environment.JDBC_USER_DB_ACCESS)).newInstance();
+ JDBCAccess mJDBC = (JDBCAccess) Class.forName(arjPropertyManager.getObjectStoreEnvironmentBean().getJdbcUserDbAccess()).newInstance();
String tableName = mJDBC.tableName();
if (tableName == "")
/* from arjuna.internal.JDBCStore */
@@ -100,7 +99,7 @@
}
else
{
- String objectStoreDirName = arjPropertyManager.getPropertyManager().getProperty(Environment.OBJECTSTORE_DIR, com.arjuna.ats.arjuna.common.Configuration.objectStoreRoot());
+ String objectStoreDirName = arjPropertyManager.getObjectStoreEnvironmentBean().getObjectStoreDir();
System.out.println("Emptying " + objectStoreDirName);
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_rawresources01_1.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_rawresources01_1.java 2009-08-06 14:56:26 UTC (rev 28858)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/testgroup/TestGroup_rawresources01_1.java 2009-08-06 15:28:29 UTC (rev 28859)
@@ -22,8 +22,6 @@
import org.jboss.jbossts.qa.junit.*;
import org.junit.*;
-import com.arjuna.ats.arjuna.common.arjPropertyManager;
-import com.arjuna.ats.arjuna.common.Environment;
// Automatically generated by XML2JUnit
public class TestGroup_rawresources01_1 extends TestGroupBase
More information about the jboss-svn-commits
mailing list