Changeset 429 for trunk/icedtea-web/tests/reproducers/simple/AccessClassInPackage

Timestamp:

Sep 24, 2014, 9:34:21 PM (11 years ago)

Author:

dmik

Message:

icedtea-web: Merge version 1.5.1 from vendor to trunk.

File:

• trunk/icedtea-web/tests/reproducers/simple/AccessClassInPackage/testcases/AccessClassInPackageTest.java (modified) (11 diffs)

trunk/icedtea-web/tests/reproducers/simple/AccessClassInPackage/testcases/AccessClassInPackageTest.java

@@ -38 +38 @@
 import java.util.Arrays;
 import java.util.List;
+import net.sourceforge.jnlp.ProcessResult;
 import net.sourceforge.jnlp.ServerAccess;
-import net.sourceforge.jnlp.ServerAccess.ProcessResult;
+
 import org.junit.Assert;
-
 import org.junit.Test;
 
@@ -73 +73 @@
     private static final List<String> xta = Arrays.asList(new String[]{"-Xtrustall"});
 
-    private void testShouldFail(ServerAccess.ProcessResult pr, String s) {
+    private void testShouldFail(ProcessResult pr, String s) {
         String c = "(?s).*java.security.AccessControlException.{0,5}access denied.{0,5}java.lang.RuntimePermission.{0,5}" + s + ".*";
         Assert.assertTrue("stderr should match `" + c + "`, but didn't ", pr.stderr.matches(c));
     }
 
-    private void testShouldNOTFail(ServerAccess.ProcessResult pr, String s) {
+    private void testShouldNOTFail(ProcessResult pr, String s) {
         String c = "(?s).*java.security.AccessControlException.{0,5}access denied.{0,5}java.lang.RuntimePermission.{0,5}" + s + ".*";
         Assert.assertFalse("stderr should NOT match `" + c + "`, but did ", pr.stderr.matches(c));
@@ -90 +90 @@
     }
 
-    private void testShouldPass(ServerAccess.ProcessResult pr, String s) {
+    private void testShouldPass(ProcessResult pr, String s) {
         String c = "Class was obtained: " + s;
         Assert.assertTrue("stdout should contains `" + c + "`, but didn't ", pr.stdout.contains(c));
     }
 
-    private void testShouldNOTPass(ServerAccess.ProcessResult pr, String s) {
+    private void testShouldNOTPass(ProcessResult pr, String s) {
         String c = "Class was obtained: " + s;
         Assert.assertFalse("stdout should not contains `" + c + "`, but did ", pr.stdout.contains(c));
@@ -102 +102 @@
     @Test
     public void AccessClassInPackageJAVAXJNLP() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/" + files[0]);
+        ProcessResult pr = server.executeJavawsHeadless(null, "/" + files[0]);
         commonPitfall(pr);
         testShouldPass(pr, pass[0]);
@@ -110 +110 @@
     @Test
     public void AccessClassInPackageSELF() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/" + files[1]);
+        ProcessResult pr = server.executeJavawsHeadless(null, "/" + files[1]);
         commonPitfall(pr);
         testShouldPass(pr, pass[1]);
@@ -118 +118 @@
     @Test
     public void AccessClassInPackageNETSF() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/" + files[2]);
+        ProcessResult pr = server.executeJavawsHeadless(null, "/" + files[2]);
         commonPitfall(pr);
         testShouldFail(pr, badExceptions[2]);
@@ -126 +126 @@
     @Test
     public void AccessClassInPackageSUNSEC() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/" + files[3]);
+        ProcessResult pr = server.executeJavawsHeadless(null, "/" + files[3]);
         commonPitfall(pr);
         commonPitfall(pr);
@@ -136 +136 @@
     @Test
     public void AccessClassInPackageSignedJAVAXJNLP() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(xta, "/" + filesSigned[0]);
+        ProcessResult pr = server.executeJavawsHeadless(xta, "/" + filesSigned[0]);
         commonPitfall(pr);
         testShouldPass(pr, pass[0]);
@@ -144 +144 @@
     @Test
     public void AccessClassInPackageSignedSELF() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(xta, "/" + filesSigned[1]);
+        ProcessResult pr = server.executeJavawsHeadless(xta, "/" + filesSigned[1]);
         commonPitfall(pr);
         testShouldPass(pr, pass[1]);
@@ -152 +152 @@
     @Test
     public void AccessClassInPackageSignedNETSF() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(xta, "/" + filesSigned[2]);
+        ProcessResult pr = server.executeJavawsHeadless(xta, "/" + filesSigned[2]);
         commonPitfall(pr);
         testShouldPass(pr, pass[2]);
@@ -160 +160 @@
     @Test
     public void AccessClassInPackageSignedSUNSEC() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(xta, "/" + filesSigned[3]);
+        ProcessResult pr = server.executeJavawsHeadless(xta, "/" + filesSigned[3]);
         commonPitfall(pr);
         testShouldPass(pr, pass[3]);