changeset 1279:bbab18a43972

Added more asserts to MixedSigningAndTrustedOnly tests * tests/reproducers/custom/MixedSigningAndTrustedOnly/testcases/MixedSigningAndTrustedOnlyBS1.java * tests/reproducers/custom/MixedSigningAndTrustedOnly/testcases/MixedSigningAndTrustedOnlyBSmanifest.java
author Jiri Vanek <jvanek@redhat.com>
date Thu, 30 Jul 2015 18:51:00 +0200
parents efb1342a55aa
children 09792ebffb27
files ChangeLog tests/reproducers/custom/MixedSigningAndTrustedOnly/testcases/MixedSigningAndTrustedOnlyBS1.java tests/reproducers/custom/MixedSigningAndTrustedOnly/testcases/MixedSigningAndTrustedOnlyBSmanifest.java
diffstat 3 files changed, 21 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Jul 30 12:39:58 2015 -0400
+++ b/ChangeLog	Thu Jul 30 18:51:00 2015 +0200
@@ -1,3 +1,9 @@
+2015-07-30  Jiri Vanek  <jvanek@redhat.com>
+
+	Added more asserts to MixedSigningAndTrustedOnly tests
+	* tests/reproducers/custom/MixedSigningAndTrustedOnly/testcases/MixedSigningAndTrustedOnlyBS1.java
+	* tests/reproducers/custom/MixedSigningAndTrustedOnly/testcases/MixedSigningAndTrustedOnlyBSmanifest.java
+
 2015-07-30  Andrew Azores  <aazores@redhat.com>
 
 	Add -defaultfile switch to PolicyEditor
--- a/tests/reproducers/custom/MixedSigningAndTrustedOnly/testcases/MixedSigningAndTrustedOnlyBS1.java	Thu Jul 30 12:39:58 2015 -0400
+++ b/tests/reproducers/custom/MixedSigningAndTrustedOnly/testcases/MixedSigningAndTrustedOnlyBS1.java	Thu Jul 30 18:51:00 2015 +0200
@@ -57,6 +57,7 @@
 /**
  * 
  * Very simple tests. Basic behavior. jnlp and html with single signed jar, no trusted-only  manifest 
+ * note - this file is declared to be in package, but directory is wrong. Itw reproducers engine needs it like it, but your ide may complain. Try to live with. Sorry
  */
 public class MixedSigningAndTrustedOnlyBS1 extends BrowserTest {
 
@@ -114,6 +115,7 @@
         String file = prepareFile(FileType.JNLP_APP, C1, new Archives[]{BS},
                 new String[]{COMMAND_C1_NORMAL, COMMAND_C2_NORMAL, COMMAND_C1_RESTRICT, COMMAND_C2_RESTRICT}, true);
         ProcessResult pr = server.executeJavaws(HEADLESS, file, new AutoOkClosingListener(), new AutoErrorClosingListener());
+        assertAllOk(pr);
     }
 
     @Test
@@ -122,6 +124,7 @@
         String file = prepareFile(FileType.JNLP_APPLET, C1, new Archives[]{BS},
                 new String[]{COMMAND_C1_NORMAL, COMMAND_C2_NORMAL, COMMAND_C1_RESTRICT, COMMAND_C2_RESTRICT}, true);
         ProcessResult pr = server.executeJavaws(file, new AutoOkClosingListener(), new AutoErrorClosingListener());
+        assertAllOk(pr);
     }
 
     @NeedsDisplay
@@ -131,6 +134,7 @@
         String file = prepareFile(FileType.HTML, C2, new Archives[]{BS},
                 new String[]{COMMAND_C1_NORMAL, COMMAND_C2_NORMAL, COMMAND_C1_RESTRICT, COMMAND_C2_RESTRICT}, false);
         ProcessResult pr = server.executeBrowser(file, AutoClose.CLOSE_ON_BOTH);
+        assertAllOk(pr);
     }
     
     @NeedsDisplay
@@ -139,6 +143,7 @@
         String file = prepareFile(FileType.HTML, C2, new Archives[]{BS},
                 new String[]{COMMAND_C1_NORMAL, COMMAND_C2_NORMAL, COMMAND_C1_RESTRICT, COMMAND_C2_RESTRICT}, false);
         ProcessResult pr = server.executeJavaws(HTML, file, new AutoOkClosingListener(), new AutoErrorClosingListener());
+        assertAllOk(pr);
     }
 
     @Test
@@ -163,6 +168,7 @@
         String file = prepareFile(FileType.JNLP_APP, C2, new Archives[]{BS},
                 new String[]{COMMAND_C1_NORMAL, COMMAND_C2_NORMAL, COMMAND_C1_RESTRICT, COMMAND_C2_RESTRICT}, true);
         ProcessResult pr = server.executeJavaws(HEADLESS, file, new AutoOkClosingListener(), new AutoErrorClosingListener());
+        assertAllOk(pr);
     }
 
     @Test
@@ -171,6 +177,7 @@
         String file = prepareFile(FileType.JNLP_APPLET, C2, new Archives[]{BS},
                 new String[]{COMMAND_C1_NORMAL, COMMAND_C2_NORMAL, COMMAND_C1_RESTRICT, COMMAND_C2_RESTRICT}, true);
         ProcessResult pr = server.executeJavaws(file, new AutoOkClosingListener(), new AutoErrorClosingListener());
+        assertAllOk(pr);
     }
 
 
--- a/tests/reproducers/custom/MixedSigningAndTrustedOnly/testcases/MixedSigningAndTrustedOnlyBSmanifest.java	Thu Jul 30 12:39:58 2015 -0400
+++ b/tests/reproducers/custom/MixedSigningAndTrustedOnly/testcases/MixedSigningAndTrustedOnlyBSmanifest.java	Thu Jul 30 18:51:00 2015 +0200
@@ -56,7 +56,8 @@
 
 /**
  * 
- * Very simple tests. Basic behavior. jnlp and html with single signed jar, no trusted-only  manifest 
+ * Very simple tests. Basic behavior. jnlp and html with single signed jar, trusted-only   in manifest 
+ * note - this file is declared to be in package, but directory is wrong. Itw reproducers engine needs it like it, but your ide may complain. Try to live with. Sorry
  */
 public class MixedSigningAndTrustedOnlyBSmanifest extends BrowserTest {
 
@@ -118,6 +119,7 @@
         String file = prepareFile(FileType.JNLP_APP, C1, new Archives[]{BSM},
                 new String[]{COMMAND_C1_NORMAL, COMMAND_C2_NORMAL, COMMAND_C1_RESTRICT, COMMAND_C2_RESTRICT}, true);
         ProcessResult pr = server.executeJavaws(HEADLESS, file, new AutoOkClosingListener(), new AutoErrorClosingListener());
+        assertAllOk(pr);
     }
 
     @Test
@@ -126,6 +128,7 @@
         String file = prepareFile(FileType.JNLP_APPLET, C1, new Archives[]{BSM},
                 new String[]{COMMAND_C1_NORMAL, COMMAND_C2_NORMAL, COMMAND_C1_RESTRICT, COMMAND_C2_RESTRICT}, true);
         ProcessResult pr = server.executeJavaws(file, new AutoOkClosingListener(), new AutoErrorClosingListener());
+        assertAllOk(pr);
     }
 
     @NeedsDisplay
@@ -135,6 +138,7 @@
         String file = prepareFile(FileType.HTML, C2, new Archives[]{BSM},
                 new String[]{COMMAND_C1_NORMAL, COMMAND_C2_NORMAL, COMMAND_C1_RESTRICT, COMMAND_C2_RESTRICT}, false);
         ProcessResult pr = server.executeBrowser(file, AutoClose.CLOSE_ON_BOTH);
+        assertAllOk(pr);
     }
     
     @NeedsDisplay
@@ -143,6 +147,7 @@
         String file = prepareFile(FileType.HTML, C2, new Archives[]{BSM},
                 new String[]{COMMAND_C1_NORMAL, COMMAND_C2_NORMAL, COMMAND_C1_RESTRICT, COMMAND_C2_RESTRICT}, false);
         ProcessResult pr = server.executeJavaws(HTML, file, new AutoOkClosingListener(), new AutoErrorClosingListener());
+        assertAllOk(pr);
     }
 
     @Test
@@ -171,6 +176,7 @@
         String file = prepareFile(FileType.JNLP_APP, C2, new Archives[]{BSM},
                 new String[]{COMMAND_C1_NORMAL, COMMAND_C2_NORMAL, COMMAND_C1_RESTRICT, COMMAND_C2_RESTRICT}, true);
         ProcessResult pr = server.executeJavaws(HEADLESS, file, new AutoOkClosingListener(), new AutoErrorClosingListener());
+        assertAllOk(pr);
     }
 
     @Test
@@ -179,6 +185,7 @@
         String file = prepareFile(FileType.JNLP_APPLET, C2, new Archives[]{BSM},
                 new String[]{COMMAND_C1_NORMAL, COMMAND_C2_NORMAL, COMMAND_C1_RESTRICT, COMMAND_C2_RESTRICT}, true);
         ProcessResult pr = server.executeJavaws(file, new AutoOkClosingListener(), new AutoErrorClosingListener());
+        assertAllOk(pr);
     }