You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by pe...@apache.org on 2013/01/02 06:21:08 UTC
svn commit: r1427655 [26/35] - in /river/jtsk/skunk/qa_refactor/trunk/qa: ./
doc/ src/com/sun/jini/qa/harness/
src/com/sun/jini/test/impl/discoverymanager/
src/com/sun/jini/test/impl/discoveryproviders/
src/com/sun/jini/test/impl/end2end/e2etest/ src/c...
Copied: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/TransactionTest.java (from r1424289, river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/AbstractTestBase.java)
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/TransactionTest.java?p2=river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/TransactionTest.java&p1=river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/AbstractTestBase.java&r1=1424289&r2=1427655&rev=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/AbstractTestBase.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/TransactionTest.java Wed Jan 2 05:20:52 2013
@@ -36,8 +36,9 @@ import net.jini.core.transaction.server.
import net.jini.space.JavaSpace;
// com.sun.jini
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.qa.harness.TestException;
import net.jini.security.ProxyPreparer;
@@ -49,422 +50,20 @@ import net.jini.config.ConfigurationExce
*
* @author Mikhail A. Markov
*/
-public abstract class AbstractTestBase extends QATest {
-
- /** The name of service for which these tests are written. */
- protected final String spaceName = "net.jini.space.JavaSpace";
-
- /** The name of current package to read current settings. */
- protected final String pkgName = "com.sun.jini.test.spec."
- + "javaspace.conformance";
-
- /** Holds JavaSpace instance of tested space. */
- protected JavaSpace space;
-
- /** Holds TransactionManager instance for transaction's testing. */
- protected TransactionManager mgr = null;
-
- /** Holds transactions instances. */
- protected ArrayList txns = new ArrayList();
-
- /**
- * Holds the value which is used instead of Lease.FOREVER one
- * to avoid infinite lease times.
- */
- protected long leaseForeverTime = 0;
-
- /** Holds the value which is used for read/take check operations. */
- protected long checkTime = 0;
-
- /** First timeout for testing in ms. */
- protected long timeout1 = 0;
-
- /**
- * Second timeout for testing in ms.
- * Must be greater then ({@link #timeout1} + 5000)
- */
- protected long timeout2 = 0;
-
- /** Value to check operations which require instant result. */
- protected long instantTime = 0;
-
- /** value to wait for notifications time in ms. */
- protected long waitingNotificationsToComeTime = 0;
-
- /**
- * Default Constructor requiring no arguments.
- */
- public AbstractTestBase() {
- super();
- }
+public abstract class TransactionTest extends JavaSpaceTest {
/**
* Sets up the testing environment.
*
- * @param config QAConfig from the runner for setup.
+ * @param config QAConfig from the runner for construct.
*/
- public void setup(QAConfig config) throws Exception {
-
+ public Test construct(QAConfig config) throws Exception {
// mandatory call to parent
- super.setup(config);
-
- // avoid changing a whole bunch of constructors to include the configuration
- NotifyCounter.setConfiguration(config.getConfiguration());
- ParticipantImpl.setConfiguration(config.getConfiguration());
-
- // output the name of this test
- logDebugText("Test Name = " + this.getClass().getName());
-
- // run tested JavaSpace
- space = getSpace();
-
- // set up lease and check times
- leaseForeverTime = getConfig().getLongConfigVal(pkgName + ".lease.forever",
- Lease.FOREVER);
- checkTime = getConfig().getLongConfigVal(pkgName + ".checkTime", 10000);
- timeout1 = getConfig().getLongConfigVal(pkgName + ".timeout1", 10000);
- timeout2 = getConfig().getLongConfigVal(pkgName + ".timeout2", 20000);
- waitingNotificationsToComeTime = getConfig().getLongConfigVal(pkgName +
- ".waitingNotificationsTime", 10000);
-
- // ensure, that timeout2 > (timeout1 + 5000)
- if (timeout1 > timeout2) {
- long tmp = timeout1;
- timeout1 = timeout2;
- timeout2 = tmp;
- }
-
- if (timeout2 < (timeout1 + 5000)) {
- timeout2 += 5000;
- }
- instantTime = getConfig().getLongConfigVal(pkgName + ".instantTime", 500);
- }
-
- /**
- * Performs cleaning operations after test's completion.
- */
- public void tearDown() {
- try {
-
- // abort noncommitted transactions
- txnsAbort();
-
- // clean the space
- cleanSpace(space);
-
- } catch (Exception ex) {
- logDebugText("Exception has been caught in tearDown method: "
- + ex);
- ex.printStackTrace();
- } finally {
- super.tearDown();
- }
- }
-
- /**
- * Runs tested JavaSpace.
- *
- * @return JavaSpace instance of started space.
- *
- * @exception TestException
- * If an exception has been thrown during JavaSpace creation or
- * created JavaSpace is null.
- */
- public JavaSpace getSpace() throws TestException {
- JavaSpace js = null;
-
- try {
- if (System.getSecurityManager() == null) {
- System.setSecurityManager(new RMISecurityManager());
- }
- printSpaceInfo();
- js = (JavaSpace) manager.startService(spaceName); // prepared
- } catch (Exception e) {
- throw new TestException(
- "Exception has been caught while trying to start space:",
- e);
- }
-
- if (js == null) {
- throw new TestException("Null space has been obtained.");
- }
- return js;
- }
-
- /**
- * Checks whether space is empty or not outside all transactions.
- *
- * @param space JavaSpace to be checked.
- *
- * @return True if space is empty, otherwise - false.
- *
- * @exception TestException
- * If an exception has been thrown during space checking.
- */
- public boolean checkSpace(JavaSpace space) throws TestException {
- return checkSpace(space, null);
- }
-
- /**
- * Checks whether space is empty or not.
- *
- * @param space JavaSpace to be checked.
- * @param txn Transaction under wich check needed to be performed.
- *
- * @return True if space is empty, otherwise - false.
- *
- * @exception TestException
- * If an exception has been thrown during space checking.
- */
- public boolean checkSpace(JavaSpace space, Transaction txn)
- throws TestException {
- try {
- Entry result = (Entry) space.readIfExists(null, txn,
- JavaSpace.NO_WAIT);
-
- if (result != null) {
- return false;
- }
- } catch (Exception ex) {
- throw new TestException(
- "Exception has been caught while space checking: ", ex);
- }
- return true;
- }
-
- /**
- * Cleans tested space without transaction.
- *
- * @param space Javaspace for cleaning.
- *
- * @exception TestException
- * If an exception has been thrown during space cleaning.
- */
- public void cleanSpace(JavaSpace space) throws TestException {
- cleanSpace(space, null);
- }
-
- /**
- * Cleans tested space within specified transaction.
- *
- * @param space Javaspace for cleaning.
- * @param txn Transaction within which we will clean the space.
- *
- * @exception TestException
- * If an exception has been thrown during space cleaning.
- */
- public void cleanSpace(JavaSpace space, Transaction txn)
- throws TestException {
- try {
- while (!checkSpace(space, txn)) {
- space.takeIfExists(null, txn, JavaSpace.NO_WAIT);
- }
- } catch (Exception ex) {
- throw new TestException("Exception has been caught while"
- + " cleaning the space: " + ex.getMessage());
- }
- }
-
- /**
- * Runs Transaction Manager.
- *
- * @return TransactionManager instance of started manager.
- *
- * @exception TestException
- * If an exception has been thrown during TransactionManager
- * creation or created TransactionManager is null.
- */
- public TransactionManager getTxnManager() throws TestException {
- TransactionManager mgr = null;
-
- try {
- String txnMgrName = getConfig().getStringConfigVal(pkgName + ".txnManager",
- TransactionManager.class.getName());
- printTxnMgrInfo(txnMgrName);
- mgr = (TransactionManager) manager.startService(txnMgrName); //prepared
- } catch (Exception e) {
- throw new TestException("Exception has been caught while"
- + "trying to start Transaction Manager.", e);
- }
-
- if (mgr == null) {
- throw new TestException("Null Transaction Manager"
- + " has been obtained.");
- }
- return mgr;
+ super.construct(config);
+ // get an instance of Transaction Manager
+ mgr = getTxnManager();
+ return this;
}
- /**
- * Creates transaction with default lease time.
- *
- * @return Created transaction.
- */
- public Transaction getTransaction() throws TestException {
- return getTransaction(leaseForeverTime * 2);
- }
-
- /**
- * Creates transaction with specified lease time.
- *
- * @param lTime Transaction's lease time.
- *
- * @return Created transaction.
- */
- public Transaction getTransaction(long lTime) throws TestException {
- Transaction.Created trc = null;
-
- try {
- trc = TransactionFactory.create(mgr, lTime);
-
- if (trc == null) {
- throw new TestException("Null transaction"
- + " has been obtained.");
- }
- txns.add(trc.transaction);
- return trc.transaction;
- } catch (Exception e) {
- throw new TestException("Could not create transaction.", e);
- }
- }
-
- /**
- * Commits specified transaction.
- *
- * @param txn Transaction to be committed.
- *
- * @exception TestException
- * If an exception has been thrown during transaction's committing.
- */
- public void txnCommit(Transaction txn) throws TestException {
- try {
- if (txn != null) {
- txn.commit();
- txns.remove(txns.indexOf(txn));
- }
- } catch (Exception e) {
- throw new TestException(
- "Exception has been caught while transaction committing:",
- e);
- }
- }
-
- /**
- * Aborts specified transaction.
- *
- * @param txn Transaction to be committed.
- *
- * @exception TestException
- * If an exception has been thrown during transaction's aborting.
- */
- public void txnAbort(Transaction txn) throws TestException {
- try {
- if (txn != null) {
- txn.abort();
- txns.remove(txns.indexOf(txn));
- }
- } catch (Exception e) {
- throw new TestException(
- "Exception has been caught while transaction aborting:", e);
- }
- }
-
- /**
- * Aborts noncommitted transactions.
- */
- public void txnsAbort() {
- try {
- while (!txns.isEmpty()) {
- txnAbort((Transaction) txns.get(0));
- }
- } catch (Exception e) {}
- }
-
- /**
- * Writes debug text to the log.
- *
- * @param text Text to be written to the log.
- */
- public void logDebugText(String text) {
- logger.fine("" + ": " + text);
- }
-
- /**
- * Prints configuration of tested JavaSpace for the current test.
- */
- protected void printSpaceInfo() {
- logDebugText("----- JavaSpace Info -----");
- String serviceImplClassname = getConfig().getStringConfigVal(spaceName
- + ".impl", "no implClassname");
- logDebugText("JavaSpace impl class -- " + serviceImplClassname);
- String serviceCodebase = getConfig().getStringConfigVal(spaceName
- + ".codebase", "no codebase");
- logDebugText("JavaSpace codebase -- " + serviceCodebase);
- String serviceClasspath = getConfig().getStringConfigVal(spaceName + ".classpath",
- "no classpath");
- logDebugText("JavaSpace classpath -- " + serviceClasspath);
- String servicePolicyFile = getConfig().getStringConfigVal(spaceName
- + ".policyfile", "no policyFile");
- logDebugText("JavaSpace policy file -- " + servicePolicyFile);
- logDebugText("--------------------------");
- }
-
- /**
- * Prints configuration of tested JavaSpace for the current test.
- *
- * @param txnMgrName Package name for transaction manager.
- */
- protected void printTxnMgrInfo(String txnMgrName) {
- logDebugText("----- Transaction Manager Info -----");
- String txnMgrImplClassname = getConfig().getStringConfigVal(txnMgrName
- + ".impl", "no implClassname");
- logDebugText("TxnManager impl class -- " + txnMgrImplClassname);
- String txnMgrCodebase = getConfig().getStringConfigVal(txnMgrName
- + ".codebase", "no codebase");
- logDebugText("TxnManager codebase -- " + txnMgrCodebase);
- String txnMgrClasspath = getConfig().getStringConfigVal(txnMgrName + ".classpath",
- "no classpath");
- logDebugText("TxnManager classpath -- " + txnMgrClasspath);
- String txnMgrPolicyFile = getConfig().getStringConfigVal(txnMgrName
- + ".policyfile", "no policyFile");
- logDebugText("TxnManager policy file -- " + txnMgrPolicyFile);
- logDebugText("------------------------------------");
- }
-
- protected Lease prepareLease(Lease l)
- throws ConfigurationException, RemoteException
- {
- if (l != null) {
- Configuration c = getConfig().getConfiguration();
- if (!(c instanceof com.sun.jini.qa.harness.QAConfiguration)) { // none configuration
- return l;
- }
- ProxyPreparer p = (ProxyPreparer)
- c.getEntry("test",
- "outriggerLeasePreparer",
- ProxyPreparer.class);
- if (p != null) {
- l = (Lease) p.prepareProxy(l);
- }
- }
- return l;
- }
-
- protected EventRegistration prepareRegistration(EventRegistration reg)
- throws ConfigurationException, RemoteException
- {
- if (reg != null) {
- Configuration c = getConfig().getConfiguration();
- if (!(c instanceof com.sun.jini.qa.harness.QAConfiguration)) { // none configuration
- return reg;
- }
- ProxyPreparer p = (ProxyPreparer)
- c.getEntry("test",
- "outriggerEventRegistrationPreparer",
- ProxyPreparer.class);
- if (p != null) {
- reg = (EventRegistration) p.prepareProxy(reg);
- }
- }
- return reg;
- }
+
}
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/TransactionWriteLeaseANYTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/TransactionWriteLeaseANYTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/TransactionWriteLeaseANYTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/TransactionWriteLeaseANYTest.java Wed Jan 2 05:20:52 2013
@@ -39,21 +39,7 @@ import com.sun.jini.qa.harness.QAConfig;
*
* @author Mikhail A. Markov
*/
-public class TransactionWriteLeaseANYTest extends AbstractTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+public class TransactionWriteLeaseANYTest extends TransactionTest {
/**
* This method asserts that write with <code>Lease.ANY</code>
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/TransactionWriteLeaseFOREVERTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/TransactionWriteLeaseFOREVERTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/TransactionWriteLeaseFOREVERTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/TransactionWriteLeaseFOREVERTest.java Wed Jan 2 05:20:52 2013
@@ -38,21 +38,7 @@ import com.sun.jini.qa.harness.QAConfig;
*
* @author Mikhail A. Markov
*/
-public class TransactionWriteLeaseFOREVERTest extends AbstractTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+public class TransactionWriteLeaseFOREVERTest extends TransactionTest {
/**
* This method asserts that write with <code>Lease.FOREVER</code>
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/TransactionWriteNegativeLeaseTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/TransactionWriteNegativeLeaseTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/TransactionWriteNegativeLeaseTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/TransactionWriteNegativeLeaseTest.java Wed Jan 2 05:20:52 2013
@@ -33,21 +33,7 @@ import com.sun.jini.qa.harness.QAConfig;
*
* @author Mikhail A. Markov
*/
-public class TransactionWriteNegativeLeaseTest extends AbstractTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+public class TransactionWriteNegativeLeaseTest extends TransactionTest {
/**
* This method asserts, that we will get an IllegalArgumentException if the
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/TransactionWriteTakeIfExistsNotifyTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/TransactionWriteTakeIfExistsNotifyTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/TransactionWriteTakeIfExistsNotifyTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/TransactionWriteTakeIfExistsNotifyTest.java Wed Jan 2 05:20:52 2013
@@ -36,21 +36,7 @@ import com.sun.jini.qa.harness.QAConfig;
*
* @author Mikhail A. Markov
*/
-public class TransactionWriteTakeIfExistsNotifyTest extends AbstractTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+public class TransactionWriteTakeIfExistsNotifyTest extends TransactionTest {
/**
* This method asserts, that if an entry is written under
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/TransactionWriteTakeIfExistsTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/TransactionWriteTakeIfExistsTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/TransactionWriteTakeIfExistsTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/TransactionWriteTakeIfExistsTest.java Wed Jan 2 05:20:52 2013
@@ -34,21 +34,7 @@ import com.sun.jini.qa.harness.QAConfig;
*
* @author Mikhail A. Markov
*/
-public class TransactionWriteTakeIfExistsTest extends AbstractTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+public class TransactionWriteTakeIfExistsTest extends TransactionTest {
/**
* This method asserts that if the entry is written and
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/TransactionWriteTakeNotifyTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/TransactionWriteTakeNotifyTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/TransactionWriteTakeNotifyTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/TransactionWriteTakeNotifyTest.java Wed Jan 2 05:20:52 2013
@@ -36,21 +36,7 @@ import com.sun.jini.qa.harness.QAConfig;
*
* @author Mikhail A. Markov
*/
-public class TransactionWriteTakeNotifyTest extends AbstractTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+public class TransactionWriteTakeNotifyTest extends TransactionTest {
/**
* This method asserts, that if an entry is written under
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/TransactionWriteTakeTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/TransactionWriteTakeTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/TransactionWriteTakeTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/TransactionWriteTakeTest.java Wed Jan 2 05:20:52 2013
@@ -34,21 +34,7 @@ import com.sun.jini.qa.harness.QAConfig;
*
* @author Mikhail A. Markov
*/
-public class TransactionWriteTakeTest extends AbstractTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+public class TransactionWriteTakeTest extends TransactionTest {
/**
* This method asserts that if the entry is written and after that
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/TransactionWriteTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/TransactionWriteTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/TransactionWriteTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/TransactionWriteTest.java Wed Jan 2 05:20:52 2013
@@ -37,21 +37,7 @@ import com.sun.jini.qa.harness.QAConfig;
*
* @author Mikhail A. Markov
*/
-public class TransactionWriteTest extends AbstractTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+public class TransactionWriteTest extends TransactionTest {
/**
* This method asserts that write with positive finite lease times
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/TransactionWriteTest05.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/TransactionWriteTest05.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/TransactionWriteTest05.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/TransactionWriteTest05.java Wed Jan 2 05:20:52 2013
@@ -34,22 +34,7 @@ import net.jini.core.lease.Lease;
*
* @author Pavel Bogdanov
*/
-public class TransactionWriteTest05 extends AbstractTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config
- * @throws Exception
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+public class TransactionWriteTest05 extends TransactionTest {
/**
* This method asserts that write:<br>
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/WriteLeaseANYTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/WriteLeaseANYTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/WriteLeaseANYTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/WriteLeaseANYTest.java Wed Jan 2 05:20:52 2013
@@ -38,7 +38,7 @@ import com.sun.jini.qa.harness.QAConfig;
*
* @author Mikhail A. Markov
*/
-public class WriteLeaseANYTest extends AbstractTestBase {
+public class WriteLeaseANYTest extends JavaSpaceTest {
/**
* This method asserts that write with <code>Lease.ANY</code>
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/WriteLeaseFOREVERTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/WriteLeaseFOREVERTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/WriteLeaseFOREVERTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/WriteLeaseFOREVERTest.java Wed Jan 2 05:20:52 2013
@@ -37,7 +37,7 @@ import com.sun.jini.qa.harness.QAConfig;
*
* @author Mikhail A. Markov
*/
-public class WriteLeaseFOREVERTest extends AbstractTestBase {
+public class WriteLeaseFOREVERTest extends JavaSpaceTest {
/**
* This method asserts that write with <code>Lease.FOREVER</code> lease time
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/WriteNegativeLeaseTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/WriteNegativeLeaseTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/WriteNegativeLeaseTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/WriteNegativeLeaseTest.java Wed Jan 2 05:20:52 2013
@@ -29,7 +29,7 @@ import com.sun.jini.qa.harness.QAConfig;
*
* @author Mikhail A. Markov
*/
-public class WriteNegativeLeaseTest extends AbstractTestBase {
+public class WriteNegativeLeaseTest extends JavaSpaceTest {
/**
* This method asserts, that we will get an IllegalArgumentException if the
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/WriteTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/WriteTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/WriteTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/WriteTest.java Wed Jan 2 05:20:52 2013
@@ -34,7 +34,7 @@ import com.sun.jini.qa.harness.QAConfig;
*
* @author Mikhail A. Markov
*/
-public class WriteTest extends AbstractTestBase {
+public class WriteTest extends JavaSpaceTest {
/**
* This method asserts that write with positive finite lease times
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/WriteTest05.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/WriteTest05.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/WriteTest05.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/WriteTest05.java Wed Jan 2 05:20:52 2013
@@ -28,7 +28,7 @@ import net.jini.core.lease.Lease;
*
* @author Pavel Bogdanov
*/
-public class WriteTest05 extends AbstractTestBase {
+public class WriteTest05 extends JavaSpaceTest {
/**
* This method asserts that write:<br>
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotExpirationNotifyTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotExpirationNotifyTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotExpirationNotifyTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotExpirationNotifyTest.java Wed Jan 2 05:20:52 2013
@@ -17,6 +17,7 @@
*/
package com.sun.jini.test.spec.javaspace.conformance.snapshot;
+import com.sun.jini.qa.harness.Test;
import java.util.logging.Level;
// net.jini
@@ -31,6 +32,7 @@ import com.sun.jini.qa.harness.TestExcep
// com.sun.jini.qa
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
import com.sun.jini.test.spec.javaspace.conformance.NotifyCounter;
+import com.sun.jini.test.spec.javaspace.conformance.TransactionTest;
/**
@@ -43,21 +45,7 @@ import com.sun.jini.test.spec.javaspace.
*
* @author Mikhail A. Markov
*/
-public class SnapshotExpirationNotifyTest extends SnapshotAbstractTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param sysConfig QAConfig from the runner for setup.
- */
- public void setup(com.sun.jini.qa.harness.QAConfig sysConfig) throws Exception {
-
- // mandatory call to parent
- super.setup(sysConfig);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+public class SnapshotExpirationNotifyTest extends TransactionTest {
/**
* This method asserts, that the request specified by a
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotExpirationTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotExpirationTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotExpirationTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotExpirationTest.java Wed Jan 2 05:20:52 2013
@@ -28,6 +28,7 @@ import net.jini.space.JavaSpace;
import com.sun.jini.qa.harness.TestException;
// com.sun.jini.qa
+import com.sun.jini.test.spec.javaspace.conformance.JavaSpaceTest;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
@@ -39,7 +40,7 @@ import com.sun.jini.test.spec.javaspace.
*
* @author Mikhail A. Markov
*/
-public class SnapshotExpirationTest extends SnapshotAbstractTestBase {
+public class SnapshotExpirationTest extends JavaSpaceTest {
/**
* This method asserts, that when the lease expires,
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotLeaseTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotLeaseTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotLeaseTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotLeaseTest.java Wed Jan 2 05:20:52 2013
@@ -27,6 +27,7 @@ import net.jini.core.lease.Lease;
import com.sun.jini.qa.harness.TestException;
// com.sun.jini.qa
+import com.sun.jini.test.spec.javaspace.conformance.JavaSpaceTest;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
@@ -38,7 +39,7 @@ import com.sun.jini.test.spec.javaspace.
*
* @author Mikhail A. Markov
*/
-public class SnapshotLeaseTest extends SnapshotAbstractTestBase {
+public class SnapshotLeaseTest extends JavaSpaceTest {
/**
* This method asserts, that each write invocation returns a Lease object
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotModifyEntryTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotModifyEntryTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotModifyEntryTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotModifyEntryTest.java Wed Jan 2 05:20:52 2013
@@ -26,6 +26,7 @@ import net.jini.core.entry.Entry;
import com.sun.jini.qa.harness.TestException;
// com.sun.jini.qa
+import com.sun.jini.test.spec.javaspace.conformance.JavaSpaceTest;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
@@ -36,7 +37,7 @@ import com.sun.jini.test.spec.javaspace.
*
* @author Mikhail A. Markov
*/
-public class SnapshotModifyEntryTest extends SnapshotAbstractTestBase {
+public class SnapshotModifyEntryTest extends JavaSpaceTest {
/**
* This method asserts, that:
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotMultipleTakeIfExistsNO_WAITTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotMultipleTakeIfExistsNO_WAITTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotMultipleTakeIfExistsNO_WAITTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotMultipleTakeIfExistsNO_WAITTest.java Wed Jan 2 05:20:52 2013
@@ -46,7 +46,7 @@ import com.sun.jini.test.spec.javaspace.
* @author Mikhail A. Markov
*/
public class SnapshotMultipleTakeIfExistsNO_WAITTest
- extends SnapshotAbstractTakeTestBase
+ extends SnapshotTakeTestBase
{
/**
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotMultipleTakeIfExistsTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotMultipleTakeIfExistsTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotMultipleTakeIfExistsTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotMultipleTakeIfExistsTest.java Wed Jan 2 05:20:52 2013
@@ -44,7 +44,7 @@ import com.sun.jini.test.spec.javaspace.
* @author Mikhail A. Markov
*/
public class SnapshotMultipleTakeIfExistsTest
- extends SnapshotAbstractTakeTestBase
+ extends SnapshotTakeTestBase
{
/**
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotMultipleTakeNO_WAITTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotMultipleTakeNO_WAITTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotMultipleTakeNO_WAITTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotMultipleTakeNO_WAITTest.java Wed Jan 2 05:20:52 2013
@@ -45,7 +45,7 @@ import com.sun.jini.test.spec.javaspace.
* @author Mikhail A. Markov
*/
public class SnapshotMultipleTakeNO_WAITTest
- extends SnapshotAbstractTakeTestBase
+ extends SnapshotTakeTestBase
{
/**
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotMultipleTakeTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotMultipleTakeTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotMultipleTakeTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotMultipleTakeTest.java Wed Jan 2 05:20:52 2013
@@ -43,7 +43,7 @@ import com.sun.jini.test.spec.javaspace.
*
* @author Mikhail A. Markov
*/
-public class SnapshotMultipleTakeTest extends SnapshotAbstractTakeTestBase {
+public class SnapshotMultipleTakeTest extends SnapshotTakeTestBase {
/**
* This method asserts that for take with timeouts other then NO_WAIT:
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotNotifyLeaseANYTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotNotifyLeaseANYTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotNotifyLeaseANYTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotNotifyLeaseANYTest.java Wed Jan 2 05:20:52 2013
@@ -28,6 +28,7 @@ import net.jini.core.event.EventRegistra
import com.sun.jini.qa.harness.TestException;
// com.sun.jini.qa
+import com.sun.jini.test.spec.javaspace.conformance.JavaSpaceTest;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
import com.sun.jini.test.spec.javaspace.conformance.NotifyCounter;
@@ -45,7 +46,7 @@ import com.sun.jini.test.spec.javaspace.
*
* @author Mikhail A. Markov
*/
-public class SnapshotNotifyLeaseANYTest extends SnapshotAbstractTestBase {
+public class SnapshotNotifyLeaseANYTest extends JavaSpaceTest {
/**
* This method asserts, that for notify with <code>Lease.ANY</code>
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotNotifyLeaseFOREVERTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotNotifyLeaseFOREVERTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotNotifyLeaseFOREVERTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotNotifyLeaseFOREVERTest.java Wed Jan 2 05:20:52 2013
@@ -28,6 +28,7 @@ import net.jini.core.event.EventRegistra
import com.sun.jini.qa.harness.TestException;
// com.sun.jini.qa
+import com.sun.jini.test.spec.javaspace.conformance.JavaSpaceTest;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
import com.sun.jini.test.spec.javaspace.conformance.NotifyCounter;
@@ -45,7 +46,7 @@ import com.sun.jini.test.spec.javaspace.
*
* @author Mikhail A. Markov
*/
-public class SnapshotNotifyLeaseFOREVERTest extends SnapshotAbstractTestBase {
+public class SnapshotNotifyLeaseFOREVERTest extends JavaSpaceTest {
/**
* This method asserts, that for notify with <code>Lease.FOREVER</code>
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotNotifyNegativeLeaseTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotNotifyNegativeLeaseTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotNotifyNegativeLeaseTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotNotifyNegativeLeaseTest.java Wed Jan 2 05:20:52 2013
@@ -28,6 +28,7 @@ import net.jini.core.event.EventRegistra
import com.sun.jini.qa.harness.TestException;
// com.sun.jini.qa
+import com.sun.jini.test.spec.javaspace.conformance.JavaSpaceTest;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
@@ -40,7 +41,7 @@ import com.sun.jini.test.spec.javaspace.
*
* @author Mikhail A. Markov
*/
-public class SnapshotNotifyNegativeLeaseTest extends SnapshotAbstractTestBase {
+public class SnapshotNotifyNegativeLeaseTest extends JavaSpaceTest {
/**
* This method asserts, that we will get
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotNotifyNonNullTxnParamTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotNotifyNonNullTxnParamTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotNotifyNonNullTxnParamTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotNotifyNonNullTxnParamTest.java Wed Jan 2 05:20:52 2013
@@ -30,8 +30,10 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
import com.sun.jini.test.spec.javaspace.conformance.NotifyCounter;
+import com.sun.jini.test.spec.javaspace.conformance.TransactionTest;
/**
@@ -45,21 +47,7 @@ import com.sun.jini.test.spec.javaspace.
* @author Mikhail A. Markov
*/
public class SnapshotNotifyNonNullTxnParamTest
- extends SnapshotAbstractTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+ extends TransactionTest {
/**
* This method asserts, that if the transaction parameter is not
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotNotifyNullTxnParamTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotNotifyNullTxnParamTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotNotifyNullTxnParamTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotNotifyNullTxnParamTest.java Wed Jan 2 05:20:52 2013
@@ -30,8 +30,10 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
import com.sun.jini.test.spec.javaspace.conformance.NotifyCounter;
+import com.sun.jini.test.spec.javaspace.conformance.TransactionTest;
/**
@@ -47,21 +49,7 @@ import com.sun.jini.test.spec.javaspace.
*
* @author Mikhail A. Markov
*/
-public class SnapshotNotifyNullTxnParamTest extends SnapshotAbstractTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+public class SnapshotNotifyNullTxnParamTest extends TransactionTest {
/**
* This method asserts, that:
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotNotifyTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotNotifyTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotNotifyTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotNotifyTest.java Wed Jan 2 05:20:52 2013
@@ -27,6 +27,7 @@ import net.jini.core.event.EventRegistra
import com.sun.jini.qa.harness.TestException;
// com.sun.jini.qa
+import com.sun.jini.test.spec.javaspace.conformance.JavaSpaceTest;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
import com.sun.jini.test.spec.javaspace.conformance.NotifyCounter;
@@ -43,7 +44,7 @@ import com.sun.jini.test.spec.javaspace.
*
* @author Mikhail A. Markov
*/
-public class SnapshotNotifyTest extends SnapshotAbstractTestBase {
+public class SnapshotNotifyTest extends JavaSpaceTest {
/**
* This method asserts, that for notify with finite lease times:
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotReadIfExistsNO_WAITTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotReadIfExistsNO_WAITTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotReadIfExistsNO_WAITTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotReadIfExistsNO_WAITTest.java Wed Jan 2 05:20:52 2013
@@ -44,7 +44,7 @@ import com.sun.jini.test.spec.javaspace.
* @author Mikhail A. Markov
*/
public class SnapshotReadIfExistsNO_WAITTest
- extends SnapshotAbstractReadTestBase
+ extends SnapshotReadTestBase
{
/**
* This method asserts that for readIfExists with NO_WAIT timeout:
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotReadIfExistsTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotReadIfExistsTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotReadIfExistsTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotReadIfExistsTest.java Wed Jan 2 05:20:52 2013
@@ -43,7 +43,7 @@ import com.sun.jini.test.spec.javaspace.
*
* @author Mikhail A. Markov
*/
-public class SnapshotReadIfExistsTest extends SnapshotAbstractReadTestBase {
+public class SnapshotReadIfExistsTest extends SnapshotReadTestBase {
/**
* This method asserts that for takeIfExists with timeouts
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotReadNO_WAITTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotReadNO_WAITTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotReadNO_WAITTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotReadNO_WAITTest.java Wed Jan 2 05:20:52 2013
@@ -42,7 +42,7 @@ import com.sun.jini.test.spec.javaspace.
*
* @author Mikhail A. Markov
*/
-public class SnapshotReadNO_WAITTest extends SnapshotAbstractReadTestBase {
+public class SnapshotReadNO_WAITTest extends SnapshotReadTestBase {
/**
* This method asserts that for read with NO_WAIT timeout:
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotReadTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotReadTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotReadTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotReadTest.java Wed Jan 2 05:20:52 2013
@@ -40,7 +40,7 @@ import com.sun.jini.test.spec.javaspace.
*
* @author Mikhail A. Markov
*/
-public class SnapshotReadTest extends SnapshotAbstractReadTestBase {
+public class SnapshotReadTest extends SnapshotReadTestBase {
/**
* This method asserts that for read with timeouts other then NO_WAIT:
Copied: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotReadTestBase.java (from r1424289, river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotAbstractReadTestBase.java)
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotReadTestBase.java?p2=river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotReadTestBase.java&p1=river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotAbstractReadTestBase.java&r1=1424289&r2=1427655&rev=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotAbstractReadTestBase.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotReadTestBase.java Wed Jan 2 05:20:52 2013
@@ -26,6 +26,7 @@ import net.jini.space.JavaSpace;
// com.sun.jini
import com.sun.jini.qa.harness.TestException;
+import com.sun.jini.test.spec.javaspace.conformance.JavaSpaceTest;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
@@ -34,8 +35,8 @@ import com.sun.jini.test.spec.javaspace.
*
* @author Mikhail A. Markov
*/
-public abstract class SnapshotAbstractReadTestBase
- extends SnapshotAbstractTestBase {
+public abstract class SnapshotReadTestBase
+ extends JavaSpaceTest {
/**
* Main testing method which tests read/readIfExists method
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTakeIfExistsNO_WAITTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTakeIfExistsNO_WAITTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTakeIfExistsNO_WAITTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTakeIfExistsNO_WAITTest.java Wed Jan 2 05:20:52 2013
@@ -44,7 +44,7 @@ import com.sun.jini.test.spec.javaspace.
* @author Mikhail A. Markov
*/
public class SnapshotTakeIfExistsNO_WAITTest
- extends SnapshotAbstractTakeTestBase
+ extends SnapshotTakeTestBase
{
/**
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTakeIfExistsTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTakeIfExistsTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTakeIfExistsTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTakeIfExistsTest.java Wed Jan 2 05:20:52 2013
@@ -41,7 +41,7 @@ import com.sun.jini.test.spec.javaspace.
*
* @author Mikhail A. Markov
*/
-public class SnapshotTakeIfExistsTest extends SnapshotAbstractTakeTestBase {
+public class SnapshotTakeIfExistsTest extends SnapshotTakeTestBase {
/**
* This method asserts that for takeIfExists with timeouts
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTakeNO_WAITTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTakeNO_WAITTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTakeNO_WAITTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTakeNO_WAITTest.java Wed Jan 2 05:20:52 2013
@@ -42,7 +42,7 @@ import com.sun.jini.test.spec.javaspace.
*
* @author Mikhail A. Markov
*/
-public class SnapshotTakeNO_WAITTest extends SnapshotAbstractTakeTestBase {
+public class SnapshotTakeNO_WAITTest extends SnapshotTakeTestBase {
/**
* This method asserts that for take with NO_WAIT timeout:
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTakeTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTakeTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTakeTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTakeTest.java Wed Jan 2 05:20:52 2013
@@ -40,7 +40,7 @@ import com.sun.jini.test.spec.javaspace.
*
* @author Mikhail A. Markov
*/
-public class SnapshotTakeTest extends SnapshotAbstractTakeTestBase {
+public class SnapshotTakeTest extends SnapshotTakeTestBase {
/**
* This method asserts that for take with timeouts other then NO_WAIT:
Copied: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTakeTestBase.java (from r1424289, river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotAbstractTakeTestBase.java)
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTakeTestBase.java?p2=river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTakeTestBase.java&p1=river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotAbstractTakeTestBase.java&r1=1424289&r2=1427655&rev=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotAbstractTakeTestBase.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTakeTestBase.java Wed Jan 2 05:20:52 2013
@@ -26,6 +26,7 @@ import net.jini.space.JavaSpace;
// com.sun.jini
import com.sun.jini.qa.harness.TestException;
+import com.sun.jini.test.spec.javaspace.conformance.JavaSpaceTest;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
@@ -34,8 +35,8 @@ import com.sun.jini.test.spec.javaspace.
*
* @author Mikhail A. Markov
*/
-public abstract class SnapshotAbstractTakeTestBase
- extends SnapshotAbstractTestBase {
+public abstract class SnapshotTakeTestBase
+ extends JavaSpaceTest {
/**
* Main testing method which tests take/takeIfExists method
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionAbortWriteTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionAbortWriteTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionAbortWriteTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionAbortWriteTest.java Wed Jan 2 05:20:52 2013
@@ -29,7 +29,9 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
+import com.sun.jini.test.spec.javaspace.conformance.TransactionTest;
/**
@@ -41,21 +43,7 @@ import com.sun.jini.test.spec.javaspace.
* @author Mikhail A. Markov
*/
public class SnapshotTransactionAbortWriteTest
- extends SnapshotAbstractTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+ extends TransactionTest {
/**
* This method asserts that entries written under a transaction
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionCommitTakeIfExistsTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionCommitTakeIfExistsTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionCommitTakeIfExistsTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionCommitTakeIfExistsTest.java Wed Jan 2 05:20:52 2013
@@ -30,9 +30,11 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
import com.sun.jini.test.spec.javaspace.conformance.ParticipantImpl;
import com.sun.jini.test.spec.javaspace.conformance.Committer;
+import com.sun.jini.test.spec.javaspace.conformance.TransactionTest;
/**
@@ -45,21 +47,7 @@ import com.sun.jini.test.spec.javaspace.
* @author Mikhail A. Markov
*/
public class SnapshotTransactionCommitTakeIfExistsTest
- extends SnapshotAbstractTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+ extends TransactionTest {
/**
* This method asserts that a takeIfExists is considered to be successful
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionCommitTakeTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionCommitTakeTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionCommitTakeTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionCommitTakeTest.java Wed Jan 2 05:20:52 2013
@@ -30,9 +30,11 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
import com.sun.jini.test.spec.javaspace.conformance.ParticipantImpl;
import com.sun.jini.test.spec.javaspace.conformance.Committer;
+import com.sun.jini.test.spec.javaspace.conformance.TransactionTest;
/**
@@ -44,21 +46,7 @@ import com.sun.jini.test.spec.javaspace.
* @author Mikhail A. Markov
*/
public class SnapshotTransactionCommitTakeTest
- extends SnapshotAbstractTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+ extends TransactionTest {
/**
* This method asserts that a take is considered to be successful
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionCommitWriteTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionCommitWriteTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionCommitWriteTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionCommitWriteTest.java Wed Jan 2 05:20:52 2013
@@ -29,7 +29,9 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
+import com.sun.jini.test.spec.javaspace.conformance.TransactionTest;
/**
@@ -42,21 +44,7 @@ import com.sun.jini.test.spec.javaspace.
* @author Mikhail A. Markov
*/
public class SnapshotTransactionCommitWriteTest
- extends SnapshotAbstractTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+ extends TransactionTest {
/**
* This method asserts that an entry that is written under the
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionExpirationTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionExpirationTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionExpirationTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionExpirationTest.java Wed Jan 2 05:20:52 2013
@@ -30,7 +30,9 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
+import com.sun.jini.test.spec.javaspace.conformance.TransactionTest;
/**
@@ -42,21 +44,7 @@ import com.sun.jini.test.spec.javaspace.
* @author Mikhail A. Markov
*/
public class SnapshotTransactionExpirationTest
- extends SnapshotAbstractTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+ extends TransactionTest {
/**
* This method asserts, that when the lease expires,
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionLeaseTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionLeaseTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionLeaseTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionLeaseTest.java Wed Jan 2 05:20:52 2013
@@ -29,7 +29,9 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
+import com.sun.jini.test.spec.javaspace.conformance.TransactionTest;
/**
@@ -41,21 +43,7 @@ import com.sun.jini.test.spec.javaspace.
*
* @author Mikhail A. Markov
*/
-public class SnapshotTransactionLeaseTest extends SnapshotAbstractTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+public class SnapshotTransactionLeaseTest extends TransactionTest {
/**
* This method asserts, that each write invocation within the non null
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionMultipleTakeIfExistsNO_WAITTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionMultipleTakeIfExistsNO_WAITTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionMultipleTakeIfExistsNO_WAITTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionMultipleTakeIfExistsNO_WAITTest.java Wed Jan 2 05:20:52 2013
@@ -28,6 +28,7 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
@@ -48,21 +49,7 @@ import com.sun.jini.test.spec.javaspace.
* @author Mikhail A. Markov
*/
public class SnapshotTransactionMultipleTakeIfExistsNO_WAITTest
- extends SnapshotAbstractTakeTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+ extends SnapshotTransactionTakeTestBase {
/**
* This method asserts that for takeIfExists with NO_WAIT timeout
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionMultipleTakeIfExistsTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionMultipleTakeIfExistsTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionMultipleTakeIfExistsTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionMultipleTakeIfExistsTest.java Wed Jan 2 05:20:52 2013
@@ -28,6 +28,7 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
@@ -46,21 +47,7 @@ import com.sun.jini.test.spec.javaspace.
* @author Mikhail A. Markov
*/
public class SnapshotTransactionMultipleTakeIfExistsTest
- extends SnapshotAbstractTakeTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+ extends SnapshotTransactionTakeTestBase {
/**
* This method asserts that for takeIfExists with timeouts
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionMultipleTakeNO_WAITTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionMultipleTakeNO_WAITTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionMultipleTakeNO_WAITTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionMultipleTakeNO_WAITTest.java Wed Jan 2 05:20:52 2013
@@ -28,6 +28,7 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
@@ -48,21 +49,7 @@ import com.sun.jini.test.spec.javaspace.
* @author Mikhail A. Markov
*/
public class SnapshotTransactionMultipleTakeNO_WAITTest
- extends SnapshotAbstractTakeTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+ extends SnapshotTransactionTakeTestBase {
/**
* This method asserts that for take with NO_WAIT timeout
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionMultipleTakeTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionMultipleTakeTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionMultipleTakeTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionMultipleTakeTest.java Wed Jan 2 05:20:52 2013
@@ -28,6 +28,7 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
@@ -46,21 +47,7 @@ import com.sun.jini.test.spec.javaspace.
* @author Mikhail A. Markov
*/
public class SnapshotTransactionMultipleTakeTest
- extends SnapshotAbstractTakeTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+ extends SnapshotTransactionTakeTestBase {
/**
* This method asserts that for take with timeouts
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionNotifyLeaseANYTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionNotifyLeaseANYTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionNotifyLeaseANYTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionNotifyLeaseANYTest.java Wed Jan 2 05:20:52 2013
@@ -30,8 +30,10 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
import com.sun.jini.test.spec.javaspace.conformance.NotifyCounter;
+import com.sun.jini.test.spec.javaspace.conformance.TransactionTest;
/**
@@ -48,21 +50,7 @@ import com.sun.jini.test.spec.javaspace.
* @author Mikhail A. Markov
*/
public class SnapshotTransactionNotifyLeaseANYTest
- extends SnapshotAbstractTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+ extends TransactionTest {
/**
* This method asserts, that for notify with <code>Lease.ANY</code>
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionNotifyLeaseFOREVERTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionNotifyLeaseFOREVERTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionNotifyLeaseFOREVERTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionNotifyLeaseFOREVERTest.java Wed Jan 2 05:20:52 2013
@@ -30,8 +30,10 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
import com.sun.jini.test.spec.javaspace.conformance.NotifyCounter;
+import com.sun.jini.test.spec.javaspace.conformance.TransactionTest;
/**
@@ -48,21 +50,7 @@ import com.sun.jini.test.spec.javaspace.
* @author Mikhail A. Markov
*/
public class SnapshotTransactionNotifyLeaseFOREVERTest
- extends SnapshotAbstractTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+ extends TransactionTest {
/**
* This method asserts, that for notify with <code>Lease.FOREVER</code>
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionNotifyNegativeLeaseTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionNotifyNegativeLeaseTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionNotifyNegativeLeaseTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionNotifyNegativeLeaseTest.java Wed Jan 2 05:20:52 2013
@@ -30,7 +30,9 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
+import com.sun.jini.test.spec.javaspace.conformance.TransactionTest;
/**
@@ -43,21 +45,7 @@ import com.sun.jini.test.spec.javaspace.
* @author Mikhail A. Markov
*/
public class SnapshotTransactionNotifyNegativeLeaseTest
- extends SnapshotAbstractTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+ extends TransactionTest {
/**
* This method asserts, that we will get
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionNotifyTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionNotifyTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionNotifyTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionNotifyTest.java Wed Jan 2 05:20:52 2013
@@ -29,8 +29,10 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
import com.sun.jini.test.spec.javaspace.conformance.NotifyCounter;
+import com.sun.jini.test.spec.javaspace.conformance.TransactionTest;
/**
@@ -46,21 +48,7 @@ import com.sun.jini.test.spec.javaspace.
*
* @author Mikhail A. Markov
*/
-public class SnapshotTransactionNotifyTest extends SnapshotAbstractTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+public class SnapshotTransactionNotifyTest extends TransactionTest {
/**
* This method asserts, that for notify with finite lease times
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionReadIfExistsNO_WAITTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionReadIfExistsNO_WAITTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionReadIfExistsNO_WAITTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionReadIfExistsNO_WAITTest.java Wed Jan 2 05:20:52 2013
@@ -28,6 +28,7 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
@@ -46,21 +47,7 @@ import com.sun.jini.test.spec.javaspace.
* @author Mikhail A. Markov
*/
public class SnapshotTransactionReadIfExistsNO_WAITTest
- extends SnapshotAbstractReadTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+ extends SnapshotTransactionReadTestBase {
/**
* This method asserts that for readIfExists within the non null