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

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/simple/simpletest2

Files:

• srcs/SimpleTest2.java (modified) (2 diffs)
• testcases/SimpleTest2Test.java (modified) (3 diffs)

trunk/icedtea-web/tests/reproducers/simple/simpletest2/srcs/SimpleTest2.java

@@ +1 @@
+
+import java.applet.Applet;
+
 /* SimpleTest2.java
 Copyright (C) 2011 Red Hat, Inc.
@@ -36 +39 @@
  */
 
-public class SimpleTest2{
+public class SimpleTest2 extends Applet{
 
-    public static void main(String[] args){
-throw new RuntimeException("Correct exception");
+    public static void main(String[] args)  {
+      throw new RuntimeException("Correct exception");
+    }
 
+    @Override
+    public void init() {
+        System.out.println("applet was initialised");
     }
+
+    @Override
+    public void start() {
+        System.out.println("applet was started");
+        main(null);
+    }
+
+    @Override
+    public void stop() {
+        System.out.println("applet was stopped");
+    }
+
+    @Override
+    public void destroy() {
+        System.out.println("applet will be destroyed");
+    }
+
 }

trunk/icedtea-web/tests/reproducers/simple/simpletest2/testcases/SimpleTest2Test.java

@@ -36 +36 @@
  */
 
+import net.sourceforge.jnlp.ProcessResult;
 import net.sourceforge.jnlp.ServerAccess;
+
 import org.junit.Assert;
-
 import org.junit.Test;
 
@@ -48 +49 @@
     @Test
     public void testSimpletest2lunchException() throws Exception {
-        ServerAccess.ProcessResult pr=server.executeJavawsHeadless(null,"/simpletest2.jnlp");
-        Assert.assertTrue("stdout should be < 1 , but was "+pr.stdout.trim().length(),pr.stdout.trim().length() < 1);
+        ProcessResult pr=server.executeJavawsHeadless(null,"/simpletest2.jnlp");
         String s="Correct exception";
         Assert.assertTrue("stderr should contains "+s+" but didn't",pr.stderr.contains(s));
@@ -55 +55 @@
         Assert.assertTrue("stderr should contains "+ss+" but did not",pr.stderr.contains(ss));
         Assert.assertFalse("testSimpletest2lunchException should not be terminated, but was",pr.wasTerminated);
-        //Assert.assertFalse(0==pr.returnValue);exception and still returned 0?
     }