Changeset 429 for trunk/icedtea-web/tests/reproducers/signed/ReadPropertiesSigned

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.

Location:

trunk/icedtea-web/tests/reproducers/signed/ReadPropertiesSigned

Files:

• README (copied) (copied from branches/vendor/sourceforge/icedtea-web/1.5.1/tests/reproducers/signed/ReadPropertiesSigned/README )
• testcases/ReadPropertiesSignedTest.java (modified) (4 diffs)

trunk/icedtea-web/tests/reproducers/signed/ReadPropertiesSigned/testcases/ReadPropertiesSignedTest.java

@@ -36 +36 @@
  */
 
-
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import net.sourceforge.jnlp.ProcessResult;
 import net.sourceforge.jnlp.ServerAccess;
+
 import org.junit.Assert;
 import org.junit.Test;
@@ -54 +55 @@
     public void ReadSignedPropertiesWithoutPermissionsWithXtrustAll() throws Exception {
         //no request for permissions
-        ServerAccess.ProcessResult pr=server.executeJavawsHeadless(l,"/ReadPropertiesSigned1.jnlp");
+        ProcessResult pr=server.executeJavawsHeadless(l,"/ReadPropertiesSigned1.jnlp");
         Assert.assertTrue("Stderr should match "+accessMatcher+" but did not",pr.stderr.matches(accessMatcher));
         String ss="ClassNotFoundException";
         Assert.assertFalse("Stderr should not contains "+ss+" but did",pr.stderr.contains(ss));
-        Assert.assertTrue("stdout lenght should be <2 but was "+pr.stdout.length(),pr.stdout.length()<2); // /home/user or /root or eanything else :(
         Assert.assertFalse("should not be terminated but was",pr.wasTerminated);
         Assert.assertEquals((Integer)0, pr.returnValue);
@@ -66 +66 @@
     public void ReadSignedPropertiesWithPermissionsWithXtrustAll() throws Exception {
         //request for allpermissions
-        ServerAccess.ProcessResult pr=server.executeJavawsHeadless(l,"/ReadPropertiesSigned2.jnlp");
+        ProcessResult pr=server.executeJavawsHeadless(l,"/ReadPropertiesSigned2.jnlp");
         Assert.assertFalse("Stderr should NOT match "+accessMatcher+" but did",pr.stderr.matches(accessMatcher));
         String ss="ClassNotFoundException";
         Assert.assertFalse("Stderr should not contains "+ss+" but did",pr.stderr.contains(ss));
-        Assert.assertTrue("stdout lenght should be >= but was "+pr.stdout.length(),pr.stdout.length()>=4); // /home/user or /root or eanything else :(
         Assert.assertFalse("should not be terminated but was",pr.wasTerminated);
         Assert.assertEquals((Integer)0, pr.returnValue);
@@ -77 +76 @@
     @Test
     public void EnsureXtrustallNotAffectingUnsignedBehaviour() throws Exception {
-        ServerAccess.ProcessResult pr=server.executeJavawsHeadless(l,"/ReadProperties1.jnlp");
+        ProcessResult pr=server.executeJavawsHeadless(l,"/ReadProperties1.jnlp");
         Assert.assertTrue("Stderr should match "+accessMatcher+" but did not",pr.stderr.matches(accessMatcher));
         String ss="ClassNotFoundException";
         Assert.assertFalse("Stderr should not contains "+ss+" but did",pr.stderr.contains(ss));
-        Assert.assertFalse("stdout lenght should not be  >2 but was "+pr.stdout.length(),pr.stdout.length()>2);
         Assert.assertFalse("should not be terminated but was",pr.wasTerminated);
         Assert.assertEquals((Integer)0, pr.returnValue);
-        ServerAccess.ProcessResult pr2=server.executeJavawsHeadless(null,"/ReadProperties1.jnlp");
+        ProcessResult pr2=server.executeJavawsHeadless(null,"/ReadProperties1.jnlp");
         Assert.assertEquals(pr.stderr, pr2.stderr);
         Assert.assertEquals(pr.stdout, pr2.stdout);
-
     }
   }