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 [27/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/javaspace/conformance/snapshot/SnapshotTransactionReadIfExistsTakeTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionReadIfExistsTakeTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionReadIfExistsTakeTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionReadIfExistsTakeTest.java Wed Jan 2 05:20:52 2013
@@ -28,7 +28,9 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
+import com.sun.jini.test.spec.javaspace.conformance.TransactionTest;
/**
@@ -41,21 +43,7 @@ import com.sun.jini.test.spec.javaspace.
* @author Mikhail A. Markov
*/
public class SnapshotTransactionReadIfExistsTakeTest
- extends SnapshotAbstractTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+ extends TransactionTest {
/**
* This method asserts that when read by readIfExists
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionReadIfExistsTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionReadIfExistsTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionReadIfExistsTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionReadIfExistsTest.java Wed Jan 2 05:20:52 2013
@@ -28,6 +28,7 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
@@ -46,21 +47,7 @@ import com.sun.jini.test.spec.javaspace.
* @author Mikhail A. Markov
*/
public class SnapshotTransactionReadIfExistsTest
- extends SnapshotAbstractReadTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+ extends SnapshotTransactionReadTestBase {
/**
* This asserts that for readIfExists with timeouts
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionReadIfExistsWaitTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionReadIfExistsWaitTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionReadIfExistsWaitTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionReadIfExistsWaitTest.java Wed Jan 2 05:20:52 2013
@@ -28,8 +28,10 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
import com.sun.jini.test.spec.javaspace.conformance.EntryWriter;
+import com.sun.jini.test.spec.javaspace.conformance.TransactionTest;
/**
@@ -46,21 +48,7 @@ import com.sun.jini.test.spec.javaspace.
* @author Mikhail A. Markov
*/
public class SnapshotTransactionReadIfExistsWaitTest
- extends SnapshotAbstractTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+ extends TransactionTest {
/**
* This method asserts, that for readIfExists method if
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionReadNO_WAITTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionReadNO_WAITTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionReadNO_WAITTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionReadNO_WAITTest.java Wed Jan 2 05:20:52 2013
@@ -28,6 +28,7 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
@@ -46,21 +47,7 @@ import com.sun.jini.test.spec.javaspace.
* @author Mikhail A. Markov
*/
public class SnapshotTransactionReadNO_WAITTest
- extends SnapshotAbstractReadTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+ extends SnapshotTransactionReadTestBase {
/**
* This method asserts that for read within the non null transaction
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionReadTakeTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionReadTakeTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionReadTakeTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionReadTakeTest.java Wed Jan 2 05:20:52 2013
@@ -28,7 +28,9 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
+import com.sun.jini.test.spec.javaspace.conformance.TransactionTest;
/**
@@ -40,21 +42,7 @@ import com.sun.jini.test.spec.javaspace.
*
* @author Mikhail A. Markov
*/
-public class SnapshotTransactionReadTakeTest extends SnapshotAbstractTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+public class SnapshotTransactionReadTakeTest extends TransactionTest {
/**
* This method asserts that when read, an entry may be read in any
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionReadTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionReadTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionReadTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionReadTest.java Wed Jan 2 05:20:52 2013
@@ -28,6 +28,7 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
@@ -43,21 +44,7 @@ import com.sun.jini.test.spec.javaspace.
*
* @author Mikhail A. Markov
*/
-public class SnapshotTransactionReadTest extends SnapshotAbstractReadTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+public class SnapshotTransactionReadTest extends SnapshotTransactionReadTestBase {
/**
* This method asserts that for read with timeouts other then NO_WAIT
Added: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionReadTestBase.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionReadTestBase.java?rev=1427655&view=auto
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionReadTestBase.java (added)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionReadTestBase.java Wed Jan 2 05:20:52 2013
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.sun.jini.test.spec.javaspace.conformance.snapshot;
+
+import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
+
+/**
+ *
+ * @author peter
+ */
+public abstract class SnapshotTransactionReadTestBase extends SnapshotReadTestBase {
+
+ public SnapshotTransactionReadTestBase() {
+ }
+
+ /**
+ * Sets up the testing environment.
+ *
+ * @param config QAConfig from the runner for construct.
+ */
+ public Test construct(QAConfig config) throws Exception {
+ // mandatory call to parent
+ super.construct(config);
+ // get an instance of Transaction Manager
+ mgr = getTxnManager();
+ return this;
+ }
+
+}
Propchange: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionReadTestBase.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionReadWaitTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionReadWaitTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionReadWaitTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionReadWaitTest.java Wed Jan 2 05:20:52 2013
@@ -28,8 +28,10 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
import com.sun.jini.test.spec.javaspace.conformance.EntryWriter;
+import com.sun.jini.test.spec.javaspace.conformance.TransactionTest;
/**
@@ -41,21 +43,7 @@ import com.sun.jini.test.spec.javaspace.
*
* @author Mikhail A. Markov
*/
-public class SnapshotTransactionReadWaitTest extends SnapshotAbstractTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+public class SnapshotTransactionReadWaitTest extends TransactionTest {
/**
* This method asserts that a read request will wait until a matching entry
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionTakeIfExistsNO_WAITTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionTakeIfExistsNO_WAITTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionTakeIfExistsNO_WAITTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionTakeIfExistsNO_WAITTest.java Wed Jan 2 05:20:52 2013
@@ -28,6 +28,7 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
@@ -46,21 +47,7 @@ import com.sun.jini.test.spec.javaspace.
* @author Mikhail A. Markov
*/
public class SnapshotTransactionTakeIfExistsNO_WAITTest
- extends SnapshotAbstractTakeTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+ extends SnapshotTransactionTakeTestBase {
/**
* This method asserts that for takeIfExists within the non null
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionTakeIfExistsReadTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionTakeIfExistsReadTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionTakeIfExistsReadTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionTakeIfExistsReadTest.java Wed Jan 2 05:20:52 2013
@@ -28,7 +28,9 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
+import com.sun.jini.test.spec.javaspace.conformance.TransactionTest;
/**
@@ -41,21 +43,7 @@ import com.sun.jini.test.spec.javaspace.
* @author Mikhail A. Markov
*/
public class SnapshotTransactionTakeIfExistsReadTest
- extends SnapshotAbstractTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+ extends TransactionTest {
/**
* This method asserts that when taken by takeIfExists
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionTakeIfExistsTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionTakeIfExistsTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionTakeIfExistsTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionTakeIfExistsTest.java Wed Jan 2 05:20:52 2013
@@ -28,6 +28,7 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
@@ -44,21 +45,7 @@ import com.sun.jini.test.spec.javaspace.
* @author Mikhail A. Markov
*/
public class SnapshotTransactionTakeIfExistsTest
- extends SnapshotAbstractTakeTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+ extends SnapshotTransactionTakeTestBase {
/**
* This method asserts that for takeIfExists with timeouts
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionTakeIfExistsWaitTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionTakeIfExistsWaitTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionTakeIfExistsWaitTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionTakeIfExistsWaitTest.java Wed Jan 2 05:20:52 2013
@@ -28,8 +28,10 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
import com.sun.jini.test.spec.javaspace.conformance.EntryWriter;
+import com.sun.jini.test.spec.javaspace.conformance.TransactionTest;
/**
@@ -46,21 +48,7 @@ import com.sun.jini.test.spec.javaspace.
* @author Mikhail A. Markov
*/
public class SnapshotTransactionTakeIfExistsWaitTest
- extends SnapshotAbstractTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+ extends TransactionTest {
/**
* This method asserts, that for takeIfExists method
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionTakeNO_WAITTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionTakeNO_WAITTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionTakeNO_WAITTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionTakeNO_WAITTest.java Wed Jan 2 05:20:52 2013
@@ -28,6 +28,7 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
@@ -46,21 +47,7 @@ import com.sun.jini.test.spec.javaspace.
* @author Mikhail A. Markov
*/
public class SnapshotTransactionTakeNO_WAITTest
- extends SnapshotAbstractTakeTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+ extends SnapshotTransactionTakeTestBase {
/**
* This method asserts that for take within the non null transaction
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionTakeReadTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionTakeReadTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionTakeReadTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionTakeReadTest.java Wed Jan 2 05:20:52 2013
@@ -28,7 +28,9 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
+import com.sun.jini.test.spec.javaspace.conformance.TransactionTest;
/**
@@ -39,21 +41,7 @@ import com.sun.jini.test.spec.javaspace.
*
* @author Mikhail A. Markov
*/
-public class SnapshotTransactionTakeReadTest extends SnapshotAbstractTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+public class SnapshotTransactionTakeReadTest extends TransactionTest {
/**
* This method asserts that when taken, an entry may not be read or taken
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionTakeTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionTakeTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionTakeTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionTakeTest.java Wed Jan 2 05:20:52 2013
@@ -28,6 +28,7 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
@@ -43,21 +44,7 @@ import com.sun.jini.test.spec.javaspace.
*
* @author Mikhail A. Markov
*/
-public class SnapshotTransactionTakeTest extends SnapshotAbstractTakeTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+public class SnapshotTransactionTakeTest extends SnapshotTransactionTakeTestBase {
/**
* This method asserts that for take with timeouts other then NO_WAIT
Added: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionTakeTestBase.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionTakeTestBase.java?rev=1427655&view=auto
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionTakeTestBase.java (added)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionTakeTestBase.java Wed Jan 2 05:20:52 2013
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.sun.jini.test.spec.javaspace.conformance.snapshot;
+
+import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
+
+/**
+ *
+ * @author peter
+ */
+public abstract class SnapshotTransactionTakeTestBase extends SnapshotTakeTestBase {
+
+ public SnapshotTransactionTakeTestBase() {
+ }
+
+ /**
+ * Sets up the testing environment.
+ *
+ * @param config QAConfig from the runner for construct.
+ */
+ public Test construct(QAConfig config) throws Exception {
+ // mandatory call to parent
+ super.construct(config);
+ // get an instance of Transaction Manager
+ mgr = getTxnManager();
+ return this;
+ }
+
+}
Propchange: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionTakeTestBase.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionTakeWaitTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionTakeWaitTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionTakeWaitTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionTakeWaitTest.java Wed Jan 2 05:20:52 2013
@@ -28,8 +28,10 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
import com.sun.jini.test.spec.javaspace.conformance.EntryWriter;
+import com.sun.jini.test.spec.javaspace.conformance.TransactionTest;
/**
@@ -41,21 +43,7 @@ import com.sun.jini.test.spec.javaspace.
*
* @author Mikhail A. Markov
*/
-public class SnapshotTransactionTakeWaitTest extends SnapshotAbstractTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+public class SnapshotTransactionTakeWaitTest extends TransactionTest {
/**
* This method asserts that a take request will wait until a matching entry
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionWriteLeaseANYTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionWriteLeaseANYTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionWriteLeaseANYTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionWriteLeaseANYTest.java Wed Jan 2 05:20:52 2013
@@ -29,7 +29,9 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
+import com.sun.jini.test.spec.javaspace.conformance.TransactionTest;
/**
@@ -47,21 +49,7 @@ import com.sun.jini.test.spec.javaspace.
* @author Mikhail A. Markov
*/
public class SnapshotTransactionWriteLeaseANYTest
- extends SnapshotAbstractTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+ extends TransactionTest {
/**
* This method asserts that write with <code>Lease.ANY</code>
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionWriteLeaseFOREVERTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionWriteLeaseFOREVERTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionWriteLeaseFOREVERTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionWriteLeaseFOREVERTest.java Wed Jan 2 05:20:52 2013
@@ -29,7 +29,9 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
+import com.sun.jini.test.spec.javaspace.conformance.TransactionTest;
/**
@@ -46,21 +48,7 @@ import com.sun.jini.test.spec.javaspace.
* @author Mikhail A. Markov
*/
public class SnapshotTransactionWriteLeaseFOREVERTest
- extends SnapshotAbstractTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+ extends TransactionTest {
/**
* This method asserts that write with <code>Lease.FOREVER</code>
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionWriteNegativeLeaseTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionWriteNegativeLeaseTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionWriteNegativeLeaseTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionWriteNegativeLeaseTest.java Wed Jan 2 05:20:52 2013
@@ -28,7 +28,9 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
+import com.sun.jini.test.spec.javaspace.conformance.TransactionTest;
/**
@@ -41,21 +43,7 @@ import com.sun.jini.test.spec.javaspace.
* @author Mikhail A. Markov
*/
public class SnapshotTransactionWriteNegativeLeaseTest
- extends SnapshotAbstractTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+ extends TransactionTest {
/**
* This method asserts, that we will get an IllegalArgumentException if the
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionWriteTakeIfExistsNotifyTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionWriteTakeIfExistsNotifyTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionWriteTakeIfExistsNotifyTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionWriteTakeIfExistsNotifyTest.java Wed Jan 2 05:20:52 2013
@@ -30,8 +30,10 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
import com.sun.jini.test.spec.javaspace.conformance.NotifyCounter;
+import com.sun.jini.test.spec.javaspace.conformance.TransactionTest;
/**
@@ -45,21 +47,7 @@ import com.sun.jini.test.spec.javaspace.
* @author Mikhail A. Markov
*/
public class SnapshotTransactionWriteTakeIfExistsNotifyTest
- extends SnapshotAbstractTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+ extends TransactionTest {
/**
* This method asserts, that if an entry is written under
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionWriteTakeIfExistsTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionWriteTakeIfExistsTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionWriteTakeIfExistsTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionWriteTakeIfExistsTest.java Wed Jan 2 05:20:52 2013
@@ -28,8 +28,9 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
-
+import com.sun.jini.test.spec.javaspace.conformance.TransactionTest;
/**
* SnapshotTransactionWriteTakeIfExistsTest asserts that if the entry is
@@ -42,21 +43,7 @@ import com.sun.jini.test.spec.javaspace.
* @author Mikhail A. Markov
*/
public class SnapshotTransactionWriteTakeIfExistsTest
- extends SnapshotAbstractTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+ extends TransactionTest {
/**
* This method asserts that if the entry is written and
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionWriteTakeNotifyTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionWriteTakeNotifyTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionWriteTakeNotifyTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionWriteTakeNotifyTest.java Wed Jan 2 05:20:52 2013
@@ -30,8 +30,10 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
import com.sun.jini.test.spec.javaspace.conformance.NotifyCounter;
+import com.sun.jini.test.spec.javaspace.conformance.TransactionTest;
/**
@@ -45,21 +47,7 @@ import com.sun.jini.test.spec.javaspace.
* @author Mikhail A. Markov
*/
public class SnapshotTransactionWriteTakeNotifyTest
- extends SnapshotAbstractTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+ extends TransactionTest {
/**
* This method asserts, that if an entry is written under
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionWriteTakeTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionWriteTakeTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionWriteTakeTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionWriteTakeTest.java Wed Jan 2 05:20:52 2013
@@ -28,7 +28,9 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
+import com.sun.jini.test.spec.javaspace.conformance.TransactionTest;
/**
@@ -41,21 +43,7 @@ import com.sun.jini.test.spec.javaspace.
*
* @author Mikhail A. Markov
*/
-public class SnapshotTransactionWriteTakeTest extends SnapshotAbstractTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+public class SnapshotTransactionWriteTakeTest extends TransactionTest {
/**
* This method asserts that if the entry is written and after that
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionWriteTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionWriteTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionWriteTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotTransactionWriteTest.java Wed Jan 2 05:20:52 2013
@@ -28,7 +28,9 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
+import com.sun.jini.test.spec.javaspace.conformance.TransactionTest;
/**
@@ -44,21 +46,7 @@ import com.sun.jini.test.spec.javaspace.
*
* @author Mikhail A. Markov
*/
-public class SnapshotTransactionWriteTest extends SnapshotAbstractTestBase {
-
- /**
- * Sets up the testing environment.
- *
- * @param config QAConfig from the runner for setup.
- */
- public void setup(QAConfig config) throws Exception {
-
- // mandatory call to parent
- super.setup(config);
-
- // get an instance of Transaction Manager
- mgr = getTxnManager();
- }
+public class SnapshotTransactionWriteTest extends TransactionTest {
/**
* This method asserts that write with positive finite lease times
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotWriteLeaseANYTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotWriteLeaseANYTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotWriteLeaseANYTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotWriteLeaseANYTest.java Wed Jan 2 05:20:52 2013
@@ -28,6 +28,7 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa
+import com.sun.jini.test.spec.javaspace.conformance.JavaSpaceTest;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
@@ -45,7 +46,7 @@ import com.sun.jini.test.spec.javaspace.
*
* @author Mikhail A. Markov
*/
-public class SnapshotWriteLeaseANYTest extends SnapshotAbstractTestBase {
+public class SnapshotWriteLeaseANYTest extends JavaSpaceTest {
/**
* This method asserts that write with <code>Lease.ANY</code>
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotWriteLeaseFOREVERTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotWriteLeaseFOREVERTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotWriteLeaseFOREVERTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotWriteLeaseFOREVERTest.java Wed Jan 2 05:20:52 2013
@@ -28,6 +28,7 @@ import com.sun.jini.qa.harness.TestExcep
import com.sun.jini.qa.harness.QAConfig;
// com.sun.jini.qa
+import com.sun.jini.test.spec.javaspace.conformance.JavaSpaceTest;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
@@ -44,7 +45,7 @@ import com.sun.jini.test.spec.javaspace.
*
* @author Mikhail A. Markov
*/
-public class SnapshotWriteLeaseFOREVERTest extends SnapshotAbstractTestBase {
+public class SnapshotWriteLeaseFOREVERTest extends JavaSpaceTest {
/**
* This method asserts that write with <code>Lease.FOREVER</code> lease time
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotWriteNegativeLeaseTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotWriteNegativeLeaseTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotWriteNegativeLeaseTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotWriteNegativeLeaseTest.java Wed Jan 2 05:20:52 2013
@@ -26,6 +26,7 @@ import net.jini.core.entry.Entry;
import com.sun.jini.qa.harness.TestException;
// com.sun.jini.qa
+import com.sun.jini.test.spec.javaspace.conformance.JavaSpaceTest;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
@@ -38,7 +39,7 @@ import com.sun.jini.test.spec.javaspace.
*
* @author Mikhail A. Markov
*/
-public class SnapshotWriteNegativeLeaseTest extends SnapshotAbstractTestBase {
+public class SnapshotWriteNegativeLeaseTest extends JavaSpaceTest {
/**
* This method asserts, that we will get an IllegalArgumentException if the
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotWriteTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotWriteTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotWriteTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/snapshot/SnapshotWriteTest.java Wed Jan 2 05:20:52 2013
@@ -26,6 +26,7 @@ import net.jini.core.entry.Entry;
import com.sun.jini.qa.harness.TestException;
// com.sun.jini.qa
+import com.sun.jini.test.spec.javaspace.conformance.JavaSpaceTest;
import com.sun.jini.test.spec.javaspace.conformance.SimpleEntry;
@@ -42,7 +43,7 @@ import com.sun.jini.test.spec.javaspace.
*
* @author Mikhail A. Markov
*/
-public class SnapshotWriteTest extends SnapshotAbstractTestBase {
+public class SnapshotWriteTest extends JavaSpaceTest {
/**
* This method asserts that write with positive finite lease times
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/abstractilfactory/AccessorTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/abstractilfactory/AccessorTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/abstractilfactory/AccessorTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/abstractilfactory/AccessorTest.java Wed Jan 2 05:20:52 2013
@@ -19,9 +19,10 @@ package com.sun.jini.test.spec.jeri.abst
import java.util.logging.Level;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
import com.sun.jini.qa.harness.TestException;
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
import net.jini.jeri.AbstractILFactory;
import net.jini.core.constraint.RemoteMethodControl;
@@ -98,7 +99,7 @@ import java.util.logging.Level;
* from FakeRemoteSubImpl's Remote interfaces is returned
* </pre>
*/
-public class AccessorTest extends QATest {
+public class AccessorTest extends QATestEnvironment implements Test {
interface FakeRemoteInterface extends Remote {
public void fakeMethod1() throws RemoteException;
@@ -146,7 +147,8 @@ public class AccessorTest extends QATest
}
- public void setup(QAConfig sysConfig) throws Exception {
+ public Test construct(QAConfig sysConfig) throws Exception {
+ return this;
}
public void run() throws Exception {
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicilfactory/ConstructorAccessorTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicilfactory/ConstructorAccessorTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicilfactory/ConstructorAccessorTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicilfactory/ConstructorAccessorTest.java Wed Jan 2 05:20:52 2013
@@ -19,9 +19,10 @@ package com.sun.jini.test.spec.jeri.basi
import java.util.logging.Level;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
import com.sun.jini.qa.harness.TestException;
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
import net.jini.jeri.BasicILFactory;
import net.jini.export.ExportPermission;
@@ -88,7 +89,7 @@ import java.util.logging.Level;
* 4) assert IllegalArgumentException is thrown
* </pre>
*/
-public class ConstructorAccessorTest extends QATest {
+public class ConstructorAccessorTest extends QATestEnvironment implements Test {
// fake BasicILFactory subclass
class FakeBasicILFactory extends BasicILFactory {
@@ -146,7 +147,8 @@ public class ConstructorAccessorTest ext
};
// inherit javadoc
- public void setup(QAConfig sysConfig) throws Exception {
+ public Test construct(QAConfig sysConfig) throws Exception {
+ return this;
}
// inherit javadoc
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicilfactory/CreateInstancesTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicilfactory/CreateInstancesTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicilfactory/CreateInstancesTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicilfactory/CreateInstancesTest.java Wed Jan 2 05:20:52 2013
@@ -19,8 +19,9 @@ package com.sun.jini.test.spec.jeri.basi
import java.util.logging.Level;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
import net.jini.jeri.BasicILFactory;
import net.jini.jeri.BasicInvocationHandler;
@@ -104,7 +105,7 @@ import java.util.logging.Level;
* -verify ExportException is thrown
* </pre>
*/
-public class CreateInstancesTest extends QATest {
+public class CreateInstancesTest extends QATestEnvironment implements Test {
// test case infrastructure
interface FakeRemoteInterface extends Remote {
@@ -150,7 +151,8 @@ public class CreateInstancesTest extends
};
// inherit javadoc
- public void setup(QAConfig sysConfig) throws Exception {
+ public Test construct(QAConfig sysConfig) throws Exception {
+ return this;
}
// inherit javadoc
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicilfactory/CreateInvocationDispatcherTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicilfactory/CreateInvocationDispatcherTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicilfactory/CreateInvocationDispatcherTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicilfactory/CreateInvocationDispatcherTest.java Wed Jan 2 05:20:52 2013
@@ -19,8 +19,9 @@ package com.sun.jini.test.spec.jeri.basi
import java.util.logging.Level;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
import net.jini.jeri.BasicILFactory;
import net.jini.jeri.InvocationDispatcher;
@@ -72,7 +73,7 @@ import java.util.logging.Level;
* IllegalArgumentException is thrown
* </pre>
*/
-public class CreateInvocationDispatcherTest extends QATest {
+public class CreateInvocationDispatcherTest extends QATestEnvironment implements Test {
// test case infrastructure
class FakeBasicILFactory extends BasicILFactory {
@@ -88,7 +89,8 @@ public class CreateInvocationDispatcherT
}
// inherit javadoc
- public void setup(QAConfig sysConfig) throws Exception {
+ public Test construct(QAConfig sysConfig) throws Exception {
+ return this;
}
// inherit javadoc
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicilfactory/CreateInvocationHandlerTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicilfactory/CreateInvocationHandlerTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicilfactory/CreateInvocationHandlerTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicilfactory/CreateInvocationHandlerTest.java Wed Jan 2 05:20:52 2013
@@ -19,8 +19,9 @@ package com.sun.jini.test.spec.jeri.basi
import java.util.logging.Level;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
import net.jini.jeri.BasicILFactory;
import net.jini.jeri.ObjectEndpoint;
@@ -68,7 +69,7 @@ import java.util.logging.Level;
* NullPointerException is thrown
* </pre>
*/
-public class CreateInvocationHandlerTest extends QATest {
+public class CreateInvocationHandlerTest extends QATestEnvironment implements Test {
// test case infrastructure
class FakeBasicILFactory extends BasicILFactory {
@@ -83,7 +84,8 @@ public class CreateInvocationHandlerTest
}
// inherit javadoc
- public void setup(QAConfig sysConfig) throws Exception {
+ public Test construct(QAConfig sysConfig) throws Exception {
+ return this;
}
// inherit javadoc
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicilfactory/GetExtraProxyInterfacesTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicilfactory/GetExtraProxyInterfacesTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicilfactory/GetExtraProxyInterfacesTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicilfactory/GetExtraProxyInterfacesTest.java Wed Jan 2 05:20:52 2013
@@ -19,8 +19,9 @@ package com.sun.jini.test.spec.jeri.basi
import java.util.logging.Level;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
import net.jini.jeri.BasicILFactory;
import net.jini.core.constraint.RemoteMethodControl;
@@ -63,7 +64,7 @@ import java.util.logging.Level;
* RemoteMethodControl and TrustEquivalence interfaces is returned
* </pre>
*/
-public class GetExtraProxyInterfacesTest extends QATest {
+public class GetExtraProxyInterfacesTest extends QATestEnvironment implements Test {
// test case infrastructure
class FakeBasicILFactory extends BasicILFactory {
@@ -76,7 +77,8 @@ public class GetExtraProxyInterfacesTest
}
// inherit javadoc
- public void setup(QAConfig sysConfig) throws Exception {
+ public Test construct(QAConfig sysConfig) throws Exception {
+ return this;
}
// inherit javadoc
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicilfactory/ObjectMethodsTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicilfactory/ObjectMethodsTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicilfactory/ObjectMethodsTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicilfactory/ObjectMethodsTest.java Wed Jan 2 05:20:52 2013
@@ -19,8 +19,9 @@ package com.sun.jini.test.spec.jeri.basi
import java.util.logging.Level;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
import net.jini.jeri.BasicILFactory;
import net.jini.jeri.InvocationDispatcher;
@@ -83,7 +84,7 @@ import java.util.logging.Level;
* verify instances are NOT .equals to each other (symmetric)
* </pre>
*/
-public class ObjectMethodsTest extends QATest {
+public class ObjectMethodsTest extends QATestEnvironment implements Test {
class FakeInvocationLayerFactory implements InvocationLayerFactory {
public InvocationLayerFactory.Instances createInstances(Remote impl,
@@ -110,7 +111,8 @@ public class ObjectMethodsTest extends Q
};
// inherit javadoc
- public void setup(QAConfig sysConfig) throws Exception {
+ public Test construct(QAConfig sysConfig) throws Exception {
+ return this;
}
// inherit javadoc
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationdispatcher/AbstractDispatcherTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationdispatcher/AbstractDispatcherTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationdispatcher/AbstractDispatcherTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationdispatcher/AbstractDispatcherTest.java Wed Jan 2 05:20:52 2013
@@ -17,9 +17,10 @@
*/
package com.sun.jini.test.spec.jeri.basicinvocationdispatcher;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
import com.sun.jini.qa.harness.TestException;
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
import net.jini.io.MarshalInputStream;
@@ -39,7 +40,7 @@ import java.rmi.ServerException;
import java.rmi.UnmarshalException;
import java.rmi.RemoteException;
-public abstract class AbstractDispatcherTest extends QATest {
+public abstract class AbstractDispatcherTest extends QATestEnvironment implements Test {
protected int counter;
protected ByteArrayInputStream response;
@@ -51,8 +52,8 @@ public abstract class AbstractDispatcher
protected FakeBasicInvocationDispatcher dispatcher;
protected Object[] nullArgs;
- public void setup(QAConfig sysConfig) throws Exception {
- // setup infrastructure needed by test
+ public Test construct(QAConfig sysConfig) throws Exception {
+ // construct infrastructure needed by test
counter = 1;
context = new ArrayList();
@@ -73,6 +74,7 @@ public abstract class AbstractDispatcher
null, //serverConstraints
null, //permClass
null); //classLoader
+ return this;
}
public void tearDown() {
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationdispatcher/CheckPermissionClassTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationdispatcher/CheckPermissionClassTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationdispatcher/CheckPermissionClassTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationdispatcher/CheckPermissionClassTest.java Wed Jan 2 05:20:52 2013
@@ -19,8 +19,9 @@ package com.sun.jini.test.spec.jeri.basi
import java.util.logging.Level;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
import net.jini.jeri.BasicInvocationDispatcher;
import net.jini.export.ExportPermission;
@@ -79,7 +80,7 @@ import java.util.logging.Level;
* 4) assert IllegalArgumentException is thrown
* </pre>
*/
-public class CheckPermissionClassTest extends QATest {
+public class CheckPermissionClassTest extends QATestEnvironment implements Test {
// fake Permission subclasses
class DefaultConstructorPermission extends BasicPermission {
@@ -106,7 +107,8 @@ public class CheckPermissionClassTest ex
};
// inherit javadoc
- public void setup(QAConfig sysConfig) throws Exception {
+ public Test construct(QAConfig sysConfig) throws Exception {
+ return this;
}
// inherit javadoc
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationdispatcher/ConstructorAccessorTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationdispatcher/ConstructorAccessorTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationdispatcher/ConstructorAccessorTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationdispatcher/ConstructorAccessorTest.java Wed Jan 2 05:20:52 2013
@@ -19,8 +19,9 @@ package com.sun.jini.test.spec.jeri.basi
import java.util.logging.Level;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
import net.jini.export.ExportPermission;
import net.jini.core.constraint.InvocationConstraint;
@@ -131,7 +132,7 @@ import java.util.logging.Level;
* 16) assert getClassLoader returns proper value
* </pre>
*/
-public class ConstructorAccessorTest extends QATest {
+public class ConstructorAccessorTest extends QATestEnvironment implements Test {
// fake Permission subclasses
class DefaultConstructorPermission extends BasicPermission {
@@ -152,7 +153,7 @@ public class ConstructorAccessorTest ext
Object[][] cases;
// inherit javadoc
- public void setup(QAConfig sysConfig) throws Exception {
+ public Test construct(QAConfig sysConfig) throws Exception {
ArrayList noMethods = new ArrayList();
ArrayList nullMethods = new ArrayList();
nullMethods.add(null);
@@ -199,6 +200,7 @@ public class ConstructorAccessorTest ext
{noMethods, caps, null, null, null, null},
{noMethods, caps, null, null, loader,null}
};
+ return this;
}
// inherit javadoc
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationdispatcher/Dispatch_NormalReturnTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationdispatcher/Dispatch_NormalReturnTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationdispatcher/Dispatch_NormalReturnTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationdispatcher/Dispatch_NormalReturnTest.java Wed Jan 2 05:20:52 2013
@@ -19,9 +19,10 @@ package com.sun.jini.test.spec.jeri.basi
import java.util.logging.Level;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
import com.sun.jini.qa.harness.TestException;
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
import net.jini.jeri.BasicInvocationDispatcher;
import net.jini.io.MarshalInputStream;
@@ -124,7 +125,7 @@ import java.util.logging.Level;
* and the proper return value
* </pre>
*/
-public class Dispatch_NormalReturnTest extends QATest {
+public class Dispatch_NormalReturnTest extends QATestEnvironment implements Test {
protected int counter;
protected ByteArrayInputStream response;
@@ -168,8 +169,8 @@ public class Dispatch_NormalReturnTest e
}
// inherit javadoc
- public void setup(QAConfig sysConfig) throws Exception {
- // setup infrastructure needed by test
+ public Test construct(QAConfig sysConfig) throws Exception {
+ // construct infrastructure needed by test
counter = 1;
context = new ArrayList();
@@ -185,6 +186,7 @@ public class Dispatch_NormalReturnTest e
FakeRemoteInterface.class.getClassLoader(),
new Class[] { FakeRemoteInterface.class },
handler);
+ return this;
}
// inherit javadoc
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationdispatcher/NullArgsTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationdispatcher/NullArgsTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationdispatcher/NullArgsTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationdispatcher/NullArgsTest.java Wed Jan 2 05:20:52 2013
@@ -89,7 +89,7 @@ public class NullArgsTest extends Abstra
public void run() throws Exception {
try {
- // setup infrastructure needed by test
+ // construct infrastructure needed by test
request = new FakeInboundRequest(null);
InvocationConstraints constraints = InvocationConstraints.EMPTY;
Object[] args = {};
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationhandler/AbstractInvokeTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationhandler/AbstractInvokeTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationhandler/AbstractInvokeTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationhandler/AbstractInvokeTest.java Wed Jan 2 05:20:52 2013
@@ -17,9 +17,10 @@
*/
package com.sun.jini.test.spec.jeri.basicinvocationhandler;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
import com.sun.jini.qa.harness.TestException;
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.test.spec.jeri.util.Util;
import com.sun.jini.test.spec.jeri.util.FakeOutboundRequest;
@@ -39,7 +40,7 @@ import java.rmi.MarshalException;
import java.rmi.RemoteException;
import java.net.ProtocolException;
-public abstract class AbstractInvokeTest extends QATest {
+public abstract class AbstractInvokeTest extends QATestEnvironment implements Test {
protected ByteArrayInputStream requestStream;
protected int counter;
protected long methodHash;
@@ -54,8 +55,8 @@ public abstract class AbstractInvokeTest
}
// inherit javadoc
- public void setup(QAConfig sysConfig) throws Exception {
- // setup infrastructure needed by test
+ public Test construct(QAConfig sysConfig) throws Exception {
+ // construct infrastructure needed by test
counter = 1;
request = new FakeOutboundRequest();
@@ -72,6 +73,7 @@ public abstract class AbstractInvokeTest
methodHash = Util.computeMethodHash(
FakeInterface.class.getMethod("fakeMethod", null));
+ return this;
}
// inherit javadoc
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationhandler/CheckTrustEquivalenceTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationhandler/CheckTrustEquivalenceTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationhandler/CheckTrustEquivalenceTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationhandler/CheckTrustEquivalenceTest.java Wed Jan 2 05:20:52 2013
@@ -19,8 +19,9 @@ package com.sun.jini.test.spec.jeri.basi
import java.util.logging.Level;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
import net.jini.core.constraint.InvocationConstraint;
import net.jini.core.constraint.Integrity;
@@ -93,7 +94,7 @@ import java.util.logging.Level;
* checkTrustEquivalence returns expected value
* </pre>
*/
-public class CheckTrustEquivalenceTest extends QATest {
+public class CheckTrustEquivalenceTest extends QATestEnvironment implements Test {
// an ObjectEndpoint that impls TrustEquivalence and is configurable
class FakeTrustedObjectEndpoint
@@ -149,7 +150,8 @@ public class CheckTrustEquivalenceTest e
};
// inherit javadoc
- public void setup(QAConfig sysConfig) throws Exception {
+ public Test construct(QAConfig sysConfig) throws Exception {
+ return this;
}
// inherit javadoc
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationhandler/ConstructorAccessorTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationhandler/ConstructorAccessorTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationhandler/ConstructorAccessorTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationhandler/ConstructorAccessorTest.java Wed Jan 2 05:20:52 2013
@@ -19,8 +19,9 @@ package com.sun.jini.test.spec.jeri.basi
import java.util.logging.Level;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
import net.jini.jeri.BasicInvocationHandler;
import net.jini.jeri.ObjectEndpoint;
@@ -84,10 +85,11 @@ import java.util.logging.Level;
* 12) verify the get method return the appropriate values
* </pre>
*/
-public class ConstructorAccessorTest extends QATest {
+public class ConstructorAccessorTest extends QATestEnvironment implements Test {
// inherit javadoc
- public void setup(QAConfig sysConfig) throws Exception {
+ public Test construct(QAConfig sysConfig) throws Exception {
+ return this;
}
// inherit javadoc
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationhandler/Invoke_ExecuteCallNonNullReturnTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationhandler/Invoke_ExecuteCallNonNullReturnTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationhandler/Invoke_ExecuteCallNonNullReturnTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationhandler/Invoke_ExecuteCallNonNullReturnTest.java Wed Jan 2 05:20:52 2013
@@ -117,7 +117,7 @@ public class Invoke_ExecuteCallNonNullRe
+ executeCallReturn);
logger.log(Level.FINE,"");
- // setup infrastructure needed by test
+ // construct infrastructure needed by test
objectEndpoint.setExecuteCallReturn(executeCallReturn);
FakeInterface impl = (FakeInterface) Proxy.newProxyInstance(
FakeInterface.class.getClassLoader(),
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationhandler/Invoke_NormalReturnTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationhandler/Invoke_NormalReturnTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationhandler/Invoke_NormalReturnTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationhandler/Invoke_NormalReturnTest.java Wed Jan 2 05:20:52 2013
@@ -122,7 +122,7 @@ public class Invoke_NormalReturnTest ext
// inherit javadoc
public void run() throws Exception {
- // setup infrastructure needed by test
+ // construct infrastructure needed by test
request.setDeliveryStatusReturn(true);
FakeInterface fi = (FakeInterface) Proxy.newProxyInstance(
FakeInterface.class.getClassLoader(),
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationhandler/Invoke_RemoteMethodControlTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationhandler/Invoke_RemoteMethodControlTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationhandler/Invoke_RemoteMethodControlTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationhandler/Invoke_RemoteMethodControlTest.java Wed Jan 2 05:20:52 2013
@@ -19,8 +19,9 @@ package com.sun.jini.test.spec.jeri.basi
import java.util.logging.Level;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.qa.harness.TestException;
import net.jini.core.constraint.MethodConstraints;
import net.jini.core.constraint.RemoteMethodControl;
@@ -79,10 +80,11 @@ import java.util.logging.Level;
* 10) verify an exception is thrown
* </pre>
*/
-public class Invoke_RemoteMethodControlTest extends QATest {
+public class Invoke_RemoteMethodControlTest extends QATestEnvironment implements Test {
// inherit javadoc
- public void setup(QAConfig sysConfig) throws Exception {
+ public Test construct(QAConfig sysConfig) throws Exception {
+ return this;
}
// inherit javadoc
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationhandler/NullArgsTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationhandler/NullArgsTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationhandler/NullArgsTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationhandler/NullArgsTest.java Wed Jan 2 05:20:52 2013
@@ -77,7 +77,7 @@ public class NullArgsTest extends Abstra
// inherit javadoc
public void run() throws Exception {
- // setup additional infrastructure needed by test
+ // construct additional infrastructure needed by test
ArrayList c = new ArrayList();
Method method = impl.getClass().getMethod("fakeMethod",null);
Object[] args = {};
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationhandler/ObjectMethodsTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationhandler/ObjectMethodsTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationhandler/ObjectMethodsTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationhandler/ObjectMethodsTest.java Wed Jan 2 05:20:52 2013
@@ -19,8 +19,9 @@ package com.sun.jini.test.spec.jeri.basi
import java.util.logging.Level;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
import net.jini.core.constraint.InvocationConstraint;
import net.jini.core.constraint.Integrity;
@@ -100,7 +101,7 @@ import java.util.logging.Level;
* verify that neither invocation handler is .equals to the other
* </pre>
*/
-public class ObjectMethodsTest extends QATest {
+public class ObjectMethodsTest extends QATestEnvironment implements Test {
interface FakeInterface1 {
public Object fake1Method() throws Throwable;
@@ -152,7 +153,8 @@ public class ObjectMethodsTest extends Q
};
// inherit javadoc
- public void setup(QAConfig sysConfig) throws Exception {
+ public Test construct(QAConfig sysConfig) throws Exception {
+ return this;
}
// inherit javadoc
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationhandler/SetClientConstraintsTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationhandler/SetClientConstraintsTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationhandler/SetClientConstraintsTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicinvocationhandler/SetClientConstraintsTest.java Wed Jan 2 05:20:52 2013
@@ -19,8 +19,9 @@ package com.sun.jini.test.spec.jeri.basi
import java.util.logging.Level;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
import net.jini.jeri.BasicInvocationHandler;
import net.jini.jeri.ObjectEndpoint;
@@ -83,7 +84,7 @@ import java.util.logging.Level;
* 12) verify UndeclaredThrowableException is thrown
* </pre>
*/
-public class SetClientConstraintsTest extends QATest {
+public class SetClientConstraintsTest extends QATestEnvironment implements Test {
// a BasicInvocationHandler with a non-conforming constructor
class FakeBadConstructorBasicInvocationHandler extends
@@ -111,7 +112,8 @@ public class SetClientConstraintsTest ex
}
// inherit javadoc
- public void setup(QAConfig sysConfig) throws Exception {
+ public Test construct(QAConfig sysConfig) throws Exception {
+ return this;
}
// inherit javadoc
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicjeriexporter/util/BJEAbstractTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicjeriexporter/util/BJEAbstractTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicjeriexporter/util/BJEAbstractTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicjeriexporter/util/BJEAbstractTest.java Wed Jan 2 05:20:52 2013
@@ -21,6 +21,7 @@ import java.util.logging.Level;
//test harness related imports
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.LegacyTest;
import com.sun.jini.qa.harness.Test;
import com.sun.jini.qa.harness.TestException;
@@ -31,14 +32,15 @@ import java.util.logging.Logger;
/**
* Abstract class for <code>BasicJeriExporter</code> tests
*/
-public abstract class BJEAbstractTest implements Test {
+public abstract class BJEAbstractTest implements LegacyTest {
protected static QAConfig config;
protected static Logger log;
- public void setup(QAConfig config) {
+ public Test construct(QAConfig config) {
this.config = config;
log = Logger.getLogger("com.sun.jini.test.spec.jeri.basicjeriexporter");
+ return this;
}
public void tearDown() {
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicjeritrustverifier/util/AbstractTrustVerifierTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicjeritrustverifier/util/AbstractTrustVerifierTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicjeritrustverifier/util/AbstractTrustVerifierTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicjeritrustverifier/util/AbstractTrustVerifierTest.java Wed Jan 2 05:20:52 2013
@@ -19,12 +19,13 @@ package com.sun.jini.test.spec.jeri.basi
//harness imports
import com.sun.jini.qa.harness.QAConfig;
-import com.sun.jini.qa.harness.Test;
+import com.sun.jini.qa.harness.LegacyTest;
//java.util
+import com.sun.jini.qa.harness.Test;
import java.util.logging.Logger;
-public abstract class AbstractTrustVerifierTest implements Test {
+public abstract class AbstractTrustVerifierTest implements LegacyTest {
protected static QAConfig sysConfig;
protected static Logger log;
@@ -32,10 +33,11 @@ public abstract class AbstractTrustVerif
+ "jeri.basicjeritrustverifier";
//inherit javadoc
- public void setup(QAConfig config) {
+ public Test construct(QAConfig config) {
sysConfig = config;
log = Logger.getLogger(
"com.sun.jini.test.spec.jeri.basicjeritrustverifier");
+ return this;
}
//inherit javadoc
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicobjectendpoint/CheckTrustEquivalenceTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicobjectendpoint/CheckTrustEquivalenceTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicobjectendpoint/CheckTrustEquivalenceTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/jeri/basicobjectendpoint/CheckTrustEquivalenceTest.java Wed Jan 2 05:20:52 2013
@@ -19,8 +19,9 @@ package com.sun.jini.test.spec.jeri.basi
import java.util.logging.Level;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
import net.jini.jeri.BasicObjectEndpoint;
import net.jini.security.proxytrust.TrustEquivalence;
@@ -79,7 +80,7 @@ import java.util.logging.Level;
* 4) assert correct result is returned
* </pre>
*/
-public class CheckTrustEquivalenceTest extends QATest {
+public class CheckTrustEquivalenceTest extends QATestEnvironment implements Test {
// an Endpoint that impls TrustEquivalence and is configurable
class FakeTrustedEndpoint
@@ -123,7 +124,8 @@ public class CheckTrustEquivalenceTest e
};
// inherit javadoc
- public void setup(QAConfig sysConfig) throws Exception {
+ public Test construct(QAConfig sysConfig) throws Exception {
+ return this;
}
// inherit javadoc