Author: peter_firmstone Date: Sun Jul 8 09:29:50 2012 New Revision: 1358709
URL: http://svn.apache.org/viewvc?rev=1358709&view=rev Log: Alter tests that fail due to ConcurrentPolicyFile delegating up to java.security.Policy.getPermissions(CodeSource) when CodeSource is found not to have AllPermission. Only CodeSources that are privileged have Permissions returned that contains AllPermission. This is an optimisation that complies with java.security.Policy. Added: river/jtsk/trunk/qa/tmp (with props) Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/SubPoliciesTest.java river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/SubPoliciesTest.td river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/loadersplitpolicyprovider/LoaderSplitPolicyProviderTest.java Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/SubPoliciesTest.java URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/SubPoliciesTest.java?rev=1358709&r1=1358708&r2=1358709&view=diff ============================================================================== --- river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/SubPoliciesTest.java (original) +++ river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/SubPoliciesTest.java Sun Jul 8 09:29:50 2012 @@ -30,6 +30,7 @@ import net.jini.security.policy.PolicyFi import com.sun.jini.qa.harness.QATest; import com.sun.jini.qa.harness.QAConfig; import com.sun.jini.qa.harness.TestException; +import org.apache.river.api.security.ConcurrentPolicyFile; public class SubPoliciesTest extends QATest { private String policy0File; @@ -220,11 +221,14 @@ public class SubPoliciesTest extends QAT CodeSource cs = new CodeSource(new URL(codebase), (java.security.cert.Certificate[]) null); PermissionCollection pc = policy.getPermissions(cs); - for (int i = 0; i < pass.length; i++) { - if (!pc.implies(pass[i])) { - throw new TestException(pass[i] + " not implied by " + cs); - } - } + // No longer tested due to ConcurrentPolicyFile calling + // super.getPermissions(source) when non privileged domain + // performance optimisation. +// for (int i = 0; i < pass.length; i++) { +// if (!pc.implies(pass[i])) { +// throw new TestException(pass[i] + " not implied by " + cs); +// } +// } for (int i = 0; i < fail.length; i++) { if (pc.implies(fail[i])) { throw new TestException(fail[i] + " implied by " + cs); Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/SubPoliciesTest.td URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/SubPoliciesTest.td?rev=1358709&r1=1358708&r2=1358709&view=diff ============================================================================== --- river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/SubPoliciesTest.td (original) +++ river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/aggregatepolicyprovider/SubPoliciesTest.td Sun Jul 8 09:29:50 2012 @@ -5,6 +5,11 @@ testCategories=start,start_impl testClasspath=${altClasspath}$:<file:lib/qa1-start-tests.jar> testPolicyfile=SubPoliciesTest.0.policy +#testjvmargs=\ +#-Xdebug,\ +#-Xrunjdwp:transport=dt_socket+,address=8000+,server=y+,suspend=y,\ +#${testjvmargs} + #!!!! the next two lines are wrong policy0File=<url:SubPoliciesTest.0.policy> policy1File=<url:SubPoliciesTest.1.policy> Modified: river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/loadersplitpolicyprovider/LoaderSplitPolicyProviderTest.java URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/loadersplitpolicyprovider/LoaderSplitPolicyProviderTest.java?rev=1358709&r1=1358708&r2=1358709&view=diff ============================================================================== --- river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/loadersplitpolicyprovider/LoaderSplitPolicyProviderTest.java (original) +++ river/jtsk/trunk/qa/src/com/sun/jini/test/impl/start/loadersplitpolicyprovider/LoaderSplitPolicyProviderTest.java Sun Jul 8 09:29:50 2012 @@ -126,15 +126,16 @@ public class LoaderSplitPolicyProviderTe + "."); } - if (!(contains(pol.getPermissions(myPd.getCodeSource()), perm) && - contains(pol.getPermissions(fooPd.getCodeSource()), perm) && - contains(pol.getPermissions(barPd.getCodeSource()), perm) && - contains(pol.getPermissions(nullPd.getCodeSource()), perm))) - { - throw new TestException( - "Does not satisfy getPermissions & getCodeSource " - + "conditions for " + perm + "."); - } + // Not tested due to changes in ConcurrentPolicyFile.getPermissions(CodeSource) +// if (!(contains(pol.getPermissions(myPd.getCodeSource()), perm) && +// contains(pol.getPermissions(fooPd.getCodeSource()), perm) && +// contains(pol.getPermissions(barPd.getCodeSource()), perm) && +// contains(pol.getPermissions(nullPd.getCodeSource()), perm))) +// { +// throw new TestException( +// "Does not satisfy getPermissions & getCodeSource " +// + "conditions for " + perm + "."); +// } perm = new RuntimePermission("defaultPolicyGrant"); ((DynamicPolicy) dynDefPolicy).grant( @@ -179,16 +180,16 @@ public class LoaderSplitPolicyProviderTe "Does not satisfy getPermissions conditions for " + perm + "."); } - - if (contains(pol.getPermissions(myPd.getCodeSource()), perm) || - contains(pol.getPermissions(fooPd.getCodeSource()), perm) || - contains(pol.getPermissions(barPd.getCodeSource()), perm) || - contains(pol.getPermissions(nullPd.getCodeSource()), perm)) - { - throw new TestException( - "Does not satisfy getPermissions & getCodeSource " - + "conditions for " + perm + "."); - } +// Not tested due to changes in ConcurrentPolicyFile.getPermissions(CodeSource) +// if (contains(pol.getPermissions(myPd.getCodeSource()), perm) || +// contains(pol.getPermissions(fooPd.getCodeSource()), perm) || +// contains(pol.getPermissions(barPd.getCodeSource()), perm) || +// contains(pol.getPermissions(nullPd.getCodeSource()), perm)) +// { +// throw new TestException( +// "Does not satisfy getPermissions & getCodeSource " +// + "conditions for " + perm + "."); +// } perm = new RuntimePermission("loaderPolicyGrant"); ((DynamicPolicy) dynLdrPolicy).grant( Added: river/jtsk/trunk/qa/tmp URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/tmp?rev=1358709&view=auto ============================================================================== Binary file - no diff available. Propchange: river/jtsk/trunk/qa/tmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream
