[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openjdk-distro-pkg-dev
Subject:    /hg/icedtea-web: Added more tests MixedSigningAndTrustedOnly
From:       jvanek () icedtea ! classpath ! org
Date:       2015-08-26 5:52:42
Message-ID: hg.c87f010b8cf7.1440568362.8643924302249223276 () icedtea ! classpath ! org
[Download RAW message or body]

changeset c87f010b8cf7 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=c87f010b8cf7
author: Jiri Vanek <jvanek@redhat.com>
date: Tue Aug 25 18:52:07 2015 +0200

	Added more tests MixedSigningAndTrustedOnly


diffstat:

 ChangeLog                                                                            \
|   16 +  tests/reproducers/custom/MixedSigningAndTrustedOnly/srcs/MixedSigningAndTrustedOnlyClass1.java \
|   67 +-  tests/reproducers/custom/MixedSigningAndTrustedOnly/srcs/MixedSigningAndTrustedOnlyClass2.java \
|   62 +-  tests/reproducers/custom/MixedSigningAndTrustedOnly/testcases/MixedSigningAndTrustedOnly.java \
|  116 +++-  tests/reproducers/custom/MixedSigningAndTrustedOnly/testcases/MixedSigningAndTrustedOnlyBS1.java \
|   62 +-  tests/reproducers/custom/MixedSigningAndTrustedOnly/testcases/MixedSigningAndTrustedOnlyBSmanifest.java \
|   17 +-  tests/reproducers/custom/MixedSigningAndTrustedOnly/testcases/MixedSigningAndTrustedOnlyFSSU.java \
|  267 ++++++++++  7 files changed, 521 insertions(+), 86 deletions(-)

diffs (truncated from 927 to 500 lines):

diff -r 18e401faa1b9 -r c87f010b8cf7 ChangeLog
--- a/ChangeLog	Mon Aug 24 12:28:23 2015 -0400
+++ b/ChangeLog	Tue Aug 25 18:52:07 2015 +0200
@@ -1,3 +1,19 @@
+2015-08-25  Jiri Vanek  <jvanek@redhat.com>
+
+	Added more tests MixedSigningAndTrustedOnly
+	* tests/reproducers/custom/MixedSigningAndTrustedOnly/srcs/MixedSigningAndTrustedOnlyClass1.java
 +	modified to suite more compelx tests
+	* tests/reproducers/custom/MixedSigningAndTrustedOnly/srcs/MixedSigningAndTrustedOnlyClass2.java
 +	same
+	* tests/reproducers/custom/MixedSigningAndTrustedOnly/testcases/MixedSigningAndTrustedOnly.java
 +	same
+	* tests/reproducers/custom/MixedSigningAndTrustedOnly/testcases/MixedSigningAndTrustedOnlyBS1.java
 +	adapted to MixedSigningAndTrustedOnly
+	* tests/reproducers/custom/MixedSigningAndTrustedOnly/testcases/MixedSigningAndTrustedOnlyBSmanifest.java
 +	same
+	* tests/reproducers/custom/MixedSigningAndTrustedOnly/testcases/MixedSigningAndTrustedOnlyFSSU.java:
 +	new file to test signed_>unsigned and unsigned->signed calls behaviors. First on \
classpath is signed +
 2015-08-19  Andrew Azores  <aazores@redhat.com>
 
 	PolicyEditor dies given invalid -codebase -signedby or -principals arguments
diff -r 18e401faa1b9 -r c87f010b8cf7 \
tests/reproducers/custom/MixedSigningAndTrustedOnly/srcs/MixedSigningAndTrustedOnlyClass1.java
                
--- a/tests/reproducers/custom/MixedSigningAndTrustedOnly/srcs/MixedSigningAndTrustedOnlyClass1.java	Mon \
                Aug 24 12:28:23 2015 -0400
+++ b/tests/reproducers/custom/MixedSigningAndTrustedOnly/srcs/MixedSigningAndTrustedOnlyClass1.java	Tue \
Aug 25 18:52:07 2015 +0200 @@ -40,8 +40,8 @@
 
 public class MixedSigningAndTrustedOnlyClass1 extends Applet {
 
-    private static final String ID1 = "MixedSigningAndTrustedOnlyClass1";
-    private static final String ID2 = "MixedSigningAndTrustedOnlyClass2";
+    private static final String ID_THIS = "MixedSigningAndTrustedOnlyClass1";
+    private static final String ID_REMOTE = "MixedSigningAndTrustedOnlyClass2";
 
     public static void main(String[] args) {
         runBody(args);
@@ -56,7 +56,7 @@
 
     private static void runBody(String... commands) {
         try {
-            System.out.println(ID1 + " running");
+            System.out.println(ID_THIS + " running");
             System.out.println("params: " + Arrays.toString(commands));
             boolean canDie = true;
             for (String command : commands) {
@@ -68,17 +68,17 @@
                         case "cantDie":
                             canDie = false;
                             break;
-                        case ID1 + "_Normal":
-                            doNormal();
+                        case ID_THIS + "_Normal":
+                            doNormalLocal();
                             break;
-                        case ID1 + "_Restricted":
-                            doRestrictedAction();
+                        case ID_THIS + "_Restricted":
+                            doRestrictedActionLocal();
                             break;
-                        case ID2 + "_Normal":
-                            MixedSigningAndTrustedOnlyClass2.doNormal();
+                        case ID_REMOTE + "_Normal":
+                            MixedSigningAndTrustedOnlyClass2.doNormalRemote();
                             break;
-                        case ID2 + "_Restricted":
-                            MixedSigningAndTrustedOnlyClass2.doRestrictedAction();
+                        case ID_REMOTE + "_Restricted":
+                            \
MixedSigningAndTrustedOnlyClass2.doRestrictedActionlRemote();  break;
 
                     }
@@ -91,20 +91,55 @@
                 }
             }
         } finally {
+            System.err.flush();
+            System.out.flush();
             System.out.println("*** APPLET FINISHED ***");
             System.out.flush();
             System.out.println("some garbage forcing to flush");
             System.out.flush();
+            System.err.println("some garbage forcing to flush");
+            System.err.flush();
         }
     }
 
-    public static void doRestrictedAction() {
-        System.out.println(System.getProperty("user.home"));
-        System.out.println(ID1 + " Property read");
+    private static void doRestrictedAction() {
+        String a = System.getProperty("user.home");
+        System.out.println(ID_THIS + " Property read");
+        System.out.println(a);
+        System.out.flush();
     }
 
-    public static void doNormal() {
-        System.out.println(ID1 + " confirmed");
+    private static void doNormal() {
+        System.out.println(ID_THIS + " confirmed");
+        System.out.flush();
+    }
+
+    private static final String REMOTE_CALL = "RemoteCall - ";
+    private static final String LOCAL_CALL = "LocalCall - ";
+    
+    public static void doNormalRemote() {
+        System.out.print(REMOTE_CALL);
+        doNormal();
+        System.out.flush();
+    }
+    
+    private static void doNormalLocal() {
+        System.out.print(LOCAL_CALL);
+        doNormal();
+        System.out.flush();
+    }
+    
+    
+     public static void doRestrictedActionlRemote() {
+        System.out.print(REMOTE_CALL);
+        doRestrictedAction();
+        System.out.flush();
+    }
+    
+    private static void doRestrictedActionLocal() {
+        System.out.print(LOCAL_CALL);
+        doRestrictedAction();
+        System.out.flush();
     }
 
 }
diff -r 18e401faa1b9 -r c87f010b8cf7 \
tests/reproducers/custom/MixedSigningAndTrustedOnly/srcs/MixedSigningAndTrustedOnlyClass2.java
                
--- a/tests/reproducers/custom/MixedSigningAndTrustedOnly/srcs/MixedSigningAndTrustedOnlyClass2.java	Mon \
                Aug 24 12:28:23 2015 -0400
+++ b/tests/reproducers/custom/MixedSigningAndTrustedOnly/srcs/MixedSigningAndTrustedOnlyClass2.java	Tue \
Aug 25 18:52:07 2015 +0200 @@ -40,8 +40,8 @@
  */
 public class MixedSigningAndTrustedOnlyClass2 extends Applet {
 
-    private static final String ID1 = "MixedSigningAndTrustedOnlyClass2";
-    private static final String ID2 = "MixedSigningAndTrustedOnlyClass1";
+    private static final String ID_THIS = "MixedSigningAndTrustedOnlyClass2";
+    private static final String ID_REMOTE = "MixedSigningAndTrustedOnlyClass1";
 
     public static void main(String[] args) {
         runBody(args);
@@ -56,7 +56,7 @@
 
     private static void runBody(String... commands) {
         try {
-            System.out.println(ID1 + " running");
+            System.out.println(ID_THIS + " running");
             System.out.println("params: " + Arrays.toString(commands));
             boolean canDie = true;
             for (String command : commands) {
@@ -68,17 +68,17 @@
                         case "cantDie":
                             canDie = false;
                             break;
-                        case ID1 + "_Normal":
-                            doNormal();
+                        case ID_THIS + "_Normal":
+                            doNormalLocal();
                             break;
-                        case ID1 + "_Restricted":
-                            doRestrictedAction();
+                        case ID_THIS + "_Restricted":
+                            doRestrictedActionLocal();
                             break;
-                        case ID2 + "_Normal":
-                            MixedSigningAndTrustedOnlyClass1.doNormal();
+                        case ID_REMOTE + "_Normal":
+                            MixedSigningAndTrustedOnlyClass1.doNormalRemote();
                             break;
-                        case ID2 + "_Restricted":
-                            MixedSigningAndTrustedOnlyClass1.doRestrictedAction();
+                        case ID_REMOTE + "_Restricted":
+                            \
MixedSigningAndTrustedOnlyClass1.doRestrictedActionlRemote();  break;
 
                     }
@@ -98,13 +98,43 @@
         }
     }
 
-    public static void doRestrictedAction() {
-        System.out.println(System.getProperty("user.home"));
-        System.out.println(ID1 + " Property read");
+    private static void doRestrictedAction() {
+        String a = System.getProperty("user.home");
+        System.out.println(ID_THIS + " Property read");
+        System.out.println(a);
+        System.out.flush();
     }
 
-    public static void doNormal() {
-        System.out.println(ID1 + " confirmed");
+    private  static void doNormal() {
+        System.out.println(ID_THIS + " confirmed");
+        System.out.flush();
+    }
+    
+    private static final String REMOTE_CALL = "RemoteCall - ";
+    private static final String LOCAL_CALL = "LocalCall - ";
+    
+    public static void doNormalRemote() {
+        System.out.print(REMOTE_CALL);
+        doNormal();
+        System.out.flush();
+    }
+    
+    private static void doNormalLocal() {
+        System.out.print(LOCAL_CALL);
+        doNormal();
+        System.out.flush();
+    }
+    
+     public static void doRestrictedActionlRemote() {
+        System.out.print(REMOTE_CALL);
+        doRestrictedAction();
+        System.out.flush();
+    }
+    
+    private static void doRestrictedActionLocal() {
+        System.out.print(LOCAL_CALL);
+        doRestrictedAction();
+        System.out.flush();
     }
 
 }
diff -r 18e401faa1b9 -r c87f010b8cf7 \
tests/reproducers/custom/MixedSigningAndTrustedOnly/testcases/MixedSigningAndTrustedOnly.java
                
--- a/tests/reproducers/custom/MixedSigningAndTrustedOnly/testcases/MixedSigningAndTrustedOnly.java	Mon \
                Aug 24 12:28:23 2015 -0400
+++ b/tests/reproducers/custom/MixedSigningAndTrustedOnly/testcases/MixedSigningAndTrustedOnly.java	Tue \
Aug 25 18:52:07 2015 +0200 @@ -34,8 +34,10 @@
  obligated to do so.  If you do not wish to do so, delete this
  exception statement from your version.
  */
+//package MixedSigningAndTrustedOnlyPackage;
 package MixedSigningAndTrustedOnlyPackage;
 
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -57,6 +59,7 @@
 
     static List<String> HEADLESS = Arrays.asList(new \
                String[]{OptionsDefinitions.OPTIONS.HEADLESS.option});
     static List<String> HTML = Arrays.asList(new \
String[]{OptionsDefinitions.OPTIONS.HTML.option}); +    static List<String> verbose = \
Arrays.asList(new String[]{OptionsDefinitions.OPTIONS.VERBOSE.option});  
     public static final String PREFIX = "MixedSigningAndTrustedOnly";
     public static final String C1 = "Class1";
@@ -64,10 +67,17 @@
 
     static final String ID11 = PREFIX + C1;
     static final String ID12 = PREFIX + C2;
-    static final String ID21 = PREFIX + C2;
-    static final String ID22 = PREFIX + C1;
+    static final String ID21 = PREFIX + C1;
+    static final String ID22 = PREFIX + C2;
+
+    static final String RUNNING = " running"; //note the space
+    static final String RUNNING1 = ID11 + RUNNING;
+    static final String RUNNING2 = ID22 + RUNNING;
+
     static final String RESTRICTED_CONFIRM_SUFFIX = " Property read"; //note the \
space  static final String NORMAL_CONFIRM_SUFFIX = " confirmed"; //same
+    static final String REMOTE_PREFIX = "RemoteCall - "; //note the space
+    static final String LOCAL_PREFIX = "LocalCall - "; //note the space
 
     static final String RESTRICTED11 = ID11 + RESTRICTED_CONFIRM_SUFFIX;
     static final String NORMAL11 = ID11 + NORMAL_CONFIRM_SUFFIX;
@@ -299,17 +309,58 @@
         Assert.assertEquals("<jar href=\"archive1\" />\n<jar href=\"archive2\" \
main=\"true\" />\n<jar href=\"archive3\" />", c4.toString());  }
 
-    static void assertAllOk(ProcessResult pr) {
-        Assert.assertTrue(pr.stdout.contains(NORMAL11));
-        Assert.assertTrue(pr.stdout.contains(NORMAL12));
-        Assert.assertTrue(pr.stdout.contains(NORMAL21));
-        Assert.assertTrue(pr.stdout.contains(NORMAL22));
-        Assert.assertTrue(pr.stdout.contains(RESTRICTED11));
-        Assert.assertTrue(pr.stdout.contains(RESTRICTED12));
-        Assert.assertTrue(pr.stdout.contains(RESTRICTED21));
-        Assert.assertTrue(pr.stdout.contains(RESTRICTED22));
+    static void assertAllOkC1(ProcessResult pr) {
+        Assert.assertTrue(pr.stdout.contains(RUNNING1));
+        Assert.assertFalse(pr.stdout.contains(RUNNING2));
+        Assert.assertTrue(pr.stdout.contains(LOCAL_PREFIX + NORMAL11));
+        Assert.assertTrue(pr.stdout.contains(REMOTE_PREFIX + NORMAL12));
+        Assert.assertTrue(pr.stdout.contains(LOCAL_PREFIX + RESTRICTED11));
+        Assert.assertTrue(pr.stdout.contains(REMOTE_PREFIX + RESTRICTED12));
     }
 
+    static void assertAllOkC2(ProcessResult pr) {
+        Assert.assertTrue(pr.stdout.contains(RUNNING2));
+        Assert.assertFalse(pr.stdout.contains(RUNNING1));
+        Assert.assertTrue(pr.stdout.contains(LOCAL_PREFIX + NORMAL22));
+        Assert.assertTrue(pr.stdout.contains(REMOTE_PREFIX + NORMAL21));
+        Assert.assertTrue(pr.stdout.contains(LOCAL_PREFIX + RESTRICTED22));
+        Assert.assertTrue(pr.stdout.contains(REMOTE_PREFIX + RESTRICTED21));
+    }
+
+    static void assertC1C1okTransNotOk(ProcessResult pr) {
+        Assert.assertFalse(pr.stdout.contains(RUNNING2));
+        Assert.assertTrue(pr.stdout.contains(RUNNING1));
+        Assert.assertTrue(pr.stdout.contains(LOCAL_PREFIX + NORMAL11));
+        Assert.assertTrue(pr.stdout.contains(LOCAL_PREFIX + RESTRICTED11));
+        Assert.assertFalse(pr.stdout.contains(REMOTE_PREFIX));
+    }
+    
+     static void assertC2C2okTransNotOk(ProcessResult pr) {
+        Assert.assertTrue(pr.stdout.contains(RUNNING2));
+        Assert.assertFalse(pr.stdout.contains(RUNNING1));
+        Assert.assertTrue(pr.stdout.contains(LOCAL_PREFIX + NORMAL22));
+        Assert.assertTrue(pr.stdout.contains(LOCAL_PREFIX + RESTRICTED22));
+        Assert.assertFalse(pr.stdout.contains(REMOTE_PREFIX));
+    }
+    
+    
+    static void assertC1C1OnlyUnrestrictedokTransNotOk(ProcessResult pr) {
+        Assert.assertFalse(pr.stdout.contains(RUNNING2));
+        Assert.assertTrue(pr.stdout.contains(RUNNING1));
+        Assert.assertTrue(pr.stdout.contains(LOCAL_PREFIX + NORMAL11));
+        Assert.assertFalse(pr.stdout.contains(LOCAL_PREFIX + RESTRICTED11));
+        Assert.assertFalse(pr.stdout.contains(REMOTE_PREFIX));
+    }
+    
+    static void assertC2C2OnlyUnrestrictedokTransNotOk(ProcessResult pr) {
+        Assert.assertTrue(pr.stdout.contains(RUNNING2));
+        Assert.assertFalse(pr.stdout.contains(RUNNING1));
+        Assert.assertTrue(pr.stdout.contains(LOCAL_PREFIX + NORMAL22));
+        Assert.assertFalse(pr.stdout.contains(LOCAL_PREFIX + RESTRICTED22));
+        Assert.assertFalse(pr.stdout.contains(REMOTE_PREFIX));
+    }
+
+
     //mostly useless, all tests are killed
     static void assertProcessOk(ProcessResult pr) {
         Assert.assertEquals(0, pr.returnValue.intValue());
@@ -320,22 +371,49 @@
         Assert.assertNotEquals(0, pr.returnValue.intValue());
     }
 
-    static void assertAllButRestricted(ProcessResult pr) {
-        Assert.assertTrue(pr.stdout.contains(NORMAL11));
-        Assert.assertTrue(pr.stdout.contains(NORMAL12));
-        Assert.assertTrue(pr.stdout.contains(NORMAL21));
-        Assert.assertTrue(pr.stdout.contains(NORMAL22));
+    static void assertAllButRestrictedC1(ProcessResult pr) {
+        Assert.assertTrue(pr.stdout.contains(RUNNING1));
+        Assert.assertTrue(pr.stdout.contains(LOCAL_PREFIX + NORMAL11));
+        Assert.assertTrue(pr.stdout.contains(REMOTE_PREFIX + NORMAL12));
+        assertNotRestricted(pr);
+    }
+
+    static void assertAllButRestrictedC2(ProcessResult pr) {
+        Assert.assertTrue(pr.stdout.contains(RUNNING2));
+        Assert.assertTrue(pr.stdout.contains(REMOTE_PREFIX + NORMAL21));
+        Assert.assertTrue(pr.stdout.contains(LOCAL_PREFIX + NORMAL22));
+        assertNotRestricted(pr);
+    }
+
+    static void assertNotRestricted(ProcessResult pr) {
         Assert.assertFalse(pr.stdout.contains(RESTRICTED11));
         Assert.assertFalse(pr.stdout.contains(RESTRICTED12));
         Assert.assertFalse(pr.stdout.contains(RESTRICTED21));
         Assert.assertFalse(pr.stdout.contains(RESTRICTED22));
     }
-    
+
     static void assertLaunchException(ProcessResult pr) {
         Assert.assertTrue(pr.stderr.contains("net.sourceforge.jnlp.LaunchException"));
  }
-    
-     static void assertNone(ProcessResult pr) {
+    static void assertInitError(ProcessResult pr) {
+        Assert.assertTrue(pr.stderr.contains("Fatal: Initialization Error"));
+    }
+
+    static void assertSecurityException(ProcessResult pr) {
+        Assert.assertTrue(pr.stderr.contains("java.lang.SecurityException"));
+    }
+
+    static void assertAccessControlException(ProcessResult pr) {
+        Assert.assertTrue(pr.stderr.contains("java.security.AccessControlException"));
 +    }
+
+    static void assertAccessDenied(ProcessResult pr) {
+        Assert.assertTrue(pr.stderr.contains("access denied"));
+    }
+
+    static void assertNone(ProcessResult pr) {
+        Assert.assertFalse(pr.stdout.contains(RUNNING1));
+        Assert.assertFalse(pr.stdout.contains(RUNNING2));
         Assert.assertFalse(pr.stdout.contains(NORMAL11));
         Assert.assertFalse(pr.stdout.contains(NORMAL12));
         Assert.assertFalse(pr.stdout.contains(NORMAL21));
diff -r 18e401faa1b9 -r c87f010b8cf7 \
tests/reproducers/custom/MixedSigningAndTrustedOnly/testcases/MixedSigningAndTrustedOnlyBS1.java
                
--- a/tests/reproducers/custom/MixedSigningAndTrustedOnly/testcases/MixedSigningAndTrustedOnlyBS1.java	Mon \
                Aug 24 12:28:23 2015 -0400
+++ b/tests/reproducers/custom/MixedSigningAndTrustedOnly/testcases/MixedSigningAndTrustedOnlyBS1.java	Tue \
Aug 25 18:52:07 2015 +0200 @@ -34,6 +34,7 @@
  obligated to do so.  If you do not wish to do so, delete this
  exception statement from your version.
  */
+//package MixedSigningAndTrustedOnlyPackage;
 package MixedSigningAndTrustedOnlyPackage;
 
 import net.sourceforge.jnlp.ProcessResult;
@@ -53,27 +54,27 @@
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 
-
 /**
- * 
- * Very simple tests. Basic behavior. jnlp and html with single signed jar, no \
                trusted-only  manifest 
- * note - this file is declared to be in package, but directory is wrong. Itw \
reproducers engine needs it like it, but your ide may complain. Try to live with. \
Sorry + *
+ * Very simple tests. Basic behavior. jnlp and html with single signed jar, no
+ * trusted-only manifest note - this file is declared to be in package, but
+ * directory is wrong. Itw reproducers engine needs it like it, but your ide may
+ * complain. Try to live with. Sorry
  */
 public class MixedSigningAndTrustedOnlyBS1 extends BrowserTest {
 
+    private static DeploymentPropertiesModifier q;
 
-    private static DeploymentPropertiesModifier q;
-    
     @BeforeClass
-    public static void setDeploymentProperties() throws IOException{
+    public static void setDeploymentProperties() throws IOException {
         q = setDeploymentPropertiesImpl();
     }
-    
+
     @AfterClass
-    public static void resetDeploymentProperties() throws IOException{
+    public static void resetDeploymentProperties() throws IOException {
         q.restoreProperties();
     }
-    
+
     @NeedsDisplay
     @Test
     @TestInBrowsers(testIn = {Browsers.one})
@@ -81,16 +82,16 @@
         String file = prepareFile(FileType.HTML, C1, new Archives[]{BS},
                 new String[]{COMMAND_C1_NORMAL, COMMAND_C2_NORMAL, \
                COMMAND_C1_RESTRICT, COMMAND_C2_RESTRICT}, false);
         ProcessResult pr = server.executeBrowser(file, AutoClose.CLOSE_ON_BOTH);
-        assertAllOk(pr);
+        assertAllOkC1(pr);
     }
-    
+
     @NeedsDisplay
     @Test
     public void jnlpHtmlC1AllCommandsBS() throws Exception {
         String file = prepareFile(FileType.HTML, C1, new Archives[]{BS},
                 new String[]{COMMAND_C1_NORMAL, COMMAND_C2_NORMAL, \
                COMMAND_C1_RESTRICT, COMMAND_C2_RESTRICT}, false);
         ProcessResult pr = server.executeJavaws(HTML, file, new \
                AutoOkClosingListener(), new AutoErrorClosingListener());
-        assertAllOk(pr);
+        assertAllOkC1(pr);
     }
 
     @Test
@@ -98,7 +99,9 @@
         String file = prepareFile(FileType.JNLP_APP, C1, new Archives[]{BS},
                 new String[]{COMMAND_C1_NORMAL, COMMAND_C2_NORMAL, \
                COMMAND_C1_RESTRICT, COMMAND_C2_RESTRICT}, false);
         ProcessResult pr = server.executeJavaws(HEADLESS, file, new \
                AutoOkClosingListener(), new AutoErrorClosingListener());
-        assertAllButRestricted(pr);
+        assertAllButRestrictedC1(pr);
+        assertLaunchException(pr);
+        assertAccessDenied(pr);
     }
 
     @Test
@@ -106,8 +109,10 @@
     public void jnlpAppletC1AllCommandsBSnosec() throws Exception {
         String file = prepareFile(FileType.JNLP_APPLET, C1, new Archives[]{BS},
                 new String[]{COMMAND_C1_NORMAL, COMMAND_C2_NORMAL, \
                COMMAND_C1_RESTRICT, COMMAND_C2_RESTRICT}, false);
-        ProcessResult pr = server.executeJavaws(file, new AutoOkClosingListener(), \
                new AutoErrorClosingListener());
-        assertAllButRestricted(pr);
+        ProcessResult pr = server.executeJavaws(verbose, file, new \
AutoOkClosingListener(), new AutoErrorClosingListener()); +        \
assertAllButRestrictedC1(pr); +        assertAccessControlException(pr);
+        assertAccessDenied(pr);
     }
 
     @Test
@@ -115,7 +120,7 @@
         String file = prepareFile(FileType.JNLP_APP, C1, new Archives[]{BS},
                 new String[]{COMMAND_C1_NORMAL, COMMAND_C2_NORMAL, \
                COMMAND_C1_RESTRICT, COMMAND_C2_RESTRICT}, true);
         ProcessResult pr = server.executeJavaws(HEADLESS, file, new \
                AutoOkClosingListener(), new AutoErrorClosingListener());
-        assertAllOk(pr);
+        assertAllOkC1(pr);
     }
 


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic