/hg/icedtea-web: 3 new changesets
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Tue May 29 06:54:02 PDT 2012
changeset c0b0577ecbe4 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=c0b0577ecbe4
author: Jiri Vanek <jvanek at redhat.com>
date: Mon May 28 11:00:49 2012 +0200
Get rid of repeated sout/serr in reproducers testcases/unit tests and introduce bottleneck for loging.
changeset c04c3b9576db in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=c04c3b9576db
author: Jiri Vanek <jvanek at redhat.com>
date: Tue May 29 15:34:46 2012 +0200
Added ignoration of inner classes during retrieving test id
changeset 526df16b6e27 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=526df16b6e27
author: Jiri Vanek <jvanek at redhat.com>
date: Tue May 29 15:54:14 2012 +0200
fixed changelog according to reviwer
diffstat:
ChangeLog | 42 ++++
tests/jnlp_tests/signed/AppletTestSigned/testcases/AppletTestSignedTests.java | 8 -
tests/jnlp_tests/signed/CacheReproducer/testcases/CacheReproducerTest.java | 14 -
tests/jnlp_tests/signed/MissingJar/testcases/MissingJarTest.java | 12 +-
tests/jnlp_tests/signed/ReadPropertiesBySignedHack/testcases/ReadPropertiesBySignedHackTest.java | 4 -
tests/jnlp_tests/signed/ReadPropertiesSigned/testcases/ReadPropertiesSignedTest.java | 12 -
tests/jnlp_tests/signed/Spaces can be everywhere signed/testcases/SpacesCanBeEverywhereTestsSigned.java | 49 +----
tests/jnlp_tests/simple/AccessClassInPackage/testcases/AccessClassInPackageTest.java | 32 ---
tests/jnlp_tests/simple/AddShutdownHook/testcases/AddShutdownHookTest.java | 4 -
tests/jnlp_tests/simple/AllStackTraces/testcases/AllStackTracesTest.java | 4 -
tests/jnlp_tests/simple/AppletTest/testcases/AppletTestTests.java | 8 -
tests/jnlp_tests/simple/CheckServices/testcases/CheckServicesTests.java | 4 -
tests/jnlp_tests/simple/CreateClassLoader/testcases/CreateClassLoaderTest.java | 4 -
tests/jnlp_tests/simple/InformationTitleVendorParser/testcases/InformationTitleVendorParserTest.java | 4 -
tests/jnlp_tests/simple/ManifestedJar1/testcases/ManifestedJar1Test.java | 40 ----
tests/jnlp_tests/simple/ReadEnvironment/testcases/ReadEnvironmentTest.java | 4 -
tests/jnlp_tests/simple/ReadProperties/testcases/ReadPropertiesTest.java | 8 -
tests/jnlp_tests/simple/RedirectStreams/testcases/RedirectStreamsTest.java | 4 -
tests/jnlp_tests/simple/ReplaceSecurityManager/testcases/ReplaceSecurityManagerTest.java | 4 -
tests/jnlp_tests/simple/SetContextClassLoader/testcases/SetContextClassLoaderTest.java | 4 -
tests/jnlp_tests/simple/Spaces can be everywhere/testcases/SpacesCanBeEverywhereTests.java | 48 ----
tests/jnlp_tests/simple/deadlocktest/testcases/DeadLockTestTest.java | 74 +++----
tests/jnlp_tests/simple/simpletest1/testcases/SimpleTest1Test.java | 10 +-
tests/jnlp_tests/simple/simpletest2/testcases/SimpleTest2Test.java | 4 -
tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ServerAccess.java | 99 +++++++++-
tests/netx/unit/net/sourceforge/jnlp/cache/CacheLRUWrapperTest.java | 3 +-
tests/netx/unit/net/sourceforge/jnlp/runtime/CodeBaseClassLoaderTest.java | 9 +-
tests/netx/unit/net/sourceforge/jnlp/util/replacements/BASE64EncoderTest.java | 5 +-
28 files changed, 185 insertions(+), 332 deletions(-)
diffs (truncated from 1398 to 500 lines):
diff -r 6df151bb5320 -r 526df16b6e27 ChangeLog
--- a/ChangeLog Fri May 25 11:44:13 2012 -0400
+++ b/ChangeLog Tue May 29 15:54:14 2012 +0200
@@ -1,3 +1,45 @@
+2012-05-20 Jiri Vanek <jvanek at redhat.com>
+
+ Get rid of repeated sout/serr in reproducers testcases/unit tests and
+ introduce bottleneck for loging.
+ * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ServerAccess.java:
+ (PROCESS_LOG) static flag for enabling/disabling automatic logging of
+ statically executed processes.
+ (logErrorReprint) (logOutputReprint) (logNoReprint) new methods, to call
+ logging bottleneck.
+ (log) main logging bottleneck, reprint message to according stream with
+ calling test-class and test-method as suffix.
+ (getTestMethod) new method to analyze calling test-method.
+ (executeProcess) enhanced for conditional automatic logging of start of
+ process and outputs of process.
+ * tests/jnlp_tests/signed/AppletTestSigned/testcases/AppletTestSignedTests.java:
+ * tests/jnlp_tests/signed/CacheReproducer/testcases/CacheReproducerTest.java:
+ * tests/jnlp_tests/signed/MissingJar/testcases/MissingJarTest.java:
+ * tests/jnlp_tests/signed/ReadPropertiesSigned/testcases/ReadPropertiesSignedTest.java:
+ * tests/jnlp_tests/signed/Spaces can be everywhere signed/testcases/SpacesCanBeEverywhereTestsSigned.java:
+ * tests/jnlp_tests/simple/AccessClassInPackage/testcases/AccessClassInPackageTest.java:
+ * tests/jnlp_tests/simple/AddShutdownHook/testcases/AddShutdownHookTest.java:
+ * tests/jnlp_tests/simple/AllStackTraces/testcases/AllStackTracesTest.java:
+ * tests/jnlp_tests/simple/AppletTest/testcases/AppletTestTests.java:
+ * tests/jnlp_tests/simple/CheckServices/testcases/CheckServicesTests.java:
+ * tests/jnlp_tests/simple/CreateClassLoader/testcases/CreateClassLoaderTest.java:
+ * tests/jnlp_tests/simple/InformationTitleVendorParser/testcases/InformationTitleVendorParserTest.java:
+ * tests/jnlp_tests/simple/ManifestedJar1/testcases/ManifestedJar1Test.java:
+ * tests/jnlp_tests/simple/ReadEnvironment/testcases/ReadEnvironmentTest.java:
+ * tests/jnlp_tests/simple/ReadProperties/testcases/ReadPropertiesTest.java:
+ * tests/jnlp_tests/simple/RedirectStreams/testcases/RedirectStreamsTest.java:
+ * tests/jnlp_tests/simple/ReplaceSecurityManager/testcases/ReplaceSecurityManagerTest.java:
+ * tests/jnlp_tests/simple/SetContextClassLoader/testcases/SetContextClassLoaderTest.java:
+ * tests/jnlp_tests/simple/Spaces can be everywhere/testcases/SpacesCanBeEverywhereTests.java:
+ * tests/jnlp_tests/simple/deadlocktest/testcases/DeadLockTestTest.java:
+ * tests/jnlp_tests/simple/simpletest1/testcases/SimpleTest1Test.java:
+ * tests/jnlp_tests/simple/simpletest2/testcases/SimpleTest2Test.java:
+ * tests/netx/unit/net/sourceforge/jnlp/cache/CacheLRUWrapperTest.java:
+ * tests/netx/unit/net/sourceforge/jnlp/runtime/CodeBaseClassLoaderTest.java:
+ * tests/netx/unit/net/sourceforge/jnlp/util/replacements/BASE64EncoderTest.java:
+ all System.out replaced by ServerAccess.logOutputReprint
+ and System.err replaced by ServerAccess.logErrorReprint
+
2012-05-25 Adam Domurad <adomurad at redhat.com>
Changed for-loops over iterators and indices to for-each loops if they
diff -r 6df151bb5320 -r 526df16b6e27 tests/jnlp_tests/signed/AppletTestSigned/testcases/AppletTestSignedTests.java
--- a/tests/jnlp_tests/signed/AppletTestSigned/testcases/AppletTestSignedTests.java Fri May 25 11:44:13 2012 -0400
+++ b/tests/jnlp_tests/signed/AppletTestSigned/testcases/AppletTestSignedTests.java Tue May 29 15:54:14 2012 +0200
@@ -51,11 +51,7 @@
@Test
public void AppletTestSignedTest() throws Exception {
- System.out.println("connecting AppletTestSigned request");
- System.err.println("connecting AppletTestSigned request");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/AppletTestSigned.jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
evaluateSignedApplet(pr);
Assert.assertFalse(pr.wasTerminated);
Assert.assertEquals((Integer) 0, pr.returnValue);
@@ -82,13 +78,9 @@
@Test
public void AppletTestSignedFirefoxTest() throws Exception {
- System.out.println("connecting AppletTestSigned in firefox request");
- System.err.println("connecting AppletTestSigned in firefox request");
ServerAccess.PROCESS_TIMEOUT = 30 * 1000;
try {
ServerAccess.ProcessResult pr = server.executeBrowser("/AppletTestSigned.html");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
evaluateSignedApplet(pr);
Assert.assertTrue(pr.wasTerminated);
//Assert.assertEquals((Integer) 0, pr.returnValue); due to destroy is null
diff -r 6df151bb5320 -r 526df16b6e27 tests/jnlp_tests/signed/CacheReproducer/testcases/CacheReproducerTest.java
--- a/tests/jnlp_tests/signed/CacheReproducer/testcases/CacheReproducerTest.java Fri May 25 11:44:13 2012 -0400
+++ b/tests/jnlp_tests/signed/CacheReproducer/testcases/CacheReproducerTest.java Tue May 29 15:54:14 2012 +0200
@@ -258,11 +258,7 @@
@Override
public void run() {
try {
- System.out.println("connecting deadlocktest request");
- System.err.println("connecting deadlocktest request");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(verbosed, "/deadlocktest.jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
} catch (Exception ex) {
throw new RuntimeException(ex);
}
@@ -271,8 +267,6 @@
t.start();
Thread.sleep(1000);
pr = tryToClearcache();
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String q = "Can not clear cache at this time";
Assert.assertTrue("Stderr should contain " + q + ", but did not.", pr.stderr.contains(q));
assertCacheIsNotEmpty();
@@ -338,8 +332,6 @@
}
private static void clearAndEvaluateCache(boolean force) throws Exception {
- System.out.println("clearing cache");
- System.err.println("clearing cache");
if (force) {
if (netxLock.isFile()) {
boolean b = netxLock.delete();
@@ -458,11 +450,7 @@
}
private static ServerAccess.ProcessResult runSimpleTest1(List<String> args, String s) throws Exception {
- System.out.println("connecting " + s + " request");
- System.err.println("connecting " + s + " request");
ServerAccess.ProcessResult pr2 = server.executeJavawsHeadless(args, "/" + s + ".jnlp");
- System.out.println(pr2.stdout);
- System.err.println(pr2.stderr);
return pr2;
}
@@ -483,8 +471,6 @@
private static ProcessResult tryToClearcache() throws Exception {
ServerAccess.ProcessResult pr1 = ServerAccess.executeProcess(clear);
- System.out.println(pr1.stdout);
- System.err.println(pr1.stderr);
return pr1;
}
}
diff -r 6df151bb5320 -r 526df16b6e27 tests/jnlp_tests/signed/MissingJar/testcases/MissingJarTest.java
--- a/tests/jnlp_tests/signed/MissingJar/testcases/MissingJarTest.java Fri May 25 11:44:13 2012 -0400
+++ b/tests/jnlp_tests/signed/MissingJar/testcases/MissingJarTest.java Tue May 29 15:54:14 2012 +0200
@@ -50,8 +50,6 @@
private final List<String> l = Collections.unmodifiableList(Arrays.asList(new String[]{"-Xtrustall"}));
private void evaluateResult(ProcessResult pr) {
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String c = "only fixed classloader can initialize this app";
Assert.assertTrue("stdout should contains `" + c + "`, but didn't ", pr.stdout.contains(c));
String cc = "ClassNotFoundException";
@@ -62,33 +60,25 @@
@Test
public void MissingJarTest1() throws Exception {
- System.out.println("connecting MissingJar1 request");
- System.err.println("connecting MissingJar1 request");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/MissingJar.jnlp");
evaluateResult(pr);
}
@Test
public void MissingJarTest2() throws Exception {
- System.out.println("connecting MissingJar2 request");
- System.err.println("connecting MissingJar2 request");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/MissingJar2.jnlp");
evaluateResult(pr);
}
@Test
public void MissingJarTest3() throws Exception {
- System.out.println("connecting MissingJar3 request");
- System.err.println("connecting MissingJar3 request");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/MissingJar3.jnlp");
evaluateResult(pr);
}
@Test
public void MissingJarTest4() throws Exception {
- System.out.println("connecting MissingJar4 request");
- System.err.println("connecting MissingJar4 request");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/MissingJar4.jnlp");
evaluateResult(pr);
}
-}
\ No newline at end of file
+}
diff -r 6df151bb5320 -r 526df16b6e27 tests/jnlp_tests/signed/ReadPropertiesBySignedHack/testcases/ReadPropertiesBySignedHackTest.java
--- a/tests/jnlp_tests/signed/ReadPropertiesBySignedHack/testcases/ReadPropertiesBySignedHackTest.java Fri May 25 11:44:13 2012 -0400
+++ b/tests/jnlp_tests/signed/ReadPropertiesBySignedHack/testcases/ReadPropertiesBySignedHackTest.java Tue May 29 15:54:14 2012 +0200
@@ -52,11 +52,7 @@
@Test
public void ReadPropertiesBySignedHackWithjoutXtrustAll() throws Exception {
//no request for permissions
- System.out.println("connecting ReadPropertiesBySignedHack request");
- System.err.println("connecting ReadPropertiesBySignedHack request");
ServerAccess.ProcessResult pr=server.executeJavawsHeadless(l,"/ReadPropertiesBySignedHack.jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s="java.lang.SecurityException: class \"ReadProperties\"'s signer information does not match signer information of other classes in the same package";
Assert.assertTrue("Stderr should contains "+s+" but did not",pr.stderr.contains(s));
String ss="ClassNotFoundException";
diff -r 6df151bb5320 -r 526df16b6e27 tests/jnlp_tests/signed/ReadPropertiesSigned/testcases/ReadPropertiesSignedTest.java
--- a/tests/jnlp_tests/signed/ReadPropertiesSigned/testcases/ReadPropertiesSignedTest.java Fri May 25 11:44:13 2012 -0400
+++ b/tests/jnlp_tests/signed/ReadPropertiesSigned/testcases/ReadPropertiesSignedTest.java Tue May 29 15:54:14 2012 +0200
@@ -53,11 +53,7 @@
@Test
public void ReadSignedPropertiesWithoutPermissionsWithXtrustAll() throws Exception {
//no request for permissions
- System.out.println("connecting ReadPropertiesSigned1 request");
- System.err.println("connecting ReadPropertiesSigned1 request");
ServerAccess.ProcessResult pr=server.executeJavawsHeadless(l,"/ReadPropertiesSigned1.jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
Assert.assertTrue("Stderr should match "+accessMatcher+" but did not",pr.stderr.matches(accessMatcher));
String ss="ClassNotFoundException";
Assert.assertFalse("Stderr should not contains "+ss+" but did",pr.stderr.contains(ss));
@@ -69,11 +65,7 @@
@Test
public void ReadSignedPropertiesWithPermissionsWithXtrustAll() throws Exception {
//request for allpermissions
- System.out.println("connecting ReadPropertiesSigned2 request");
- System.err.println("connecting ReadPropertiesSigned2 request");
ServerAccess.ProcessResult pr=server.executeJavawsHeadless(l,"/ReadPropertiesSigned2.jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
Assert.assertFalse("Stderr should NOT match "+accessMatcher+" but did",pr.stderr.matches(accessMatcher));
String ss="ClassNotFoundException";
Assert.assertFalse("Stderr should not contains "+ss+" but did",pr.stderr.contains(ss));
@@ -84,11 +76,7 @@
@Test
public void EnsureXtrustallNotAffectingUnsignedBehaviour() throws Exception {
- System.err.println("connecting ReadPropertiesSigned3 request");
- System.out.println("connecting ReadPropertiesSigned3 request");
ServerAccess.ProcessResult pr=server.executeJavawsHeadless(l,"/ReadProperties1.jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
Assert.assertTrue("Stderr should match "+accessMatcher+" but did not",pr.stderr.matches(accessMatcher));
String ss="ClassNotFoundException";
Assert.assertFalse("Stderr should not contains "+ss+" but did",pr.stderr.contains(ss));
diff -r 6df151bb5320 -r 526df16b6e27 tests/jnlp_tests/signed/Spaces can be everywhere signed/testcases/SpacesCanBeEverywhereTestsSigned.java
--- a/tests/jnlp_tests/signed/Spaces can be everywhere signed/testcases/SpacesCanBeEverywhereTestsSigned.java Fri May 25 11:44:13 2012 -0400
+++ b/tests/jnlp_tests/signed/Spaces can be everywhere signed/testcases/SpacesCanBeEverywhereTestsSigned.java Tue May 29 15:54:14 2012 +0200
@@ -53,8 +53,6 @@
@Test
@NeedsDisplay
public void SpacesCanBeEverywhereLocalAppletTestsJnlp2Signed() throws Exception {
- System.out.println("connecting NotOnly spaces can kill ěšÄřž too signed.jnlp request");
- System.err.println("connecting NotOnly spaces can kill ěšÄřž too signed.jnlp request");
List<String> commands=new ArrayList<String>(1);
commands.add(server.getJavawsLocation());
commands.add(server.getDir()+"/NotOnly spaces can kill ěšÄřž too signed.jnlp");
@@ -83,8 +81,6 @@
* only on ocal files, and probably only from test run - it can be ignored
*/
ServerAccess.ProcessResult pr = ServerAccess.executeProcess(commands);
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s="Signed spaces can be everywhere.jsr was launched correctly";
Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
String cc = "xception";
@@ -97,11 +93,7 @@
@Test
@NeedsDisplay
public void SpacesCanBeEverywhereRemoteAppletTestsJnlp2Signed() throws Exception {
- System.out.println("connecting NotOnly spaces can kill ěšÄřž too signed.jnlp request");
- System.err.println("connecting NotOnly spaces can kill ěšÄřž too signed.jnlp request");
ServerAccess.ProcessResult pr = server.executeJavaws("/NotOnly%20spaces%20can%20kill%20%C4%9B%C5%A1%C4%8D%C5%99%C5%BE%20too%20signed.jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s="Signed spaces can be everywhere.jsr was launched correctly";
Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
String cc = "xception";
@@ -113,11 +105,7 @@
@Test
@NeedsDisplay
public void SpacesCanBeEverywhereRemoteAppletTestsHtml2Signed() throws Exception {
- System.out.println("connecting spaces applet Tests signed.html request");
- System.err.println("connecting spaces applet Tests signed.html request");
ServerAccess.ProcessResult pr = server.executeBrowser("/spaces+applet+Tests+signed.html");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s="Signed spaces can be everywhere.jsr was launched correctly";
Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
String cc = "xception";
@@ -129,11 +117,7 @@
@Bug(id={"PR811","http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-October/016144.html"})
@Test
public void SpacesCanBeEverywhereRemoteTests1Signed() throws Exception {
- System.out.println("connecting SpacesCanBeEverywhereRemoteTests1 signed request");
- System.err.println("connecting SpacesCanBeEverywhereRemoteTests1 signed request");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/Spaces%20can%20be%20everywhere1%20signed.jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s = "Good simple javaws exapmle";
Assert.assertTrue("stdout should contains `" + s + "`, but did not", pr.stdout.contains(s));
String cc = "ClassNotFoundException";
@@ -145,11 +129,7 @@
@Bug(id="PR811")
@Test
public void SpacesCanBeEverywhereRemoteTests2Signed() throws Exception {
- System.out.println("connecting SpacesCanBeEverywhereRemoteTests2 signed request");
- System.err.println("connecting SpacesCanBeEverywhereRemoteTests2 signed request");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/Spaces%20can%20be%20everywhere2%20signed.jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s="Signed spaces can be everywhere.jsr was launched correctly";
Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
String cc = "ClassNotFoundException";
@@ -161,11 +141,7 @@
@Bug(id="PR811")
@Test
public void SpacesCanBeEverywhereRemoteTests2Signed_withQuery1() throws Exception {
- System.out.println("connecting SpacesCanBeEverywhereRemoteTests2 signed request");
- System.err.println("connecting SpacesCanBeEverywhereRemoteTests2 signed request");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/Spaces%20can%20be%20everywhere2%20signed.jnlp?test=20");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s="Signed spaces can be everywhere.jsr was launched correctly";
Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
String cc = "ClassNotFoundException";
@@ -177,11 +153,8 @@
@Bug(id="PR811")
@Test
public void SpacesCanBeEverywhereRemoteTests2Signed_withQuery2() throws Exception {
- System.out.println("connecting SpacesCanBeEverywhereRemoteTests2 signed request");
- System.err.println("connecting SpacesCanBeEverywhereRemoteTests2 signed request");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/Spaces%20can%20be%20everywhere2%20signed.jnlp?test%3D20");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
+
String s="Signed spaces can be everywhere.jsr was launched correctly";
Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
String cc = "ClassNotFoundException";
@@ -193,11 +166,7 @@
@Bug(id="PR811")
@Test
public void SpacesCanBeEverywhereRemoteTests3Signed() throws Exception {
- System.out.println("connecting SpacesCanBeEverywhereRemoteTests3signed request");
- System.err.println("connecting SpacesCanBeEverywhereRemoteTests3signed request");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/SpacesCanBeEverywhere1signed.jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s="Signed spaces can be everywhere.jsr was launched correctly";
Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
String cc = "ClassNotFoundException";
@@ -210,15 +179,11 @@
@Bug(id="PR804")
@Test
public void SpacesCanBeEverywhereLocalTests1Signed() throws Exception {
- System.out.println("connecting SpacesCanBeEverywhereLocalTests1 request");
- System.err.println("connecting SpacesCanBeEverywhereLocalTests1 request");
List<String> commands=new ArrayList<String>(4);
commands.add(server.getJavawsLocation());
commands.add(ServerAccess.HEADLES_OPTION);
commands.add("Spaces can be everywhere1.jnlp");
ServerAccess.ProcessResult pr = ServerAccess.executeProcess(commands,server.getDir());
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s = "Good simple javaws exapmle";
Assert.assertTrue("stdout should contains `" + s + "`, but did not", pr.stdout.contains(s));
String cc = "ClassNotFoundException";
@@ -230,15 +195,11 @@
@Bug(id="PR804")
@Test
public void SpacesCanBeEverywhereLocalTests2Signed() throws Exception {
- System.out.println("connecting SpacesCanBeEverywhereLocalTests2 signed request");
- System.err.println("connecting SpacesCanBeEverywhereLocalTests2 signed request");
List<String> commands=new ArrayList<String>(4);
commands.add(server.getJavawsLocation());
commands.add(ServerAccess.HEADLES_OPTION);
commands.add("Spaces can be everywhere2 signed.jnlp");
ServerAccess.ProcessResult pr = ServerAccess.executeProcess(commands,server.getDir());
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s="Signed spaces can be everywhere.jsr was launched correctly";
Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
String cc = "ClassNotFoundException";
@@ -250,15 +211,11 @@
@Bug(id="PR804")
@Test
public void SpacesCanBeEverywhereLocalTests4Signed() throws Exception {
- System.out.println("connecting SpacesCanBeEverywhereLocalTests2 signed request");
- System.err.println("connecting SpacesCanBeEverywhereLocalTests2 signed request");
List<String> commands=new ArrayList<String>(4);
commands.add(server.getJavawsLocation());
commands.add(ServerAccess.HEADLES_OPTION);
commands.add(server.getDir()+"/Spaces can be everywhere2 signed.jnlp");
ServerAccess.ProcessResult pr = ServerAccess.executeProcess(commands);
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s="Signed spaces can be everywhere.jsr was launched correctly";
Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
String cc = "ClassNotFoundException";
@@ -270,15 +227,11 @@
@Bug(id="PR804")
@Test
public void SpacesCanBeEverywhereLocalTests3Signed() throws Exception {
- System.out.println("connecting SpacesCanBeEverywhereLocalTests3signed request");
- System.err.println("connecting SpacesCanBeEverywhereLocalTests3signed request");
List<String> commands=new ArrayList<String>(4);
commands.add(server.getJavawsLocation());
commands.add(ServerAccess.HEADLES_OPTION);
commands.add("SpacesCanBeEverywhere1signed.jnlp");
ServerAccess.ProcessResult pr = ServerAccess.executeProcess(commands,server.getDir());
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s="Signed spaces can be everywhere.jsr was launched correctly";
Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
String cc = "ClassNotFoundException";
diff -r 6df151bb5320 -r 526df16b6e27 tests/jnlp_tests/simple/AccessClassInPackage/testcases/AccessClassInPackageTest.java
--- a/tests/jnlp_tests/simple/AccessClassInPackage/testcases/AccessClassInPackageTest.java Fri May 25 11:44:13 2012 -0400
+++ b/tests/jnlp_tests/simple/AccessClassInPackage/testcases/AccessClassInPackageTest.java Tue May 29 15:54:14 2012 +0200
@@ -101,11 +101,7 @@
@Test
public void AccessClassInPackageJAVAXJNLP() throws Exception {
- System.out.println("AccessClassInPackageJAVAXJNLP");
- System.err.println("AccessClassInPackageJAVAXJNLP");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/" + files[0]);
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
commonPitfall(pr);
testShouldPass(pr, pass[0]);
testShouldNOTFail(pr, badExceptions[0]);
@@ -113,11 +109,7 @@
@Test
public void AccessClassInPackageSELF() throws Exception {
- System.out.println("AccessClassInPackageSELF");
- System.err.println("AccessClassInPackageSELF");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/" + files[1]);
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
commonPitfall(pr);
testShouldPass(pr, pass[1]);
testShouldNOTFail(pr, badExceptions[1]);
@@ -125,11 +117,7 @@
@Test
public void AccessClassInPackageNETSF() throws Exception {
- System.out.println("AccessClassInPackageNETSF");
- System.err.println("AccessClassInPackageNETSF");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/" + files[2]);
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
commonPitfall(pr);
testShouldFail(pr, badExceptions[2]);
testShouldNOTPass(pr, pass[2]);
@@ -137,11 +125,7 @@
@Test
public void AccessClassInPackageSUNSEC() throws Exception {
- System.out.println("AccessClassInPackageSUNSEC");
- System.err.println("AccessClassInPackageSUNSEC");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/" + files[3]);
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
commonPitfall(pr);
commonPitfall(pr);
testShouldFail(pr, badExceptions[3]);
@@ -151,11 +135,7 @@
//now signed vaiants
@Test
public void AccessClassInPackageSignedJAVAXJNLP() throws Exception {
- System.out.println("AccessClassInPackageSignedJAVAXJNLP");
- System.err.println("AccessClassInPackageSignedJAVAXJNLP");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(xta, "/" + filesSigned[0]);
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
commonPitfall(pr);
testShouldPass(pr, pass[0]);
testShouldNOTFail(pr, badExceptions[0]);
@@ -163,11 +143,7 @@
@Test
public void AccessClassInPackageSignedSELF() throws Exception {
- System.out.println("AccessClassInPackageSignedSELF");
- System.err.println("AccessClassInPackageSignedSELF");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(xta, "/" + filesSigned[1]);
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
commonPitfall(pr);
testShouldPass(pr, pass[1]);
testShouldNOTFail(pr, badExceptions[1]);
@@ -175,11 +151,7 @@
@Test
public void AccessClassInPackageSignedNETSF() throws Exception {
- System.out.println("AccessClassInPackageSignedNETSF");
- System.err.println("AccessClassInPackageSignedNETSF");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(xta, "/" + filesSigned[2]);
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
commonPitfall(pr);
testShouldPass(pr, pass[2]);
testShouldNOTFail(pr, badExceptions[2]);
@@ -187,11 +159,7 @@
@Test
public void AccessClassInPackageSignedSUNSEC() throws Exception {
- System.out.println("AccessClassInPackageSignedSUNSEC");
- System.err.println("AccessClassInPackageSignedSUNSEC");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(xta, "/" + filesSigned[3]);
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
More information about the distro-pkg-dev
mailing list