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 [15/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...
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/leasing/LeaseUsesTestBase.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/leasing/LeaseUsesTestBase.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/leasing/LeaseUsesTestBase.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/leasing/LeaseUsesTestBase.java Wed Jan 2 05:20:52 2013
@@ -30,6 +30,7 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// Shared classes
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.share.TestBase;
@@ -94,9 +95,10 @@ public abstract class LeaseUsesTestBase
*/
protected abstract boolean isAvailable() throws TestException;
- public void setup(QAConfig config) throws Exception {
- super.setup(config);
+ public Test construct(QAConfig config) throws Exception {
+ super.construct(config);
this.parse();
+ return this;
}
/**
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/AdminIteratorTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/AdminIteratorTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/AdminIteratorTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/AdminIteratorTest.java Wed Jan 2 05:20:52 2013
@@ -34,6 +34,7 @@ import net.jini.space.JavaSpace;
import net.jini.admin.Administrable;
import com.sun.jini.outrigger.JavaSpaceAdmin;
import com.sun.jini.outrigger.AdminIterator;
+import com.sun.jini.qa.harness.Test;
/**
@@ -63,11 +64,12 @@ public class AdminIteratorTest extends M
/**
* Sets up the testing environment.
*
- * @param config Arguments from the runner for setup.
+ * @param config Arguments from the runner for construct.
*/
- public void setup(QAConfig config) throws Exception {
- super.setup(config);
+ public Test construct(QAConfig config) throws Exception {
+ super.construct(config);
this.parse();
+ return this;
}
public void run() throws Exception {
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/BlockingTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/BlockingTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/BlockingTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/BlockingTest.java Wed Jan 2 05:20:52 2013
@@ -25,6 +25,7 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// All other imports
+import com.sun.jini.qa.harness.Test;
import java.util.List;
import java.util.Iterator;
import java.rmi.*;
@@ -51,11 +52,12 @@ public class BlockingTest extends MatchT
/**
* Sets up the testing environment.
*
- * @param config Arguments from the runner for setup.
+ * @param config Arguments from the runner for construct.
*/
- public void setup(QAConfig config) throws Exception {
- super.setup(config);
+ public Test construct(QAConfig config) throws Exception {
+ super.construct(config);
this.parse();
+ return this;
}
public void run() throws Exception {
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/FieldMatchTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/FieldMatchTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/FieldMatchTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/FieldMatchTest.java Wed Jan 2 05:20:52 2013
@@ -33,6 +33,7 @@ import net.jini.space.JavaSpace;
import net.jini.core.entry.UnusableEntryException;
import com.sun.jini.outrigger.JavaSpaceAdmin;
import com.sun.jini.outrigger.AdminIterator;
+import com.sun.jini.qa.harness.Test;
/**
@@ -102,11 +103,12 @@ public class FieldMatchTest extends Matc
/**
* Sets up the testing environment.
*
- * @param config Arguments from the runner for setup.
+ * @param config Arguments from the runner for construct.
*/
- public void setup(QAConfig config) throws Exception {
- super.setup(config);
+ public Test construct(QAConfig config) throws Exception {
+ super.construct(config);
this.parse();
+ return this;
}
public void run() throws Exception {
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/FieldNotifyTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/FieldNotifyTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/FieldNotifyTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/FieldNotifyTest.java Wed Jan 2 05:20:52 2013
@@ -24,6 +24,7 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// All other imports
+import com.sun.jini.qa.harness.Test;
import java.rmi.*;
import java.util.List;
import java.util.Iterator;
@@ -42,11 +43,12 @@ public class FieldNotifyTest extends Mat
/**
* Sets up the testing environment.
*
- * @param config Arguments from the runner for setup.
+ * @param config Arguments from the runner for construct.
*/
- public void setup(QAConfig config) throws Exception {
- super.setup(config);
+ public Test construct(QAConfig config) throws Exception {
+ super.construct(config);
this.parse();
+ return this;
}
protected void parse() throws Exception {
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/JavaSpaceAuditor.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/JavaSpaceAuditor.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/JavaSpaceAuditor.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/JavaSpaceAuditor.java Wed Jan 2 05:20:52 2013
@@ -59,7 +59,7 @@ import net.jini.security.ProxyPreparer;
import net.jini.security.TrustVerifier;
import net.jini.security.proxytrust.ProxyTrust;
-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.TestException;
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/MatchTestBase.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/MatchTestBase.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/MatchTestBase.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/MatchTestBase.java Wed Jan 2 05:20:52 2013
@@ -24,6 +24,7 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// All other imports
+import com.sun.jini.qa.harness.Test;
import java.util.List;
import java.util.Iterator;
import java.util.LinkedList;
@@ -58,10 +59,10 @@ public abstract class MatchTestBase exte
/**
* Sets up the testing environment.
*
- * @param config Arguments from the runner for setup.
+ * @param config Arguments from the runner for construct.
*/
- public void setup(QAConfig config) throws Exception {
- super.setup(config);
+ public Test construct(QAConfig config) throws Exception {
+ super.construct(config);
/*
* Would like to this next bit in an initlize but they
* can throw exception...
@@ -122,12 +123,13 @@ public abstract class MatchTestBase exte
}
space = new JavaSpaceAuditor(getConfig().getConfiguration(), space);
logger.log(Level.INFO, "Have JavaSpace and re-bound to Auditor");
+ return this;
}
/**
* Write a bunch of test entries to the JavaSpace.
- * Not valid until <code>setup()</code> is called.
- * @see MatchTestBase#setup
+ * Not valid until <code>construct()</code> is called.
+ * @see MatchTestBase#construct
*/
protected void writeBunch() throws Exception {
writeBunch(Class.forName("net.jini.core.entry.Entry"));
@@ -136,8 +138,8 @@ public abstract class MatchTestBase exte
/**
* Write a bunch of test entries to the JavaSpace that are
* instances of the passed class.
- * Not valid until <code>setup()</code> is called.
- * @see MatchTestBase#setup
+ * Not valid until <code>construct()</code> is called.
+ * @see MatchTestBase#construct
*/
protected void writeBunch(Class filter) throws Exception {
for (Iterator i = writeList.iterator(); i.hasNext();) {
@@ -155,8 +157,8 @@ public abstract class MatchTestBase exte
* Write a bunch of test entries to the JavaSpace that are
* instances of the class of the passed entry. <code>null</code>
* is considered to have the class <code>Entery</code>.
- * Not valid until <code>setup()</code> is called.
- * @see MatchTestBase#setup
+ * Not valid until <code>construct()</code> is called.
+ * @see MatchTestBase#construct
*/
protected void writeBunch(Entry filter) throws Exception {
if (filter == null) {
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/MatchTestCore.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/MatchTestCore.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/MatchTestCore.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/MatchTestCore.java Wed Jan 2 05:20:52 2013
@@ -24,10 +24,10 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// All other imports
+import com.sun.jini.qa.harness.Test;
import java.util.List;
import java.util.Iterator;
import java.util.LinkedList;
-import java.rmi.*;
import net.jini.core.lease.Lease;
import net.jini.core.entry.Entry;
import net.jini.space.JavaSpace;
@@ -35,20 +35,21 @@ import net.jini.core.entry.UnusableEntry
import net.jini.core.transaction.Transaction;
import net.jini.core.transaction.TransactionException;
import com.sun.jini.test.share.TestBase;
+import java.rmi.RemoteException;
/**
* Base class for matching tests. Sets up an audited JavaSpace and
- * provides a number of convince methods.
+ * provides a number of convenience methods.
*/
-public abstract class MatchTestCore extends TestBase {
+public abstract class MatchTestCore extends TestBase implements Test {
/**
* True if test should use <code>takeIfExists</code> and
* <code>readIfExists</code> over <code>take</code> and
* <code>read</code>
- * Not valid until <code>setup()</code> is called.
- * @see MatchTestBase#setup
+ * Not valid until <code>construct()</code> is called.
+ * @see MatchTestBase#construct
*/
protected boolean useIfExists = false;
@@ -59,7 +60,7 @@ public abstract class MatchTestCore exte
/**
* Time in milliseconds to wait for a read or take.
- * Not valid until <code>setup()</code> is called.
+ * Not valid until <code>construct()</code> is called.
*/
protected long queryTimeOut; // 10 seconds
private long tryShutdown;
@@ -67,8 +68,8 @@ public abstract class MatchTestCore exte
/**
* Convince method for doing a read on the JavaSpace, uses the
* proper form of read based on <code>useIfExists</code>.
- * Not valid until <code>setup()</code> is called.
- * @see MatchTestBase#setup
+ * Not valid until <code>construct()</code> is called.
+ * @see MatchTestBase#construct
* @see MatchTestBase#useIfExists
*/
protected Entry spaceRead(Entry tmpl, Transaction txn, long timeout)
@@ -84,8 +85,8 @@ public abstract class MatchTestCore exte
/**
* Convince method for doing a take on the JavaSpace, uses the
* proper form of take based on <code>useIfExists</code>.
- * Not valid until <code>setup()</code> is called.
- * @see MatchTestBase#setup
+ * Not valid until <code>construct()</code> is called.
+ * @see MatchTestBase#construct
* @see MatchTestBase#useIfExists
*/
protected Entry spaceTake(Entry tmpl, Transaction txn, long timeout)
@@ -101,8 +102,8 @@ public abstract class MatchTestCore exte
/**
* Convince method for dumping a UnusableEntryException to the
* log.
- * Not valid until <code>setup()</code> is called.
- * @see TestBase#setup
+ * Not valid until <code>construct()</code> is called.
+ * @see TestBase#construct
*/
protected void dumpUnusableEntryException(UnusableEntryException e) {
logger.log(Level.INFO, " Partial Entry:" + e.partialEntry, e);
@@ -152,16 +153,17 @@ public abstract class MatchTestCore exte
/**
* Sets up the testing environment.
*
- * @param config Arguments from the runner for setup.
+ * @param config Arguments from the runner for construct.
*/
- public void setup(QAConfig config) throws Exception {
- super.setup(config);
+ public Test construct(QAConfig config) throws Exception {
+ super.construct(config);
this.parse();
// Get the space for testing, and rebind it to audited space
specifyServices(new Class[] {
JavaSpace.class});
space = (JavaSpace) services[0];
+ return this;
}
/**
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/MismatchNotifyTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/MismatchNotifyTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/MismatchNotifyTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/MismatchNotifyTest.java Wed Jan 2 05:20:52 2013
@@ -24,6 +24,7 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// All other imports
+import com.sun.jini.qa.harness.Test;
import java.rmi.*;
import java.util.List;
import java.util.Iterator;
@@ -44,11 +45,12 @@ public class MismatchNotifyTest extends
/**
* Sets up the testing environment.
*
- * @param config Arguments from the runner for setup.
+ * @param config Arguments from the runner for construct.
*/
- public void setup(QAConfig config) throws Exception {
- super.setup(config);
+ public Test construct(QAConfig config) throws Exception {
+ super.construct(config);
this.parse();
+ return this;
}
protected void parse() throws Exception {
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/MismatchTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/MismatchTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/MismatchTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/MismatchTest.java Wed Jan 2 05:20:52 2013
@@ -24,6 +24,7 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// All other imports
+import com.sun.jini.qa.harness.Test;
import net.jini.core.entry.Entry;
import net.jini.space.JavaSpace;
import net.jini.core.entry.UnusableEntryException;
@@ -40,11 +41,12 @@ public class MismatchTest extends Single
/**
* Sets up the testing environment.
*
- * @param config Arguments from the runner for setup.
+ * @param config Arguments from the runner for construct.
*/
- public void setup(QAConfig config) throws Exception {
- super.setup(config);
+ public Test construct(QAConfig config) throws Exception {
+ super.construct(config);
this.parse();
+ return this;
}
/**
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/NotifyTestUtil.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/NotifyTestUtil.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/NotifyTestUtil.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/NotifyTestUtil.java Wed Jan 2 05:20:52 2013
@@ -21,7 +21,7 @@ import java.util.logging.Level;
// Test harness specific classes
import com.sun.jini.qa.harness.QAConfig;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
import com.sun.jini.qa.harness.TestException;
import java.io.PrintWriter;
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/SingletonMatchTestBase.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/SingletonMatchTestBase.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/SingletonMatchTestBase.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/SingletonMatchTestBase.java Wed Jan 2 05:20:52 2013
@@ -21,6 +21,7 @@ import java.util.logging.Level;
// Test harness specific classes
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.qa.harness.TestException;
// All other imports
@@ -43,11 +44,12 @@ public abstract class SingletonMatchTest
/**
* Sets up the testing environment.
*
- * @param config Arguments from the runner for setup.
+ * @param config Arguments from the runner for construct.
*/
- public void setup(QAConfig config) throws Exception {
- super.setup(config);
+ public Test construct(QAConfig config) throws Exception {
+ super.construct(config);
this.parse();
+ return this;
}
/**
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/StressTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/StressTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/StressTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/StressTest.java Wed Jan 2 05:20:52 2013
@@ -34,9 +34,11 @@ import net.jini.core.transaction.Transac
import net.jini.core.transaction.TransactionException;
import com.sun.jini.thread.TaskManager;
import com.sun.jini.constants.TimeConstants;
-import net.jini.admin.Administrable;
-import com.sun.jini.outrigger.JavaSpaceAdmin;
import com.sun.jini.outrigger.AdminIterator;
+import com.sun.jini.outrigger.JavaSpaceAdmin;
+import net.jini.admin.Administrable;
+import com.sun.jini.qa.harness.Test;
+import java.io.IOException;
/**
@@ -101,8 +103,8 @@ public class StressTest extends MatchTes
/**
* The <code>TaskManager</code> handling read/write tasks.
- * Not valid until <code>setup()</code> is called.
- * @see StressTest#setup
+ * Not valid until <code>construct()</code> is called.
+ * @see StressTest#construct
*/
private TaskManager taskMgr = null;
@@ -131,7 +133,7 @@ public class StressTest extends MatchTes
/**
* If set, compute timing statistics for reads, takes, and
* and write operations.
- * Not valid until <code>setup()</code> is called.
+ * Not valid until <code>construct()</code> is called.
*/
protected boolean timingStats;
@@ -139,7 +141,7 @@ public class StressTest extends MatchTes
* If set, verify each take operation with a subsequent read operation.
* That is, try reading an entry after it was taken in order
* to verify that the take took place.
- * Not valid until <code>setup()</code> is called.
+ * Not valid until <code>construct()</code> is called.
*/
protected boolean verifyingTakes;
@@ -213,13 +215,13 @@ public class StressTest extends MatchTes
* Sets up a TaskManager with enough threads to run all tasks concurrently
* as well as requesting a space to be started.
*/
- public void setup(QAConfig config) throws Exception {
+ public Test construct(QAConfig config) throws Exception {
if (debug) {
logger.log(Level.INFO, "setup()");
}
// Get the space for testing
- super.setup(config);
+ super.construct(config);
if (debug) {
logger.log(Level.INFO, "\tHave a JavaSpace");
@@ -247,6 +249,7 @@ public class StressTest extends MatchTes
taskMgr = new TaskManager(numReaders + numWriters,
1000 * 60, // idle timeout -- 60 secs
1.0f); // load factor
+ return this;
}
/**
@@ -273,7 +276,7 @@ public class StressTest extends MatchTes
/*
* Determine allocation of write requests per write task
* Note: There is already a pre-check for entryAllocation == 0
- * in the setup() method. If entryAllocation == 0 the program
+ * in the construct() method. If entryAllocation == 0 the program
* should fail earlier than here.
*/
int entryAllocation = numEntries / numWriters;
@@ -303,7 +306,7 @@ public class StressTest extends MatchTes
/*
* Determine allocation of read requests per read task.
* Note: There is already a pre-check for entryAllocation == 0
- * in the setup() method. If entryAllocation == 0 the program
+ * in the construct() method. If entryAllocation == 0 the program
* should fail earlier than here.
*/
entryAllocation = numEntries / numReaders;
@@ -1013,7 +1016,7 @@ public class StressTest extends MatchTes
/**
* Internal counter variable.
*/
- private int _count = 0;
+ private volatile int _count = 0;
/**
* Constructor. Declared to enforce protection level.
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/SuperclassTmplGen.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/SuperclassTmplGen.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/SuperclassTmplGen.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/SuperclassTmplGen.java Wed Jan 2 05:20:52 2013
@@ -21,7 +21,6 @@ package com.sun.jini.test.impl.outrigger
import net.jini.core.entry.Entry;
import java.lang.reflect.*;
-
/**
* Template generator that generate all the templates that are a
* proper super clase of and match the UniqueEntry or NBEUniqueEntry
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/SupertypeMatchTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/SupertypeMatchTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/SupertypeMatchTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/SupertypeMatchTest.java Wed Jan 2 05:20:52 2013
@@ -24,6 +24,7 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// All other imports
+import com.sun.jini.qa.harness.Test;
import java.util.List;
import java.util.Iterator;
import java.rmi.*;
@@ -66,10 +67,11 @@ public abstract class SupertypeMatchTest
/**
* Sets up the testing environment.
*
- * @param config Arguments from the runner for setup.
+ * @param config Arguments from the runner for construct.
*/
- public void setup(QAConfig config) throws Exception {
- super.setup(config);
+ public Test construct(QAConfig config) throws Exception {
+ super.construct(config);
+ return this;
}
public void run() throws Exception {
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/SupertypeNotifyTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/SupertypeNotifyTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/SupertypeNotifyTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/SupertypeNotifyTest.java Wed Jan 2 05:20:52 2013
@@ -24,6 +24,7 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// All other imports
+import com.sun.jini.qa.harness.Test;
import java.rmi.*;
import java.util.List;
import java.util.Iterator;
@@ -43,11 +44,12 @@ public class SupertypeNotifyTest extends
/**
* Sets up the testing environment.
*
- * @param config Arguments from the runner for setup.
+ * @param config Arguments from the runner for construct.
*/
- public void setup(QAConfig config) throws Exception {
- super.setup(config);
+ public Test construct(QAConfig config) throws Exception {
+ super.construct(config);
this.parse();
+ return this;
}
protected void parse() throws Exception {
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/TakeOneTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/TakeOneTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/TakeOneTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/TakeOneTest.java Wed Jan 2 05:20:52 2013
@@ -21,6 +21,7 @@ import java.util.logging.Level;
// Test harness specific classes
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.qa.harness.TestException;
// All other imports
@@ -42,10 +43,11 @@ public class TakeOneTest extends MatchTe
/**
* Sets up the testing environment.
*
- * @param config Arguments from the runner for setup.
+ * @param config Arguments from the runner for construct.
*/
- public void setup(QAConfig config) throws Exception {
- super.setup(config);
+ public Test construct(QAConfig config) throws Exception {
+ super.construct(config);
+ return this;
}
public void run() throws Exception {
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/WildcardsNotifyTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/WildcardsNotifyTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/WildcardsNotifyTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/WildcardsNotifyTest.java Wed Jan 2 05:20:52 2013
@@ -21,6 +21,7 @@ import java.util.logging.Level;
// Test harness specific classes
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.qa.harness.TestException;
// All other imports
@@ -44,11 +45,12 @@ public class WildcardsNotifyTest extends
/**
* Sets up the testing environment.
*
- * @param config Arguments from the runner for setup.
+ * @param config Arguments from the runner for construct.
*/
- public void setup(QAConfig config) throws Exception {
- super.setup(config);
+ public Test construct(QAConfig config) throws Exception {
+ super.construct(config);
this.parse();
+ return this;
}
protected void parse() throws Exception {
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/WildcardsTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/WildcardsTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/WildcardsTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/WildcardsTest.java Wed Jan 2 05:20:52 2013
@@ -24,6 +24,7 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// All other imports
+import com.sun.jini.qa.harness.Test;
import net.jini.core.entry.Entry;
import net.jini.space.JavaSpace;
import net.jini.core.entry.UnusableEntryException;
@@ -39,10 +40,11 @@ public class WildcardsTest extends Singl
/**
* Sets up the testing environment.
*
- * @param config Arguments from the runner for setup.
+ * @param config Arguments from the runner for construct.
*/
- public void setup(QAConfig config) throws Exception {
- super.setup(config);
+ public Test construct(QAConfig config) throws Exception {
+ super.construct(config);
+ return this;
}
public void run() throws Exception {
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/WriteOneTakeRead.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/WriteOneTakeRead.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/WriteOneTakeRead.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/matching/WriteOneTakeRead.java Wed Jan 2 05:20:52 2013
@@ -24,6 +24,7 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// All other imports
+import com.sun.jini.qa.harness.Test;
import net.jini.core.entry.Entry;
import net.jini.space.JavaSpace;
import net.jini.core.entry.UnusableEntryException;
@@ -39,10 +40,11 @@ public class WriteOneTakeRead extends Si
/**
* Sets up the testing environment.
*
- * @param config Arguments from the runner for setup.
+ * @param config Arguments from the runner for construct.
*/
- public void setup(QAConfig config) throws Exception {
- super.setup(config);
+ public Test construct(QAConfig config) throws Exception {
+ super.construct(config);
+ return this;
}
public void run() throws Exception {
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/notify/ThrowRuntimeException.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/notify/ThrowRuntimeException.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/notify/ThrowRuntimeException.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/notify/ThrowRuntimeException.java Wed Jan 2 05:20:52 2013
@@ -49,6 +49,7 @@ import net.jini.security.TrustVerifier;
import net.jini.security.proxytrust.ServerProxyTrust;
import com.sun.jini.proxy.BasicProxyTrustVerifier;
+import com.sun.jini.qa.harness.Test;
/**
* Check to see how space deals with RuntimeException being thrown by
@@ -60,7 +61,7 @@ import com.sun.jini.proxy.BasicProxyTrus
* Register a 2nd handler, and write a 2nd entry. Make sure the
* first handler is not called and the second one is.
*/
-public class ThrowRuntimeException extends TestBase {
+public class ThrowRuntimeException extends TestBase implements Test {
/**
* How long to wait before giving up on an event notification to
@@ -130,11 +131,12 @@ public class ThrowRuntimeException exten
/**
* Sets up the testing environment.
*
- * @param config Arguments from the runner for setup.
+ * @param config Arguments from the runner for construct.
*/
- public void setup(QAConfig config) throws Exception {
- super.setup(config);
+ public Test construct(QAConfig config) throws Exception {
+ super.construct(config);
this.parse();
+ return this;
}
/**
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/AbortToReadTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/AbortToReadTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/AbortToReadTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/AbortToReadTest.java Wed Jan 2 05:20:52 2013
@@ -70,7 +70,7 @@ public class AbortToReadTest extends Tra
// take the entry under one transaction
Transaction t1 = createTransaction();
- Entry takeResult = space.take(entry, t1, 0);
+ Entry takeResult = getSpace().take(entry, t1, 0);
assertEquals(entry, takeResult, "taken");
timeLog("entry taken under t1");
@@ -131,7 +131,7 @@ public class AbortToReadTest extends Tra
}
timeLog("BlockAndRead: starting to read: timeout is "
+ BLOCK_TIME + " seconds, tmpl = " + tmpl);
- readResult = space.read(tmpl, t2, BLOCK_TIME * SECONDS);
+ readResult = getSpace().read(tmpl, t2, BLOCK_TIME * SECONDS);
timeLog("BlockAndRead: read returned");
synchronized (this) {
readReturned = true;
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/BlockingOnDeadTransactionTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/BlockingOnDeadTransactionTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/BlockingOnDeadTransactionTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/BlockingOnDeadTransactionTest.java Wed Jan 2 05:20:52 2013
@@ -29,6 +29,7 @@ import net.jini.core.entry.*;
import net.jini.core.transaction.Transaction;
import net.jini.admin.Administrable;
import com.sun.jini.admin.DestroyAdmin;
+import com.sun.jini.qa.harness.Test;
import java.rmi.UnmarshalException;
@@ -56,11 +57,12 @@ public class BlockingOnDeadTransactionTe
/**
* Sets up the testing environment.
*
- * @param config Arguments from the runner for setup.
+ * @param config Arguments from the runner for construct.
*/
- public void setup(QAConfig config) throws Exception {
- super.setup(config);
+ public Test construct(QAConfig config) throws Exception {
+ super.construct(config);
this.parse();
+ return this;
}
public void run() throws Exception {
@@ -84,7 +86,7 @@ public class BlockingOnDeadTransactionTe
// read the entry under one transaction
Transaction t1 = createTransaction();
- Entry readResult = space.read(entry, t1, 0);
+ Entry readResult = getSpace().read(entry, t1, 0);
assertEquals(entry, readResult, "read");
timeLog("entry read under t1");
@@ -99,14 +101,14 @@ public class BlockingOnDeadTransactionTe
// read the entry under another transaction
Transaction t2 = createTransaction();
- readResult = space.read(entry, t2, 0);
+ readResult = getSpace().read(entry, t2, 0);
assertEquals(entry, readResult, "read");
timeLog("entry read under t2");
timeLog("destroying");
try {
DestroyAdmin admin = (DestroyAdmin) ((Administrable)
- txmgr).getAdmin();
+ getTxmgr()).getAdmin();
admin = (DestroyAdmin) getConfig().prepare("test.mahaloAdminPreparer",
admin);
@@ -171,7 +173,7 @@ public class BlockingOnDeadTransactionTe
if (!usePolling) {
timeLog("BlockAndTake: starting to take: timeout is "
+ BLOCK_TIME + ", tmpl = " + tmpl);
- takeResult = space.take(tmpl, txn, BLOCK_TIME);
+ takeResult = getSpace().take(tmpl, txn, BLOCK_TIME);
} else {
timeLog("BlockAndTake: starting to take: polling time is "
+ BLOCK_TIME + ", tmpl = " + tmpl);
@@ -180,7 +182,7 @@ public class BlockingOnDeadTransactionTe
while (System.currentTimeMillis() < endTime) {
timeLog("poll #" + pollNum++);
- takeResult = space.takeIfExists(tmpl, txn,
+ takeResult = getSpace().takeIfExists(tmpl, txn,
JavaSpace.NO_WAIT);
if (takeResult != null) {
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/CommitAbortTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/CommitAbortTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/CommitAbortTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/CommitAbortTest.java Wed Jan 2 05:20:52 2013
@@ -101,7 +101,7 @@ public class CommitAbortTest extends Tra
// try to read/take the entry without transaction
SimpleEntry entry = null;
- entry = (SimpleEntry) ope.get(space, template, null, JavaSpace.NO_WAIT);
+ entry = (SimpleEntry) ope.get(getSpace(), template, null, JavaSpace.NO_WAIT);
// check the result
if (useAbort) {
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/CommitTerminationTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/CommitTerminationTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/CommitTerminationTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/CommitTerminationTest.java Wed Jan 2 05:20:52 2013
@@ -110,7 +110,7 @@ public class CommitTerminationTest exten
Entry gotEntry = new SimpleEntry();
try {
- gotEntry = ope.get(space, template, txn, 10000);
+ gotEntry = ope.get(getSpace(), template, txn, 10000);
throw new TestException("get did not get a TransactionException");
} catch (TransactionException e) {
}
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/DestroyTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/DestroyTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/DestroyTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/DestroyTest.java Wed Jan 2 05:20:52 2013
@@ -71,7 +71,7 @@ public class DestroyTest extends Transac
pass("step-1: create a transaction object");
Transaction txn = null;
- Transaction.Created tc = TransactionFactory.create(txmgr,
+ Transaction.Created tc = TransactionFactory.create(getTxmgr(),
Lease.FOREVER);
txn = tc.transaction;
@@ -83,7 +83,7 @@ public class DestroyTest extends Transac
pass("step-3: destroy transaction manager.");
DestroyAdmin admin = (DestroyAdmin) ((Administrable)
- txmgr).getAdmin();
+ getTxmgr()).getAdmin();
admin = (DestroyAdmin) getConfig().prepare("test.mahaloAdminPreparer",
admin);
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/ExceptionTest1.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/ExceptionTest1.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/ExceptionTest1.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/ExceptionTest1.java Wed Jan 2 05:20:52 2013
@@ -87,7 +87,7 @@ public class ExceptionTest1 extends Tran
if (useDummy) {
pass("step-0: write a dummy entry under a transaction");
- space.write(wentry, txn, Lease.FOREVER);
+ getSpace().write(wentry, txn, Lease.FOREVER);
}
// abort/commit this transaction
@@ -115,12 +115,12 @@ public class ExceptionTest1 extends Tran
new SimpleEventListener(getConfig().getConfiguration());
pass("step-3: register the listener with the terminated"
+ " transaction");
- space.notify(template, txn, listener, Lease.FOREVER, null);
+ getSpace().notify(template, txn, listener, Lease.FOREVER, null);
fail("TransactionException has not thrown while registering"
+ " notify with a terminated txn.");
} else {
pass("step-2: write an entry with the terminated transaction");
- space.write(wentry, txn, Lease.FOREVER);
+ getSpace().write(wentry, txn, Lease.FOREVER);
fail("TransactionException has not thrown while writing with a"
+ " terminated txn.");
}
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/ExceptionTest2.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/ExceptionTest2.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/ExceptionTest2.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/ExceptionTest2.java Wed Jan 2 05:20:52 2013
@@ -28,7 +28,6 @@ import net.jini.core.entry.Entry;
import net.jini.core.transaction.Transaction;
import net.jini.core.transaction.TransactionException;
-
/**
* Force to generate <tt>TransactionException</tt>s
* by aborting the transaction while <tt>space.read</tt> or <tt>space.take</tt>
@@ -85,7 +84,7 @@ public class ExceptionTest2 extends Tran
Transaction txn = createTransaction();
// invoke read/take thread
- EntryGetter getter = new EntryGetter(space, ope, txn, this);
+ EntryGetter getter = new EntryGetter(getSpace(), ope, txn, this);
getter.start();
// wait for a while,
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/GetBlockTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/GetBlockTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/GetBlockTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/GetBlockTest.java Wed Jan 2 05:20:52 2013
@@ -148,7 +148,7 @@ public class GetBlockTest extends Transa
}
// invoke read/take thread
- EntryGetter getter = new EntryGetter(space, ope, txn2, this);
+ EntryGetter getter = new EntryGetter(getSpace(), ope, txn2, this);
getter.start();
// wait for a while,
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/IfExistsDontBlockSelfTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/IfExistsDontBlockSelfTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/IfExistsDontBlockSelfTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/IfExistsDontBlockSelfTest.java Wed Jan 2 05:20:52 2013
@@ -24,6 +24,7 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// All other imports
+import com.sun.jini.qa.harness.Test;
import java.rmi.*;
import java.io.File;
import net.jini.core.lease.Lease;
@@ -40,7 +41,7 @@ import com.sun.jini.test.share.TestBase;
* <code>readIfExits</code>/<code>takeIfExists</code> under the same
* transaction. Final query should return almost immediately.
*/
-public class IfExistsDontBlockSelfTest extends TestBase {
+public class IfExistsDontBlockSelfTest extends TestBase implements Test {
/** Space under test */
protected JavaSpace space;
@@ -63,11 +64,12 @@ public class IfExistsDontBlockSelfTest e
/**
* Sets up the testing environment.
*
- * @param config Arguments from the runner for setup.
+ * @param config Arguments from the runner for construct.
*/
- public void setup(QAConfig config) throws Exception {
- super.setup(config);
+ public Test construct(QAConfig config) throws Exception {
+ super.construct(config);
this.parse();
+ return this;
}
/**
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/IfExistsTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/IfExistsTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/IfExistsTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/IfExistsTest.java Wed Jan 2 05:20:52 2013
@@ -124,7 +124,7 @@ public class IfExistsTest extends Transa
}
// invoke read/take thread
- EntryGetter getter = new EntryGetter(space, ope, txn, this);
+ EntryGetter getter = new EntryGetter(getSpace(), ope, txn, this);
getter.start();
// wait for a while,
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/MultipleAccessTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/MultipleAccessTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/MultipleAccessTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/MultipleAccessTest.java Wed Jan 2 05:20:52 2013
@@ -69,14 +69,14 @@ public class MultipleAccessTest extends
writeEntries(txn);
// start illegal access thread
- Peeker peeker = new Peeker(space, this);
+ Peeker peeker = new Peeker(getSpace(), this);
peeker.start();
// create & start worker threads
Worker[] workers = new Worker[NUM_WORKERS];
for (int i = 0; i < NUM_WORKERS; i++) {
- workers[i] = new Worker(space, txn, i, i + 1, NUM_ENTRIES,
+ workers[i] = new Worker(getSpace(), txn, i, i + 1, NUM_ENTRIES,
this);
workers[i].start();
}
@@ -150,7 +150,7 @@ public class MultipleAccessTest extends
template.id = new Integer(i);
try {
- entry = (SimpleEntry) space.takeIfExists(template, null,
+ entry = (SimpleEntry) getSpace().takeIfExists(template, null,
JavaSpace.NO_WAIT);
} catch (Exception e) {
fail("[checkEntries]: Exception thrown while try to read an"
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/NotifyLogTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/NotifyLogTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/NotifyLogTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/NotifyLogTest.java Wed Jan 2 05:20:52 2013
@@ -45,7 +45,7 @@ public class NotifyLogTest extends Trans
// Force an event registration under transaction
logger.log(Level.INFO, "Registering for notification");
- final EventRegistration reg = space.notify(notifyEntry, txn,
+ final EventRegistration reg = getSpace().notify(notifyEntry, txn,
listener, Lease.FOREVER, null);
Lease lease = reg.getLease();
lease = (Lease)
@@ -82,7 +82,7 @@ public class NotifyLogTest extends Trans
// Try to write the entry we wrote
logger.log(Level.INFO, "Looking for second write in log");
- final Entry ent = space.takeIfExists(dataEntry, null,
+ final Entry ent = getSpace().takeIfExists(dataEntry, null,
JavaSpace.NO_WAIT);
if (ent == null || !ent.equals(dataEntry)) {
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/NotifyTransactionTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/NotifyTransactionTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/NotifyTransactionTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/NotifyTransactionTest.java Wed Jan 2 05:20:52 2013
@@ -81,9 +81,9 @@ public class NotifyTransactionTest exten
try {
tCatcher = new SimpleEventListener(getConfig().getConfiguration());
nCatcher = new SimpleEventListener(getConfig().getConfiguration());
- tReg = space.notify(template, txn, tCatcher, Lease.FOREVER,
+ tReg = getSpace().notify(template, txn, tCatcher, Lease.FOREVER,
null);
- nReg = space.notify(template, null, nCatcher, Lease.FOREVER,
+ nReg = getSpace().notify(template, null, nCatcher, Lease.FOREVER,
null);
// preparation added for completeness. No remote calls are made on these
tReg = (EventRegistration)
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/PreparedTransactionTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/PreparedTransactionTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/PreparedTransactionTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/PreparedTransactionTest.java Wed Jan 2 05:20:52 2013
@@ -28,6 +28,7 @@ import net.jini.core.entry.*;
import net.jini.core.transaction.*;
import net.jini.core.transaction.server.*;
import com.sun.jini.constants.TxnConstants;
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.share.TesterTransaction;
import com.sun.jini.test.share.TesterTransactionManager;
@@ -79,11 +80,12 @@ public abstract class PreparedTransactio
/**
* Sets up the testing environment.
*
- * @param config Arguments from the runner for setup.
+ * @param config Arguments from the runner for construct.
*/
- public void setup(QAConfig config) throws Exception {
- super.setup(config);
+ public Test construct(QAConfig config) throws Exception {
+ super.construct(config);
this.parse();
+ return this;
}
/**
@@ -128,7 +130,7 @@ public abstract class PreparedTransactio
logger.log(Level.INFO, "wrote entry " + written);
writeEntry(tt.transaction, written);
tt.assertParticipants(1); // just to be sure
- Entry taken = space.take(toTake, tt.transaction, 0);
+ Entry taken = getSpace().take(toTake, tt.transaction, 0);
assertEquals(taken, toTake, "reading 'toTake' entry");
if (!active) {
@@ -197,7 +199,7 @@ public abstract class PreparedTransactio
private void canSee(Entry tmpl, Entry shouldMatch, String desc)
throws Exception {
- Entry e = space.read(tmpl, null, 0);
+ Entry e = getSpace().read(tmpl, null, 0);
assertEquals(e, shouldMatch, desc);
}
}
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/ReactivationTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/ReactivationTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/ReactivationTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/ReactivationTest.java Wed Jan 2 05:20:52 2013
@@ -70,7 +70,7 @@ public class ReactivationTest extends Tr
Transaction txn = null;
try {
- Transaction.Created tc = TransactionFactory.create(txmgr,
+ Transaction.Created tc = TransactionFactory.create(getTxmgr(),
Lease.FOREVER);
txn = tc.transaction;
} catch (Exception e) {
@@ -90,7 +90,7 @@ public class ReactivationTest extends Tr
Transaction txn2 = null;
try {
- Transaction.Created tc = TransactionFactory.create(txmgr,
+ Transaction.Created tc = TransactionFactory.create(getTxmgr(),
Lease.FOREVER);
txn2 = tc.transaction;
} catch (Exception e) {
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/ReadReadTakeTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/ReadReadTakeTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/ReadReadTakeTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/ReadReadTakeTest.java Wed Jan 2 05:20:52 2013
@@ -17,6 +17,7 @@
*/
package com.sun.jini.test.impl.outrigger.transaction;
+import com.sun.jini.qa.harness.Test;
import java.util.logging.Level;
// Test harness specific classes
@@ -40,7 +41,7 @@ import com.sun.jini.test.share.TestBase;
* trying each combination of aborting/committing T1 and using
* take/takeIfExists.
*/
-public class ReadReadTakeTest extends TestBase {
+public class ReadReadTakeTest extends TestBase implements Test {
/** Space under test */
protected JavaSpace space;
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/ReadTakeAbortTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/ReadTakeAbortTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/ReadTakeAbortTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/ReadTakeAbortTest.java Wed Jan 2 05:20:52 2013
@@ -17,6 +17,7 @@
*/
package com.sun.jini.test.impl.outrigger.transaction;
+import com.sun.jini.qa.harness.Test;
import java.util.logging.Level;
// Test harness specific classes
@@ -38,7 +39,7 @@ import com.sun.jini.test.share.TestBase;
* the entry under the transaction, aborts the transaction and then
* checks to see if the entry is present.
*/
-public class ReadTakeAbortTest extends TestBase {
+public class ReadTakeAbortTest extends TestBase implements Test {
/** Space under test */
protected JavaSpace space;
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/ReadTakeCommitTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/ReadTakeCommitTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/ReadTakeCommitTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/ReadTakeCommitTest.java Wed Jan 2 05:20:52 2013
@@ -17,6 +17,7 @@
*/
package com.sun.jini.test.impl.outrigger.transaction;
+import com.sun.jini.qa.harness.Test;
import java.util.logging.Level;
// Test harness specific classes
@@ -38,7 +39,7 @@ import com.sun.jini.test.share.TestBase;
* the entry under the transaction, commits the transaction and then
* checks to see if the entry is gone.
*/
-public class ReadTakeCommitTest extends TestBase {
+public class ReadTakeCommitTest extends TestBase implements Test {
/** Space under test */
protected JavaSpace space;
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/SimpleTransactionTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/SimpleTransactionTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/SimpleTransactionTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/SimpleTransactionTest.java Wed Jan 2 05:20:52 2013
@@ -138,7 +138,7 @@ public class SimpleTransactionTest exten
SimpleEntry entry = null;
try {
- entry = (SimpleEntry) ope.get(space, template, txn2,
+ entry = (SimpleEntry) ope.get(getSpace(), template, txn2,
JavaSpace.NO_WAIT);
} catch (Exception e) {
fail("Exception thrown while reading/taking an entry", e);
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/SimpleTransactionTest2.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/SimpleTransactionTest2.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/SimpleTransactionTest2.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/SimpleTransactionTest2.java Wed Jan 2 05:20:52 2013
@@ -95,7 +95,7 @@ public class SimpleTransactionTest2 exte
SimpleEntry entry = null;
try {
- entry = (SimpleEntry) ope.get(space, template, txn2,
+ entry = (SimpleEntry) ope.get(getSpace(), template, txn2,
JavaSpace.NO_WAIT);
} catch (Exception e) {
fail("Exception thrown while reading/taking an entry", e);
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/TransactionTestBase.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/TransactionTestBase.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/TransactionTestBase.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/TransactionTestBase.java Wed Jan 2 05:20:52 2013
@@ -32,8 +32,7 @@ import net.jini.core.lease.Lease;
import net.jini.core.transaction.Transaction;
import net.jini.core.transaction.TransactionFactory;
import net.jini.core.transaction.server.TransactionManager;
-import com.sun.jini.outrigger.JavaSpaceAdmin;
-import com.sun.jini.outrigger.AdminIterator;
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.share.TestBase;
@@ -42,41 +41,41 @@ import com.sun.jini.test.share.TestBase;
*
* @author H.Fukuda
*/
-public abstract class TransactionTestBase extends TestBase {
- protected boolean verbose = true;
- protected boolean disableTxn = false;
+public abstract class TransactionTestBase extends TestBase implements Test {
+ private boolean verbose = true;
+// private boolean disableTxn = false;
// for the convenience of simple tests
- protected JavaSpace space;
- protected JavaSpaceAdmin admin;
- protected TransactionManager txmgr;
+ private JavaSpace space;
+ private TransactionManager txmgr;
// for two space test
- protected JavaSpace[] spaces = new JavaSpace[2];
+ private JavaSpace[] spaces = new JavaSpace[2];
/**
* Sets up the testing environment.
*
- * @param config Arguments from the runner for setup.
+ * @param config Arguments from the runner for construct.
*/
- public void setup(QAConfig config) throws Exception {
- super.setup(config);
+ public Test construct(QAConfig config) throws Exception {
+ super.construct(config);
this.parse();
+ return this;
}
- /**
- * Parse non-generic option(s).
- */
- protected void parse() throws Exception {
- super.parse();
-
- /*
- * schuldy 5-Nov-1999 bug 4288354 - always be verbose
- * verbose = line.getBoolean("verbose");
- */
- disableTxn = getConfig().getBooleanConfigVal("com.sun.jini.qa.outrigger."
- + "transaction.disableTxn", false);
- }
+// /**
+// * Parse non-generic option(s).
+// */
+// protected void parse() throws Exception {
+// super.parse();
+//
+// /*
+// * schuldy 5-Nov-1999 bug 4288354 - always be verbose
+// * verbose = line.getBoolean("verbose");
+// */
+// setDisableTxn(getConfig().getBooleanConfigVal("com.sun.jini.qa.outrigger."
+// + "transaction.disableTxn", false));
+// }
/**
* Makes sure the designated service is activated by getting its admin
@@ -92,41 +91,41 @@ public abstract class TransactionTestBas
protected void spaceOnlySetup() throws TestException {
- // setup servers
+ // construct servers
specifyServices(new Class[] {
JavaSpace.class});
prep(0);
- space = spaces[0] = (JavaSpace) services[0];
+ setSpace(getSpaces()[0] = (JavaSpace) services[0]);
}
protected void simpleSetup() throws TestException {
- // setup servers
+ // construct servers
specifyServices(new Class[] {
TransactionManager.class, JavaSpace.class});
prep(0);
prep(1);
- txmgr = (TransactionManager) services[0];
- space = spaces[0] = (JavaSpace) services[1];
+ setTxmgr((TransactionManager) services[0]);
+ setSpace(getSpaces()[0] = (JavaSpace) services[1]);
}
protected void twoSpaceSetup() throws TestException {
- // setup servers
+ // construct servers
specifyServices(new Class[] {
TransactionManager.class, JavaSpace.class, JavaSpace.class});
prep(0);
prep(1);
prep(2);
- txmgr = (TransactionManager) services[0];
- spaces[0] = (JavaSpace) services[1];
- spaces[1] = (JavaSpace) services[2];
+ setTxmgr((TransactionManager) services[0]);
+ getSpaces()[0] = (JavaSpace) services[1];
+ getSpaces()[1] = (JavaSpace) services[2];
}
protected void scrubSpaces() throws TestException {
for (int i = 0; i < 2; i++) {
- if (spaces[i] != null) {
- super.scrubSpace(spaces[i]);
+ if (getSpaces()[i] != null) {
+ super.scrubSpace(getSpaces()[i]);
}
}
}
@@ -149,7 +148,7 @@ public abstract class TransactionTestBas
protected void writeEntry(int id, Transaction txn, Entry entry)
throws TestException {
try {
- Lease l = spaces[id].write(entry, txn, Lease.FOREVER);
+ Lease l = getSpaces()[id].write(entry, txn, Lease.FOREVER);
addOutriggerLease(l, true);
} catch (Exception e) {
throw new TestException("Can't write an entry with a transaction",
@@ -166,7 +165,7 @@ public abstract class TransactionTestBas
protected void writeEntry(Transaction txn, Entry entry)
throws TestException {
try {
- Lease l = space.write(entry, txn, Lease.FOREVER);
+ Lease l = getSpace().write(entry, txn, Lease.FOREVER);
addOutriggerLease(l, true);
} catch (Exception e) {
throw new TestException("Can't write an entry with a transaction",
@@ -185,7 +184,7 @@ public abstract class TransactionTestBas
Transaction.Created tc = null;
try {
- tc = TransactionFactory.create(txmgr, Lease.FOREVER);
+ tc = TransactionFactory.create(getTxmgr(), Lease.FOREVER);
addMahaloLease(tc.lease, true);
} catch (Exception e) {
throw new TestException("Can't make transaction object", e);
@@ -234,7 +233,7 @@ public abstract class TransactionTestBas
}
public void passOperation(SpaceOperation ope) {
- if (verbose) {
+ if (isVerbose()) {
logger.log(Level.FINE, "[" + ope + "]: Pass");
}
}
@@ -244,7 +243,7 @@ public abstract class TransactionTestBas
}
public void pass(String msg) {
- if (verbose) {
+ if (isVerbose()) {
logger.log(Level.FINE, msg);
}
}
@@ -257,4 +256,54 @@ public abstract class TransactionTestBas
return new String[] {
"outrigger" };
}
+
+ /**
+ * @return the verbose
+ */
+ protected boolean isVerbose() {
+ return verbose;
+ }
+
+// /**
+// * @param disableTxn the disableTxn to set
+// */
+// protected void setDisableTxn(boolean disableTxn) {
+// this.disableTxn = disableTxn;
+// }
+
+ /**
+ * @return the space
+ */
+ protected JavaSpace getSpace() {
+ return space;
+ }
+
+ /**
+ * @param space the space to set
+ */
+ protected void setSpace(JavaSpace space) {
+ this.space = space;
+ }
+
+ /**
+ * @return the txmgr
+ */
+ protected TransactionManager getTxmgr() {
+ return txmgr;
+ }
+
+ /**
+ * @param txmgr the txmgr to set
+ */
+ protected void setTxmgr(TransactionManager txmgr) {
+ this.txmgr = txmgr;
+ }
+
+ /**
+ * @return the spaces
+ */
+ protected JavaSpace[] getSpaces() {
+ return spaces;
+ }
+
}
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/TwoSpaceTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/TwoSpaceTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/TwoSpaceTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/outrigger/transaction/TwoSpaceTest.java Wed Jan 2 05:20:52 2013
@@ -96,7 +96,7 @@ public class TwoSpaceTest extends Transa
pass("step-2: read/take the entry with a transaction");
try {
- entry = ope.get(spaces[0], template, txn, 10000);
+ entry = ope.get(getSpaces()[0], template, txn, 10000);
} catch (Exception e) {
fail("Unexpected exception has thrown", e);
}
@@ -158,7 +158,7 @@ public class TwoSpaceTest extends Transa
Entry entry = null;
try {
- entry = spaces[id].take(template, null, JavaSpace.NO_WAIT);
+ entry = getSpaces()[id].take(template, null, JavaSpace.NO_WAIT);
} catch (Exception e) {
fail("Unexpected exception thrown while taking an entry", e);
}
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/reggie/MultihomedClientTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/reggie/MultihomedClientTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/reggie/MultihomedClientTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/reggie/MultihomedClientTest.java Wed Jan 2 05:20:52 2013
@@ -17,8 +17,9 @@
*/
package com.sun.jini.test.impl.reggie;
-import com.sun.jini.qa.harness.Test;
+import com.sun.jini.qa.harness.LegacyTest;
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
import java.io.BufferedReader;
import java.io.File;
import java.io.InputStream;
@@ -26,18 +27,19 @@ import java.io.InputStreamReader;
import java.io.PrintStream;
/**
- * Test that verifies that Reggie will attempt to connect to
+ * LegacyTest that verifies that Reggie will attempt to connect to
* all addresses a multihomed client host resolves to
*
*/
-public class MultihomedClientTest implements Test {
+public class MultihomedClientTest implements LegacyTest {
private String command = System.getProperty("java.home") + File.separator
+ "bin" + File.separator + "java ";
private QAConfig config = null;
- public void setup(QAConfig config) {
+ public Test construct(QAConfig config) {
this.config = config;
+ return this;
}
public void run() throws Exception {
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/reggie/NullMemberGroups.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/reggie/NullMemberGroups.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/reggie/NullMemberGroups.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/reggie/NullMemberGroups.java Wed Jan 2 05:20:52 2013
@@ -17,7 +17,8 @@
*/
package com.sun.jini.test.impl.reggie;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.qa.harness.TestException;
import java.util.logging.Level;
import net.jini.config.ConfigurationException;
@@ -26,12 +27,12 @@ import net.jini.config.ConfigurationExce
* Verifies fix for 4935237 ("reggie should throw clearer exception if member
* groups set to ALL_GROUPS").
*/
-public class NullMemberGroups extends QATest {
+public class NullMemberGroups extends QATestEnvironment implements Test {
public void run() throws Exception {
logger.log(Level.INFO, "run()");
try {
- manager.startLookupService();
+ getManager().startLookupService();
throw new TestException(
"Started service with invalid configuration");
} catch (Exception e) {
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/reliability/AppleUserImpl.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/reliability/AppleUserImpl.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/reliability/AppleUserImpl.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/reliability/AppleUserImpl.java Wed Jan 2 05:20:52 2013
@@ -72,10 +72,11 @@ import java.net.InetAddress;
import net.jini.config.Configuration;
import net.jini.export.Exporter;
-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.SlaveRequest;
import com.sun.jini.qa.harness.SlaveTest;
+import com.sun.jini.qa.harness.Test;
/**
* The AppleUserImpl class implements the behavior of the remote
@@ -83,7 +84,7 @@ import com.sun.jini.qa.harness.SlaveTest
* passes each of its remote "apple" objects to an apple user, and an
* AppleUserThread is created for each apple.
*/
-public class AppleUserImpl extends QATest implements AppleUser {
+public class AppleUserImpl extends QATestEnvironment implements AppleUser, Test {
private int threadNum = 0;
private long testDuration;
@@ -230,8 +231,9 @@ public class AppleUserImpl extends QATes
}
// inherit javadoc
- public void setup(QAConfig sysConfig) throws Exception {
- super.setup(sysConfig);
+ public Test construct(QAConfig sysConfig) throws Exception {
+ super.construct(sysConfig);
+ return this;
}
/**
@@ -241,9 +243,9 @@ public class AppleUserImpl extends QATes
public void run() throws Exception {
// run ApplicationServer on a separate host if running distributed
boolean othervm = (QAConfig.getConfig().getHostList().size() > 1);
- maxLevel = config.getIntConfigVal(
+ maxLevel = getConfig().getIntConfigVal(
"com.sun.jini.test.impl.reliability.maxLevel",7);
- testDuration = config.getIntConfigVal(
+ testDuration = getConfig().getIntConfigVal(
"com.sun.jini.test.impl.reliability.minutes",1) * 60 * 1000;
Configuration c = QAConfig.getConfig().getConfiguration();
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/scalability/DemoScalabilityTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/scalability/DemoScalabilityTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/scalability/DemoScalabilityTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/scalability/DemoScalabilityTest.java Wed Jan 2 05:20:52 2013
@@ -21,7 +21,8 @@ import java.util.logging.Level;
// Test harness specific classes
import com.sun.jini.qa.harness.QAConfig;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.qa.harness.TestException;
import java.rmi.NoSuchObjectException;
@@ -34,32 +35,33 @@ import java.util.HashMap;
* cancels, and/or expires leases. Tests for availably by adding
* leases to the set.
*/
-public class DemoScalabilityTest extends QATest {
+public class DemoScalabilityTest extends QATestEnvironment implements Test {
- public void setup(QAConfig config) throws Exception {
- super.setup(config);
+ public Test construct(QAConfig config) throws Exception {
+ super.construct(config);
+ return this;
}
public void run() throws Exception {
// wait for 'all systems go'
- config.suspendRun("Demo test suspended at phase 1"
+ getConfig().suspendRun("Demo test suspended at phase 1"
+ "<popup>Resume this test when<br>"
+ "all participating services are ready</popup>");
// simulate doing some work
- config.setTestStatus("Performing test actions for 10 seconds");
+ getConfig().setTestStatus("Performing test actions for 10 seconds");
try {
Thread.sleep(10000);
} catch (InterruptedException ignore) {
}
// simulate phase 2 work
- config.suspendRun("Demo test suspended at phase 2"
+ getConfig().suspendRun("Demo test suspended at phase 2"
+ "<popup>Resume this test when<br>"
+ "all phase 2 activities are setup</popup>");
// wait for termination request
- config.suspendRun("Demo test suspended at end of run"
+ getConfig().suspendRun("Demo test suspended at end of run"
+ "<popup>Resume this test to terminate</popup>");
}
}
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/scalability/ServiceLauncher.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/scalability/ServiceLauncher.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/scalability/ServiceLauncher.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/scalability/ServiceLauncher.java Wed Jan 2 05:20:52 2013
@@ -21,7 +21,8 @@ import java.util.logging.Level;
// Test harness specific classes
import com.sun.jini.qa.harness.QAConfig;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.qa.harness.TestException;
import java.rmi.NoSuchObjectException;
@@ -34,7 +35,7 @@ import java.util.HashMap;
* cancels, and/or expires leases. Tests for availably by adding
* leases to the set.
*/
-public class ServiceLauncher extends QATest {
+public class ServiceLauncher extends QATestEnvironment implements Test {
private static HashMap nameMap = new HashMap();
static {
@@ -47,8 +48,8 @@ public class ServiceLauncher extends QAT
nameMap.put("reggie", "net.jini.core.lookup.ServiceRegistrar");
}
- public void setup(QAConfig config) throws Exception {
- super.setup(config);
+ public Test construct(QAConfig config) throws Exception {
+ super.construct(config);
String serviceList =
config.getStringConfigVal("com.sun.jini.qa.harness.scalability.serviceList", "");
StringTokenizer tok = new StringTokenizer(serviceList);
@@ -58,15 +59,16 @@ public class ServiceLauncher extends QAT
service = (String) nameMap.get(service);
}
try {
- manager.startService(service);
+ getManager().startService(service);
} catch (Exception e) {
throw new TestException("Failed to start " + service, e);
}
}
+ return this;
}
public void run() throws Exception {
- config.suspendRun("service launcher suspended"
+ getConfig().suspendRun("service launcher suspended"
+ "<popup>resume to teardown and terminate</popup>");
}
}
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/servicediscovery/TerminateSemantics.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/servicediscovery/TerminateSemantics.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/servicediscovery/TerminateSemantics.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/servicediscovery/TerminateSemantics.java Wed Jan 2 05:20:52 2013
@@ -30,6 +30,7 @@ import net.jini.core.lookup.ServiceItem;
import java.rmi.RemoteException;
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.qa.harness.TestException;
/**
@@ -66,17 +67,18 @@ public class TerminateSemantics extends
*
* 1. Creates a service discovery manager using the default input
*/
- public void setup(QAConfig config) throws Exception {
- super.setup(config);
+ public Test construct(QAConfig config) throws Exception {
+ super.construct(config);
testDesc = "verify invocation semantics of public methods after "
+"termination";
waitForLookupDiscovery = false;
terminateDelay = 0;
- }//end setup
+ return this;
+ }//end construct
/** Defines the actual steps of this particular test.
*
- * 1. Terminates the service discovery manager created in setup and
+ * 1. Terminates the service discovery manager created in construct and
* verifies that an invocation of any of that service discovery
* manager's public methods (except the terminate method itself)
* will result in an <code>IllegalStateException</code>.
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/servicediscovery/cache/CacheTerminateSemantics.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/servicediscovery/cache/CacheTerminateSemantics.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/servicediscovery/cache/CacheTerminateSemantics.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/servicediscovery/cache/CacheTerminateSemantics.java Wed Jan 2 05:20:52 2013
@@ -27,6 +27,7 @@ import net.jini.lookup.ServiceDiscoveryL
import net.jini.core.lookup.ServiceItem;
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.qa.harness.TestException;
/**
@@ -71,8 +72,8 @@ public class CacheTerminateSemantics ext
* 1. Creates a service discovery manager using the default input
* 2. Creates a lookup cache using the default input
*/
- public void setup(QAConfig config) throws Exception {
- super.setup(config);
+ public Test construct(QAConfig config) throws Exception {
+ super.construct(config);
testDesc = "verify invocation semantics of public methods after "
+"termination";
waitForLookupDiscovery = false;
@@ -81,11 +82,12 @@ public class CacheTerminateSemantics ext
cache = srvcDiscoveryMgr.createLookupCache(template,
firstStageFilter,
null);//listener
- }//end setup
+ return this;
+ }//end construct
/** Defines the actual steps of this particular test.
*
- * 1. Terminates the lookup cache created in setup and verifies that
+ * 1. Terminates the lookup cache created in construct and verifies that
* an invocation of any of that cache's public methods (except the
* terminate method itself) will result in an
* <code>IllegalStateException</code>.