river-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peter_firmst...@apache.org
Subject svn commit: r1427655 [29/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...
Date Wed, 02 Jan 2013 05:21:08 GMT
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/joinmanager/Register.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/joinmanager/Register.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/joinmanager/Register.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/joinmanager/Register.java Wed Jan  2 05:20:52 2013
@@ -21,6 +21,7 @@ package com.sun.jini.test.spec.joinmanag
 import java.util.logging.Level;
 
 import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
 import com.sun.jini.qa.harness.TestException;
 
 import net.jini.lookup.JoinManager;
@@ -50,15 +51,16 @@ public class Register extends AbstractBa
      *          lookup services started in the previous step
      *   </ul>
      */
-    public void setup(QAConfig sysConfig) throws Exception {
-        super.setup(sysConfig);
+    public Test construct(QAConfig sysConfig) throws Exception {
+        super.construct(sysConfig);
         /* Discover & join lookups just started */
         logger.log(Level.FINE, "creating a service ID join manager ...");
         joinMgrSrvcID = new JoinManager(testService,serviceAttrs,serviceID,
                                         getLookupDiscoveryManager(),leaseMgr,
 					sysConfig.getConfiguration());
         joinMgrList.add(joinMgrSrvcID);
-    }//end setup
+        return this;
+    }//end construct
 
     /** Executes the current test by doing the following:
      * <p>
@@ -72,8 +74,8 @@ public class Register extends AbstractBa
         /* Verify that the lookups were discovered */
         logger.log(Level.FINE, "verifying the lookup "
                                         +"service(s) are discovered ...");
-        mainListener.setLookupsToDiscover(lookupsStarted,
-                                          toGroupsArray(lookupsStarted));
+        mainListener.setLookupsToDiscover(getLookupsStarted(),
+                                          toGroupsArray(getLookupsStarted()));
         waitForDiscovery(mainListener);
         verifyJoin();
         logger.log(Level.FINE, "join manager successfully registered "

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/joinmanager/RegisterProp.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/joinmanager/RegisterProp.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/joinmanager/RegisterProp.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/joinmanager/RegisterProp.java Wed Jan  2 05:20:52 2013
@@ -51,15 +51,15 @@ public class RegisterProp extends Regist
         super.run();
 
         /* Stagger-start additional lookup services */
-        logger.log(Level.FINE, "starting "+nAddLookupServices
+        logger.log(Level.FINE, "starting "+getnAddLookupServices()
                           +" additional lookup service(s) ...");
         StaggeredStartThread lookupsThread =
-             new StaggeredStartThread(lookupsStarted.size(),allLookupsToStart);
+             new StaggeredStartThread(getLookupsStarted().size(), getAllLookupsToStart());
         lookupsThread.start();
         try {
             mainListener.clearAllEventInfo();
-            mainListener.setLookupsToDiscover(addLookupsToStart,
-                                             toGroupsArray(addLookupsToStart));
+            mainListener.setLookupsToDiscover(getAddLookupsToStart(),
+                                             toGroupsArray(getAddLookupsToStart()));
             waitForDiscovery(mainListener);
         } finally {
             /* If an exception occurred before the thread finished starting
@@ -78,7 +78,7 @@ public class RegisterProp extends Regist
                           +"service with each new lookup service ...");
         verifyJoin();
         logger.log(Level.FINE, "join manager successfully registered "
-                          +"TestService with all "+nAddLookupServices
+                          +"TestService with all "+getnAddLookupServices()
                           +" additional lookup service(s)");
     }//end run
 

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/joinmanager/ServiceIDNotify.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/joinmanager/ServiceIDNotify.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/joinmanager/ServiceIDNotify.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/joinmanager/ServiceIDNotify.java Wed Jan  2 05:20:52 2013
@@ -21,6 +21,7 @@ package com.sun.jini.test.spec.joinmanag
 import java.util.logging.Level;
 
 import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
 import com.sun.jini.qa.harness.TestException;
 
 import net.jini.lookup.JoinManager;
@@ -57,8 +58,8 @@ public class ServiceIDNotify extends Abs
      *          previous step
      *   </ul>
      */
-    public void setup(QAConfig sysConfig) throws Exception {
-        super.setup(sysConfig);
+    public Test construct(QAConfig sysConfig) throws Exception {
+        super.construct(sysConfig);
         logger.log(Level.FINE, "creating a callback join manager ...");
         callback = new SrvcIDListener(testService);
         joinMgrCallback = new JoinManager(testService,serviceAttrs,callback,
@@ -66,7 +67,8 @@ public class ServiceIDNotify extends Abs
                                           leaseMgr,
 					  sysConfig.getConfiguration());
         joinMgrList.add(joinMgrCallback);
-    }//end setup
+        return this;
+    }//end construct
 
     /** Executes the current test by doing the following:
      * <p>
@@ -79,8 +81,8 @@ public class ServiceIDNotify extends Abs
         /* Verify that the lookups were discovered */
         logger.log(Level.FINE, "verifying the lookup "
                                         +"service(s) are discovered ...");
-        mainListener.setLookupsToDiscover(lookupsStarted,
-                                          toGroupsArray(lookupsStarted));
+        mainListener.setLookupsToDiscover(getLookupsStarted(),
+                                          toGroupsArray(getLookupsStarted()));
         waitForDiscovery(mainListener);
         verifyJoin(expectedNEvents);
     }//end run

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/joinmanager/SetAttributes.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/joinmanager/SetAttributes.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/joinmanager/SetAttributes.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/joinmanager/SetAttributes.java Wed Jan  2 05:20:52 2013
@@ -21,6 +21,7 @@ package com.sun.jini.test.spec.joinmanag
 import java.util.logging.Level;
 
 import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
 import com.sun.jini.qa.harness.TestException;
 
 import com.sun.jini.test.share.AttributesUtil;
@@ -48,14 +49,15 @@ public class SetAttributes extends GetAt
      *          the current set with a new set
      *   </ul>
      */
-    public void setup(QAConfig sysConfig) throws Exception {
-        super.setup(sysConfig);
+    public Test construct(QAConfig sysConfig) throws Exception {
+        super.construct(sysConfig);
         if(AttributesUtil.compareAttributeSets(serviceAttrs,newServiceAttrs, Level.OFF)) {
             throw new TestException("newServiceAttrs is identical to "
                                   +"current serviceAttrs ... test is invalid");
         }//endif
         expectedAttrs = removeDups(newServiceAttrs);
-    }//end setup
+        return this;
+    }//end construct
 
     /** Executes the current test by doing the following:
      * <p>

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/joinmanager/SetAttributesDup.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/joinmanager/SetAttributesDup.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/joinmanager/SetAttributesDup.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/joinmanager/SetAttributesDup.java Wed Jan  2 05:20:52 2013
@@ -21,6 +21,7 @@ package com.sun.jini.test.spec.joinmanag
 import java.util.logging.Level;
 
 import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
 import com.sun.jini.qa.harness.TestException;
 
 /**
@@ -45,8 +46,8 @@ public class SetAttributesDup extends Se
      *          the current set with a new set
      *   </ul>
      */
-    public void setup(QAConfig sysConfig) throws Exception {
-        super.setup(sysConfig);
+    public Test construct(QAConfig sysConfig) throws Exception {
+        super.construct(sysConfig);
         /* Create an array that contains 1 element from the set of attributes
          * with which the join manager is currently configured, the new
          * set of attributes to be added to the initial set, and duplicates
@@ -54,7 +55,8 @@ public class SetAttributesDup extends Se
          */
         newServiceAttrs = addAttrsDup1DupAll(serviceAttrs,newServiceAttrs);
         expectedAttrs   = removeDups(newServiceAttrs);
-    }//end setup
+        return this;
+    }//end construct
 
 } //end class SetAttributesDup
 

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/joinmanager/SetAttributesNullSet.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/joinmanager/SetAttributesNullSet.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/joinmanager/SetAttributesNullSet.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/joinmanager/SetAttributesNullSet.java Wed Jan  2 05:20:52 2013
@@ -21,6 +21,7 @@ package com.sun.jini.test.spec.joinmanag
 import java.util.logging.Level;
 
 import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
 import com.sun.jini.qa.harness.TestException;
 
 /**
@@ -40,10 +41,11 @@ public class SetAttributesNullSet extend
      *          the setAttributes method
      *   </ul>
      */
-    public void setup(QAConfig sysConfig) throws Exception {
-        super.setup(sysConfig);
+    public Test construct(QAConfig sysConfig) throws Exception {
+        super.construct(sysConfig);
         newServiceAttrs = null;
-    }//end setup
+        return this;
+    }//end construct
 
 } //end class SetAttributesNullSet
 

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/joinmanager/SetAttributesProp.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/joinmanager/SetAttributesProp.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/joinmanager/SetAttributesProp.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/joinmanager/SetAttributesProp.java Wed Jan  2 05:20:52 2013
@@ -21,6 +21,7 @@ package com.sun.jini.test.spec.joinmanag
 import java.util.logging.Level;
 
 import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
 import com.sun.jini.qa.harness.TestException;
 import com.sun.jini.test.share.AttributesUtil;
 
@@ -48,11 +49,12 @@ public class SetAttributesProp extends R
      *          the new set
      *   </ul>
      */
-    public void setup(QAConfig sysConfig) throws Exception {
-        super.setup(sysConfig);
+    public Test construct(QAConfig sysConfig) throws Exception {
+        super.construct(sysConfig);
         newServiceAttrs = addAttrsDup1DupAll(serviceAttrs,newServiceAttrs);
         expectedAttrs   = removeDups(newServiceAttrs);
-    }//end setup
+        return this;
+    }//end construct
 
     /** Executes the current test by doing the following:
      * <p>
@@ -71,7 +73,7 @@ public class SetAttributesProp extends R
         joinMgrSrvcID.setAttributes(newServiceAttrs);
         logger.log(Level.FINE, "verifying new attributes were "
                                     +"propagated to each lookup service ...");
-        verifyPropagation(expectedAttrs,nSecsJoin);
+        verifyPropagation(expectedAttrs, getnSecsJoin());
         logger.log(Level.FINE, "new attributes successfully propagated to "
                           +"all "+curLookupListSize("SetAttributesProp.run")
                           +" lookup service(s)");

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/joinmanager/SetAttributesPropNew.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/joinmanager/SetAttributesPropNew.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/joinmanager/SetAttributesPropNew.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/joinmanager/SetAttributesPropNew.java Wed Jan  2 05:20:52 2013
@@ -50,15 +50,15 @@ public class SetAttributesPropNew extend
         super.run();
 
         /* Stagger-start additional lookup services */
-        logger.log(Level.FINE, "starting "+nAddLookupServices
+        logger.log(Level.FINE, "starting "+getnAddLookupServices()
                           +" additional lookup service(s) ...");
         StaggeredStartThread lookupsThread =
-             new StaggeredStartThread(lookupsStarted.size(),allLookupsToStart);
+             new StaggeredStartThread(getLookupsStarted().size(), getAllLookupsToStart());
         lookupsThread.start();
         try {
             mainListener.clearAllEventInfo();
-            mainListener.setLookupsToDiscover(addLookupsToStart,
-                                             toGroupsArray(addLookupsToStart));
+            mainListener.setLookupsToDiscover(getAddLookupsToStart(),
+                                             toGroupsArray(getAddLookupsToStart()));
             waitForDiscovery(mainListener);
         } finally {
             /* If an exception occurred before the thread finished starting
@@ -75,7 +75,7 @@ public class SetAttributesPropNew extend
         /* Verify attribute propagation to new lookup services */
         logger.log(Level.FINE, "verifying all attributes were "
                           +"propagated to each new lookup service ...");
-        verifyPropagation(expectedAttrs,nSecsJoin);
+        verifyPropagation(expectedAttrs, getnSecsJoin());
         logger.log(Level.FINE, "join manager successfully propagated "
                           +"all attributes to the new lookup service(s)");
     }//end run

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/joinmanager/TerminateDiscovery.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/joinmanager/TerminateDiscovery.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/joinmanager/TerminateDiscovery.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/joinmanager/TerminateDiscovery.java Wed Jan  2 05:20:52 2013
@@ -21,6 +21,7 @@ package com.sun.jini.test.spec.joinmanag
 import java.util.logging.Level;
 
 import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
 import com.sun.jini.qa.harness.TestException;
 
 import net.jini.discovery.LookupDiscoveryManager;
@@ -56,8 +57,8 @@ public class TerminateDiscovery extends 
      *         to the default discovery manager
      *   </ul>
      */
-    public void setup(QAConfig sysConfig) throws Exception {
-        super.setup(sysConfig);
+    public Test construct(QAConfig sysConfig) throws Exception {
+        super.construct(sysConfig);
         /* Discover & join lookups just started */
         logger.log(Level.FINE, "creating a service ID join manager ...");
         joinMgrSrvcID = new JoinManager(testService,serviceAttrs,serviceID,
@@ -68,9 +69,10 @@ public class TerminateDiscovery extends 
          */
         LookupDiscoveryManager discMgr 
               = (LookupDiscoveryManager)(joinMgrSrvcID.getDiscoveryManager());
-        discMgr.setGroups(toGroupsArray(initLookupsToStart));
+        discMgr.setGroups(toGroupsArray(getInitLookupsToStart()));
         discMgr.addDiscoveryListener(mainListener);
-    }//end setup
+        return this;
+    }//end construct
 
     /** Executes the current test by doing the following:
      * <p><ul>
@@ -94,8 +96,8 @@ public class TerminateDiscovery extends 
         /* Verify that the initial lookups were discovered */
         logger.log(Level.FINE, "verifying initial lookup "
 		   +"service(s) are discovered ...");
-        mainListener.setLookupsToDiscover(lookupsStarted,
-                                          toGroupsArray(lookupsStarted));
+        mainListener.setLookupsToDiscover(getLookupsStarted(),
+                                          toGroupsArray(getLookupsStarted()));
         waitForDiscovery(mainListener);
         /* Start a new lookup service */
         logger.log(Level.FINE, "starting another lookup service "
@@ -104,8 +106,8 @@ public class TerminateDiscovery extends 
         /* Verify that the new lookup was discovered */
         logger.log(Level.FINE, ""+": verifying the new lookup "
                                         +"service is discovered ...");
-        mainListener.setLookupsToDiscover(lookupsStarted,
-                                          toGroupsArray(lookupsStarted));
+        mainListener.setLookupsToDiscover(getLookupsStarted(),
+                                          toGroupsArray(getLookupsStarted()));
         waitForDiscovery(mainListener);
         /* Terminate the join manager */
         logger.log(Level.FINE, "terminating the join manager ...");
@@ -117,8 +119,8 @@ public class TerminateDiscovery extends 
         /* Verify that the new lookup was NOT discovered */
         logger.log(Level.FINE, "verifying the new lookup "
                           +"service was NOT discovered ...");
-        mainListener.setLookupsToDiscover(lookupsStarted,
-                                          toGroupsArray(lookupsStarted));
+        mainListener.setLookupsToDiscover(getLookupsStarted(),
+                                          toGroupsArray(getLookupsStarted()));
         try {
             waitForDiscovery(mainListener);
             throw new TestException("discovery still works even though "

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/joinmanager/TerminateLeases.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/joinmanager/TerminateLeases.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/joinmanager/TerminateLeases.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/joinmanager/TerminateLeases.java Wed Jan  2 05:20:52 2013
@@ -22,7 +22,7 @@ import java.util.logging.Level;
 
 import com.sun.jini.qa.harness.QAConfig;
 import com.sun.jini.qa.harness.TestException;
-
+import com.sun.jini.qa.harness.Test;
 import net.jini.discovery.DiscoveryManagement;
 import net.jini.lookup.JoinManager;
 
@@ -49,8 +49,8 @@ public class TerminateLeases extends Abs
      *          lookup services started in the previous step
      *   </ul>
      */
-    public void setup(QAConfig sysConfig) throws Exception {
-        super.setup(sysConfig);
+    public Test construct(QAConfig sysConfig) throws Exception {
+        super.construct(sysConfig);
         /* Discover & join lookups just started */
         logger.log(Level.FINE, "creating a service ID join manager ...");
         joinMgrSrvcID = new JoinManager(testService,serviceAttrs,serviceID,
@@ -60,13 +60,14 @@ public class TerminateLeases extends Abs
          *       termination during tearDown because it will be terminated
          *       in the run method
          */
-    }//end setup
+        return this;
+    }//end construct
 
     /** Executes the current test by doing the following:
      * <p><ul>
      *     <li> verifies that the test service is registered (it's leases
      *          are being managed) with each lookup service started during
-     *          setup
+     *          construct
      *     <li> terminates the join manager
      *     <li> verifies that the test service is no longer registered (the
      *          leases are no longer being managed) with any of the lookup
@@ -78,8 +79,8 @@ public class TerminateLeases extends Abs
         /* Verify that the lookups were discovered */
         logger.log(Level.FINE, "verifying the lookup "
                                         +"service(s) are discovered ...");
-        mainListener.setLookupsToDiscover(lookupsStarted,
-                                          toGroupsArray(lookupsStarted));
+        mainListener.setLookupsToDiscover(getLookupsStarted(),
+                                          toGroupsArray(getLookupsStarted()));
         waitForDiscovery(mainListener);
         /* Verify join is successful */
         logger.log(Level.FINE, "verifying test service is "

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jrmp/util/AbstractTestBase.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jrmp/util/AbstractTestBase.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jrmp/util/AbstractTestBase.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jrmp/util/AbstractTestBase.java Wed Jan  2 05:20:52 2013
@@ -40,16 +40,16 @@ import java.net.ServerSocket;
 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 net.jini.jrmp.JrmpExporter;
-
+import com.sun.jini.qa.harness.Test;
 
 /**
  * Abstract Test base for all jrmp 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;
@@ -102,11 +102,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("jrmp.util.constructorType", 0);
@@ -141,6 +141,7 @@ public abstract class AbstractTestBase e
         } else {
             cSsf = null;
         }
+        return this;
     }
 
     /**

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/downloadPermission/Constructor.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/downloadPermission/Constructor.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/downloadPermission/Constructor.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/downloadPermission/Constructor.java Wed Jan  2 05:20:52 2013
@@ -22,9 +22,9 @@ import java.util.logging.Level;
 // com.sun.jini.qa.harness
 import com.sun.jini.qa.harness.TestException;
 import com.sun.jini.qa.harness.QAConfig;
-
+import com.sun.jini.qa.harness.Test;
 // 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;
 
 // java.util.logging
@@ -91,7 +91,7 @@ import net.jini.loader.DownloadPermissio
  * </ol>
  *
  */
-public class Constructor extends QATest {
+public class Constructor extends QATestEnvironment implements Test {
 
     /** Symbolic name of default DownloadPermission object */
     private static final String DEFAULT_NAME = "permit";
@@ -102,16 +102,17 @@ public class Constructor extends QATest 
     /**
      * Sets up the testing environment.
      *
-     * @param sysConfig QAConfig from the runner for setup.
+     * @param sysConfig QAConfig from the runner for construct.
      */
-    public void setup(QAConfig sysConfig) throws Exception {
+    public Test construct(QAConfig sysConfig) throws Exception {
         // Set shared vm mode to be disabled in all cases
         ((QAConfig)
                 sysConfig).setDynamicParameter("com.sun.jini.qa.harness.shared",
                 "false");
 
         // mandatory call to parent
-        super.setup(sysConfig);
+        super.construct(sysConfig);
+        return this;
     }
 
     /**

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/AbstractTestBase.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/AbstractTestBase.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/AbstractTestBase.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/AbstractTestBase.java Wed Jan  2 05:20:52 2013
@@ -21,10 +21,11 @@ import java.util.logging.Level;
 
 // com.sun.jini.qa.harness
 import com.sun.jini.qa.harness.QAConfig;
-
+import com.sun.jini.qa.harness.Test;
 // 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;
+import com.sun.jini.qa.harness.Test;
 import com.sun.jini.qa.harness.TestException;
 
 // java.net
@@ -54,7 +55,7 @@ import com.sun.jini.test.spec.loader.uti
  * This class sets up the testing environment and
  * has some helper methods.
  */
-public abstract class AbstractTestBase extends QATest {
+public abstract class AbstractTestBase extends QATestEnvironment implements Test {
 
     /** The name of java.rmi.server.codebase system property */
     protected static final String RMICODEBASE = "java.rmi.server.codebase";
@@ -63,57 +64,57 @@ public abstract class AbstractTestBase e
     protected static final String INVCODEBASE = "Invalid_codebase";
 
     /** The QAConfig object */
-    protected QAConfig config;
+    protected volatile QAConfig config;
 
     /**
      * The instrumented preferred class loader
      * {@link QATestPreferredClassLoader}
      */
-    protected QATestPreferredClassLoader loader;
+    protected volatile QATestPreferredClassLoader loader;
 
     /**
      *  Flag to define whether http or file url will be used
      *  for download preferred classes and resources
      */
-    protected boolean isHttp;
+    protected volatile boolean isHttp;
 
     /**
      * Http port to download preferred classes and resources via
      * com.sun.jini.qa.port
      */
-    protected int port;
+    protected volatile int port;
 
     /** Auxiliary http port to download preferred classes and resources */
-    protected int auxPort;
+    protected volatile int auxPort;
 
     /**
      * Flag to define boolean requireDlPerm argument that will be passed to
      * {@link QATestPreferredClassLoader} constructor.
      */
-    protected boolean dlPerm;
+    protected volatile boolean dlPerm;
 
     /**
      * String to define the exportAnnotation string that will be passed to
      * {@link QATestPreferredClassLoader} constructor.
      */
-    protected String annotation;
+    protected volatile String annotation;
 
     /**
      *  Flag to indicate that SecurityException should be thrown.
      */
-    protected boolean expectSecurityException;
+    protected volatile boolean expectSecurityException;
 
     /**
      *  String codebase for {@link QATestPreferredClassProvider}.
      */
-    protected String codebaseParam;
+    protected volatile String codebaseParam;
 
     /**
      * Sets up the testing environment.
      *
-     * @param config QAConfig from the runner for setup.
+     * @param config QAConfig from the runner for construct.
      */
-    public void setup(QAConfig config) throws Exception {
+    public Test construct(QAConfig config) throws Exception {
         this.config = config;
 
         // Set shared vm mode to be disabled in all cases
@@ -129,7 +130,7 @@ public abstract class AbstractTestBase e
         }
 
         // mandatory call to parent
-        super.setup(config);
+        super.construct(config);
 
 
         /*
@@ -159,6 +160,7 @@ public abstract class AbstractTestBase e
                 config.getBooleanConfigVal("loader.expectSecurityException",
                 false);
         codebaseParam = config.getStringConfigVal("loader.codebase", null);
+        return this;
     }
 
     /**
@@ -184,7 +186,7 @@ public abstract class AbstractTestBase e
             throws TestException {
 
         /*
-         * Obtain array of URL according setup patameters.
+         * Obtain array of URL according construct patameters.
          */
         URL[] urls = Util.getUrls(isHttp, jar, jar2, config, port);
         ClassLoader prnt = Util.systemClassLoader();

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/Constructor.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/Constructor.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/Constructor.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/Constructor.java Wed Jan  2 05:20:52 2013
@@ -24,7 +24,7 @@ import com.sun.jini.qa.harness.TestExcep
 import com.sun.jini.qa.harness.QAConfig;
 
 // com.sun.jini.qa
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
 import com.sun.jini.qa.harness.QAConfig;
 
 // java.io
@@ -170,7 +170,7 @@ public class Constructor extends Abstrac
     }
 
     /**
-     * Reset setup parameters by passing parameters and create
+     * Reset construct parameters by passing parameters and create
      * PreferredClassLoader.
      * <br><br>
      * Then run the test case according <b>Test Description</b>
@@ -186,7 +186,7 @@ public class Constructor extends Abstrac
             throws TestException {
 
         /*
-         * Reset setup parameters by passing parameters.
+         * Reset construct parameters by passing parameters.
          */
         super.isHttp = isHttp;
         super.annotation = annotation;

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/GetClassAnnotation.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/GetClassAnnotation.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/GetClassAnnotation.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/GetClassAnnotation.java Wed Jan  2 05:20:52 2013
@@ -24,7 +24,7 @@ import com.sun.jini.qa.harness.TestExcep
 import com.sun.jini.qa.harness.QAConfig;
 
 // com.sun.jini.qa
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
 import com.sun.jini.qa.harness.QAConfig;
 
 // java.io
@@ -125,7 +125,7 @@ public class GetClassAnnotation extends 
     }
 
     /**
-     * Reset setup parameters by passing parameters and create
+     * Reset construct parameters by passing parameters and create
      * {@link QATestPreferredClassLoader}.
      * <br><br>
      * Then run the test case according <b>Test Description</b>
@@ -141,7 +141,7 @@ public class GetClassAnnotation extends 
             throws TestException {
 
         /*
-         * Reset setup parameters by passing parameters.
+         * Reset construct parameters by passing parameters.
          */
         super.isHttp = isHttp;
         super.annotation = annotation;

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/GetPermissions.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/GetPermissions.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/GetPermissions.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/GetPermissions.java Wed Jan  2 05:20:52 2013
@@ -217,7 +217,7 @@ public class GetPermissions extends Abst
     }
 
     /**
-     * Reset setup parameters by passing parameters and create
+     * Reset construct parameters by passing parameters and create
      * {@link QATestPreferredClassLoader}.
      * <br><br>
      * Then run the test case according <b>Test Description</b>
@@ -233,7 +233,7 @@ public class GetPermissions extends Abst
             throws TestException {
 
         /*
-         * Reset setup parameters by passing parameters.
+         * Reset construct parameters by passing parameters.
          */
         super.isHttp = isHttp;
         super.annotation = annotation;

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/GetResources.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/GetResources.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/GetResources.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/GetResources.java Wed Jan  2 05:20:52 2013
@@ -24,7 +24,7 @@ import com.sun.jini.qa.harness.TestExcep
 import com.sun.jini.qa.harness.QAConfig;
 
 // com.sun.jini.qa
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
 import com.sun.jini.qa.harness.QAConfig;
 
 // java.io
@@ -172,7 +172,7 @@ public class GetResources extends Abstra
     }
 
     /**
-     * Reset setup parameters by passing parameters and create
+     * Reset construct parameters by passing parameters and create
      * {@link QATestPreferredClassLoader}.
      * <br><br>
      * Then run the test case according <b>Test Description</b>
@@ -188,7 +188,7 @@ public class GetResources extends Abstra
             throws TestException {
 
         /*
-         * Reset setup parameters by passing parameters.
+         * Reset construct parameters by passing parameters.
          */
         super.isHttp = isHttp;
         super.annotation = annotation;

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/IsPreferredClass.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/IsPreferredClass.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/IsPreferredClass.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/IsPreferredClass.java Wed Jan  2 05:20:52 2013
@@ -24,7 +24,7 @@ import com.sun.jini.qa.harness.TestExcep
 import com.sun.jini.qa.harness.QAConfig;
 
 // com.sun.jini.qa
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
 import com.sun.jini.qa.harness.QAConfig;
 
 // java.io
@@ -174,7 +174,7 @@ public class IsPreferredClass extends Ab
     }
 
     /**
-     * Reset setup parameters by passing parameters and create
+     * Reset construct parameters by passing parameters and create
      * {@link QATestPreferredClassLoader}.
      * <br><br>
      * Then run the test case according <b>Test Description</b>
@@ -190,7 +190,7 @@ public class IsPreferredClass extends Ab
             throws TestException {
 
         /*
-         * Reset setup parameters by passing parameters.
+         * Reset construct parameters by passing parameters.
          */
         super.isHttp = isHttp;
         super.annotation = annotation;

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/IsPreferredResource.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/IsPreferredResource.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/IsPreferredResource.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/IsPreferredResource.java Wed Jan  2 05:20:52 2013
@@ -24,7 +24,7 @@ import com.sun.jini.qa.harness.TestExcep
 import com.sun.jini.qa.harness.QAConfig;
 
 // com.sun.jini.qa
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
 import com.sun.jini.qa.harness.QAConfig;
 
 // java.io
@@ -176,7 +176,7 @@ public class IsPreferredResource extends
     }
 
     /**
-     * Reset setup parameters by passing parameters and create
+     * Reset construct parameters by passing parameters and create
      * {@link QATestPreferredClassLoader}.
      * <br><br>
      * Then run the test case according <b>Test Description</b>
@@ -192,7 +192,7 @@ public class IsPreferredResource extends
             throws TestException {
 
         /*
-         * Reset setup parameters by passing parameters.
+         * Reset construct parameters by passing parameters.
          */
         super.isHttp = isHttp;
         super.annotation = annotation;

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/IsPreferredResourceIOException.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/IsPreferredResourceIOException.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/IsPreferredResourceIOException.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/IsPreferredResourceIOException.java Wed Jan  2 05:20:52 2013
@@ -24,7 +24,7 @@ import com.sun.jini.qa.harness.TestExcep
 import com.sun.jini.qa.harness.QAConfig;
 
 // com.sun.jini.qa
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
 import com.sun.jini.qa.harness.QAConfig;
 
 // java.io
@@ -149,7 +149,7 @@ public class IsPreferredResourceIOExcept
     }
 
     /**
-     * Reset setup parameters by passing parameters and create
+     * Reset construct parameters by passing parameters and create
      * {@link QATestPreferredClassLoader}.
      * <br><br>
      * Then run the test case according <b>Test Description</b>
@@ -165,7 +165,7 @@ public class IsPreferredResourceIOExcept
             throws TestException {
 
         /*
-         * Reset setup parameters by passing parameters.
+         * Reset construct parameters by passing parameters.
          */
         super.isHttp = isHttp;
         super.annotation = annotation;

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/LoadClasses.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/LoadClasses.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/LoadClasses.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/LoadClasses.java Wed Jan  2 05:20:52 2013
@@ -24,7 +24,7 @@ import com.sun.jini.qa.harness.TestExcep
 import com.sun.jini.qa.harness.QAConfig;
 
 // com.sun.jini.qa
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
 import com.sun.jini.qa.harness.QAConfig;
 
 // java.io
@@ -188,7 +188,7 @@ public class LoadClasses extends Abstrac
     }
 
     /**
-     * Reset setup parameters by passing parameters and create
+     * Reset construct parameters by passing parameters and create
      * {@link QATestPreferredClassLoader}.
      * <br><br>
      * Then run the test case according <b>Test Description</b>
@@ -204,13 +204,13 @@ public class LoadClasses extends Abstrac
             throws TestException {
 
         /*
-         * Reset setup parameters by passing parameters.
+         * Reset construct parameters by passing parameters.
          */
         super.isHttp = isHttp;
         super.annotation = annotation;
 
         /*
-         * 1) construct a QATestPreferredClassLoader according setup parameters
+         * 1) construct a QATestPreferredClassLoader according construct parameters
          *    with a single URL to the "qa1-loader-pref.jar file.
          */
         createLoader(Util.PREFERREDJarFile);

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/NewInstance.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/NewInstance.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/NewInstance.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/NewInstance.java Wed Jan  2 05:20:52 2013
@@ -24,7 +24,7 @@ import com.sun.jini.qa.harness.TestExcep
 import com.sun.jini.qa.harness.QAConfig;
 
 // com.sun.jini.qa
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
 import com.sun.jini.qa.harness.QAConfig;
 
 // java.io
@@ -171,7 +171,7 @@ public class NewInstance extends Abstrac
     }
 
     /**
-     * Reset setup parameters by passing parameters and create
+     * Reset construct parameters by passing parameters and create
      * PreferredClassLoader.
      * <br><br>
      * Then run the test case according <b>Test Description</b>
@@ -187,7 +187,7 @@ public class NewInstance extends Abstrac
             throws TestException {
 
         /*
-         * Reset setup parameters by passing parameters.
+         * Reset construct parameters by passing parameters.
          */
         super.isHttp = isHttp;
         super.annotation = annotation;

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassAnnotation.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassAnnotation.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassAnnotation.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassAnnotation.java Wed Jan  2 05:20:52 2013
@@ -24,7 +24,7 @@ import com.sun.jini.qa.harness.TestExcep
 import com.sun.jini.qa.harness.QAConfig;
 
 // com.sun.jini.qa
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
 import com.sun.jini.qa.harness.QAConfig;
 
 // java.io

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoader.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoader.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoader.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoader.java Wed Jan  2 05:20:52 2013
@@ -24,7 +24,7 @@ import com.sun.jini.qa.harness.TestExcep
 import com.sun.jini.qa.harness.QAConfig;
 
 // com.sun.jini.qa
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
 import com.sun.jini.qa.harness.QAConfig;
 
 // java.io

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderMalformedURLException.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderMalformedURLException.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderMalformedURLException.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderMalformedURLException.java Wed Jan  2 05:20:52 2013
@@ -24,7 +24,7 @@ import com.sun.jini.qa.harness.TestExcep
 import com.sun.jini.qa.harness.QAConfig;
 
 // com.sun.jini.qa
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
 import com.sun.jini.qa.harness.QAConfig;
 
 // java.io

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderSecurityException.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderSecurityException.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderSecurityException.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/GetClassLoaderSecurityException.java Wed Jan  2 05:20:52 2013
@@ -24,7 +24,7 @@ import com.sun.jini.qa.harness.TestExcep
 import com.sun.jini.qa.harness.QAConfig;
 
 // com.sun.jini.qa
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
 import com.sun.jini.qa.harness.QAConfig;
 
 // java.io

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClasses.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClasses.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClasses.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClasses.java Wed Jan  2 05:20:52 2013
@@ -24,7 +24,7 @@ import com.sun.jini.qa.harness.TestExcep
 import com.sun.jini.qa.harness.QAConfig;
 
 // com.sun.jini.qa
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
 import com.sun.jini.qa.harness.QAConfig;
 
 // java.io

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesClassNotFoundException.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesClassNotFoundException.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesClassNotFoundException.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesClassNotFoundException.java Wed Jan  2 05:20:52 2013
@@ -24,7 +24,7 @@ import com.sun.jini.qa.harness.TestExcep
 import com.sun.jini.qa.harness.QAConfig;
 
 // com.sun.jini.qa
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
 import com.sun.jini.qa.harness.QAConfig;
 
 // java.io

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesMalformedURLException.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesMalformedURLException.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesMalformedURLException.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesMalformedURLException.java Wed Jan  2 05:20:52 2013
@@ -24,7 +24,7 @@ import com.sun.jini.qa.harness.TestExcep
 import com.sun.jini.qa.harness.QAConfig;
 
 // com.sun.jini.qa
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
 import com.sun.jini.qa.harness.QAConfig;
 
 // java.io

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesSecurityException.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesSecurityException.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesSecurityException.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadClassesSecurityException.java Wed Jan  2 05:20:52 2013
@@ -24,7 +24,7 @@ import com.sun.jini.qa.harness.TestExcep
 import com.sun.jini.qa.harness.QAConfig;
 
 // com.sun.jini.qa
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
 import com.sun.jini.qa.harness.QAConfig;
 
 // java.io

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClasses.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClasses.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClasses.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClasses.java Wed Jan  2 05:20:52 2013
@@ -24,7 +24,7 @@ import com.sun.jini.qa.harness.TestExcep
 import com.sun.jini.qa.harness.QAConfig;
 
 // com.sun.jini.qa
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
 import com.sun.jini.qa.harness.QAConfig;
 
 // java.io

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesClassNotFoundException.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesClassNotFoundException.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesClassNotFoundException.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesClassNotFoundException.java Wed Jan  2 05:20:52 2013
@@ -24,7 +24,7 @@ import com.sun.jini.qa.harness.TestExcep
 import com.sun.jini.qa.harness.QAConfig;
 
 // com.sun.jini.qa
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
 import com.sun.jini.qa.harness.QAConfig;
 
 // java.io

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURLException.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURLException.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURLException.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassProvider/LoadProxyClassesMalformedURLException.java Wed Jan  2 05:20:52 2013
@@ -24,7 +24,7 @@ import com.sun.jini.qa.harness.TestExcep
 import com.sun.jini.qa.harness.QAConfig;
 
 // com.sun.jini.qa
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
 import com.sun.jini.qa.harness.QAConfig;
 
 // java.io

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/LoadClasses.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/LoadClasses.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/LoadClasses.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/LoadClasses.java Wed Jan  2 05:20:52 2013
@@ -24,7 +24,7 @@ import com.sun.jini.qa.harness.TestExcep
 import com.sun.jini.qa.harness.QAConfig;
 
 // com.sun.jini.qa
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
 import com.sun.jini.qa.harness.QAConfig;
 
 // java.io

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/LoadClassesSecurityException.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/LoadClassesSecurityException.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/LoadClassesSecurityException.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/LoadClassesSecurityException.java Wed Jan  2 05:20:52 2013
@@ -24,7 +24,7 @@ import com.sun.jini.qa.harness.TestExcep
 import com.sun.jini.qa.harness.QAConfig;
 
 // com.sun.jini.qa
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
 import com.sun.jini.qa.harness.QAConfig;
 
 // java.io

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/util/QATestPreferredClassLoader.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/util/QATestPreferredClassLoader.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/util/QATestPreferredClassLoader.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/util/QATestPreferredClassLoader.java Wed Jan  2 05:20:52 2013
@@ -23,7 +23,7 @@ import java.util.logging.Level;
 import com.sun.jini.qa.harness.QAConfig;
 
 // 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;
 import com.sun.jini.qa.harness.TestException;
 

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/util/QATestPreferredClassProvider.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/util/QATestPreferredClassProvider.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/util/QATestPreferredClassProvider.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/util/QATestPreferredClassProvider.java Wed Jan  2 05:20:52 2013
@@ -26,7 +26,7 @@ import java.net.MalformedURLException;
 import java.net.URL;
 
 // 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;
 import com.sun.jini.qa.harness.TestException;
 

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/util/Util.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/util/Util.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/util/Util.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/loader/util/Util.java Wed Jan  2 05:20:52 2013
@@ -38,7 +38,7 @@ import java.util.logging.Logger;
 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;
 import com.sun.jini.qa.harness.TestException;
 

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/AbstractBaseTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/AbstractBaseTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/AbstractBaseTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/AbstractBaseTest.java Wed Jan  2 05:20:52 2013
@@ -23,6 +23,7 @@ import java.util.logging.Level;
 import com.sun.jini.test.share.BaseQATest;
 
 import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
 import com.sun.jini.qa.harness.TestException;
 
 import net.jini.discovery.DiscoveryManagement;
@@ -31,7 +32,8 @@ import net.jini.core.discovery.LookupLoc
 import net.jini.core.lookup.ServiceRegistrar;
 
 import java.rmi.RemoteException;
-import java.util.ArrayList;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.List;
 
 /**
  * This class is an abstract class that acts as the base class from which
@@ -42,7 +44,7 @@ import java.util.ArrayList;
  * used as a listener to participate in the process of discovering lookup
  * services on behalf of the tests that are decendants of this abstract class.
  * <p>
- * This class provides an implementation of the <code>setup</code> method
+ * This class provides an implementation of the <code>construct</code> method
  * which performs standard functions related to the initialization of the
  * system state necessary to execute the test.
  * <p>
@@ -65,9 +67,9 @@ import java.util.ArrayList;
  */
 abstract public class AbstractBaseTest extends BaseQATest {
 
-    protected LookupLocatorDiscovery locatorDiscovery = null;
-    protected ArrayList locatorDiscoveryList = new ArrayList(1);
-    protected LookupListener mainListener = null;
+    protected volatile LookupLocatorDiscovery locatorDiscovery = null;
+    protected final List<LookupLocatorDiscovery> locatorDiscoveryList = new CopyOnWriteArrayList<LookupLocatorDiscovery>();
+    protected volatile LookupListener mainListener = null;
 
     /** Performs actions necessary to prepare for execution of the 
      *  current test as follows:
@@ -81,8 +83,8 @@ abstract public class AbstractBaseTest e
      *         discovery utility
      * </ul>
      */
-    public void setup(QAConfig sysConfig) throws Exception {
-        super.setup(sysConfig);
+    public Test construct(QAConfig sysConfig) throws Exception {
+        super.construct(sysConfig);
         try {
             /* Start locator discovery by creating a lookup locator discovery*/
             logger.log(Level.FINE, "creating a lookup locator discovery "
@@ -97,7 +99,8 @@ abstract public class AbstractBaseTest e
             e.printStackTrace();
             throw new Exception(e.toString());
         }
-    }//end setup
+        return this;
+    }//end construct
 
     /** Executes the current test
      */
@@ -127,7 +130,7 @@ abstract public class AbstractBaseTest e
 
     /** Convenience method that encapsulates basic discovery processing.
      *  This method is useful when a lookup locator discovery utility different
-     *  from the standard one created during setup is to be used for discovery.
+     *  from the standard one created during construct is to be used for discovery.
      *  
      *  This method does the following:
      *  <p><ul>
@@ -141,7 +144,7 @@ abstract public class AbstractBaseTest e
      *  </ul>
      *  @throws com.sun.jini.qa.harness.TestException
      */
-    protected void doDiscovery(ArrayList locGroupsListToDiscover,
+    protected void doDiscovery(List locGroupsListToDiscover,
                                LookupLocatorDiscovery lld,
                                LookupListener listener) throws TestException
     {
@@ -163,10 +166,10 @@ abstract public class AbstractBaseTest e
 
     /** Convenience method that encapsulates basic discovery processing.
      *  Use this method when the standard lookup locator discovery utility
-     *  created during setup is to be used for discovery.
+     *  created during construct is to be used for discovery.
      *  @throws com.sun.jini.qa.harness.TestException
      */
-    protected void doDiscovery(ArrayList locGroupsListToDiscover,
+    protected void doDiscovery(List locGroupsListToDiscover,
                                LookupListener listener) throws TestException
     {
         doDiscovery(locGroupsListToDiscover,locatorDiscovery,listener);

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/AddLocators.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/AddLocators.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/AddLocators.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/AddLocators.java Wed Jan  2 05:20:52 2013
@@ -38,7 +38,7 @@ import net.jini.core.discovery.LookupLoc
  *
  * The environment in which this class expects to operate is as follows:
  * <p><ul>
- *   <li> one or more "initial" lookup services, each started during setup,
+ *   <li> one or more "initial" lookup services, each started during construct,
  *        before the test begins execution
  *   <li> one or more "additional" lookup services, each started after the
  *        test has begun execution
@@ -61,7 +61,7 @@ public class AddLocators extends Discove
      *     <li> start the additional lookup services
      *     <li> verifies that the lookup locator discovery utility under test
      *          discovers the initial lookup services that were started 
-     *          during setup
+     *          during construct
      *     <li> re-configures the listener's expected event state to expect
      *          the discovery of the addtional lookup services
      *     <li> re-configures the lookup locator discovery utility to discover
@@ -76,16 +76,16 @@ public class AddLocators extends Discove
         /* Start the additional lookup services */
         startAddLookups();
         /* Verify discovery of the initial lookups */
-        doDiscovery(initLookupsToStart,mainListener);
+        doDiscovery(getInitLookupsToStart(),mainListener);
         /* Configure the listener's expected event state for the additional
          * lookup services
          */
         mainListener.clearAllEventInfo();
-        mainListener.setLookupsToDiscover(addLookupsToStart);
+        mainListener.setLookupsToDiscover(getAddLookupsToStart());
         /* Configure the lookup locator discovery utility to discover the
          * additional lookups
          */
-        LookupLocator[] locsToAdd = toLocatorArray(addLookupsToStart);
+        LookupLocator[] locsToAdd = toLocatorArray(getAddLookupsToStart());
         locatorDiscovery.addLocators(locsToAdd);
         logger.log(Level.FINE, "added additional locators to "
                           +"lookup locator discovery --");

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/AddLocatorsDups.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/AddLocatorsDups.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/AddLocatorsDups.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/AddLocatorsDups.java Wed Jan  2 05:20:52 2013
@@ -37,7 +37,7 @@ import net.jini.core.discovery.LookupLoc
  *
  * The environment in which this class expects to operate is as follows:
  * <p><ul>
- *   <li> one or more "initial" lookup services, each started during setup,
+ *   <li> one or more "initial" lookup services, each started during construct,
  *        before the test begins execution
  *   <li> one or more "additional" lookup services, each started after the
  *        test has begun execution
@@ -61,7 +61,7 @@ public class AddLocatorsDups extends Con
      *     <li> start the additional lookup services
      *     <li> verifies that the lookup locator discovery utility under test
      *          discovers the initial lookup services that were started 
-     *          during setup
+     *          during construct
      *     <li> re-configures the listener's expected event state to expect
      *          the discovery of the addtional lookup services
      *     <li> re-configures the lookup locator discovery utility to discover
@@ -76,12 +76,12 @@ public class AddLocatorsDups extends Con
         /* Start the additional lookup services */
         startAddLookups();
         /* Verify discovery of the initial lookups */
-        doDiscovery(initLookupsToStart,mainListener);
+        doDiscovery(getInitLookupsToStart(),mainListener);
         /* Configure the listener's expected event state for the additional
          * lookup services
          */
         mainListener.clearAllEventInfo();
-        mainListener.setLookupsToDiscover(addLookupsToStart);
+        mainListener.setLookupsToDiscover(getAddLookupsToStart());
         /* Configure the lookup locator discovery utility to discover the
          * additional lookups
          */

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/AddLocatorsEmpty.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/AddLocatorsEmpty.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/AddLocatorsEmpty.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/AddLocatorsEmpty.java Wed Jan  2 05:20:52 2013
@@ -35,7 +35,7 @@ import net.jini.core.discovery.LookupLoc
  *
  * The environment in which this class expects to operate is as follows:
  * <p><ul>
- *   <li> one or more "initial" lookup services, each started during setup,
+ *   <li> one or more "initial" lookup services, each started during construct,
  *        before the test begins execution
  *   <li> one or more "additional" lookup services, each started after the
  *        test has begun execution
@@ -63,7 +63,7 @@ public class AddLocatorsEmpty extends Di
      *     <li> start the additional lookup services
      *     <li> verifies that the lookup locator discovery utility under test
      *          discovers the initial lookup services that were started 
-     *          during setup
+     *          during construct
      *     <li> re-configures the listener's expected event state to expect
      *          no more discovered events
      *     <li> adds the empty set to the set of locators with which the
@@ -81,7 +81,7 @@ public class AddLocatorsEmpty extends Di
         /* Start the additional lookup services */
         startAddLookups();
         /* Verify discovery of the initial lookups */
-        doDiscovery(initLookupsToStart,mainListener);
+        doDiscovery(getInitLookupsToStart(),mainListener);
         /* Configure the listener's expected event state for the additional
          * lookup services
          */

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/AddLocatorsNull.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/AddLocatorsNull.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/AddLocatorsNull.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/AddLocatorsNull.java Wed Jan  2 05:20:52 2013
@@ -20,6 +20,7 @@ package com.sun.jini.test.spec.locatordi
 
 import java.util.logging.Level;
 import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
 
 /**
  * This class verifies that the <code>LookupLocatorDiscovery</code>
@@ -48,10 +49,11 @@ public class AddLocatorsNull extends Add
      *  current test (refer to the description of this method in the
      *  parent class).
      */
-    public void setup(QAConfig sysConfig) throws Exception {
-        super.setup(sysConfig);
+    public Test construct(QAConfig sysConfig) throws Exception {
+        super.construct(sysConfig);
         nullLocs = null;
-    }//end setup
+        return this;
+    }//end construct
 
 }//end class AddLocatorsNull
 

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/AddLocatorsNullElement.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/AddLocatorsNullElement.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/AddLocatorsNullElement.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/AddLocatorsNullElement.java Wed Jan  2 05:20:52 2013
@@ -19,7 +19,7 @@
 package com.sun.jini.test.spec.locatordiscovery;
 
 import java.util.logging.Level;
-
+import com.sun.jini.qa.harness.Test;
 import com.sun.jini.qa.harness.QAConfig;
 import com.sun.jini.qa.harness.TestException;
 import com.sun.jini.test.share.LocatorsUtil;
@@ -57,13 +57,14 @@ public class AddLocatorsNullElement exte
      *  current test (refer to the description of this method in the
      *  parent class).
      */
-    public void setup(QAConfig sysConfig) throws Exception {
+    public Test construct(QAConfig sysConfig) throws Exception {
         delayLookupStart = true;//don't start lookups, just want config info
-        super.setup(sysConfig);
-        configLocs = toLocatorArray(initLookupsToStart);
+        super.construct(sysConfig);
+        configLocs = toLocatorArray(getInitLookupsToStart());
         lld = new LookupLocatorDiscovery(configLocs, sysConfig.getConfiguration());
         locatorDiscoveryList.add(lld);
-    }//end setup
+        return this;
+    }//end construct
 
     /** Executes the current test by doing the following:
      * <p><ul>

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/AddNewDiscoveryChangeListener.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/AddNewDiscoveryChangeListener.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/AddNewDiscoveryChangeListener.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/AddNewDiscoveryChangeListener.java Wed Jan  2 05:20:52 2013
@@ -19,7 +19,7 @@
 package com.sun.jini.test.spec.locatordiscovery;
 
 import java.util.logging.Level;
-
+import com.sun.jini.qa.harness.Test;
 import com.sun.jini.qa.harness.QAConfig;
 import com.sun.jini.qa.harness.TestException;
 import com.sun.jini.test.spec.locatordiscovery.AbstractBaseTest;
@@ -58,10 +58,11 @@ public class AddNewDiscoveryChangeListen
      *  current test (refer to the description of this method in the
      *  parent class).
      */
-    public void setup(QAConfig sysConfig) throws Exception {
-        super.setup(sysConfig);
+    public Test construct(QAConfig sysConfig) throws Exception {
+        super.construct(sysConfig);
         newListener = new AbstractBaseTest.GroupChangeListener();
-    }//end setup
+        return this;
+    }//end construct
 
 }//end class AddNewDiscoveryListener
 

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/AddNewDiscoveryListener.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/AddNewDiscoveryListener.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/AddNewDiscoveryListener.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/AddNewDiscoveryListener.java Wed Jan  2 05:20:52 2013
@@ -19,7 +19,7 @@
 package com.sun.jini.test.spec.locatordiscovery;
 
 import java.util.logging.Level;
-
+import com.sun.jini.qa.harness.Test;
 import com.sun.jini.qa.harness.QAConfig;
 import com.sun.jini.qa.harness.TestException;
 
@@ -59,17 +59,18 @@ public class AddNewDiscoveryListener ext
      *  current test (refer to the description of this method in the
      *  parent class).
      */
-    public void setup(QAConfig sysConfig) throws Exception {
-        super.setup(sysConfig);
+    public Test construct(QAConfig sysConfig) throws Exception {
+        super.construct(sysConfig);
         newListener = new AbstractBaseTest.LookupListener();
-    }//end setup
+        return this;
+    }//end construct
 
     /** Executes the current test by doing the following:
      * <p>
      *   <ul>
      *     <li> re-configures the lookup locator discovery utility to discover
      *          the set of locators whose elements are the locators of each
-     *          lookup service that was started during setup
+     *          lookup service that was started during construct
      *     <li> starts the unicast discovery process by adding a listener to
      *          the lookup locator discovery utility
      *     <li> verifies that the discovery process is working by waiting
@@ -87,7 +88,7 @@ public class AddNewDiscoveryListener ext
 
         logger.log(Level.FINE, "adding a new listener to "
 		   +"LookupLocatorDiscovery ... ");
-        newListener.setLookupsToDiscover(initLookupsToStart);
+        newListener.setLookupsToDiscover(getInitLookupsToStart());
         locatorDiscovery.addDiscoveryListener(newListener);
         waitForDiscovery(newListener);
     }//end run

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/ConstructorDups.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/ConstructorDups.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/ConstructorDups.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/ConstructorDups.java Wed Jan  2 05:20:52 2013
@@ -22,7 +22,7 @@ import java.util.logging.Level;
 
 import com.sun.jini.qa.harness.QAConfig;
 import com.sun.jini.qa.harness.TestException;
-
+import com.sun.jini.qa.harness.Test;
 import net.jini.discovery.LookupLocatorDiscovery;
 
 import net.jini.core.discovery.LookupLocator;
@@ -40,7 +40,7 @@ import java.util.ArrayList;
  *
  * The environment in which this class expects to operate is as follows:
  * <p><ul>
- *   <li> one or more initial lookup services started during setup
+ *   <li> one or more initial lookup services started during construct
  *   <li> an instance of the lookup locator discovery utility constructed
  *        using a set of locators in which at least 1 element duplicates
  *        at least 1 other element in the set
@@ -62,23 +62,24 @@ public class ConstructorDups extends Abs
      *  current test (refer to the description of this method in the
      *  parent class).
      */
-    public void setup(QAConfig sysConfig) throws Exception {
-        super.setup(sysConfig);
+    public Test construct(QAConfig sysConfig) throws Exception {
+        super.construct(sysConfig);
         /* Create a set of locators to discover that contain duplicates */
-        int len1 = allLookupsToStart.size();
+        int len1 = getAllLookupsToStart().size();
         int len2 = 2*len1;
         for(int i=0;i<len1;i++) {
             LocatorGroupsPair pair
-                                = (LocatorGroupsPair)allLookupsToStart.get(i);
+                                = (LocatorGroupsPair)getAllLookupsToStart().get(i);
             newLookups.add(i,pair);
         }//end loop
         for(int i=len1;i<len2;i++) {
             LocatorGroupsPair pair
-                          = (LocatorGroupsPair)allLookupsToStart.get(i-len1);
+                          = (LocatorGroupsPair)getAllLookupsToStart().get(i-len1);
             newLookups.add(i,pair);
         }//end loop
         dupLocs = toLocatorArray(newLookups);
-    }//end setup
+        return this;
+    }//end construct
 
     /** Executes the current test by doing the following:
      * <p><ul>

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/ConstructorNullElement.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/ConstructorNullElement.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/ConstructorNullElement.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/ConstructorNullElement.java Wed Jan  2 05:20:52 2013
@@ -22,7 +22,7 @@ import java.util.logging.Level;
 
 import com.sun.jini.qa.harness.TestException;
 import com.sun.jini.qa.harness.QAConfig;
-
+import com.sun.jini.qa.harness.Test;
 import net.jini.discovery.LookupLocatorDiscovery;
 
 import net.jini.core.discovery.LookupLocator;
@@ -56,8 +56,8 @@ public class ConstructorNullElement exte
      *  current test (refer to the description of this method in the
      *  parent class).
      */
-    public void setup(QAConfig sysConfig) throws Exception {
-        super.setup(sysConfig);
+    public Test construct(QAConfig sysConfig) throws Exception {
+        super.construct(sysConfig);
         /* Create an array of LookupLocator instances in which at least 1
          * element is null
          */
@@ -74,7 +74,8 @@ public class ConstructorNullElement exte
                         = ((indx == i) ? null : QAConfig.getConstrainedLocator(host,port));
             }//end loop
         }//endif
-    }//end setup
+        return this;
+    }//end construct
 
     /** Executes the current test by doing the following:
      * <p>

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/DiscardDNE.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/DiscardDNE.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/DiscardDNE.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/DiscardDNE.java Wed Jan  2 05:20:52 2013
@@ -19,7 +19,7 @@
 package com.sun.jini.test.spec.locatordiscovery;
 
 import java.util.logging.Level;
-
+import com.sun.jini.qa.harness.Test;
 import com.sun.jini.qa.harness.QAConfig;
 import com.sun.jini.qa.harness.TestException;
 import com.sun.jini.test.services.lookupsimulator.LookupSimulatorProxy;
@@ -66,13 +66,14 @@ public class DiscardDNE extends DiscardN
      *  current test (refer to the description of this method in the
      *  parent class).
      */
-    public void setup(QAConfig sysConfig) throws Exception {
-        super.setup(sysConfig);
+    public Test construct(QAConfig sysConfig) throws Exception {
+        super.construct(sysConfig);
         proxy = new LookupSimulatorProxy(null,new ServiceID(1,2));
         discardStr = new String("attempt to discard a registrar that "
                                 +"DOES NOT EXIST in the managed set of "
                                 +"registrars ...");
-    }//end setup
+        return this;
+    }//end construct
 
 }//end class DiscardDNE
 

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/DiscardNull.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/DiscardNull.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/DiscardNull.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/locatordiscovery/DiscardNull.java Wed Jan  2 05:20:52 2013
@@ -67,12 +67,12 @@ public class DiscardNull extends Discove
      * <p><ul>
      *    <li> re-configures the lookup locator discovery utility to discover
      *         the set of locators whose elements are the locators of each
-     *         lookup service that was started during setup
+     *         lookup service that was started during construct
      *    <li> starts the unicast discovery process by adding a listener to
      *         the lookup locator discovery utility
      *    <li> verifies that the discovery process is working by waiting
      *         for the expected discovery events
-     *    <li> for each lookup service started during setup, destroys the
+     *    <li> for each lookup service started during construct, destroys the
      *         lookup service and invokes the discard method on the lookup
      *         locator discovery utility
      *    <li> verifies that the discard mechanism is working correctly by
@@ -109,7 +109,7 @@ public class DiscardNull extends Discove
 	    discoveredProxies[i] = (ServiceRegistrar)
 	    getConfig().prepare("test.reggiePreparer", 
 				discoveredProxies[i]);
-	    manager.destroyService(discoveredProxies[i]);
+	    getManager().destroyService(discoveredProxies[i]);
 	    locatorDiscovery.discard( discoveredProxies[i] );
 	}//end loop
         waitForDiscard(mainListener);//verify the discarded events



Mime
View raw message