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

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/signed/ClasspathManifestTest/testcases/ClasspathManifestTest.java (modified) (8 diffs)

trunk/icedtea-web/tests/reproducers/signed/ClasspathManifestTest/testcases/ClasspathManifestTest.java

@@ -39 +39 @@
 import java.util.List;
 
+import net.sourceforge.jnlp.ProcessResult;
 import net.sourceforge.jnlp.ServerAccess;
-import net.sourceforge.jnlp.ServerAccess.ProcessResult;
-import net.sourceforge.jnlp.annotations.Bug;
 import net.sourceforge.jnlp.annotations.KnownToFail;
 import net.sourceforge.jnlp.annotations.NeedsDisplay;
@@ -51 +50 @@
 import org.junit.Test;
 
-@Bug(id = "PR975")
 public class ClasspathManifestTest extends BrowserTest {
 
@@ -79 +77 @@
         commands.add(ServerAccess.HEADLES_OPTION);
         commands.add("ClasspathManifestApplicationTest.jnlp");
-        ServerAccess.ProcessResult pr = ServerAccess.executeProcess(commands, server.getDir());
+        ProcessResult pr = ServerAccess.executeProcess(commands, server.getDir());
         checkAppFails(pr, "ApplicationJNLPLocalTest");
     }
@@ -86 +84 @@
     @Test
     public void AppletJNLPRemoteTest() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/ClasspathManifestAppletTest.jnlp");
+        ProcessResult pr = server.executeJavawsHeadless(null, "/ClasspathManifestAppletTest.jnlp");
         checkAppFails(pr, "AppletJNLPRemoteTest");
     }
@@ -98 +96 @@
         commands.add(ServerAccess.HEADLES_OPTION);
         commands.add("ClasspathManifestAppletTest.jnlp");
-        ServerAccess.ProcessResult pr = ServerAccess.executeProcess(commands, server.getDir());
+        ProcessResult pr = ServerAccess.executeProcess(commands, server.getDir());
         checkAppFails(pr, "AppletJNLPRLocalTest");
     }
@@ -106 +104 @@
     @Test
     public void BrowserJNLPHrefRemoteTest() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeBrowser("/ClasspathManifestJNLPHrefTest.html");
+        ProcessResult pr = server.executeBrowser("/ClasspathManifestJNLPHrefTest.html");
         checkAppFails(pr, "BrowserJNLPHrefRemoteTest");
     }
@@ -118 +116 @@
         commands.add(server.getBrowserLocation());
         commands.add("ClasspathManifestJNLPHrefTest.html");
-        ServerAccess.ProcessResult pr = ServerAccess.executeProcess(commands, server.getDir());
+        ProcessResult pr = ServerAccess.executeProcess(commands, server.getDir());
         checkAppFails(pr, "BrowserJNLPHrefLocalTest");
     }
@@ -126 +124 @@
     @Test
     public void BrowserAppletRemoteTest() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeBrowser("/ClasspathManifestAppletTest.html");
+        ProcessResult pr = server.executeBrowser("/ClasspathManifestAppletTest.html");
         Assert.assertTrue("ClasspathManifest.BrowserAppletRemoteTest stdout should contain " + s1 + " but didn't", pr.stdout.contains(s1));
         // Should be the only one to search manifest for classpath.
         Assert.assertTrue("ClasspathManifest.BrowserAppletRemoteTest stdout should contain " + s2 + " but didn't", pr.stdout.contains(s2));
-        Assert.assertFalse("ClasspathManifest.BrowserAppletRemoteTest stderr should not contain " + ss + " but did", pr.stderr.contains(ss));
     }
 }