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 [34/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/renewalservice/IndefiniteRenewalTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/IndefiniteRenewalTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/IndefiniteRenewalTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/IndefiniteRenewalTest.java Wed Jan 2 05:20:52 2013
@@ -30,9 +30,10 @@ import net.jini.lease.RenewalFailureEven
//
import com.sun.jini.qa.harness.TestException;
+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.test.share.RememberingRemoteListener;
import com.sun.jini.test.share.TestLease;
import com.sun.jini.test.share.TestLeaseProvider;
@@ -78,10 +79,10 @@ public class IndefiniteRenewalTest exten
/**
* Sets up the testing environment.
*/
- public void setup(com.sun.jini.qa.harness.QAConfig sysConfig) throws Exception {
+ public Test construct(com.sun.jini.qa.harness.QAConfig sysConfig) throws Exception {
// mandatory call to parent
- super.setup(sysConfig);
+ super.construct(sysConfig);
// Announce where we are in the test
logger.log(Level.FINE, "IndefiniteRenewalTest: In setup() method.");
@@ -103,6 +104,7 @@ public class IndefiniteRenewalTest exten
// create lease renewal manager for wider use across implementations
lrm = new LeaseRenewalManager(sysConfig.getConfiguration());
+ return this;
}
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/LeaseDurationTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/LeaseDurationTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/LeaseDurationTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/LeaseDurationTest.java Wed Jan 2 05:20:52 2013
@@ -27,9 +27,10 @@ import net.jini.lease.LeaseRenewalSet;
//
import com.sun.jini.qa.harness.TestException;
+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;
/**
@@ -48,14 +49,14 @@ public class LeaseDurationTest extends A
/**
* Sets up the testing environment.
*/
- public void setup(com.sun.jini.qa.harness.QAConfig sysConfig) throws Exception {
+ public Test construct(com.sun.jini.qa.harness.QAConfig sysConfig) throws Exception {
// mandatory call to parent
- super.setup(sysConfig);
+ super.construct(sysConfig);
// Announce where we are in the test
logger.log(Level.FINE, "LeaseDurationTest: In setup() method.");
-
+ return this;
}
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/LeaseExpirationTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/LeaseExpirationTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/LeaseExpirationTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/LeaseExpirationTest.java Wed Jan 2 05:20:52 2013
@@ -35,6 +35,7 @@ import java.rmi.UnmarshalException;
//
import com.sun.jini.qa.harness.TestException;
+import com.sun.jini.qa.harness.Test;
// net.jini
import net.jini.core.lease.Lease;
@@ -44,7 +45,7 @@ import net.jini.lease.LeaseRenewalServic
import net.jini.lease.LeaseRenewalSet;
// com.sun.jini
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
import com.sun.jini.test.share.FailingOpCountingOwner;
import com.sun.jini.test.share.TestLease;
import com.sun.jini.test.share.TestLeaseProvider;
@@ -182,10 +183,10 @@ public class LeaseExpirationTest extends
/**
* Sets up the testing environment.
*/
- public void setup(com.sun.jini.qa.harness.QAConfig sysConfig) throws Exception {
+ public Test construct(com.sun.jini.qa.harness.QAConfig sysConfig) throws Exception {
// mandatory call to parent
- super.setup(sysConfig);
+ super.construct(sysConfig);
// Announce where we are in the test
logger.log(Level.FINE, "LeaseExpirationTest: In setup() method.");
@@ -301,6 +302,7 @@ public class LeaseExpirationTest extends
// create lease renewal manager for wider use across implementations
lrm = new LeaseRenewalManager(sysConfig.getConfiguration());
+ return this;
}
/**
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/LeaseNotInSetTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/LeaseNotInSetTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/LeaseNotInSetTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/LeaseNotInSetTest.java Wed Jan 2 05:20:52 2013
@@ -28,9 +28,10 @@ import net.jini.lease.LeaseRenewalSet;
//
import com.sun.jini.qa.harness.TestException;
+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.test.share.BasicLeaseOwner;
import com.sun.jini.test.share.TestLease;
import com.sun.jini.test.share.TestLeaseProvider;
@@ -60,10 +61,10 @@ public class LeaseNotInSetTest extends A
/**
* Sets up the testing environment.
*/
- public void setup(com.sun.jini.qa.harness.QAConfig sysConfig) throws Exception {
+ public Test construct(com.sun.jini.qa.harness.QAConfig sysConfig) throws Exception {
// mandatory call to parent
- super.setup(sysConfig);
+ super.construct(sysConfig);
// Announce where we are in the test
logger.log(Level.FINE, "LeaseNotInSetTest: In setup() method.");
@@ -76,6 +77,7 @@ public class LeaseNotInSetTest extends A
// create lease renewal manager for wider use across implementations
lrm = new LeaseRenewalManager(sysConfig.getConfiguration());
+ return this;
}
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/LeaseRenewalServiceTestUtil.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/LeaseRenewalServiceTestUtil.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/LeaseRenewalServiceTestUtil.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/LeaseRenewalServiceTestUtil.java Wed Jan 2 05:20:52 2013
@@ -40,7 +40,7 @@ import net.jini.core.lease.UnknownLeaseE
import com.sun.jini.qa.harness.TestException;
import com.sun.jini.qa.harness.QAConfig;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
import com.sun.jini.test.share.RememberingRemoteListener;
/**
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/LeaseRenewalTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/LeaseRenewalTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/LeaseRenewalTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/LeaseRenewalTest.java Wed Jan 2 05:20:52 2013
@@ -30,9 +30,10 @@ import net.jini.lease.RenewalFailureEven
//
import com.sun.jini.qa.harness.TestException;
+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.test.share.RememberingRemoteListener;
import com.sun.jini.test.share.TestLease;
import com.sun.jini.test.share.TestLeaseProvider;
@@ -84,10 +85,10 @@ public class LeaseRenewalTest extends Ab
/**
* Sets up the testing environment.
*/
- public void setup(com.sun.jini.qa.harness.QAConfig sysConfig) throws Exception {
+ public Test construct(com.sun.jini.qa.harness.QAConfig sysConfig) throws Exception {
// mandatory call to parent
- super.setup(sysConfig);
+ super.construct(sysConfig);
// Announce where we are in the test
logger.log(Level.FINE, "LeaseRenewalTest: In setup() method.");
@@ -109,6 +110,7 @@ public class LeaseRenewalTest extends Ab
// create lease renewal manager for wider use across implementations
lrm = new LeaseRenewalManager(sysConfig.getConfiguration());
+ return this;
}
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/LeaseUnmarshalExceptionTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/LeaseUnmarshalExceptionTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/LeaseUnmarshalExceptionTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/LeaseUnmarshalExceptionTest.java Wed Jan 2 05:20:52 2013
@@ -38,9 +38,10 @@ import net.jini.lease.LeaseUnmarshalExce
//
import com.sun.jini.qa.harness.TestException;
+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.test.share.OpCountingOwner;
import com.sun.jini.test.share.TestLease;
import com.sun.jini.test.share.TestLeaseProvider;
@@ -76,10 +77,10 @@ public class LeaseUnmarshalExceptionTest
/**
* Sets up the testing environment.
*/
- public void setup(com.sun.jini.qa.harness.QAConfig sysConfig) throws Exception {
+ public Test construct(com.sun.jini.qa.harness.QAConfig sysConfig) throws Exception {
// mandatory call to parent
- super.setup(sysConfig);
+ super.construct(sysConfig);
// Announce where we are in the test
logger.log(Level.FINE, "LeaseUnmarshalException: In setup() method.");
@@ -94,6 +95,7 @@ public class LeaseUnmarshalExceptionTest
// create lease renewal manager for wider use across implementations
lrm = new LeaseRenewalManager(sysConfig.getConfiguration());
+ return this;
}
/**
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/LeaseUnmarshalNoneTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/LeaseUnmarshalNoneTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/LeaseUnmarshalNoneTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/LeaseUnmarshalNoneTest.java Wed Jan 2 05:20:52 2013
@@ -38,9 +38,10 @@ import net.jini.lease.LeaseUnmarshalExce
//
import com.sun.jini.qa.harness.TestException;
+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.test.share.OpCountingOwner;
import com.sun.jini.test.share.TestLease;
import com.sun.jini.test.share.TestLeaseProvider;
@@ -74,10 +75,10 @@ public class LeaseUnmarshalNoneTest
/**
* Sets up the testing environment.
*/
- public void setup(com.sun.jini.qa.harness.QAConfig sysConfig) throws Exception {
+ public Test construct(com.sun.jini.qa.harness.QAConfig sysConfig) throws Exception {
// mandatory call to parent
- super.setup(sysConfig);
+ super.construct(sysConfig);
// Announce where we are in the test
logger.log(Level.FINE, "LeaseUnmarshalNoneExceptionTest:" +
@@ -92,6 +93,7 @@ public class LeaseUnmarshalNoneTest
// create lease renewal manager for wider use across implementations
lrm = new LeaseRenewalManager(sysConfig.getConfiguration());
+ return this;
}
/**
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/MaxMembershipTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/MaxMembershipTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/MaxMembershipTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/MaxMembershipTest.java Wed Jan 2 05:20:52 2013
@@ -28,9 +28,10 @@ import net.jini.lease.LeaseRenewalSet;
//
import com.sun.jini.qa.harness.TestException;
+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.test.share.BasicLeaseOwner;
import com.sun.jini.test.share.TestLease;
import com.sun.jini.test.share.TestLeaseProvider;
@@ -73,10 +74,10 @@ public class MaxMembershipTest extends A
/**
* Sets up the testing environment.
*/
- public void setup(com.sun.jini.qa.harness.QAConfig sysConfig) throws Exception {
+ public Test construct(com.sun.jini.qa.harness.QAConfig sysConfig) throws Exception {
// mandatory call to parent
- super.setup(sysConfig);
+ super.construct(sysConfig);
// Announce where we are in the test
logger.log(Level.FINE, "RenewalTimeTest: In setup() method.");
@@ -96,6 +97,7 @@ public class MaxMembershipTest extends A
// create lease renewal manager for wider use across implementations
lrm = new LeaseRenewalManager(sysConfig.getConfiguration());
+ return this;
}
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/MembershipDurationTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/MembershipDurationTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/MembershipDurationTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/MembershipDurationTest.java Wed Jan 2 05:20:52 2013
@@ -27,9 +27,10 @@ import net.jini.lease.LeaseRenewalSet;
//
import com.sun.jini.qa.harness.TestException;
+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.test.share.BasicLeaseOwner;
import com.sun.jini.test.share.TestLease;
import com.sun.jini.test.share.TestLeaseProvider;
@@ -56,10 +57,10 @@ public class MembershipDurationTest exte
/**
* Sets up the testing environment.
*/
- public void setup(com.sun.jini.qa.harness.QAConfig sysConfig) throws Exception {
+ public Test construct(com.sun.jini.qa.harness.QAConfig sysConfig) throws Exception {
// mandatory call to parent
- super.setup(sysConfig);
+ super.construct(sysConfig);
// Announce where we are in the test
logger.log(Level.FINE, "MembershipDurationTest: In setup() method.");
@@ -69,6 +70,7 @@ public class MembershipDurationTest exte
// create an owner to for testing definite exceptions
leaseOwner = new BasicLeaseOwner(Lease.FOREVER);
+ return this;
}
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/NewListenerEventTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/NewListenerEventTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/NewListenerEventTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/NewListenerEventTest.java Wed Jan 2 05:20:52 2013
@@ -36,9 +36,10 @@ import net.jini.lease.LeaseRenewalSet;
//
import com.sun.jini.qa.harness.TestException;
+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.test.share.FailingOpCountingOwner;
import com.sun.jini.test.share.RememberingRemoteListener;
import com.sun.jini.test.share.TestLease;
@@ -84,10 +85,10 @@ public class NewListenerEventTest extend
/**
* Sets up the testing environment.
*/
- public void setup(com.sun.jini.qa.harness.QAConfig sysConfig) throws Exception {
+ public Test construct(com.sun.jini.qa.harness.QAConfig sysConfig) throws Exception {
// mandatory call to parent
- super.setup(sysConfig);
+ super.construct(sysConfig);
// Announce where we are in the test
logger.log(Level.FINE, "NewListenerEventTest: In setup() method.");
@@ -108,6 +109,7 @@ public class NewListenerEventTest extend
new IllegalArgumentException("NewListenerEventTest");
failingOwner =
new FailingOpCountingOwner(definiteException, 0, renewGrant);
+ return this;
}
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/NormalEventReturnTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/NormalEventReturnTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/NormalEventReturnTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/NormalEventReturnTest.java Wed Jan 2 05:20:52 2013
@@ -30,9 +30,10 @@ import net.jini.lease.RenewalFailureEven
//
import com.sun.jini.qa.harness.TestException;
+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.test.share.RememberingRemoteListener;
import com.sun.jini.test.share.TestLease;
import com.sun.jini.test.share.TestLeaseProvider;
@@ -78,10 +79,10 @@ public class NormalEventReturnTest exten
/**
* Sets up the testing environment.
*/
- public void setup(com.sun.jini.qa.harness.QAConfig sysConfig) throws Exception {
+ public Test construct(com.sun.jini.qa.harness.QAConfig sysConfig) throws Exception {
// mandatory call to parent
- super.setup(sysConfig);
+ super.construct(sysConfig);
// Announce where we are in the test
logger.log(Level.FINE, "NormalEventReturnTest: In setup() method.");
@@ -101,6 +102,7 @@ public class NormalEventReturnTest exten
new IllegalArgumentException("NormalEventReturnTest");
failingOwner =
new FailingOpCountingOwner(definiteException, 0, renewGrant);
+ return this;
}
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/ReAddLeaseTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/ReAddLeaseTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/ReAddLeaseTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/ReAddLeaseTest.java Wed Jan 2 05:20:52 2013
@@ -27,9 +27,10 @@ import net.jini.lease.LeaseRenewalSet;
//
import com.sun.jini.qa.harness.TestException;
+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.test.share.BasicLeaseOwner;
import com.sun.jini.test.share.TestLease;
import com.sun.jini.test.share.TestLeaseProvider;
@@ -65,10 +66,10 @@ public class ReAddLeaseTest extends Abst
/**
* Sets up the testing environment.
*/
- public void setup(com.sun.jini.qa.harness.QAConfig sysConfig) throws Exception {
+ public Test construct(com.sun.jini.qa.harness.QAConfig sysConfig) throws Exception {
// mandatory call to parent
- super.setup(sysConfig);
+ super.construct(sysConfig);
// Announce where we are in the test
logger.log(Level.FINE, "ReAddLeaseTest: In setup() method.");
@@ -84,7 +85,7 @@ public class ReAddLeaseTest extends Abst
"membershipduration";
membershipDuration =
getConfig().getLongConfigVal(property, MEMBERSHIP_DURATION);
-
+ return this;
}
/**
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/RemovalTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/RemovalTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/RemovalTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/RemovalTest.java Wed Jan 2 05:20:52 2013
@@ -23,6 +23,7 @@ import java.util.logging.Level;
//
import com.sun.jini.qa.harness.TestException;
+import com.sun.jini.qa.harness.Test;
// net.jini
import net.jini.core.lease.Lease;
@@ -30,7 +31,7 @@ import net.jini.lease.LeaseRenewalServic
import net.jini.lease.LeaseRenewalSet;
// com.sun.jini
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
import com.sun.jini.test.share.TestLease;
import com.sun.jini.test.share.TestLeaseProvider;
import com.sun.jini.test.share.OpCountingOwner;
@@ -72,10 +73,10 @@ public class RemovalTest extends Abstrac
/**
* Sets up the testing environment.
*/
- public void setup(com.sun.jini.qa.harness.QAConfig sysConfig) throws Exception {
+ public Test construct(com.sun.jini.qa.harness.QAConfig sysConfig) throws Exception {
// mandatory call to parent
- super.setup(sysConfig);
+ super.construct(sysConfig);
// Announce where we are in the test
logger.log(Level.FINE, "RemovalTest: In setup() method.");
@@ -92,7 +93,7 @@ public class RemovalTest extends Abstrac
// calculate the renewal time for the renewal set's lease
setLeaseGrant = renewGrant * 5 / 3;
-
+ return this;
}
/**
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/RemoveCancelTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/RemoveCancelTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/RemoveCancelTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/RemoveCancelTest.java Wed Jan 2 05:20:52 2013
@@ -28,9 +28,10 @@ import net.jini.lease.LeaseRenewalSet;
//
import com.sun.jini.qa.harness.TestException;
+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.test.share.OpCountingOwner;
import com.sun.jini.test.share.TestLease;
import com.sun.jini.test.share.TestLeaseProvider;
@@ -59,10 +60,10 @@ public class RemoveCancelTest extends Ab
/**
* Sets up the testing environment.
*/
- public void setup(com.sun.jini.qa.harness.QAConfig sysConfig) throws Exception {
+ public Test construct(com.sun.jini.qa.harness.QAConfig sysConfig) throws Exception {
// mandatory call to parent
- super.setup(sysConfig);
+ super.construct(sysConfig);
// Announce where we are in the test
logger.log(Level.FINE, "RemoveCancelTest: In setup() method.");
@@ -75,6 +76,7 @@ public class RemoveCancelTest extends Ab
// create lease renewal manager for wider use across implementations
lrm = new LeaseRenewalManager(sysConfig.getConfiguration());
+ return this;
}
/**
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/RenewAtIntervalTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/RenewAtIntervalTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/RenewAtIntervalTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/RenewAtIntervalTest.java Wed Jan 2 05:20:52 2013
@@ -29,9 +29,10 @@ import net.jini.lease.LeaseRenewalSet;
//
import com.sun.jini.qa.harness.TestException;
+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.test.share.TestLease;
import com.sun.jini.test.share.TestLeaseProvider;
import com.sun.jini.test.share.OpCountingOwner;
@@ -100,10 +101,10 @@ public class RenewAtIntervalTest extends
/**
* Sets up the testing environment.
*/
- public void setup(com.sun.jini.qa.harness.QAConfig sysConfig) throws Exception {
+ public Test construct(com.sun.jini.qa.harness.QAConfig sysConfig) throws Exception {
// mandatory call to parent
- super.setup(sysConfig);
+ super.construct(sysConfig);
// Announce where we are in the test
logger.log(Level.FINE, "RenewAtIntervalTest: In setup() method.");
@@ -141,6 +142,7 @@ public class RenewAtIntervalTest extends
// create lease renewal manager for wider use across implementations
lrm = new LeaseRenewalManager(sysConfig.getConfiguration());
+ return this;
}
/**
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/RenewalFailureEventTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/RenewalFailureEventTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/RenewalFailureEventTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/RenewalFailureEventTest.java Wed Jan 2 05:20:52 2013
@@ -36,9 +36,10 @@ import net.jini.lease.RenewalFailureEven
//
import com.sun.jini.qa.harness.TestException;
+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.test.share.RememberingRemoteListener;
import com.sun.jini.test.share.TestLease;
import com.sun.jini.test.share.TestLeaseProvider;
@@ -89,10 +90,10 @@ public class RenewalFailureEventTest ext
/**
* Sets up the testing environment.
*/
- public void setup(com.sun.jini.qa.harness.QAConfig sysConfig) throws Exception {
+ public Test construct(com.sun.jini.qa.harness.QAConfig sysConfig) throws Exception {
// mandatory call to parent
- super.setup(sysConfig);
+ super.construct(sysConfig);
// Announce where we are in the test
logger.log(Level.FINE, "RenewalFailureEventTest: In setup() method.");
@@ -112,6 +113,7 @@ public class RenewalFailureEventTest ext
// create lease renewal manager for wider use across implementations
lrm = new LeaseRenewalManager(sysConfig.getConfiguration());
+ return this;
}
/**
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/RenewalFailureIndefiniteTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/RenewalFailureIndefiniteTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/RenewalFailureIndefiniteTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/RenewalFailureIndefiniteTest.java Wed Jan 2 05:20:52 2013
@@ -32,9 +32,10 @@ import net.jini.lease.LeaseRenewalSet;
//
import com.sun.jini.qa.harness.TestException;
+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.test.share.FailingOpCountingOwner;
import com.sun.jini.test.share.RememberingRemoteListener;
import com.sun.jini.test.share.TestLease;
@@ -86,10 +87,10 @@ public class RenewalFailureIndefiniteTes
/**
* Sets up the testing environment.
*/
- public void setup(com.sun.jini.qa.harness.QAConfig sysConfig) throws Exception {
+ public Test construct(com.sun.jini.qa.harness.QAConfig sysConfig) throws Exception {
// mandatory call to parent
- super.setup(sysConfig);
+ super.construct(sysConfig);
// Announce where we are in the test
logger.log(Level.FINE, "RenewalFailureIndefiniteTest: In setup() method.");
@@ -109,6 +110,7 @@ public class RenewalFailureIndefiniteTes
new RemoteException("RenewalFailureIndefiniteTest");
indefiniteOwner =
new FailingOpCountingOwner(indefiniteException, 0, renewGrant);
+ return this;
}
/**
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/RenewalFailureListenerTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/RenewalFailureListenerTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/RenewalFailureListenerTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/RenewalFailureListenerTest.java Wed Jan 2 05:20:52 2013
@@ -33,9 +33,10 @@ import net.jini.lease.LeaseRenewalSet;
//
import com.sun.jini.qa.harness.TestException;
+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.test.share.FailingOpCountingOwner;
import com.sun.jini.test.share.RememberingRemoteListener;
import com.sun.jini.test.share.TestLease;
@@ -102,10 +103,10 @@ public class RenewalFailureListenerTest
/**
* Sets up the testing environment.
*/
- public void setup(com.sun.jini.qa.harness.QAConfig sysConfig) throws Exception {
+ public Test construct(com.sun.jini.qa.harness.QAConfig sysConfig) throws Exception {
// mandatory call to parent
- super.setup(sysConfig);
+ super.construct(sysConfig);
// Announce where we are in the test
logger.log(Level.FINE, "RenewalFailureListenerTest: In setup() method.");
@@ -132,6 +133,7 @@ public class RenewalFailureListenerTest
// create lease renewal manager for wider use across implementations
lrm = new LeaseRenewalManager(sysConfig.getConfiguration());
+ return this;
}
/**
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/RenewalTimeTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/RenewalTimeTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/RenewalTimeTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/RenewalTimeTest.java Wed Jan 2 05:20:52 2013
@@ -28,9 +28,10 @@ import net.jini.lease.LeaseRenewalSet;
//
import com.sun.jini.qa.harness.TestException;
+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.test.share.OpCountingOwner;
import com.sun.jini.test.share.TestLease;
import com.sun.jini.test.share.TestLeaseProvider;
@@ -71,10 +72,10 @@ public class RenewalTimeTest extends Abs
/**
* Sets up the testing environment.
*/
- public void setup(com.sun.jini.qa.harness.QAConfig sysConfig) throws Exception {
+ public Test construct(com.sun.jini.qa.harness.QAConfig sysConfig) throws Exception {
// mandatory call to parent
- super.setup(sysConfig);
+ super.construct(sysConfig);
// Announce where we are in the test
logger.log(Level.FINE, "RenewalTimeTest: In setup() method.");
@@ -94,6 +95,7 @@ public class RenewalTimeTest extends Abs
// create lease renewal manager for wider use across implementations
lrm = new LeaseRenewalManager(sysConfig.getConfiguration());
+ return this;
}
/**
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/SetEqualsTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/SetEqualsTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/SetEqualsTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/SetEqualsTest.java Wed Jan 2 05:20:52 2013
@@ -31,9 +31,10 @@ import net.jini.lease.LeaseRenewalSet;
//
import com.sun.jini.qa.harness.TestException;
+import com.sun.jini.qa.harness.Test;
// com.sun.qa.
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
/**
* SetEqualsTest asserts that two lease renewal set proxies are equal
@@ -60,10 +61,10 @@ public class SetEqualsTest extends Abstr
/**
* Sets up the testing environment.
*/
- public void setup(com.sun.jini.qa.harness.QAConfig sysConfig) throws Exception {
+ public Test construct(com.sun.jini.qa.harness.QAConfig sysConfig) throws Exception {
// mandatory call to parent
- super.setup(sysConfig);
+ super.construct(sysConfig);
// Announce where we are in the test
logger.log(Level.FINE, "SetEqualsTest: In setup() method.");
@@ -82,7 +83,7 @@ public class SetEqualsTest extends Abstr
MarshalledObject marshObj = new MarshalledObject(set1);
set4 = (LeaseRenewalSet) marshObj.get();
set4 = prepareSet(set4);
-
+ return this;
}
/**
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/ValidLeaseDurationTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/ValidLeaseDurationTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/ValidLeaseDurationTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/renewalservice/ValidLeaseDurationTest.java Wed Jan 2 05:20:52 2013
@@ -30,7 +30,8 @@ import net.jini.lease.LeaseRenewalServic
import net.jini.lease.LeaseRenewalSet;
// com.sun.jini
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.share.TestLease;
import com.sun.jini.test.share.TestLeaseProvider;
@@ -51,14 +52,14 @@ public class ValidLeaseDurationTest exte
/**
* Sets up the testing environment.
*/
- public void setup(com.sun.jini.qa.harness.QAConfig sysConfig) throws Exception {
+ public Test construct(com.sun.jini.qa.harness.QAConfig sysConfig) throws Exception {
// mandatory call to parent
- super.setup(sysConfig);
+ super.construct(sysConfig);
// Announce where we are in the test
logger.log(Level.FINE, "ValidLeaseDurationTest: In setup() method.");
-
+ return this;
}
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/accesspermission/ConstructorExceptionsTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/accesspermission/ConstructorExceptionsTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/accesspermission/ConstructorExceptionsTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/accesspermission/ConstructorExceptionsTest.java Wed Jan 2 05:20:52 2013
@@ -24,7 +24,8 @@ import net.jini.security.AccessPermissio
// com.sun.jini
import com.sun.jini.qa.harness.TestException;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
+import com.sun.jini.qa.harness.Test;
/**
@@ -75,7 +76,7 @@ import com.sun.jini.qa.harness.QATest;
* 4) assert that IllegalArgumentException will be thrown
* </pre>
*/
-public class ConstructorExceptionsTest extends QATest {
+public class ConstructorExceptionsTest extends QATestEnvironment implements Test {
/**
* This method performs all actions mentioned in class description.
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/accesspermission/EqualsTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/accesspermission/EqualsTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/accesspermission/EqualsTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/accesspermission/EqualsTest.java Wed Jan 2 05:20:52 2013
@@ -27,7 +27,8 @@ import net.jini.security.AccessPermissio
// com.sun.jini
import com.sun.jini.qa.harness.TestException;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.security.util.TestAccessPermission;
@@ -146,7 +147,7 @@ import com.sun.jini.test.spec.security.u
* 63) assert that true will be returned
* </pre>
*/
-public class EqualsTest extends QATest {
+public class EqualsTest extends QATestEnvironment implements Test {
/**
* This method performs all actions mentioned in class description.
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/accesspermission/ImpliesTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/accesspermission/ImpliesTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/accesspermission/ImpliesTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/accesspermission/ImpliesTest.java Wed Jan 2 05:20:52 2013
@@ -27,7 +27,8 @@ import net.jini.security.AccessPermissio
// com.sun.jini
import com.sun.jini.qa.harness.TestException;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.security.util.TestAccessPermission;
/**
@@ -150,7 +151,7 @@ import com.sun.jini.test.spec.security.u
* 60) assert that true will be returned
* </pre>
*/
-public class ImpliesTest extends QATest {
+public class ImpliesTest extends QATestEnvironment implements Test {
/**
* This method performs all actions mentioned in class description.
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/accesspermission/ReadObjectTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/accesspermission/ReadObjectTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/accesspermission/ReadObjectTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/accesspermission/ReadObjectTest.java Wed Jan 2 05:20:52 2013
@@ -35,7 +35,8 @@ import net.jini.security.AccessPermissio
// com.sun.jini
import com.sun.jini.qa.harness.TestException;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
+import com.sun.jini.qa.harness.Test;
/**
@@ -74,7 +75,7 @@ import com.sun.jini.qa.harness.QATest;
* 10) assert that object will be got without exceptions
* </pre>
*/
-public class ReadObjectTest extends QATest {
+public class ReadObjectTest extends QATestEnvironment implements Test {
/**
* This method performs all actions mentioned in class description.
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/authenticationpermission/Constructor1ExceptionsTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/authenticationpermission/Constructor1ExceptionsTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/authenticationpermission/Constructor1ExceptionsTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/authenticationpermission/Constructor1ExceptionsTest.java Wed Jan 2 05:20:52 2013
@@ -24,7 +24,8 @@ import net.jini.security.AuthenticationP
// com.sun.jini
import com.sun.jini.qa.harness.TestException;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
+import com.sun.jini.qa.harness.Test;
/**
@@ -86,7 +87,7 @@ import com.sun.jini.qa.harness.QATest;
* 10) assert that IllegalArgumentException will be thrown
* </pre>
*/
-public class Constructor1ExceptionsTest extends QATest {
+public class Constructor1ExceptionsTest extends QATestEnvironment implements Test {
/**
* This method performs all actions mentioned in class description.
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/authenticationpermission/Constructor2ExceptionsTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/authenticationpermission/Constructor2ExceptionsTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/authenticationpermission/Constructor2ExceptionsTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/authenticationpermission/Constructor2ExceptionsTest.java Wed Jan 2 05:20:52 2013
@@ -28,7 +28,8 @@ import net.jini.security.AuthenticationP
// com.sun.jini
import com.sun.jini.qa.harness.TestException;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.security.util.FakePrincipal;
@@ -70,7 +71,7 @@ import com.sun.jini.test.spec.security.u
* 12) assert that IllegalArgumentException will be thrown
* </pre>
*/
-public class Constructor2ExceptionsTest extends QATest {
+public class Constructor2ExceptionsTest extends QATestEnvironment implements Test {
/**
* This method performs all actions mentioned in class description.
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/authenticationpermission/EqualsTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/authenticationpermission/EqualsTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/authenticationpermission/EqualsTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/authenticationpermission/EqualsTest.java Wed Jan 2 05:20:52 2013
@@ -27,7 +27,8 @@ import net.jini.security.AuthenticationP
// com.sun.jini
import com.sun.jini.qa.harness.TestException;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
+import com.sun.jini.qa.harness.Test;
/**
@@ -156,7 +157,7 @@ import com.sun.jini.qa.harness.QATest;
* 48) assert that true will be returned
* </pre>
*/
-public class EqualsTest extends QATest {
+public class EqualsTest extends QATestEnvironment implements Test {
/**
* This method performs all actions mentioned in class description.
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/authenticationpermission/ImpliesTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/authenticationpermission/ImpliesTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/authenticationpermission/ImpliesTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/authenticationpermission/ImpliesTest.java Wed Jan 2 05:20:52 2013
@@ -27,7 +27,8 @@ import net.jini.security.AuthenticationP
// com.sun.jini
import com.sun.jini.qa.harness.TestException;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
+import com.sun.jini.qa.harness.Test;
/**
@@ -175,7 +176,7 @@ import com.sun.jini.qa.harness.QATest;
* 50) assert that true will be returned
* </pre>
*/
-public class ImpliesTest extends QATest {
+public class ImpliesTest extends QATestEnvironment implements Test {
/**
* This method performs all actions mentioned in class description.
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/authenticationpermission/NewPermissionCollectionTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/authenticationpermission/NewPermissionCollectionTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/authenticationpermission/NewPermissionCollectionTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/authenticationpermission/NewPermissionCollectionTest.java Wed Jan 2 05:20:52 2013
@@ -27,7 +27,8 @@ import net.jini.security.AuthenticationP
// com.sun.jini
import com.sun.jini.qa.harness.TestException;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
+import com.sun.jini.qa.harness.Test;
/**
@@ -46,7 +47,7 @@ import com.sun.jini.qa.harness.QATest;
* 3) assert that returned PermissionCollection is empty
* </pre>
*/
-public class NewPermissionCollectionTest extends QATest {
+public class NewPermissionCollectionTest extends QATestEnvironment implements Test {
/**
* This method performs all actions mentioned in class description.
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/authenticationpermission/ReadObjectTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/authenticationpermission/ReadObjectTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/authenticationpermission/ReadObjectTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/authenticationpermission/ReadObjectTest.java Wed Jan 2 05:20:52 2013
@@ -38,7 +38,8 @@ import net.jini.security.AuthenticationP
// com.sun.jini
import com.sun.jini.qa.harness.TestException;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
+import com.sun.jini.qa.harness.Test;
/**
@@ -102,7 +103,7 @@ import com.sun.jini.qa.harness.QATest;
* 15) assert that object will be got without exceptions
* </pre>
*/
-public class ReadObjectTest extends QATest {
+public class ReadObjectTest extends QATestEnvironment implements Test {
/**
* This method performs all actions mentioned in class description.
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/basicproxypreparer/Constructor_Test.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/basicproxypreparer/Constructor_Test.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/basicproxypreparer/Constructor_Test.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/basicproxypreparer/Constructor_Test.java Wed Jan 2 05:20:52 2013
@@ -18,11 +18,12 @@
package com.sun.jini.test.spec.security.basicproxypreparer;
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.TestException;
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
import java.util.logging.Logger;
import java.util.logging.Level;
import net.jini.security.BasicProxyPreparer;
@@ -130,7 +131,7 @@ import net.jini.core.constraint.Integrit
* methodConstrains specified as parameter;
* </pre>
*/
-public class Constructor_Test extends QATest {
+public class Constructor_Test extends QATestEnvironment implements Test {
/**
* Test cases description.
* Elemens: amount of arguments in BasicProxyPreparer constructor
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/basicproxypreparer/Equals_Test.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/basicproxypreparer/Equals_Test.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/basicproxypreparer/Equals_Test.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/basicproxypreparer/Equals_Test.java Wed Jan 2 05:20:52 2013
@@ -18,11 +18,12 @@
package com.sun.jini.test.spec.security.basicproxypreparer;
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.TestException;
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
import java.util.logging.Logger;
import java.util.logging.Level;
import net.jini.security.BasicProxyPreparer;
@@ -226,7 +227,7 @@ import net.jini.core.constraint.Integrit
* assert true is returned;
* </pre>
*/
-public class Equals_Test extends QATest {
+public class Equals_Test extends QATestEnvironment implements Test {
/**
* Test cases description.
* Elemens: amount of arguments in BasicProxyPreparer constructor
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/basicproxypreparer/GetMethodConstraints_Test.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/basicproxypreparer/GetMethodConstraints_Test.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/basicproxypreparer/GetMethodConstraints_Test.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/basicproxypreparer/GetMethodConstraints_Test.java Wed Jan 2 05:20:52 2013
@@ -18,11 +18,12 @@
package com.sun.jini.test.spec.security.basicproxypreparer;
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.TestException;
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
import java.util.logging.Logger;
import java.util.logging.Level;
import java.security.Permission;
@@ -84,7 +85,7 @@ import net.jini.core.constraint.Integrit
* assert null is returned;
* </pre>
*/
-public class GetMethodConstraints_Test extends QATest {
+public class GetMethodConstraints_Test extends QATestEnvironment implements Test {
/**
* Run BasicProxyPreparer constructor for valid test case.
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/basicproxypreparer/GetPermissions_Test.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/basicproxypreparer/GetPermissions_Test.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/basicproxypreparer/GetPermissions_Test.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/basicproxypreparer/GetPermissions_Test.java Wed Jan 2 05:20:52 2013
@@ -18,11 +18,12 @@
package com.sun.jini.test.spec.security.basicproxypreparer;
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.TestException;
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
import java.util.logging.Logger;
import java.util.logging.Level;
import net.jini.security.BasicProxyPreparer;
@@ -73,7 +74,7 @@ import net.jini.core.constraint.Integrit
* repeat steps 1-3 passing null as proxy argument;
* </pre>
*/
-public class GetPermissions_Test extends QATest {
+public class GetPermissions_Test extends QATestEnvironment implements Test {
/**
* Run BasicProxyPreparer constructor for valid test case.
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/basicproxypreparer/Grant_Test.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/basicproxypreparer/Grant_Test.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/basicproxypreparer/Grant_Test.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/basicproxypreparer/Grant_Test.java Wed Jan 2 05:20:52 2013
@@ -18,7 +18,7 @@
package com.sun.jini.test.spec.security.basicproxypreparer;
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.TestException;
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/basicproxypreparer/HashCode_Test.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/basicproxypreparer/HashCode_Test.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/basicproxypreparer/HashCode_Test.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/basicproxypreparer/HashCode_Test.java Wed Jan 2 05:20:52 2013
@@ -18,7 +18,7 @@
package com.sun.jini.test.spec.security.basicproxypreparer;
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.TestException;
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/basicproxypreparer/PrepareProxy_Test.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/basicproxypreparer/PrepareProxy_Test.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/basicproxypreparer/PrepareProxy_Test.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/basicproxypreparer/PrepareProxy_Test.java Wed Jan 2 05:20:52 2013
@@ -18,7 +18,7 @@
package com.sun.jini.test.spec.security.basicproxypreparer;
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.TestException;
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/basicproxypreparer/SetConstraints_Test.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/basicproxypreparer/SetConstraints_Test.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/basicproxypreparer/SetConstraints_Test.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/basicproxypreparer/SetConstraints_Test.java Wed Jan 2 05:20:52 2013
@@ -18,7 +18,7 @@
package com.sun.jini.test.spec.security.basicproxypreparer;
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.TestException;
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/basicproxypreparer/ToString_Test.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/basicproxypreparer/ToString_Test.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/basicproxypreparer/ToString_Test.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/basicproxypreparer/ToString_Test.java Wed Jan 2 05:20:52 2013
@@ -18,7 +18,7 @@
package com.sun.jini.test.spec.security.basicproxypreparer;
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.TestException;
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/basicproxypreparer/Verify_Test.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/basicproxypreparer/Verify_Test.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/basicproxypreparer/Verify_Test.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/basicproxypreparer/Verify_Test.java Wed Jan 2 05:20:52 2013
@@ -18,7 +18,7 @@
package com.sun.jini.test.spec.security.basicproxypreparer;
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.TestException;
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/AbstractTestBase.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/AbstractTestBase.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/AbstractTestBase.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/AbstractTestBase.java Wed Jan 2 05:20:52 2013
@@ -31,9 +31,10 @@ import java.lang.reflect.InvocationHandl
import java.lang.reflect.Proxy;
// com.sun.jini
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
// net.jini
+import com.sun.jini.qa.harness.Test;
import net.jini.export.Exporter;
import net.jini.security.TrustVerifier;
import net.jini.security.proxytrust.ProxyTrustExporter;
@@ -52,7 +53,7 @@ import net.jini.core.constraint.Integrit
/**
* Base class for proxytrust spec-tests.
*/
-public abstract class AbstractTestBase extends QATest {
+public abstract class AbstractTestBase extends QATestEnvironment implements Test {
/**
* Holds expected results for 'isTrustedObject' method calls of
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/security/DoPrivilegedExceptionTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/security/DoPrivilegedExceptionTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/security/DoPrivilegedExceptionTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/security/DoPrivilegedExceptionTest.java Wed Jan 2 05:20:52 2013
@@ -36,7 +36,8 @@ import net.jini.security.Security;
// com.sun.jini
import com.sun.jini.qa.harness.TestException;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.security.util.FakeCaller;
import com.sun.jini.test.spec.security.util.FakePrincipal;
import com.sun.jini.test.spec.security.util.TestPrivilegedExceptionAction;
@@ -119,7 +120,7 @@ import com.sun.jini.test.spec.security.u
* PEAThrowingUncheckedEx
* </pre>
*/
-public class DoPrivilegedExceptionTest extends QATest {
+public class DoPrivilegedExceptionTest extends QATestEnvironment implements Test {
/**
* This method performs all actions mentioned in class description.
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/security/DoPrivilegedTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/security/DoPrivilegedTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/security/DoPrivilegedTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/security/DoPrivilegedTest.java Wed Jan 2 05:20:52 2013
@@ -35,7 +35,8 @@ import net.jini.security.Security;
// com.sun.jini
import com.sun.jini.qa.harness.TestException;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.security.util.FakeCaller;
import com.sun.jini.test.spec.security.util.FakePrincipal;
import com.sun.jini.test.spec.security.util.TestPrivilegedAction;
@@ -78,7 +79,7 @@ import com.sun.jini.test.spec.security.u
* 13) assert that privileges will be enabled inside 'doPrivileged' method
* </pre>
*/
-public class DoPrivilegedTest extends QATest {
+public class DoPrivilegedTest extends QATestEnvironment implements Test {
/**
* This method performs all actions mentioned in class description.
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/security/GetContextTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/security/GetContextTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/security/GetContextTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/security/GetContextTest.java Wed Jan 2 05:20:52 2013
@@ -33,7 +33,8 @@ import net.jini.security.SecurityContext
// com.sun.jini
import com.sun.jini.qa.harness.TestException;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.security.util.BasePolicyProvider;
import com.sun.jini.test.spec.security.util.SCSPolicyProvider;
import com.sun.jini.test.spec.security.util.SCSSecurityManager;
@@ -93,7 +94,7 @@ import com.sun.jini.test.spec.security.u
* 'getContext' method of SCSSecurityManager
* </pre>
*/
-public class GetContextTest extends QATest {
+public class GetContextTest extends QATestEnvironment implements Test {
/**
* This method performs all actions mentioned in class description.
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/security/GrantSupportedTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/security/GrantSupportedTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/security/GrantSupportedTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/security/GrantSupportedTest.java Wed Jan 2 05:20:52 2013
@@ -27,7 +27,8 @@ import net.jini.security.Security;
// com.sun.jini
import com.sun.jini.qa.harness.TestException;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.security.util.BasePolicyProvider;
import com.sun.jini.test.spec.security.util.TestDynamicPolicyProvider;
@@ -71,7 +72,7 @@ import com.sun.jini.test.spec.security.u
* 12) assert that true will be returned
* </pre>
*/
-public class GrantSupportedTest extends QATest {
+public class GrantSupportedTest extends QATestEnvironment implements Test {
/**
* This method performs all actions mentioned in class description.
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/security/GrantTest1.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/security/GrantTest1.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/security/GrantTest1.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/security/GrantTest1.java Wed Jan 2 05:20:52 2013
@@ -33,7 +33,8 @@ import net.jini.security.Security;
// com.sun.jini
import com.sun.jini.qa.harness.TestException;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.security.util.Util;
import com.sun.jini.test.spec.security.util.BasePolicyProvider;
import com.sun.jini.test.spec.security.util.BaseDynamicPolicyProvider;
@@ -115,7 +116,7 @@ import com.sun.jini.test.spec.security.u
* 19) assert that method will return normally
* </pre>
*/
-public class GrantTest1 extends QATest {
+public class GrantTest1 extends QATestEnvironment implements Test {
/**
* This method performs all actions mentioned in class description.
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/security/GrantTest2.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/security/GrantTest2.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/security/GrantTest2.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/security/GrantTest2.java Wed Jan 2 05:20:52 2013
@@ -30,7 +30,8 @@ import net.jini.security.Security;
// com.sun.jini
import com.sun.jini.qa.harness.TestException;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.security.util.Util;
import com.sun.jini.test.spec.security.util.BasePolicyProvider;
import com.sun.jini.test.spec.security.util.BaseDynamicPolicyProvider;
@@ -107,7 +108,7 @@ import com.sun.jini.test.spec.security.u
* 19) assert that method will return normally
* </pre>
*/
-public class GrantTest2 extends QATest {
+public class GrantTest2 extends QATestEnvironment implements Test {
/**
* This method performs all actions mentioned in class description.
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/security/GrantTest3.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/security/GrantTest3.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/security/GrantTest3.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/security/GrantTest3.java Wed Jan 2 05:20:52 2013
@@ -35,7 +35,8 @@ import net.jini.security.GrantPermission
// com.sun.jini
import com.sun.jini.qa.harness.TestException;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.security.util.BasePolicyProvider;
import com.sun.jini.test.spec.security.util.TestDynamicPolicyProvider;
import com.sun.jini.test.spec.security.util.FakePrincipal;
@@ -118,7 +119,7 @@ import com.sun.jini.test.spec.security.u
* only those permissions which current context is authorized to grant
* </pre>
*/
-public class GrantTest3 extends QATest {
+public class GrantTest3 extends QATestEnvironment implements Test {
/**
* This method performs all actions mentioned in class description.
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/security/VerifyCodebaseIntegrityTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/security/VerifyCodebaseIntegrityTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/security/VerifyCodebaseIntegrityTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/security/VerifyCodebaseIntegrityTest.java Wed Jan 2 05:20:52 2013
@@ -30,7 +30,8 @@ import net.jini.security.Security;
// com.sun.jini
import com.sun.jini.qa.harness.TestException;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.security.util.Util;
import com.sun.jini.test.spec.security.util.BaseIntegrityVerifier;
import com.sun.jini.test.spec.security.util.TrueIntegrityVerifier;
@@ -139,7 +140,7 @@ import com.sun.jini.test.spec.security.u
* 21) assert that method will return normally
* </pre>
*/
-public class VerifyCodebaseIntegrityTest extends QATest {
+public class VerifyCodebaseIntegrityTest extends QATestEnvironment implements Test {
/** Resource name method */
protected static String resName =
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/security/VerifyObjectTrustTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/security/VerifyObjectTrustTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/security/VerifyObjectTrustTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/security/security/VerifyObjectTrustTest.java Wed Jan 2 05:20:52 2013
@@ -30,7 +30,8 @@ import net.jini.security.Security;
// com.sun.jini
import com.sun.jini.qa.harness.TestException;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.security.util.Util;
import com.sun.jini.test.spec.security.util.TestObject;
import com.sun.jini.test.spec.security.util.BaseTrustVerifier;
@@ -194,7 +195,7 @@ import com.sun.jini.test.spec.security.u
* 48) assert that method will return normally
* </pre>
*/
-public class VerifyObjectTrustTest extends QATest {
+public class VerifyObjectTrustTest extends QATestEnvironment implements Test {
/** Resource name method */
protected static String resName =
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/AbstractBaseTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/AbstractBaseTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/AbstractBaseTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/AbstractBaseTest.java Wed Jan 2 05:20:52 2013
@@ -25,6 +25,7 @@ import com.sun.jini.test.share.BaseQATes
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.share.DiscoveryServiceUtil;
import com.sun.jini.test.share.GroupsUtil;
@@ -63,6 +64,7 @@ import java.rmi.RemoteException;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.Properties;
import net.jini.config.ConfigurationException;
@@ -81,7 +83,7 @@ import net.jini.config.ConfigurationExce
* in the various test classes that test the methods of the service
* discovery manager that interact with a filter object.
* <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.
*
@@ -381,7 +383,7 @@ abstract public class AbstractBaseTest e
protected String[] subCategories;
- protected boolean createSDMInSetup = true;
+ protected boolean createSDMduringConstruction = true;
protected boolean waitForLookupDiscovery = true;
protected ServiceDiscoveryManager srvcDiscoveryMgr = null;
@@ -425,6 +427,7 @@ abstract public class AbstractBaseTest e
/* Construct the member groups with which to configure the
* LookupDiscoveryManager utility
*/
+ List initLookupsToStart = getLookupServices().getInitLookupsToStart();
String[] groupsToDiscover = toGroupsArray(initLookupsToStart);
GroupsUtil.displayGroupSet(groupsToDiscover," groupsToDiscover",
Level.FINE);
@@ -489,8 +492,8 @@ abstract public class AbstractBaseTest e
* <li> constructs the template and filter to use for service discovery
* </ul>
*/
- public void setup(QAConfig sysConfig) throws Exception {
- super.setup(sysConfig);
+ public Test construct(QAConfig sysConfig) throws Exception {
+ super.construct(sysConfig);
/* LeaseRenewalManager for services to be registered with lookup */
leaseRenewalMgr =
new LeaseRenewalManager(sysConfig.getConfiguration());
@@ -498,8 +501,9 @@ abstract public class AbstractBaseTest e
setupDiscardWait();
getSetupInfo();
mainListener = new LookupListener();
+ List initLookupsToStart = getLookupServices().getInitLookupsToStart();
mainListener.setLookupsToDiscover(initLookupsToStart);
- if(createSDMInSetup) {
+ if(createSDMduringConstruction) {
/* Construct the ServiceDiscoveryManager that will be tested */
logger.log(Level.FINE, "constructing a service discovery manager");
srvcDiscoveryMgr = new ServiceDiscoveryManager
@@ -513,7 +517,8 @@ abstract public class AbstractBaseTest e
template = getServiceTemplate();
firstStageFilter = getFirstStageFilter();
secondStageFilter = getSecondStageFilter();
- }//end setup
+ return this;
+ }//end construct
/** Executes the current test by doing the following:
*
@@ -663,12 +668,12 @@ abstract public class AbstractBaseTest e
* attribute(s) based on the value of the given number of services
* and number of attributes.
*
- * This method is not called in the setup() method of this class because
+ * This method is not called in the construct() method of this class because
* there are tests (for example, tests for the blocking versions of
* lookup()) that do not wish to have services pre-registered. Such
* tests typically wish to have more control over when the services
* being looked up are registered with the various lookup services
- * started in setup().
+ * started in construct().
*/
protected void registerServices(int nSrvcs, int nAttrs)
throws UnknownLeaseException, RemoteException
@@ -710,7 +715,7 @@ abstract public class AbstractBaseTest e
throws UnknownLeaseException, RemoteException
{
- ArrayList lusList = getLookupListSnapshot
+ List lusList = getLookupListSnapshot
("AbstractBaseTest.registerServices");
/* Construct and register the expected service(s) */
int begIndx = ( (startVal >= 0) ? startVal : 0 );
@@ -753,7 +758,7 @@ abstract public class AbstractBaseTest e
testService = new TestService(srvcVal);
break;
}//end switch(serviceType)
- expectedServiceList.add( testService );
+ getExpectedServiceList().add( testService );
/* Each test service is registered with at least one lookup. The
* intent is to register some with all lookups, other services
* with only some of the lookups. This is done so that when
@@ -845,10 +850,10 @@ abstract public class AbstractBaseTest e
leaseRenewalMgr.cancel( (Lease)(leaseList.get(i)) );
}//end loop
leaseList.clear();
- expectedServiceList.clear();
+ getExpectedServiceList().clear();
}//end unregisterServices
- /** Convenience method called by setup that configures the current test
+ /** Convenience method called by construct that configures the current test
* run with the appropriate timeout value for the service discard thread.
* These tests must also be configured to register a
* DiscardWaitOverrideProvider which will define a test override for
@@ -862,12 +867,12 @@ abstract public class AbstractBaseTest e
/* Retrieves/stores/displays configuration values for the current test */
private void getSetupInfo() {
/* category/test-specific info */
- if( (nServices+nAddServices) > 0) {
+ if( (getnServices()+getnAddServices()) > 0) {
logger.log(Level.FINE, " ----- Category/Test Info ----- ");
logger.log(Level.FINE,
" # of secs to wait for cache to populate -- "
- +nSecsServiceDiscovery);
+ +getnSecsServiceDiscovery());
nSecsServiceEvent = getConfig().getIntConfigVal
("net.jini.lookup.nSecsServiceEvent",
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/DefaultDiscoverPublic.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/DefaultDiscoverPublic.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/DefaultDiscoverPublic.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/DefaultDiscoverPublic.java Wed Jan 2 05:20:52 2013
@@ -26,6 +26,7 @@ import net.jini.discovery.LookupDiscover
import net.jini.lookup.ServiceDiscoveryManager;
import com.sun.jini.qa.harness.QAConfig;
import com.sun.jini.qa.harness.TestException;
+import com.sun.jini.qa.harness.Test;
/**
* With respect to the lookup discovery processing performed by the
@@ -51,11 +52,11 @@ public class DefaultDiscoverPublic exten
* inputting <code>null</code> to the <code>DiscoveryManagement</code>
* parameter.
*/
- public void setup(QAConfig config) throws Exception {
- createSDMInSetup = false;
+ public Test construct(QAConfig config) throws Exception {
+ createSDMduringConstruction = false;
waitForLookupDiscovery = false;
terminateDelay = 0;
- super.setup(config);
+ super.construct(config);
testDesc = "service discovery manager with default lookup "
+"discovery manager (should discover public lookups)";
srvcDiscoveryMgr =
@@ -63,7 +64,8 @@ public class DefaultDiscoverPublic exten
null,
config.getConfiguration());
sdmList.add(srvcDiscoveryMgr);
- }//end setup
+ return this;
+ }//end construct
/** Executes the current test by doing the following:
*
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/AddListenerNPE.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/AddListenerNPE.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/AddListenerNPE.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/AddListenerNPE.java Wed Jan 2 05:20:52 2013
@@ -32,6 +32,7 @@ import net.jini.lookup.ServiceDiscoveryM
import java.rmi.RemoteException;
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.qa.harness.TestException;
/**
@@ -70,11 +71,11 @@ public class AddListenerNPE extends Abst
* no groups and no locators.
* 2. Creates an instance of <code>ServiceDiscoveryManager</code>
*/
- public void setup(QAConfig sysConfig) throws Exception {
- createSDMInSetup = false;
+ public Test construct(QAConfig sysConfig) throws Exception {
+ createSDMduringConstruction = false;
waitForLookupDiscovery = false;
terminateDelay = 0;
- super.setup(sysConfig);
+ super.construct(sysConfig);
testDesc = "NullPointerException should occur upon adding a null "
+"listener to a lookup cache";
logger.log(Level.FINE, "constructing a service discovery manager");
@@ -88,7 +89,8 @@ public class AddListenerNPE extends Abst
null,
sysConfig.getConfiguration());
sdmList.add(srvcDiscoveryMgr);
- }//end setup
+ return this;
+ }//end construct
/** Executes the current test by doing the following:
*