Index: src/test/api/java/org/apache/harmony/security/tests/java/security/PolicyTest.java =================================================================== --- src/test/api/java/org/apache/harmony/security/tests/java/security/PolicyTest.java (revision 548376) +++ src/test/api/java/org/apache/harmony/security/tests/java/security/PolicyTest.java (working copy) @@ -197,7 +197,7 @@ // Regression for HARMONY-1963 and HARMONY-2910 String policyFile = Support_Resources .getAbsoluteResourcePath("PolicyTest.txt"); - String oldSysProp = System.getProperty(JAVA_SECURITY_POLICY); + String oldJavaPolicy = System.getProperty(JAVA_SECURITY_POLICY); Policy oldPolicy = Policy.getPolicy(); try { @@ -206,14 +206,20 @@ // test: absolute paths assertCodeBasePropertyExpansion("/11111/*", "/11111/-"); assertCodeBasePropertyExpansion("/22222/../22222/*", "/22222/-"); - //FIXME assertCodeBasePropertyExpansion("/33333/*", "/33333/../33333/-"); + assertCodeBasePropertyExpansion("/33333/*", "/33333/../33333/-"); + assertCodeBasePropertyExpansion("/44444/../44444/-", "/44444/*"); + assertCodeBasePropertyExpansion("/55555/../55555/-", + "/55555/../55555/-"); // test: relative paths - assertCodeBasePropertyExpansion("44444/*", "44444/-"); - assertCodeBasePropertyExpansion("55555/../55555/*", "55555/-"); - //FIXME assertCodeBasePropertyExpansion("66666/*", "66666/../66666/-"); + assertCodeBasePropertyExpansion("11111/*", "11111/-"); + assertCodeBasePropertyExpansion("22222/../22222/*", "22222/-"); + assertCodeBasePropertyExpansion("33333/*", "33333/../33333/-"); + assertCodeBasePropertyExpansion("44444/../44444/-", "44444/*"); + assertCodeBasePropertyExpansion("55555/../55555/-", + "55555/../55555/-"); } finally { - TestUtils.setSystemProperty(JAVA_SECURITY_POLICY, oldSysProp); + TestUtils.setSystemProperty(JAVA_SECURITY_POLICY, oldJavaPolicy); Policy.setPolicy(oldPolicy); } }