Mercurial > hg > release > icedtea-web-1.6

changeset 1173:ef028348584e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minor tweeks to gifar reproducers
author Jiri Vanek <jvanek@redhat.com>
date Fri, 13 Mar 2015 15:58:04 +0100
parents 9caff6cc3aaa
children ca12027fa85b
files ChangeLog tests/reproducers/signed/GifarBase/resources/gifar_application.jnlp tests/reproducers/signed/GifarBase/srcs/GifarMain.java tests/reproducers/signed/GifarBase/testcases/GifarTestcases.java tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java
diffstat 5 files changed, 16 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Mar 10 15:01:29 2015 +0100
+++ b/ChangeLog	Fri Mar 13 15:58:04 2015 +0100
@@ -1,3 +1,13 @@
+2015-03-13  Jiri Vanek  <jvanek@redhat.com>
+
+	* tests/reproducers/signed/GifarBase/resources/gifar_application.jnlp: removed
+	dangling element
+	* tests/reproducers/signed/GifarBase/srcs/GifarMain.java: formating
+	* tests/reproducers/signed/GifarBase/testcases/GifarTestcases.java: used
+	constants instead of hardcoded values
+	* tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java: same
+
+
 2015-03-10  Jiri Vanek  <jvanek@redhat.com>
 
 	Fixed locale tests
--- a/tests/reproducers/signed/GifarBase/resources/gifar_application.jnlp	Tue Mar 10 15:01:29 2015 +0100
+++ b/tests/reproducers/signed/GifarBase/resources/gifar_application.jnlp	Fri Mar 13 15:58:04 2015 +0100
@@ -55,6 +55,3 @@
     <argument>Gifar.jar</argument>
   </application-desc>
 </jnlp>
-
-
-</applet-desc>
--- a/tests/reproducers/signed/GifarBase/srcs/GifarMain.java	Tue Mar 10 15:01:29 2015 +0100
+++ b/tests/reproducers/signed/GifarBase/srcs/GifarMain.java	Fri Mar 13 15:58:04 2015 +0100
@@ -186,7 +186,7 @@
         System.out.println("gifar will be destroyed");
     }
 
-    public static void main(String args[]) {
+   public static void main(String[] args){
         final JFrame f = new JFrame();
         f.setLayout(new BorderLayout());
         f.setSize(250, 200);
--- a/tests/reproducers/signed/GifarBase/testcases/GifarTestcases.java	Tue Mar 10 15:01:29 2015 +0100
+++ b/tests/reproducers/signed/GifarBase/testcases/GifarTestcases.java	Fri Mar 13 15:58:04 2015 +0100
@@ -42,6 +42,7 @@
 import java.util.List;
 import javax.imageio.ImageIO;
 import net.sourceforge.jnlp.ClosingListener;
+import net.sourceforge.jnlp.OptionsDefinitions;
 import net.sourceforge.jnlp.ProcessResult;
 import net.sourceforge.jnlp.ServerAccess;
 import net.sourceforge.jnlp.annotations.NeedsDisplay;
@@ -57,8 +58,8 @@
 
 public class GifarTestcases extends BrowserTest {
 
-    List<String> trustIgnore = Arrays.asList(new String[]{ServerAccess.HEADLES_OPTION, "-Xtrustall", "-Xignoreheaders"});
-    List<String> trust = Arrays.asList(new String[]{ServerAccess.HEADLES_OPTION, "-Xtrustall"});
+    List<String> trustIgnore = Arrays.asList(new String[]{ServerAccess.HEADLES_OPTION, OptionsDefinitions.OPTIONS.TRUSTALL.option, OptionsDefinitions.OPTIONS.NOHEADERS.option});
+    List<String> trust = Arrays.asList(new String[]{ServerAccess.HEADLES_OPTION, OptionsDefinitions.OPTIONS.TRUSTALL.option});
     RulesFolowingClosingListener.ContainsRule exceptionRule = new RulesFolowingClosingListener.ContainsRule(InvalidJarHeaderException.class.getName());
     RulesFolowingClosingListener.ContainsRule okRule = new RulesFolowingClosingListener.ContainsRule("Image loaded");
     RulesFolowingClosingListener.ContainsRule sucideRule = new RulesFolowingClosingListener.ContainsRule("gifar killing himself");
--- a/tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java	Tue Mar 10 15:01:29 2015 +0100
+++ b/tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java	Fri Mar 13 15:58:04 2015 +0100
@@ -160,8 +160,8 @@
         findPortTestingSocket.close();
         return port;
     }
-    public static final  String HEADLES_OPTION="-headless";
-    public static final  String VERBOSE_OPTION="-verbose";
+    public static final  String HEADLES_OPTION=OptionsDefinitions.OPTIONS.HEADLESS.option;
+    public static final  String VERBOSE_OPTION=OptionsDefinitions.OPTIONS.VERBOSE.option;
 
     /**
      * we would like to have an singleton instance ASAP