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 [24/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/spec/eventmailbox/EMSRIFT_PULL.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/eventmailbox/EMSRIFT_PULL.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/eventmailbox/EMSRIFT_PULL.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/eventmailbox/EMSRIFT_PULL.java Wed Jan 2 05:20:52 2013
@@ -40,6 +40,7 @@ import net.jini.core.event.RemoteEvent;
import net.jini.core.event.RemoteEventListener;
import com.sun.jini.constants.TimeConstants;
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.impl.mercury.EMSTestBase;
import com.sun.jini.test.impl.mercury.TestUtils;
@@ -81,7 +82,7 @@ public class EMSRIFT_PULL extends EMSTes
// Create an event generator and pass it the
// mailbox's remote event listener.
- TestGenerator myGen = TestUtils.createGenerator(manager);
+ TestGenerator myGen = TestUtils.createGenerator(getManager());
EventRegistration evtReg =
myGen.register(EVENT_ID, // Event ID to use
null, // handback
@@ -91,7 +92,7 @@ public class EMSRIFT_PULL extends EMSTes
checkLease(tgl, DURATION1);
// Create "listener" to collect events for this test
- TestPullListener tpl = TestUtils.createPullListener(manager);
+ TestPullListener tpl = TestUtils.createPullListener(getManager());
int eventCount = 0;
// Generate some events
@@ -203,12 +204,13 @@ public class EMSRIFT_PULL extends EMSTes
}
/**
- * Invoke parent's setup and parser
+ * Invoke parent's construct and parser
* @exception TestException will usually indicate an "unresolved"
* condition because at this point the test has not yet begun.
*/
- public void setup(QAConfig config) throws Exception {
- super.setup(config);
+ public Test construct(QAConfig config) throws Exception {
+ super.construct(config);
parse();
+ return this;
}
}
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/eventmailbox/EMSRIFT_PULL3.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/eventmailbox/EMSRIFT_PULL3.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/eventmailbox/EMSRIFT_PULL3.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/eventmailbox/EMSRIFT_PULL3.java Wed Jan 2 05:20:52 2013
@@ -40,6 +40,7 @@ import net.jini.core.event.RemoteEvent;
import net.jini.core.event.RemoteEventListener;
import com.sun.jini.constants.TimeConstants;
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.impl.mercury.EMSTestBase;
import com.sun.jini.test.impl.mercury.TestUtils;
@@ -81,7 +82,7 @@ public class EMSRIFT_PULL3 extends EMSTe
// Create an event generator and pass it the
// mailbox's remote event listener.
- TestGenerator myGen = TestUtils.createGenerator(manager);
+ TestGenerator myGen = TestUtils.createGenerator(getManager());
EventRegistration evtReg =
myGen.register(EVENT_ID, // Event ID to use
null, // handback
@@ -164,12 +165,13 @@ public class EMSRIFT_PULL3 extends EMSTe
}
/**
- * Invoke parent's setup and parser
+ * Invoke parent's construct and parser
* @exception TestException will usually indicate an "unresolved"
* condition because at this point the test has not yet begun.
*/
- public void setup(QAConfig config) throws Exception {
- super.setup(config);
+ public Test construct(QAConfig config) throws Exception {
+ super.construct(config);
parse();
+ return this;
}
}
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/eventmailbox/EMSST.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/eventmailbox/EMSST.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/eventmailbox/EMSST.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/eventmailbox/EMSST.java Wed Jan 2 05:20:52 2013
@@ -38,6 +38,7 @@ import com.sun.jini.test.impl.mercury.Te
import com.sun.jini.test.impl.mercury.TestGenerator;
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
public class EMSST extends EMSTestBase implements TimeConstants {
@@ -69,7 +70,7 @@ public class EMSST extends EMSTestBase i
// Create an event generator and pass it the
// mailbox's remote event listener.
- TestGenerator myGen = TestUtils.createGenerator(manager);
+ TestGenerator myGen = TestUtils.createGenerator(getManager());
EventRegistration evtReg =
myGen.register(EVENT_ID, // Event ID to use
null, // handback
@@ -78,7 +79,7 @@ public class EMSST extends EMSTestBase i
Lease tgl = evtReg.getLease();
checkLease(tgl, DURATION1);
- TestListener goodListener = TestUtils.createListener(manager);
+ TestListener goodListener = TestUtils.createListener(getManager());
int goodCount = 0;
// Generate some events
@@ -123,12 +124,13 @@ public class EMSST extends EMSTestBase i
}
/**
- * Invoke parent's setup and parser
+ * Invoke parent's construct and parser
* @exception TestException will usually indicate an "unresolved"
* condition because at this point the test has not yet begun.
*/
- public void setup(QAConfig config) throws Exception {
- super.setup(config);
+ public Test construct(QAConfig config) throws Exception {
+ super.construct(config);
parse();
+ return this;
}
}
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/eventmailbox/EMSST2.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/eventmailbox/EMSST2.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/eventmailbox/EMSST2.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/eventmailbox/EMSST2.java Wed Jan 2 05:20:52 2013
@@ -34,6 +34,7 @@ import net.jini.core.event.RemoteEvent;
import net.jini.core.event.RemoteEventListener;
import com.sun.jini.constants.TimeConstants;
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.impl.mercury.EMSTestBase;
import com.sun.jini.test.impl.mercury.TestUtils;
@@ -71,7 +72,7 @@ public class EMSST2 extends EMSTestBase
// Create an event generator and pass it the
// mailbox's remote event listener.
- TestGenerator myGen = TestUtils.createGenerator(manager);
+ TestGenerator myGen = TestUtils.createGenerator(getManager());
EventRegistration evtReg =
myGen.register(EVENT_ID, // Event ID to use
null, // handback
@@ -80,7 +81,7 @@ public class EMSST2 extends EMSTestBase
Lease tgl = evtReg.getLease();
checkLease(tgl, DURATION1);
- TestListener goodListener = TestUtils.createListener(manager);
+ TestListener goodListener = TestUtils.createListener(getManager());
int goodCount = 0;
int badCount = 0;
@@ -119,12 +120,13 @@ public class EMSST2 extends EMSTestBase
}
/**
- * Invoke parent's setup and parser
+ * Invoke parent's construct and parser
* @exception TestException will usually indicate an "unresolved"
* condition because at this point the test has not yet begun.
*/
- public void setup(QAConfig config) throws Exception {
- super.setup(config);
+ public Test construct(QAConfig config) throws Exception {
+ super.construct(config);
parse();
+ return this;
}
}
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/eventmailbox/EMSST2_PULL.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/eventmailbox/EMSST2_PULL.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/eventmailbox/EMSST2_PULL.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/eventmailbox/EMSST2_PULL.java Wed Jan 2 05:20:52 2013
@@ -41,6 +41,7 @@ import com.sun.jini.test.impl.mercury.Te
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
public class EMSST2_PULL extends EMSTestBase implements TimeConstants {
@@ -68,14 +69,14 @@ public class EMSST2_PULL extends EMSTest
checkLease(mrl, DURATION1);
// Create "listener" to collect events for this test
- TestPullListener tpl = TestUtils.createPullListener(manager);
+ TestPullListener tpl = TestUtils.createPullListener(getManager());
logger.log(Level.INFO, "Getting pull mailbox listener");
RemoteEventListener mbRel = getPullMailboxListener(mr);
// Create an event generator and pass it the
// mailbox's remote event listener.
- TestGenerator myGen = TestUtils.createGenerator(manager);
+ TestGenerator myGen = TestUtils.createGenerator(getManager());
EventRegistration evtReg =
myGen.register(EVENT_ID, // Event ID to use
null, // handback
@@ -125,12 +126,13 @@ public class EMSST2_PULL extends EMSTest
}
/**
- * Invoke parent's setup and parser
+ * Invoke parent's construct and parser
* @exception TestException will usually indicate an "unresolved"
* condition because at this point the test has not yet begun.
*/
- public void setup(QAConfig config) throws Exception {
- super.setup(config);
+ public Test construct(QAConfig config) throws Exception {
+ super.construct(config);
parse();
+ return this;
}
}
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/eventmailbox/EMSST3.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/eventmailbox/EMSST3.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/eventmailbox/EMSST3.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/eventmailbox/EMSST3.java Wed Jan 2 05:20:52 2013
@@ -34,6 +34,7 @@ import net.jini.core.event.RemoteEvent;
import net.jini.core.event.RemoteEventListener;
import com.sun.jini.constants.TimeConstants;
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.impl.mercury.EMSTestBase;
import com.sun.jini.test.impl.mercury.TestUtils;
@@ -72,7 +73,7 @@ public class EMSST3 extends EMSTestBase
// Create an event generator and pass it the
// mailbox's remote event listener.
- TestGenerator myGen = TestUtils.createGenerator(manager);
+ TestGenerator myGen = TestUtils.createGenerator(getManager());
EventRegistration evtReg =
myGen.register(EVENT_ID, // Event ID to use
null, // handback
@@ -81,7 +82,7 @@ public class EMSST3 extends EMSTestBase
Lease tgl = evtReg.getLease();
checkLease(tgl, DURATION1);
- TestListener goodListener = TestUtils.createListener(manager);
+ TestListener goodListener = TestUtils.createListener(getManager());
int goodCount = 0;
int badCount = 0;
@@ -119,12 +120,13 @@ public class EMSST3 extends EMSTestBase
}
/**
- * Invoke parent's setup and parser
+ * Invoke parent's construct and parser
* @exception TestException will usually indicate an "unresolved"
* condition because at this point the test has not yet begun.
*/
- public void setup(QAConfig config) throws Exception {
- super.setup(config);
+ public Test construct(QAConfig config) throws Exception {
+ super.construct(config);
parse();
+ return this;
}
}
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/eventmailbox/EMSST3_PULL.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/eventmailbox/EMSST3_PULL.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/eventmailbox/EMSST3_PULL.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/eventmailbox/EMSST3_PULL.java Wed Jan 2 05:20:52 2013
@@ -40,6 +40,7 @@ import com.sun.jini.test.impl.mercury.Te
import com.sun.jini.test.impl.mercury.TestGenerator;
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
public class EMSST3_PULL extends EMSTestBase implements TimeConstants {
@@ -67,14 +68,14 @@ public class EMSST3_PULL extends EMSTest
checkLease(mrl, DURATION1);
// Create "listener" to collect events for this test
- TestPullListener tpl = TestUtils.createPullListener(manager);
+ TestPullListener tpl = TestUtils.createPullListener(getManager());
logger.log(Level.INFO, "Getting pull mailbox listener");
RemoteEventListener mbRel = getPullMailboxListener(mr);
// Create an event generator and pass it the
// mailbox's remote event listener.
- TestGenerator myGen = TestUtils.createGenerator(manager);
+ TestGenerator myGen = TestUtils.createGenerator(getManager());
EventRegistration evtReg =
myGen.register(EVENT_ID, // Event ID to use
null, // handback
@@ -121,12 +122,13 @@ public class EMSST3_PULL extends EMSTest
}
/**
- * Invoke parent's setup and parser
+ * Invoke parent's construct and parser
* @exception TestException will usually indicate an "unresolved"
* condition because at this point the test has not yet begun.
*/
- public void setup(QAConfig config) throws Exception {
- super.setup(config);
+ public Test construct(QAConfig config) throws Exception {
+ super.construct(config);
parse();
+ return this;
}
}
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/eventmailbox/EMSST_PULL.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/eventmailbox/EMSST_PULL.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/eventmailbox/EMSST_PULL.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/eventmailbox/EMSST_PULL.java Wed Jan 2 05:20:52 2013
@@ -39,6 +39,7 @@ import com.sun.jini.test.impl.mercury.Te
import com.sun.jini.test.impl.mercury.TestGenerator;
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
public class EMSST_PULL extends EMSTestBase implements TimeConstants {
@@ -66,14 +67,14 @@ public class EMSST_PULL extends EMSTestB
checkLease(mrl, DURATION1);
// Create "listener" to collect events for this test
- TestPullListener tpl = TestUtils.createPullListener(manager);
+ TestPullListener tpl = TestUtils.createPullListener(getManager());
logger.log(Level.INFO, "Getting pull mailbox listener");
RemoteEventListener mbRel = getPullMailboxListener(mr);
// Create an event generator and pass it the
// mailbox's remote event listener.
- TestGenerator myGen = TestUtils.createGenerator(manager);
+ TestGenerator myGen = TestUtils.createGenerator(getManager());
EventRegistration evtReg =
myGen.register(EVENT_ID, // Event ID to use
null, // handback
@@ -121,12 +122,13 @@ public class EMSST_PULL extends EMSTestB
}
/**
- * Invoke parent's setup and parser
+ * Invoke parent's construct and parser
* @exception TestException will usually indicate an "unresolved"
* condition because at this point the test has not yet begun.
*/
- public void setup(QAConfig config) throws Exception {
- super.setup(config);
+ public Test construct(QAConfig config) throws Exception {
+ super.construct(config);
parse();
+ return this;
}
}
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/eventmailbox/StressTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/eventmailbox/StressTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/eventmailbox/StressTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/eventmailbox/StressTest.java Wed Jan 2 05:20:52 2013
@@ -40,41 +40,43 @@ import com.sun.jini.constants.TimeConsta
import com.sun.jini.test.impl.mercury.EMSTestBase;
import com.sun.jini.test.impl.mercury.TestListener;
import com.sun.jini.test.impl.mercury.TestGenerator;
+import java.util.concurrent.atomic.AtomicInteger;
public abstract class StressTest extends EMSTestBase implements TimeConstants {
- private static int genCount = 0;
- private static int evtCount = 0;
+ private static final AtomicInteger genCount = new AtomicInteger();
+ private static final AtomicInteger evtCount = new AtomicInteger();
private class EventGeneratorThread extends Thread {
- private TestGenerator tg;
- private long eventID;
- private int numEvents;
+ private final TestGenerator tg;
+ private final long eventID;
+ private final AtomicInteger numEvents;
- private RemoteEvent[] events = null;
+ private volatile RemoteEvent[] events = null;
public EventGeneratorThread(TestGenerator tg, long eventID,
int numEvents)
{
- super("EventGeneratorThread-" + ++genCount);
+ super("EventGeneratorThread-" + genCount.incrementAndGet());
this.tg = tg;
this.eventID = eventID;
- this.numEvents = numEvents;
+ this.numEvents = new AtomicInteger(numEvents);
events = new RemoteEvent[numEvents];
}
public void run() {
int counter = 0;
+ RemoteEvent[] events = this.events; // copy reference.
try {
- while (numEvents-- > 0) {
+ while (numEvents.getAndDecrement() > 0) {
events[counter++] = tg.generateEvent(eventID, 2);
if (counter % 99 == 0) {
logger.log(Level.FINE,
getName() + " has sent " + counter + " events.");
}
- yield();
+ //yield();
try {
Thread.sleep(100);
} catch (InterruptedException ie) { /*ignore*/}
@@ -87,6 +89,7 @@ public abstract class StressTest extends
+ counter + " events and terminated:");
e.printStackTrace();
}
+ this.events = events; // publish changes.
}
public RemoteEvent[] getEvents() {
@@ -96,12 +99,12 @@ public abstract class StressTest extends
private class EventListenerThread extends Thread {
- private TestListener tl;
- private int numEvents;
- private long wait;
+ private final TestListener tl;
+ private final int numEvents;
+ private final long wait;
public EventListenerThread(TestListener tl, int numEvents, long wait) {
- super("EventListenerThread-" + ++evtCount);
+ super("EventListenerThread-" + evtCount.incrementAndGet());
this.tl = tl;
this.numEvents = numEvents;
this.wait = wait;
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/export/exportpermission/ExportPermission_AbstractTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/export/exportpermission/ExportPermission_AbstractTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/export/exportpermission/ExportPermission_AbstractTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/export/exportpermission/ExportPermission_AbstractTest.java Wed Jan 2 05:20:52 2013
@@ -18,13 +18,14 @@
package com.sun.jini.test.spec.export.exportpermission;
// com.sun.jini.qa
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa.harness
import com.sun.jini.qa.harness.QAConfig; // base class for QAConfig
// java.util
+import com.sun.jini.qa.harness.Test;
import java.util.logging.Level;
// davis packages
@@ -35,7 +36,7 @@ import net.jini.export.ExportPermission;
* Abstract class for all {@link com.sun.jini.test.spec.export.exportpermission}
* tests.
*/
-public abstract class ExportPermission_AbstractTest extends QATest {
+public abstract class ExportPermission_AbstractTest extends QATestEnvironment implements Test {
QAConfig config;
/**
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/DoWithServerContext.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/DoWithServerContext.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/DoWithServerContext.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/DoWithServerContext.java Wed Jan 2 05:20:52 2013
@@ -20,11 +20,12 @@ package com.sun.jini.test.spec.export.se
import java.util.logging.Level;
// com.sun.jini.qa
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa.harness
import com.sun.jini.qa.harness.QAConfig; // base class for QAConfig
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.qa.harness.TestException;
// java.util
@@ -94,7 +95,7 @@ import com.sun.jini.test.spec.export.uti
*
* </pre>
*/
-public class DoWithServerContext extends QATest {
+public class DoWithServerContext extends QATestEnvironment implements Test {
QAConfig config;
/**
@@ -118,8 +119,8 @@ public class DoWithServerContext extends
/**
* This method performs all preparations.
*/
- public void setup(QAConfig config) throws Exception {
- super.setup(config);
+ public Test construct(QAConfig config) throws Exception {
+ super.construct(config);
this.config = (QAConfig) config; // or this.config = getConfig();
/* Create context element */
@@ -128,6 +129,7 @@ public class DoWithServerContext extends
/* Create server context collection with the created element */
context = new ArrayList();
context.add(cxtElement);
+ return this;
}
/**
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/DoWithServerContext_IllegalStateException.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/DoWithServerContext_IllegalStateException.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/DoWithServerContext_IllegalStateException.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/DoWithServerContext_IllegalStateException.java Wed Jan 2 05:20:52 2013
@@ -20,11 +20,12 @@ package com.sun.jini.test.spec.export.se
import java.util.logging.Level;
// com.sun.jini.qa
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa.harness
import com.sun.jini.qa.harness.QAConfig; // base class for QAConfig
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.qa.harness.TestException;
// java.util
@@ -89,7 +90,7 @@ import com.sun.jini.test.spec.export.uti
*
* </pre>
*/
-public class DoWithServerContext_IllegalStateException extends QATest {
+public class DoWithServerContext_IllegalStateException extends QATestEnvironment implements Test {
QAConfig config;
/**
@@ -133,8 +134,8 @@ public class DoWithServerContext_Illegal
/**
* This method performs all preparations.
*/
- public void setup(QAConfig config) throws Exception {
- super.setup(config);
+ public Test construct(QAConfig config) throws Exception {
+ super.construct(config);
this.config = (QAConfig) config; // or this.config = getConfig();
/* Create server context elements of different types */
@@ -147,6 +148,7 @@ public class DoWithServerContext_Illegal
ancontext = new ArrayList();
ancontext.add(anCxtElement);
+ return this;
}
/**
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/DoWithServerContext_UnsetContext.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/DoWithServerContext_UnsetContext.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/DoWithServerContext_UnsetContext.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/DoWithServerContext_UnsetContext.java Wed Jan 2 05:20:52 2013
@@ -20,11 +20,12 @@ package com.sun.jini.test.spec.export.se
import java.util.logging.Level;
// com.sun.jini.qa
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa.harness
import com.sun.jini.qa.harness.QAConfig; // base class for QAConfig
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.qa.harness.TestException;
// java.util
@@ -70,7 +71,7 @@ import java.rmi.server.ServerNotActiveEx
*
* </pre>
*/
-public class DoWithServerContext_UnsetContext extends QATest {
+public class DoWithServerContext_UnsetContext extends QATestEnvironment implements Test {
QAConfig config;
/**
@@ -88,12 +89,13 @@ public class DoWithServerContext_UnsetCo
/**
* This method performs all preparations.
*/
- public void setup(QAConfig config) throws Exception {
- super.setup(config);
+ public Test construct(QAConfig config) throws Exception {
+ super.construct(config);
this.config = (QAConfig) config; // or this.config = getConfig();
/* Create server context collection */
context = new ArrayList();
+ return this;
}
/**
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/GetServerContext.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/GetServerContext.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/GetServerContext.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/GetServerContext.java Wed Jan 2 05:20:52 2013
@@ -20,11 +20,12 @@ package com.sun.jini.test.spec.export.se
import java.util.logging.Level;
// com.sun.jini.qa
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa.harness
import com.sun.jini.qa.harness.QAConfig; // base class for QAConfig
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.qa.harness.TestException;
// java.util
@@ -84,7 +85,7 @@ import com.sun.jini.test.spec.export.uti
*
* </pre>
*/
-public class GetServerContext extends QATest {
+public class GetServerContext extends QATestEnvironment implements Test {
QAConfig config;
/**
@@ -120,8 +121,8 @@ public class GetServerContext extends QA
/**
* This method performs all preparations.
*/
- public void setup(QAConfig config) throws Exception {
- super.setup(config);
+ public Test construct(QAConfig config) throws Exception {
+ super.construct(config);
this.config = (QAConfig) config; // or this.config = getConfig();
/* Create server context elements of the type FakeType */
@@ -132,6 +133,7 @@ public class GetServerContext extends QA
context = new ArrayList();
context.add(cnxtEl1);
context.add(cnxtEl2);
+ return this;
}
/**
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/GetServerContextElement.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/GetServerContextElement.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/GetServerContextElement.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/GetServerContextElement.java Wed Jan 2 05:20:52 2013
@@ -20,11 +20,12 @@ package com.sun.jini.test.spec.export.se
import java.util.logging.Level;
// com.sun.jini.qa
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa.harness
import com.sun.jini.qa.harness.QAConfig; // base class for QAConfig
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.qa.harness.TestException;
// java.util
@@ -102,7 +103,7 @@ import com.sun.jini.test.spec.export.uti
*
* </pre>
*/
-public class GetServerContextElement extends QATest {
+public class GetServerContextElement extends QATestEnvironment implements Test {
QAConfig config;
/**
@@ -146,8 +147,8 @@ public class GetServerContextElement ext
/**
* This method performs all preparations.
*/
- public void setup(QAConfig config) throws Exception {
- super.setup(config);
+ public Test construct(QAConfig config) throws Exception {
+ super.construct(config);
this.config = (QAConfig) config; // or this.config = getConfig();
/* Create server context elements */
@@ -189,6 +190,7 @@ public class GetServerContextElement ext
context3.add(cnxtElement3);
// logger.log(Level.FINE,
// "context for TestCase #3:: " + context3.toString());
+ return this;
}
/**
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/GetServerContext_NoContext.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/GetServerContext_NoContext.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/GetServerContext_NoContext.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/GetServerContext_NoContext.java Wed Jan 2 05:20:52 2013
@@ -20,11 +20,12 @@ package com.sun.jini.test.spec.export.se
import java.util.logging.Level;
// com.sun.jini.qa
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa.harness
import com.sun.jini.qa.harness.QAConfig; // base class for QAConfig
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.qa.harness.TestException;
// java.util
@@ -98,7 +99,7 @@ import java.rmi.server.ServerNotActiveEx
*
* </pre>
*/
-public class GetServerContext_NoContext extends QATest {
+public class GetServerContext_NoContext extends QATestEnvironment implements Test {
QAConfig config;
/**
@@ -128,8 +129,8 @@ public class GetServerContext_NoContext
/**
* This method performs all preparations.
*/
- public void setup(QAConfig config) throws Exception {
- super.setup(config);
+ public Test construct(QAConfig config) throws Exception {
+ super.construct(config);
this.config = (QAConfig) config; // or this.config = getConfig();
/*
@@ -271,6 +272,7 @@ public class GetServerContext_NoContext
}
}
logger.log(Level.INFO, "============================================");
+ return this;
}
/**
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/GetServerContext_ProvidersParsing.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/GetServerContext_ProvidersParsing.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/GetServerContext_ProvidersParsing.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/GetServerContext_ProvidersParsing.java Wed Jan 2 05:20:52 2013
@@ -20,11 +20,12 @@ package com.sun.jini.test.spec.export.se
import java.util.logging.Level;
// com.sun.jini.qa
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa.harness
import com.sun.jini.qa.harness.QAConfig; // base class for QAConfig
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.qa.harness.TestException;
// java.util
@@ -122,7 +123,7 @@ import net.jini.export.ServerContext;
*
* </pre>
*/
-public class GetServerContext_ProvidersParsing extends QATest {
+public class GetServerContext_ProvidersParsing extends QATestEnvironment implements Test {
QAConfig config;
/**
@@ -165,8 +166,8 @@ public class GetServerContext_ProvidersP
/**
* This method performs all preparations.
*/
- public void setup(QAConfig config) throws Exception {
- super.setup(config);
+ public Test construct(QAConfig config) throws Exception {
+ super.construct(config);
this.config = (QAConfig) config; // or this.config = getConfig();
// Prepare expected result
expectedRes.add(expectedStr);
@@ -356,6 +357,7 @@ public class GetServerContext_ProvidersP
+ " Providers whose getServerContext() method returns: "
+ expectedRes);
}
+ return this;
}
/**
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/GetServerContext_Providers_NonNull.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/GetServerContext_Providers_NonNull.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/GetServerContext_Providers_NonNull.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/export/servercontext/GetServerContext_Providers_NonNull.java Wed Jan 2 05:20:52 2013
@@ -20,11 +20,12 @@ package com.sun.jini.test.spec.export.se
import java.util.logging.Level;
// com.sun.jini.qa
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa.harness
import com.sun.jini.qa.harness.QAConfig; // base class for QAConfig
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.qa.harness.TestException;
// java.util
@@ -115,7 +116,7 @@ import net.jini.export.ServerContext;
*
* </pre>
*/
-public class GetServerContext_Providers_NonNull extends QATest {
+public class GetServerContext_Providers_NonNull extends QATestEnvironment implements Test {
QAConfig config;
/**
@@ -157,8 +158,8 @@ public class GetServerContext_Providers_
/**
* This method performs all preparations.
*/
- public void setup(QAConfig config) throws Exception {
- super.setup(config);
+ public Test construct(QAConfig config) throws Exception {
+ super.construct(config);
this.config = (QAConfig) config; // or this.config = getConfig();
// Prepare expected result
expectedRes.add(expectedStr);
@@ -343,6 +344,7 @@ public class GetServerContext_Providers_
+ " Providers whose getServerContext() method returns: "
+ expectedRes);
}
+ return this;
}
/**
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/id/referentuuids/CompareMethodTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/id/referentuuids/CompareMethodTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/id/referentuuids/CompareMethodTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/id/referentuuids/CompareMethodTest.java Wed Jan 2 05:20:52 2013
@@ -19,9 +19,10 @@ package com.sun.jini.test.spec.id.refere
import java.util.logging.Level;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
import com.sun.jini.qa.harness.TestException;
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
import net.jini.id.ReferentUuids;
import net.jini.id.Uuid;
@@ -56,11 +57,11 @@ import java.util.logging.Level;
* 2) assert expectedResult is returned
* </pre>
*/
-public class CompareMethodTest extends QATest {
+public class CompareMethodTest extends QATestEnvironment implements Test {
Object[][] cases;
- public void setup(QAConfig sysConfig) throws Exception {
+ public Test construct(QAConfig sysConfig) throws Exception {
// expectedResult
Boolean f = Boolean.FALSE;
Boolean t = Boolean.TRUE;
@@ -81,6 +82,7 @@ public class CompareMethodTest extends Q
{new FakeReferentUuid(u1), new Object(), f},
{new Object(), new Object(), f}
};
+ return this;
}
public void run() throws Exception {
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/id/uuid/ConstructorAccessorTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/id/uuid/ConstructorAccessorTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/id/uuid/ConstructorAccessorTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/id/uuid/ConstructorAccessorTest.java Wed Jan 2 05:20:52 2013
@@ -19,9 +19,10 @@ package com.sun.jini.test.spec.id.uuid;
import java.util.logging.Level;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
import com.sun.jini.qa.harness.TestException;
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
import net.jini.id.Uuid;
@@ -62,7 +63,7 @@ import com.sun.jini.test.spec.id.util.Fa
* return the correct values
* </pre>
*/
-public class ConstructorAccessorTest extends QATest {
+public class ConstructorAccessorTest extends QATestEnvironment implements Test {
class FakeUuidExternalizable extends Uuid implements Externalizable {
public FakeUuidExternalizable(long bits0, long bits1) {
@@ -73,7 +74,8 @@ public class ConstructorAccessorTest ext
throws IOException, ClassNotFoundException { }
}
- public void setup(QAConfig sysConfig) throws Exception {
+ public Test construct(QAConfig sysConfig) throws Exception {
+ return this;
}
public void run() throws Exception {
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/id/uuid/ObjectMethodsTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/id/uuid/ObjectMethodsTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/id/uuid/ObjectMethodsTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/id/uuid/ObjectMethodsTest.java Wed Jan 2 05:20:52 2013
@@ -19,9 +19,10 @@ package com.sun.jini.test.spec.id.uuid;
import java.util.logging.Level;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
import com.sun.jini.qa.harness.TestException;
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
import net.jini.id.Uuid;
import net.jini.id.UuidFactory;
@@ -60,9 +61,10 @@ import java.util.logging.Level;
* string representation
* </pre>
*/
-public class ObjectMethodsTest extends QATest {
+public class ObjectMethodsTest extends QATestEnvironment implements Test {
- public void setup(QAConfig sysConfig) throws Exception {
+ public Test construct(QAConfig sysConfig) throws Exception {
+ return this;
}
public void run() throws Exception {
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/id/uuid/WriteTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/id/uuid/WriteTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/id/uuid/WriteTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/id/uuid/WriteTest.java Wed Jan 2 05:20:52 2013
@@ -19,9 +19,10 @@ package com.sun.jini.test.spec.id.uuid;
import java.util.logging.Level;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
import com.sun.jini.qa.harness.TestException;
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
import net.jini.id.Uuid;
import net.jini.id.UuidFactory;
@@ -59,7 +60,7 @@ import com.sun.jini.test.spec.id.util.Fa
* to the ByteArrayOutputStream
* </pre>
*/
-public class WriteTest extends QATest {
+public class WriteTest extends QATestEnvironment implements Test {
long[][] cases = {
{ 0, 0 },
@@ -75,7 +76,8 @@ public class WriteTest extends QATest {
{ Long.MIN_VALUE, Long.MAX_VALUE }
};
- public void setup(QAConfig sysConfig) throws Exception {
+ public Test construct(QAConfig sysConfig) throws Exception {
+ return this;
}
public void run() throws Exception {
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/id/uuidfactory/CreateGenerateTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/id/uuidfactory/CreateGenerateTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/id/uuidfactory/CreateGenerateTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/id/uuidfactory/CreateGenerateTest.java Wed Jan 2 05:20:52 2013
@@ -19,9 +19,10 @@ package com.sun.jini.test.spec.id.uuidfa
import java.util.logging.Level;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
import com.sun.jini.qa.harness.TestException;
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
import net.jini.id.Uuid;
import net.jini.id.UuidFactory;
@@ -63,7 +64,7 @@ import java.util.logging.Level;
* and assert the correct exception is thrown
* </pre>
*/
-public class CreateGenerateTest extends QATest {
+public class CreateGenerateTest extends QATestEnvironment implements Test {
long[][] cases1 = {
{ 0, 0 },
@@ -92,7 +93,8 @@ public class CreateGenerateTest extends
"01234567-89ab-cdef-0123--56789ABCDEF"
};
- public void setup(QAConfig sysConfig) throws Exception {
+ public Test construct(QAConfig sysConfig) throws Exception {
+ return this;
}
public void run() throws Exception {
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/id/uuidfactory/ReadTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/id/uuidfactory/ReadTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/id/uuidfactory/ReadTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/id/uuidfactory/ReadTest.java Wed Jan 2 05:20:52 2013
@@ -19,9 +19,10 @@ package com.sun.jini.test.spec.id.uuidfa
import java.util.logging.Level;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
import com.sun.jini.qa.harness.TestException;
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
import net.jini.id.Uuid;
import net.jini.id.UuidFactory;
@@ -57,7 +58,7 @@ import java.util.logging.Level;
* 3) verify the returned Uuid contains the correct values
* </pre>
*/
-public class ReadTest extends QATest {
+public class ReadTest extends QATestEnvironment implements Test {
long[][] cases = {
{ 0, 0 },
@@ -73,7 +74,8 @@ public class ReadTest extends QATest {
{ Long.MIN_VALUE, Long.MAX_VALUE }
};
- public void setup(QAConfig sysConfig) throws Exception {
+ public Test construct(QAConfig sysConfig) throws Exception {
+ return this;
}
public void run() throws Exception {
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/iiop/util/AbstractTestBase.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/iiop/util/AbstractTestBase.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/iiop/util/AbstractTestBase.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/iiop/util/AbstractTestBase.java Wed Jan 2 05:20:52 2013
@@ -26,9 +26,10 @@ import java.rmi.Remote;
import java.util.logging.Level;
// com.sun.jini
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
import com.sun.jini.qa.harness.TestException;
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
import net.jini.iiop.IiopExporter;
// org.omg
@@ -41,7 +42,7 @@ import javax.rmi.CORBA.Stub;
/**
* Abstract Test base for all iiop spec tests.
*/
-public abstract class AbstractTestBase extends QATest {
+public abstract class AbstractTestBase extends QATestEnvironment implements Test {
/** Constant for no-arg constructor type */
public static final int NOARG_FACTORY = 0;
@@ -63,11 +64,11 @@ public abstract class AbstractTestBase e
/**
* Sets up the testing environment.
*
- * @param sysConfig Configuration for setup.
+ * @param sysConfig Configuration for construct.
*/
- public void setup(QAConfig sysConfig) throws Exception {
+ public Test construct(QAConfig sysConfig) throws Exception {
// mandatory call to parent
- super.setup(sysConfig);
+ super.construct(sysConfig);
// obtain type of constructor being used
cType = sysConfig.getIntConfigVal("iiop.util.constructorType",
@@ -89,6 +90,7 @@ public abstract class AbstractTestBase e
orb = null;
}
}
+ return this;
}
/**
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/ConstructorAccessorTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/ConstructorAccessorTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/ConstructorAccessorTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/ConstructorAccessorTest.java Wed Jan 2 05:20:52 2013
@@ -19,9 +19,10 @@ package com.sun.jini.test.spec.io.marsha
import java.util.logging.Level;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
import com.sun.jini.qa.harness.TestException;
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.io.util.FakeSecurityManager;
@@ -97,7 +98,7 @@ import java.util.logging.Level;
* 17) assert SecurityException is thrown
* </pre>
*/
-public class ConstructorAccessorTest extends QATest {
+public class ConstructorAccessorTest extends QATestEnvironment implements Test {
private SecurityManager original;
@@ -110,8 +111,9 @@ public class ConstructorAccessorTest ext
}
}
- public void setup(QAConfig sysConfig) throws Exception {
+ public Test construct(QAConfig sysConfig) throws Exception {
original = System.getSecurityManager();
+ return this;
}
/**
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/LoadClass_ExceptionTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/LoadClass_ExceptionTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/LoadClass_ExceptionTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/LoadClass_ExceptionTest.java Wed Jan 2 05:20:52 2013
@@ -19,9 +19,10 @@ package com.sun.jini.test.spec.io.marsha
import java.util.logging.Level;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
import com.sun.jini.qa.harness.TestException;
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
import net.jini.loader.ClassLoading;
@@ -68,7 +69,7 @@ import java.net.MalformedURLException;
* 7) assert loadClassException is thrown directly
* </pre>
*/
-public class LoadClass_ExceptionTest extends QATest {
+public class LoadClass_ExceptionTest extends QATestEnvironment implements Test {
// test cases
Throwable[] cases = {
@@ -83,7 +84,8 @@ public class LoadClass_ExceptionTest ext
};
// inherit javadoc
- public void setup(QAConfig sysConfig) throws Exception {
+ public Test construct(QAConfig sysConfig) throws Exception {
+ return this;
}
// inherit javadoc
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/LoadClass_NullArgsTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/LoadClass_NullArgsTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/LoadClass_NullArgsTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/LoadClass_NullArgsTest.java Wed Jan 2 05:20:52 2013
@@ -19,8 +19,9 @@ package com.sun.jini.test.spec.io.marsha
import java.util.logging.Level;
-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 net.jini.loader.ClassLoading;
@@ -51,10 +52,11 @@ import java.util.logging.Level;
* NullPointerExceptions are thrown
* </pre>
*/
-public class LoadClass_NullArgsTest extends QATest {
+public class LoadClass_NullArgsTest extends QATestEnvironment implements Test {
// inherit javadoc
- public void setup(QAConfig sysConfig) throws Exception {
+ public Test construct(QAConfig sysConfig) throws Exception {
+ return this;
}
// inherit javadoc
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/LoadClass_VerifyCodebaseIntegrityTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/LoadClass_VerifyCodebaseIntegrityTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/LoadClass_VerifyCodebaseIntegrityTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/LoadClass_VerifyCodebaseIntegrityTest.java Wed Jan 2 05:20:52 2013
@@ -19,10 +19,11 @@ package com.sun.jini.test.spec.io.marsha
import java.util.logging.Level;
-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.QAConfig;
import com.sun.jini.qa.harness.AdminManager;
+import com.sun.jini.qa.harness.Test;
import net.jini.loader.ClassLoading;
@@ -83,7 +84,7 @@ import java.lang.reflect.Proxy;
* assert loadClass equals the returned class
* </pre>
*/
-public class LoadClass_VerifyCodebaseIntegrityTest extends QATest {
+public class LoadClass_VerifyCodebaseIntegrityTest extends QATestEnvironment implements Test {
QAConfig config;
Object[][] cases;
@@ -92,7 +93,7 @@ public class LoadClass_VerifyCodebaseInt
// inherit javadoc
- public void setup(QAConfig sysConfig) throws Exception {
+ public Test construct(QAConfig sysConfig) throws Exception {
this.config = (QAConfig) sysConfig;
config.setDynamicParameter(
"qaClassServer.port",
@@ -130,6 +131,7 @@ public class LoadClass_VerifyCodebaseInt
{proxy, f, codebase, t},
{proxy, t, codebase, f}
};
+ return this;
}
// inherit javadoc
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_LoadClassExceptionTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_LoadClassExceptionTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_LoadClassExceptionTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_LoadClassExceptionTest.java Wed Jan 2 05:20:52 2013
@@ -21,10 +21,11 @@ package com.sun.jini.test.spec.io.marsha
import java.util.logging.Level;
-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;
import com.sun.jini.qa.harness.AdminManager;
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.io.util.FakeMarshalInputStream;
import com.sun.jini.test.spec.io.util.FakeObjectEndpoint;
@@ -104,14 +105,14 @@ import java.net.MalformedURLException;
* is thrown directly
* </pre>
*/
-public class Resolve_LoadClassExceptionTest extends QATest {
+public class Resolve_LoadClassExceptionTest extends QATestEnvironment implements Test {
QAConfig config;
Object[][] cases;
String interfaceName = "com.sun.jini.test.spec.io.util.FakeInterface";
AdminManager manager;
- public void setup(QAConfig sysConfig) throws Exception {
+ public Test construct(QAConfig sysConfig) throws Exception {
this.config = (QAConfig) sysConfig;
config.setDynamicParameter(
"qaClassServer.port",
@@ -158,6 +159,7 @@ public class Resolve_LoadClassExceptionT
{npe, proxy, t, codebase},
{ae, proxy, t, codebase}
};
+ return this;
}
/**
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_LoadClassTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_LoadClassTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_LoadClassTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_LoadClassTest.java Wed Jan 2 05:20:52 2013
@@ -19,8 +19,9 @@ package com.sun.jini.test.spec.io.marsha
import java.util.logging.Level;
-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.test.spec.io.util.FakeMarshalInputStream;
import com.sun.jini.test.spec.io.util.FakeRMIClassLoaderSpi;
@@ -68,7 +69,7 @@ import java.util.logging.Level;
* the same as transferObject
* </pre>
*/
-public class Resolve_LoadClassTest extends QATest {
+public class Resolve_LoadClassTest extends QATestEnvironment implements Test {
// test cases
Class[] cases = {
@@ -84,7 +85,8 @@ public class Resolve_LoadClassTest exten
};
// inherit javadoc
- public void setup(QAConfig sysConfig) throws Exception {
+ public Test construct(QAConfig sysConfig) throws Exception {
+ return this;
}
// inherit javadoc
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_NullArgsTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_NullArgsTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_NullArgsTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_NullArgsTest.java Wed Jan 2 05:20:52 2013
@@ -19,8 +19,9 @@ package com.sun.jini.test.spec.io.marsha
import java.util.logging.Level;
-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.test.spec.io.util.FakeMarshalInputStream;
@@ -56,10 +57,11 @@ import java.util.logging.Level;
* with null arguments and assert that NullPointerExceptions are thrown
* </pre>
*/
-public class Resolve_NullArgsTest extends QATest {
+public class Resolve_NullArgsTest extends QATestEnvironment implements Test {
// inherit javadoc
- public void setup(QAConfig sysConfig) throws Exception {
+ public Test construct(QAConfig sysConfig) throws Exception {
+ return this;
}
// inherit javadoc
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_ReadAnnotationExceptionTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_ReadAnnotationExceptionTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_ReadAnnotationExceptionTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_ReadAnnotationExceptionTest.java Wed Jan 2 05:20:52 2013
@@ -19,8 +19,9 @@ package com.sun.jini.test.spec.io.marsha
import java.util.logging.Level;
-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.test.spec.io.util.FakeMarshalInputStream;
import com.sun.jini.test.spec.io.util.FakeMarshalOutputStream;
@@ -79,7 +80,7 @@ import java.rmi.ConnectIOException;
* 6) assert readAnnotationException is thrown directly
* </pre>
*/
-public class Resolve_ReadAnnotationExceptionTest extends QATest {
+public class Resolve_ReadAnnotationExceptionTest extends QATestEnvironment implements Test {
Throwable[] cases = {
new ClassNotFoundException(),
@@ -100,7 +101,8 @@ public class Resolve_ReadAnnotationExcep
new AssertionError() //Error subclass
};
- public void setup(QAConfig sysConfig) throws Exception {
+ public Test construct(QAConfig sysConfig) throws Exception {
+ return this;
}
public void run() throws Exception {
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_VerifyCodebaseIntegrityTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_VerifyCodebaseIntegrityTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_VerifyCodebaseIntegrityTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalinputstream/Resolve_VerifyCodebaseIntegrityTest.java Wed Jan 2 05:20:52 2013
@@ -19,9 +19,10 @@ package com.sun.jini.test.spec.io.marsha
import java.util.logging.Level;
-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.AdminManager;
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.io.util.FakeMarshalOutputStream;
import com.sun.jini.test.spec.io.util.FakeObjectEndpoint;
@@ -98,7 +99,7 @@ import java.lang.reflect.Proxy;
* assert transferObject equals the read object
* </pre>
*/
-public class Resolve_VerifyCodebaseIntegrityTest extends QATest {
+public class Resolve_VerifyCodebaseIntegrityTest extends QATestEnvironment implements Test {
QAConfig config;
Object[][] cases;
@@ -106,7 +107,7 @@ public class Resolve_VerifyCodebaseInteg
AdminManager manager;
// inherit javadoc
- public void setup(QAConfig sysConfig) throws Exception {
+ public Test construct(QAConfig sysConfig) throws Exception {
this.config = (QAConfig) sysConfig;
config.setDynamicParameter(
"qaClassServer.port",
@@ -150,6 +151,7 @@ public class Resolve_VerifyCodebaseInteg
{proxy, f, codebase, t},
{proxy, t, codebase, f}
};
+ return this;
}
// inherit javadoc
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/ConstructorTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/ConstructorTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/ConstructorTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/ConstructorTest.java Wed Jan 2 05:20:52 2013
@@ -19,8 +19,9 @@ package com.sun.jini.test.spec.io.marsha
import java.util.logging.Level;
-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 net.jini.io.MarshalledInstance;
@@ -64,10 +65,11 @@ import java.util.ArrayList;
* 14) assert no exception is thrown
* </pre>
*/
-public class ConstructorTest extends QATest {
+public class ConstructorTest extends QATestEnvironment implements Test {
// inherit javadoc
- public void setup(QAConfig sysConfig) throws Exception {
+ public Test construct(QAConfig sysConfig) throws Exception {
+ return this;
}
// inherit javadoc
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/ConvertToMarshalledObjectTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/ConvertToMarshalledObjectTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/ConvertToMarshalledObjectTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/ConvertToMarshalledObjectTest.java Wed Jan 2 05:20:52 2013
@@ -19,9 +19,10 @@ package com.sun.jini.test.spec.io.marsha
import java.util.logging.Level;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
import com.sun.jini.qa.harness.TestException;
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
import net.jini.io.MarshalledInstance;
@@ -66,7 +67,7 @@ import java.util.logging.Level;
* equivalent to marshalObject
* </pre>
*/
-public class ConvertToMarshalledObjectTest extends QATest {
+public class ConvertToMarshalledObjectTest extends QATestEnvironment implements Test {
// test cases
Object[][] cases = {
@@ -77,7 +78,8 @@ public class ConvertToMarshalledObjectTe
};
// inherit javadoc
- public void setup(QAConfig sysConfig) throws Exception {
+ public Test construct(QAConfig sysConfig) throws Exception {
+ return this;
}
// inherit javadoc
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/Get_ExceptionTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/Get_ExceptionTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/Get_ExceptionTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/Get_ExceptionTest.java Wed Jan 2 05:20:52 2013
@@ -19,9 +19,10 @@ package com.sun.jini.test.spec.io.marsha
import java.util.logging.Level;
-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.AdminManager;
+import com.sun.jini.qa.harness.Test;
import net.jini.io.MarshalledInstance;
@@ -67,14 +68,14 @@ import java.lang.reflect.UndeclaredThrow
* 3) call the MarshalledInstance get methods
* 4) assert readObjectException is thrown directly
* Additionally, perform the following steps:
- * 5) setup FakeIntegrityVerifier return values by setting system properties
+ * 5) construct FakeIntegrityVerifier return values by setting system properties
* 6) construct a FakeArgument instance by calling RMIClassLoader.loadClass
* 7) construct a MarshalledInstance with the FakeArgument
* 8) call the MarshalledInstance get methods, passing in true
* 9) assert a ClassNotFoundException is thrown
* </pre>
*/
-public class Get_ExceptionTest extends QATest {
+public class Get_ExceptionTest extends QATestEnvironment implements Test {
QAConfig config;
AdminManager manager;
@@ -93,13 +94,14 @@ public class Get_ExceptionTest extends Q
new ClassNotFoundException()
};
- public void setup(QAConfig sysConfig) throws Exception {
+ public Test construct(QAConfig sysConfig) throws Exception {
this.config = (QAConfig) sysConfig;
config.setDynamicParameter(
"qaClassServer.port",
config.getStringConfigVal("com.sun.jini.test.port", "8082"));
manager = new AdminManager(sysConfig);
manager.startService("testClassServer");
+ return this;
}
public void run() throws Exception {
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/Get_NormalTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/Get_NormalTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/Get_NormalTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/Get_NormalTest.java Wed Jan 2 05:20:52 2013
@@ -19,9 +19,10 @@ package com.sun.jini.test.spec.io.marsha
import java.util.logging.Level;
-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.AdminManager;
+import com.sun.jini.qa.harness.Test;
import net.jini.io.MarshalledInstance;
import net.jini.jeri.BasicInvocationHandler;
@@ -77,14 +78,14 @@ import java.lang.reflect.Proxy;
* 4) assert an object equivalent to storeObject is returned
* </pre>
*/
-public class Get_NormalTest extends QATest {
+public class Get_NormalTest extends QATestEnvironment implements Test {
QAConfig config;
Object[][] cases;
String interfaceName = "com.sun.jini.test.spec.io.util.FakeInterface";
AdminManager manager;
- public void setup(QAConfig sysConfig) throws Exception {
+ public Test construct(QAConfig sysConfig) throws Exception {
this.config = (QAConfig) sysConfig;
config.setDynamicParameter(
"qaClassServer.port",
@@ -118,7 +119,7 @@ public class Get_NormalTest extends QATe
{proxy, f},
{proxy, t}
};
-
+ return this;
}
public void run() throws Exception {
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/ObjectMethodsTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/ObjectMethodsTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/ObjectMethodsTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshalledinstance/ObjectMethodsTest.java Wed Jan 2 05:20:52 2013
@@ -19,9 +19,10 @@ package com.sun.jini.test.spec.io.marsha
import java.util.logging.Level;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
import com.sun.jini.qa.harness.TestException;
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
import net.jini.io.MarshalledInstance;
@@ -88,7 +89,7 @@ import java.util.logging.Level;
* 18) verify instance is not .equals or .fullyEquals to FakeObject
* </pre>
*/
-public class ObjectMethodsTest extends QATest {
+public class ObjectMethodsTest extends QATestEnvironment implements Test {
class FakeMarshalledInstance extends MarshalledInstance {
public FakeMarshalledInstance(Object obj) throws IOException {
@@ -97,7 +98,8 @@ public class ObjectMethodsTest extends Q
}
// inherit javadoc
- public void setup(QAConfig sysConfig) throws Exception {
+ public Test construct(QAConfig sysConfig) throws Exception {
+ return this;
}
// inherit javadoc
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshaloutputstream/ConstructorAccessorTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshaloutputstream/ConstructorAccessorTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshaloutputstream/ConstructorAccessorTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/io/marshaloutputstream/ConstructorAccessorTest.java Wed Jan 2 05:20:52 2013
@@ -19,8 +19,9 @@ package com.sun.jini.test.spec.io.marsha
import java.util.logging.Level;
-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.test.spec.io.util.FakeSecurityManager;
@@ -91,7 +92,7 @@ import java.util.logging.Level;
* 17) assert SecurityException is thrown
* </pre>
*/
-public class ConstructorAccessorTest extends QATest {
+public class ConstructorAccessorTest extends QATestEnvironment implements Test {
private SecurityManager original;
@@ -104,8 +105,9 @@ public class ConstructorAccessorTest ext
public void writeUnshared(Object obj) throws IOException {}
}
- public void setup(QAConfig sysConfig) throws Exception {
+ public Test construct(QAConfig sysConfig) throws Exception {
original = System.getSecurityManager();
+ return this;
}
public void run() throws Exception {
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/AbstractReadTestBase.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/AbstractReadTestBase.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/AbstractReadTestBase.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/AbstractReadTestBase.java Wed Jan 2 05:20:52 2013
@@ -31,7 +31,7 @@ import com.sun.jini.qa.harness.TestExcep
*
* @author Mikhail A. Markov
*/
-public abstract class AbstractReadTestBase extends AbstractTestBase {
+public abstract class AbstractReadTestBase extends JavaSpaceTest {
/**
* Default Constructor requiring no arguments.
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/AbstractTakeTestBase.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/AbstractTakeTestBase.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/AbstractTakeTestBase.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/AbstractTakeTestBase.java Wed Jan 2 05:20:52 2013
@@ -32,7 +32,7 @@ import com.sun.jini.qa.harness.TestExcep
*
* @author Mikhail A. Markov
*/
-public abstract class AbstractTakeTestBase extends AbstractTestBase {
+public abstract class AbstractTakeTestBase extends JavaSpaceTest {
/**
* Default Constructor requiring no arguments.
Added: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/AbstractTransactionReadTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/AbstractTransactionReadTest.java?rev=1427655&view=auto
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/AbstractTransactionReadTest.java (added)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/AbstractTransactionReadTest.java Wed Jan 2 05:20:52 2013
@@ -0,0 +1,32 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.sun.jini.test.spec.javaspace.conformance;
+
+import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
+
+/**
+ *
+ * @author peter
+ */
+public abstract class AbstractTransactionReadTest extends AbstractReadTestBase {
+
+ public AbstractTransactionReadTest() {
+ }
+
+ /**
+ * Sets up the testing environment.
+ *
+ * @param config QAConfig from the runner for construct.
+ */
+ public Test construct(QAConfig config) throws Exception {
+ // mandatory call to parent
+ super.construct(config);
+ // get an instance of Transaction Manager
+ mgr = getTxnManager();
+ return this;
+ }
+
+}
Propchange: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/AbstractTransactionReadTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/AbstractTransactionTakeTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/AbstractTransactionTakeTest.java?rev=1427655&view=auto
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/AbstractTransactionTakeTest.java (added)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/AbstractTransactionTakeTest.java Wed Jan 2 05:20:52 2013
@@ -0,0 +1,32 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.sun.jini.test.spec.javaspace.conformance;
+
+import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
+
+/**
+ *
+ * @author peter
+ */
+public abstract class AbstractTransactionTakeTest extends AbstractTakeTestBase {
+
+ public AbstractTransactionTakeTest() {
+ }
+
+ /**
+ * Sets up the testing environment.
+ *
+ * @param config QAConfig from the runner for construct.
+ */
+ public Test construct(QAConfig config) throws Exception {
+ // mandatory call to parent
+ super.construct(config);
+ // get an instance of Transaction Manager
+ mgr = getTxnManager();
+ return this;
+ }
+
+}
Propchange: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/AbstractTransactionTakeTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/ContentsTest05.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/ContentsTest05.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/ContentsTest05.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/ContentsTest05.java Wed Jan 2 05:20:52 2013
@@ -34,7 +34,7 @@ import net.jini.space.MatchSet;
*
* @author Pavel Bogdanov
*/
-public class ContentsTest05 extends AbstractTestBase {
+public class ContentsTest05 extends JavaSpaceTest {
private final long MAX_ENTRIES = 5;
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/ExpirationNotifyTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/ExpirationNotifyTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/ExpirationNotifyTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/ExpirationNotifyTest.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;
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
/**
* ExpirationNotifyTest asserts, that the request specified by a
@@ -37,21 +38,7 @@ import com.sun.jini.qa.harness.QAConfig;
*
* @author Mikhail A. Markov
*/
-public class ExpirationNotifyTest 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 ExpirationNotifyTest 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/ExpirationTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/ExpirationTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/ExpirationTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/ExpirationTest.java Wed Jan 2 05:20:52 2013
@@ -33,7 +33,7 @@ import com.sun.jini.qa.harness.QAConfig;
*
* @author Mikhail A. Markov
*/
-public class ExpirationTest extends AbstractTestBase {
+public class ExpirationTest extends JavaSpaceTest {
/**
* This method asserts, that when the lease expires,