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 [17/35] - in /river/jtsk/skunk/qa_refactor/trunk/qa: ./
doc/ src/com/sun/jini/qa/harness/
src/com/sun/jini/test/impl/discoverymanager/
src/com/sun/jini/test/impl/discoveryproviders/
src/com/sun/jini/test/impl/end2end/e2etest/ src/c...
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationGroupDescriptorTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationGroupDescriptorTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationGroupDescriptorTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationGroupDescriptorTest.java Wed Jan 2 05:20:52 2013
@@ -17,6 +17,7 @@
*/
package com.sun.jini.test.impl.start;
+import com.sun.jini.qa.harness.Test;
import java.util.logging.Level;
import com.sun.jini.qa.harness.TestException;
@@ -27,7 +28,7 @@ import java.lang.reflect.Constructor;
import java.util.Arrays;
import java.util.Properties;
-public class SharedActivationGroupDescriptorTest extends StarterBase {
+public class SharedActivationGroupDescriptorTest extends StarterBase implements Test {
private static String p = "policy";
private static String cp = "classpath/bogus.jar";
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationGroupDescriptorTest2.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationGroupDescriptorTest2.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationGroupDescriptorTest2.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedActivationGroupDescriptorTest2.java Wed Jan 2 05:20:52 2013
@@ -17,6 +17,7 @@
*/
package com.sun.jini.test.impl.start;
+import com.sun.jini.qa.harness.Test;
import java.util.logging.Level;
import com.sun.jini.qa.harness.TestException;
@@ -31,7 +32,7 @@ import java.util.Properties;
import sun.security.action.GetIntegerAction;
-public class SharedActivationGroupDescriptorTest2 extends StarterBase {
+public class SharedActivationGroupDescriptorTest2 extends StarterBase implements Test {
private static String p = "policy";
private static String cp = "classpath/bogus.jar";
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedGroupNullConfigEntries.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedGroupNullConfigEntries.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedGroupNullConfigEntries.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedGroupNullConfigEntries.java Wed Jan 2 05:20:52 2013
@@ -20,13 +20,14 @@ package com.sun.jini.test.impl.start;
import java.util.logging.Level;
import com.sun.jini.qa.harness.QAConfig;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
import net.jini.config.ConfigurationException;
import com.sun.jini.start.ServiceStarter;
import com.sun.jini.start.SharedGroup;
import com.sun.jini.qa.harness.TestException;
import com.sun.jini.qa.harness.OverrideProvider;
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.Test;
import java.io.*;
import java.rmi.*;
@@ -40,7 +41,7 @@ import net.jini.event.EventMailbox;
* are not equal
*/
-public class SharedGroupNullConfigEntries extends QATest {
+public class SharedGroupNullConfigEntries extends QATestEnvironment implements Test {
private static class OverrideGenerator implements OverrideProvider {
@@ -66,9 +67,10 @@ public class SharedGroupNullConfigEntrie
}
}
- public void setup(QAConfig sysConfig) throws Exception {
- super.setup(sysConfig);
+ public Test construct(QAConfig sysConfig) throws Exception {
+ super.construct(sysConfig);
sysConfig.addOverrideProvider(new OverrideGenerator());
+ return this;
}
public void run() throws Exception {
@@ -83,7 +85,7 @@ public class SharedGroupNullConfigEntrie
}
for (int i=0; i < numGroups; i++) {
try {
- group_proxy = (SharedGroup)manager.startService(serviceName);
+ group_proxy = (SharedGroup)getManager().startService(serviceName);
throw new TestException(
"Started service with invalid configuration");
} catch (Exception e) {
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedGroupProxyEqualityTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedGroupProxyEqualityTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedGroupProxyEqualityTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/SharedGroupProxyEqualityTest.java Wed Jan 2 05:20:52 2013
@@ -20,7 +20,8 @@ package com.sun.jini.test.impl.start;
import java.util.logging.Level;
import com.sun.jini.qa.harness.QAConfig;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.start.ServiceStarter;
import com.sun.jini.start.SharedGroup;
import com.sun.jini.qa.harness.TestException;
@@ -37,7 +38,7 @@ import net.jini.event.EventMailbox;
* are not equal
*/
-public class SharedGroupProxyEqualityTest extends QATest {
+public class SharedGroupProxyEqualityTest extends QATestEnvironment implements Test {
public void run() throws Exception {
logger.log(Level.INFO, "" + ":run()");
@@ -51,9 +52,9 @@ public class SharedGroupProxyEqualityTes
SharedGroup bogus_group_proxy = null;
final String serviceName = "com.sun.jini.start.SharedGroup";
MarshalledObject marshObj01 =
- new MarshalledObject(manager.startService(serviceName));
+ new MarshalledObject(getManager().startService(serviceName));
MarshalledObject marshObj02 =
- new MarshalledObject(manager.startService(serviceName));
+ new MarshalledObject(getManager().startService(serviceName));
group_proxy = (SharedGroup) marshObj01.get();
group_proxy_dup = (SharedGroup) marshObj01.get();
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/StartAllServicesTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/StartAllServicesTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/StartAllServicesTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/StartAllServicesTest.java Wed Jan 2 05:20:52 2013
@@ -60,7 +60,7 @@ public class StartAllServicesTest extend
Arrays.asList(services));
Object serviceRef = null;
for (int i=0; i < services.length; i++) {
- serviceRef = manager.startService(services[i]);
+ serviceRef = getManager().startService(services[i]);
logger.log(Level.INFO, "{0} ref: {1}",
new Object[] { services[i], serviceRef });
}
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/StarterBase.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/StarterBase.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/StarterBase.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/StarterBase.java Wed Jan 2 05:20:52 2013
@@ -17,8 +17,9 @@
*/
package com.sun.jini.test.impl.start;
-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 java.util.ArrayList;
import java.util.Arrays;
@@ -29,12 +30,12 @@ import java.util.logging.Logger;
import java.util.logging.LogRecord;
-public abstract class StarterBase extends QATest {
+public abstract class StarterBase extends QATestEnvironment {
protected MyHandler handler = null;
- public void setup(QAConfig sysConfig) throws Exception {
- super.setup(sysConfig);
+ public Test construct(QAConfig sysConfig) throws Exception {
+ super.construct(sysConfig);
Logger l = Logger.getLogger("com.sun.jini.start.service.starter");
l.setLevel(Level.ALL);
handler = new MyHandler();
@@ -42,8 +43,15 @@ public abstract class StarterBase extend
if (getConfig().getBooleanConfigVal("com.sun.jini.qa.harness.shared",
true))
{
- manager.startService("sharedGroup");
+ getManager().startService("sharedGroup");
}
+ return new Test() {
+
+ public void run() throws Exception {
+ // do nothing.
+ }
+
+ };
}
static class MyHandler extends Handler {
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/GetContextTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/GetContextTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/GetContextTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/GetContextTest.java Wed Jan 2 05:20:52 2013
@@ -30,8 +30,9 @@ import java.security.Permission;
import java.security.Policy;
import java.security.PrivilegedAction;
import net.jini.security.*;
-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;
/*
* Permission key:
@@ -41,7 +42,7 @@ import com.sun.jini.qa.harness.QAConfig;
* RuntimePermission("C") -- granted to RestoreContext
* AllPermission -- granted to CheckContextAction
*/
-public class GetContextTest extends QATest {
+public class GetContextTest extends QATestEnvironment implements Test {
public static volatile SecurityContext securityContext;
public static final Permission[] passPermissions = {
@@ -58,8 +59,8 @@ public class GetContextTest extends QATe
private volatile String restoreContextJarFile;
private volatile String checkContextActionJarFile;
- public void setup(QAConfig sysConfig) throws Exception {
- super.setup(sysConfig);
+ public Test construct(QAConfig sysConfig) throws Exception {
+ super.construct(sysConfig);
getContextJarFile = sysConfig.getStringConfigVal("getContextJarFile",
sysConfig.getKitHomeDir() + File.separator
+ "lib" + File.separator
@@ -74,6 +75,7 @@ public class GetContextTest extends QATe
sysConfig.getKitHomeDir() + File.separator
+ "lib" + File.separator
+ "qa1-start-cb3.jar");
+ return this;
}
public void run() throws Exception {
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/MainPolicyNotFoundTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/MainPolicyNotFoundTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/MainPolicyNotFoundTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/MainPolicyNotFoundTest.java Wed Jan 2 05:20:52 2013
@@ -25,10 +25,11 @@ package com.sun.jini.test.impl.start.agg
import com.sun.jini.start.AggregatePolicyProvider;
import java.security.*;
import net.jini.security.policy.*;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.qa.harness.TestException;
-public class MainPolicyNotFoundTest extends QATest {
+public class MainPolicyNotFoundTest extends QATestEnvironment implements Test {
public void run() throws Exception {
if (System.getSecurityManager() == null) {
System.setSecurityManager(new SecurityManager());
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/NullCasesTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/NullCasesTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/NullCasesTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/NullCasesTest.java Wed Jan 2 05:20:52 2013
@@ -24,10 +24,11 @@ package com.sun.jini.test.impl.start.agg
import com.sun.jini.start.AggregatePolicyProvider;
import java.security.*;
import net.jini.security.policy.*;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.qa.harness.TestException;
-public class NullCasesTest extends QATest {
+public class NullCasesTest extends QATestEnvironment implements Test {
public void run() throws Exception {
if (System.getSecurityManager() == null) {
System.setSecurityManager(new SecurityManager());
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/SubPoliciesTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/SubPoliciesTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/SubPoliciesTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/SubPoliciesTest.java Wed Jan 2 05:20:52 2013
@@ -27,24 +27,26 @@ import java.net.*;
import java.security.*;
import net.jini.security.policy.DynamicPolicyProvider;
import net.jini.security.policy.PolicyFileProvider;
-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 org.apache.river.api.security.ConcurrentPolicyFile;
-public class SubPoliciesTest extends QATest {
+public class SubPoliciesTest extends QATestEnvironment implements Test {
private String policy0File;
private String policy1File;
private static String jsk_home = System.getProperty("com.sun.jini.jsk.home");
- public void setup(QAConfig sysConfig) throws Exception {
- super.setup(sysConfig);
+ public Test construct(QAConfig sysConfig) throws Exception {
+ super.construct(sysConfig);
policy0File = sysConfig.getStringConfigVal("policy0File",
sysConfig.getKitHomeDir() + File.separator + "policy"
+ File.separator + "policy.start.SubPoliciesTest.0");
policy1File = sysConfig.getStringConfigVal("policy1File",
sysConfig.getKitHomeDir() + File.separator + "policy"
+ File.separator + "policy.start.SubPoliciesTest.1");
+ return this;
}
public void run() throws Exception {
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/UntrustedGetContextClassLoader.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/UntrustedGetContextClassLoader.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/UntrustedGetContextClassLoader.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/UntrustedGetContextClassLoader.java Wed Jan 2 05:20:52 2013
@@ -24,10 +24,11 @@ package com.sun.jini.test.impl.start.agg
import com.sun.jini.start.AggregatePolicyProvider;
import net.jini.security.policy.*;
-import com.sun.jini.qa.harness.QATest;
+import com.sun.jini.qa.harness.QATestEnvironment;
+import com.sun.jini.qa.harness.Test;
import com.sun.jini.qa.harness.TestException;
-public class UntrustedGetContextClassLoader extends QATest {
+public class UntrustedGetContextClassLoader extends QATestEnvironment implements Test {
static AggregatePolicyProvider policy;
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/loadersplitpolicyprovider/LoaderSplitPolicyProviderTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/loadersplitpolicyprovider/LoaderSplitPolicyProviderTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/loadersplitpolicyprovider/LoaderSplitPolicyProviderTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/start/loadersplitpolicyprovider/LoaderSplitPolicyProviderTest.java Wed Jan 2 05:20:52 2013
@@ -28,21 +28,22 @@ import net.jini.security.policy.*;
import java.io.File;
import java.net.*;
import java.security.*;
-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 java.util.Enumeration;
import java.util.HashSet;
import java.util.Set;
-public class LoaderSplitPolicyProviderTest extends QATest {
+public class LoaderSplitPolicyProviderTest extends QATestEnvironment implements Test {
private String ldrPolicyFile;
private String defPolicyFile;
private String fooJarFile;
private String barJarFile;
- public void setup(QAConfig sysConfig) throws Exception {
- super.setup(sysConfig);
+ public Test construct(QAConfig sysConfig) throws Exception {
+ super.construct(sysConfig);
ldrPolicyFile = sysConfig.getStringConfigVal("ldrPolicyfile",
sysConfig.getKitHomeDir() + File.separator + "policy"
+ File.separator
@@ -59,6 +60,7 @@ public class LoaderSplitPolicyProviderTe
sysConfig.getKitHomeDir() + File.separator
+ "lib" + File.separator
+ "qa1-start-cb2.jar");
+ return this;
}
public void run() throws Exception {
Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/thread/AbstractThreadTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/thread/AbstractThreadTest.java?rev=1427655&r1=1427654&r2=1427655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/thread/AbstractThreadTest.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/impl/thread/AbstractThreadTest.java Wed Jan 2 05:20:52 2013
@@ -18,19 +18,21 @@
package com.sun.jini.test.impl.thread;
//harness imports
import com.sun.jini.qa.harness.QAConfig;
+import com.sun.jini.qa.harness.LegacyTest;
import com.sun.jini.qa.harness.Test;
/**
* Abstract utility class that serves as the base for all
* thread tests
*/
-public abstract class AbstractThreadTest implements Test {
+public abstract class AbstractThreadTest implements LegacyTest {
protected static QAConfig sysConfig;
//inherit javadoc
- public void setup(QAConfig config) {
+ public Test construct(QAConfig config) {
sysConfig = config;
+ return this;
}
//inherit javadoc