/hg/icedtea-web: Fixed AccessClassInPackageTest

[jvanek at icedtea.classpath.org]

changeset 7e00cd6e46df in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=7e00cd6e46df
author: Jiri Vanek <jvanek at redhat.com>
date: Tue Jul 14 13:48:29 2015 +0200

	Fixed AccessClassInPackageTest

	* tests/reproducers/simple/AccessClassInPackage/testcases/AccessClassInPackageTest.java:(AccessClassInPackageSUNSEC) and (AccessClassInPackageNETSF) now correctly expect non-zero return value of child javaws


diffstat:

 ChangeLog                                                                             |   7 ++++++
 tests/reproducers/simple/AccessClassInPackage/testcases/AccessClassInPackageTest.java |  11 ++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diffs (52 lines):

diff -r 1e46c2f4f13f -r 7e00cd6e46df ChangeLog
--- a/ChangeLog	Tue Jul 14 13:24:57 2015 +0200
+++ b/ChangeLog	Tue Jul 14 13:48:29 2015 +0200
@@ -1,3 +1,10 @@
+2015-07-14  Jiri Vanek  <jvanek at redhat.com>
+
+	Fixed AccessClassInPackageTest
+	* tests/reproducers/simple/AccessClassInPackage/testcases/AccessClassInPackageTest.java:
+	(AccessClassInPackageSUNSEC) and (AccessClassInPackageNETSF) now correctly expect
+	non-zero return value of child javaws
+
 2015-07-13  Jiri Vanek  <jvanek at redhat.com>
 
 	Fixed codebase reproducers
diff -r 1e46c2f4f13f -r 7e00cd6e46df tests/reproducers/simple/AccessClassInPackage/testcases/AccessClassInPackageTest.java
--- a/tests/reproducers/simple/AccessClassInPackage/testcases/AccessClassInPackageTest.java	Tue Jul 14 13:24:57 2015 +0200
+++ b/tests/reproducers/simple/AccessClassInPackage/testcases/AccessClassInPackageTest.java	Tue Jul 14 13:48:29 2015 +0200
@@ -83,10 +83,14 @@
     }
 
     private void commonPitfall(ProcessResult pr) {
+        commonPitfall(pr, 0);
+    }
+    
+    private void commonPitfall(ProcessResult pr, int i) {
         String cc = "ClassNotFoundException";
         Assert.assertFalse("stderr should NOT contains `" + cc + "`, but did", pr.stderr.contains(cc));
         Assert.assertFalse("AccessClassInPackageTestLunch1 should not be terminated, but was", pr.wasTerminated);
-        Assert.assertEquals((Integer) 0, pr.returnValue);
+        Assert.assertEquals((Integer) i, pr.returnValue);
     }
 
     private void testShouldPass(ProcessResult pr, String s) {
@@ -118,7 +122,7 @@
     @Test
     public void AccessClassInPackageNETSF() throws Exception {
         ProcessResult pr = server.executeJavawsHeadless(null, "/" + files[2]);
-        commonPitfall(pr);
+        commonPitfall(pr, 1);
         testShouldFail(pr, badExceptions[2]);
         testShouldNOTPass(pr, pass[2]);
     }
@@ -126,8 +130,7 @@
     @Test
     public void AccessClassInPackageSUNSEC() throws Exception {
         ProcessResult pr = server.executeJavawsHeadless(null, "/" + files[3]);
-        commonPitfall(pr);
-        commonPitfall(pr);
+        commonPitfall(pr, 1);
         testShouldFail(pr, badExceptions[3]);
         testShouldNOTPass(pr, pass[3]);
     }