/hg/icedtea-web: 3 new changesets
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Fri Nov 11 05:40:01 PST 2011
changeset 1f74d3de726c in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=1f74d3de726c
author: Jiri Vanek <jvanek at redhat.com>
date: Fri Nov 11 14:33:29 2011 +0100
reproducers engine can now handle files and directories with spaces
changeset dc34e82d88d4 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=dc34e82d88d4
author: Jiri Vanek <jvanek at redhat.com>
date: Fri Nov 11 14:35:45 2011 +0100
Added reproducer for handling spaces by javaws both localy and
remotely
changeset 22db4e09bbc7 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=22db4e09bbc7
author: Jiri Vanek <jvanek at redhat.com>
date: Fri Nov 11 14:40:26 2011 +0100
chenglogs for spaces reproducers and for changes to engine because
of spaces
diffstat:
ChangeLog | 38 ++
Makefile.am | 26 +-
NEW_LINE_IFS | 8 +
tests/jnlp_tests/simple/Spaces can be everywhere/resources/Spaces can be everywhere1.jnlp | 53 +++
tests/jnlp_tests/simple/Spaces can be everywhere/resources/Spaces can be everywhere2.jnlp | 53 +++
tests/jnlp_tests/simple/Spaces can be everywhere/resources/SpacesCanBeEverywhere1.jnlp | 53 +++
tests/jnlp_tests/simple/Spaces can be everywhere/srcs/SpacesCanBeEverywhere.java | 43 ++
tests/jnlp_tests/simple/Spaces can be everywhere/testcases/SpacesCanBeEverywhereTests.java | 152 ++++++++++
tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ResourcesTest.java | 14 +-
tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ServerAccess.java | 27 +-
10 files changed, 449 insertions(+), 18 deletions(-)
diffs (truncated from 640 to 500 lines):
diff -r 5860a2cbe221 -r 22db4e09bbc7 ChangeLog
--- a/ChangeLog Thu Nov 10 20:57:36 2011 +0100
+++ b/ChangeLog Fri Nov 11 14:40:26 2011 +0100
@@ -1,3 +1,41 @@
+2011-11-11 Jiri Vanek <jvanek at redhat.com>
+
+ Added reproducer for PR804 and PR8011
+ * tests/jnlp_tests/simple/Spaces can be everywhere/resources/Spaces can be everywhere1.jnlp:
+ new jnlp file with space in name and with jar in resources which name does not contain
+ spaces
+ * tests/jnlp_tests/simple/Spaces can be everywhere/resources/Spaces can be everywhere2.jnlp:
+ new jnlp file with space in name and with jar in resources which name contains spaces
+ * tests/jnlp_tests/simple/Spaces can be everywhere/resources/SpacesCanBeEverywhere1.jnlp:
+ jnlp file without space in name but with jar in resources which name contains spaces
+ * tests/jnlp_tests/simple/Spaces can be everywhere/srcs/SpacesCanBeEverywhere.java:
+ new file containig simple main method of "Spaces can be everywhere.jar" jar
+ * tests/jnlp_tests/simple/Spaces can be everywhere/testcases/SpacesCanBeEverywhereTests.java
+ testcase for this reproducer. It is lunching each of this jnlp once locally from filesystem and
+ once remotely from server. Please note that except it's own jar, this reproducer is also
+ using simpletest1.jar
+
+2011-11-11 Jiri Vanek <jvanek at redhat.com>
+
+ Fixed reproducers engine to handle spaces in files and in urls
+ * Makefile.am: (stamps/netx-dist-tests-prepare-reproducers.stamp)
+ (stamps/netx-dist-tests-sign-some-reproducers.stamp)
+ (stamps/netx-dist-tests-compile-testcases.stamp):
+ added call to NEW_LINE_IFS to use line breake temporarily as parameter
+ separator while loading files from list and correct quoting
+ * NEW_LINE_IFS: new file, small separate script used in makefile as inline script
+ which backup original IFS variable and then set it to pure new line. It is in
+ separate file because it is reused and I do not know another way how to save a new
+ line variable in makefile. Restore to original vlaue is handled in Makefile
+ *tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ResourcesTest.java:
+ (testResourcesExists) filename is encoded to correct URL before requested from server
+ * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ServerAccess.java:
+ "-headless" string extracted to variable HEADLES_OPTION
+ (executeProcess) and (ThreadedProcess) enhanced for variable dir to specify working
+ directory. Backward compatibility kept
+ (TinyHttpdImpl) now expects url on requests, so all requests are now decoded by
+ java.net.URLDecoder
+
2011-11-10 Jiri Vanek <jvanek at redhat.com>
Added tests which covers corner cases or rhino support function dateRange
diff -r 5860a2cbe221 -r 22db4e09bbc7 Makefile.am
--- a/Makefile.am Thu Nov 10 20:57:36 2011 +0100
+++ b/Makefile.am Fri Nov 11 14:40:26 2011 +0100
@@ -473,22 +473,24 @@
stamps/netx-dist-tests-prepare-reproducers.stamp: stamps/junit-jnlp-dist-dirs
types=(simple signed); \
for which in "$${types[@]}" ; do \
+ . $(abs_top_builddir)/NEW_LINE_IFS ; \
simpleReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-$$which.txt `); \
+ IFS="$$IFS_BACKUP" ; \
for dir in "$${simpleReproducers[@]}" ; do \
echo "processing: $$dir" ; \
- mkdir -p $(JNLP_TESTS_DIR)/$$dir ; \
+ mkdir -p "$(JNLP_TESTS_DIR)/$$dir" ; \
d=`pwd` ; \
- cd $(JNLP_TESTS_SRCDIR)/$$which/$$dir/srcs/ ; \
+ cd "$(JNLP_TESTS_SRCDIR)/$$which/$$dir/srcs/" ; \
srcFiles=`find . -mindepth 1 -type f -name "*.java" | sed "s/.\/*//"` ; \
notSrcFiles=`find . -mindepth 1 -type f \! -name "*.java" | sed "s/.\/*//"` ; \
- $(BOOT_DIR)/bin/javac -d $(JNLP_TESTS_DIR)/$$dir/ $$srcFiles ; \
+ $(BOOT_DIR)/bin/javac -d "$(JNLP_TESTS_DIR)/$$dir/" $$srcFiles ; \
if [ -n "$$notSrcFiles" ] ; then \
- cp -R --parents $$notSrcFiles $(JNLP_TESTS_DIR)/$$dir/ ; \
+ cp -R --parents "$$notSrcFiles" "$(JNLP_TESTS_DIR)/$$dir/" ; \
fi ; \
- cd $(JNLP_TESTS_DIR)/$$dir/ ; \
- $(BOOT_DIR)/bin/jar cf $(JNLP_TESTS_SERVER_DEPLOYDIR)/$$dir.jar * ; \
- cd $$d ; \
- cp -R $(JNLP_TESTS_SRCDIR)/$$which/$$dir/resources/* $(JNLP_TESTS_SERVER_DEPLOYDIR)/ ; \
+ cd "$(JNLP_TESTS_DIR)/$$dir/" ; \
+ $(BOOT_DIR)/bin/jar cf "$(JNLP_TESTS_SERVER_DEPLOYDIR)/$$dir.jar" * ; \
+ cd "$$d" ; \
+ cp -R "$(JNLP_TESTS_SRCDIR)/$$which/$$dir/resources/"* $(JNLP_TESTS_SERVER_DEPLOYDIR)/ ; \
done ; \
done ; \
mkdir -p stamps && \
@@ -499,9 +501,11 @@
keystore=$(abs_top_builddir)/$(KEYSTORE_NAME); \
pass=123456789; \
$(BOOT_DIR)/bin/keytool -genkey -alias $$alias -keystore $$keystore -keypass $$pass -storepass $$pass -dname "cn=$$alias, ou=$$alias, o=$$alias, c=$$alias" ; \
+ . $(abs_top_builddir)/NEW_LINE_IFS ; \
signedReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-signed.txt `); \
+ IFS="$$IFS_BACKUP" ; \
for dir in "$${signedReproducers[@]}" ; do \
- $(BOOT_DIR)/bin/jarsigner -keystore $$keystore -storepass $$pass -keypass $$pass $(JNLP_TESTS_SERVER_DEPLOYDIR)/$$dir.jar $$alias ; \
+ $(BOOT_DIR)/bin/jarsigner -keystore $$keystore -storepass $$pass -keypass $$pass "$(JNLP_TESTS_SERVER_DEPLOYDIR)/$$dir.jar" $$alias ; \
done ; \
mkdir -p stamps && \
touch $@
@@ -522,12 +526,14 @@
netx-dist-tests-source-files.txt stamps/netx-dist-tests-compile.stamp
types=(simple signed); \
for which in "$${types[@]}" ; do \
+ . $(abs_top_builddir)/NEW_LINE_IFS ; \
simpleReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-$$which.txt `); \
+ IFS="$$IFS_BACKUP" ; \
for dir in "$${simpleReproducers[@]}" ; do \
$(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
-d $(JNLP_TESTS_ENGINE_DIR) \
-classpath $(JUNIT_JAR):$(NETX_DIR)/lib/classes.jar:$(JNLP_TESTS_ENGINE_DIR) \
- $(JNLP_TESTS_SRCDIR)/$$which/$$dir/testcases/* ; \
+ "$(JNLP_TESTS_SRCDIR)/$$which/$$dir/testcases/"* ; \
done ; \
done ; \
mkdir -p stamps && \
diff -r 5860a2cbe221 -r 22db4e09bbc7 NEW_LINE_IFS
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/NEW_LINE_IFS Fri Nov 11 14:40:26 2011 +0100
@@ -0,0 +1,8 @@
+#!/bin/sh
+NEW_LINE_IFS="
+"
+
+IFS_BACKUP="$IFS";
+#echo "1xx""$IFS""xx" ;
+IFS="$NEW_LINE_IFS" ;
+#echo "2xx""$IFS""xx" ;
diff -r 5860a2cbe221 -r 22db4e09bbc7 tests/jnlp_tests/simple/Spaces can be everywhere/resources/Spaces can be everywhere1.jnlp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/jnlp_tests/simple/Spaces can be everywhere/resources/Spaces can be everywhere1.jnlp Fri Nov 11 14:40:26 2011 +0100
@@ -0,0 +1,53 @@
+<!--
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+IcedTea is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version.
+
+ -->
+<?xml version="1.0" encoding="utf-8"?>
+<jnlp spec="1.0" href="Spaces can be everywhere1.jnlp" codebase=".">
+ <information>
+ <title>Spaces can be everywhere1</title>
+ <vendor>NetX</vendor>
+ <homepage href="http://jnlp.sourceforge.net/netx/"/>
+ <description>Spaces can be everywhere1</description>
+ <offline/>
+ </information>
+ <resources>
+ <j2se version="1.4+"/>
+ <jar href="simpletest1.jar"/>
+ </resources>
+ <application-desc main-class="SimpleTest1">
+ </application-desc>
+</jnlp>
diff -r 5860a2cbe221 -r 22db4e09bbc7 tests/jnlp_tests/simple/Spaces can be everywhere/resources/Spaces can be everywhere2.jnlp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/jnlp_tests/simple/Spaces can be everywhere/resources/Spaces can be everywhere2.jnlp Fri Nov 11 14:40:26 2011 +0100
@@ -0,0 +1,53 @@
+<!--
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+IcedTea is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version.
+
+ -->
+<?xml version="1.0" encoding="utf-8"?>
+<jnlp spec="1.0" href="Spaces can be everywhere2.jnlp" codebase=".">
+ <information>
+ <title>Spaces can be everywhere2</title>
+ <vendor>NetX</vendor>
+ <homepage href="http://jnlp.sourceforge.net/netx/"/>
+ <description>Spaces can be everywhere2</description>
+ <offline/>
+ </information>
+ <resources>
+ <j2se version="1.4+"/>
+ <jar href="Spaces can be everywhere.jar"/>
+ </resources>
+ <application-desc main-class="SpacesCanBeEverywhere">
+ </application-desc>
+</jnlp>
diff -r 5860a2cbe221 -r 22db4e09bbc7 tests/jnlp_tests/simple/Spaces can be everywhere/resources/SpacesCanBeEverywhere1.jnlp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/jnlp_tests/simple/Spaces can be everywhere/resources/SpacesCanBeEverywhere1.jnlp Fri Nov 11 14:40:26 2011 +0100
@@ -0,0 +1,53 @@
+<!--
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+IcedTea is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version.
+
+ -->
+<?xml version="1.0" encoding="utf-8"?>
+<jnlp spec="1.0" href="SpacesCanBeEverywhere1.jnlp" codebase=".">
+ <information>
+ <title>simpletest1</title>
+ <vendor>NetX</vendor>
+ <homepage href="http://jnlp.sourceforge.net/netx/"/>
+ <description>simpletest1</description>
+ <offline/>
+ </information>
+ <resources>
+ <j2se version="1.4+"/>
+ <jar href="Spaces can be everywhere.jar"/>
+ </resources>
+ <application-desc main-class="SpacesCanBeEverywhere">
+ </application-desc>
+</jnlp>
diff -r 5860a2cbe221 -r 22db4e09bbc7 tests/jnlp_tests/simple/Spaces can be everywhere/srcs/SpacesCanBeEverywhere.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/jnlp_tests/simple/Spaces can be everywhere/srcs/SpacesCanBeEverywhere.java Fri Nov 11 14:40:26 2011 +0100
@@ -0,0 +1,43 @@
+/* SpacesCanBeEverywhere.java
+Copyright (C) 2011 Red Hat, Inc.
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as published by
+the Free Software Foundation, version 2.
+
+IcedTea is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING. If not, write to
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version.
+ */
+
+public class SpacesCanBeEverywhere{
+
+ public static void main(String[] args){
+ System.out.println("Spaces can be everywhere.jsr was launched correctly");
+ }
+}
diff -r 5860a2cbe221 -r 22db4e09bbc7 tests/jnlp_tests/simple/Spaces can be everywhere/testcases/SpacesCanBeEverywhereTests.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/jnlp_tests/simple/Spaces can be everywhere/testcases/SpacesCanBeEverywhereTests.java Fri Nov 11 14:40:26 2011 +0100
@@ -0,0 +1,152 @@
+/* SpacesCanBeEverywhereTests.java
+Copyright (C) 2011 Red Hat, Inc.
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as published by
+the Free Software Foundation, version 2.
+
+IcedTea is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING. If not, write to
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version.
+ */
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import net.sourceforge.jnlp.ServerAccess;
+import org.junit.Assert;
+
+import org.junit.Test;
+
+public class SpacesCanBeEverywhereTests {
+
+ private static ServerAccess server = new ServerAccess();
+
+ @Test
+ public void SpacesCanBeEverywhereRemoteTests1() throws Exception {
+ System.out.println("connecting SpacesCanBeEverywhereRemoteTests1 request");
+ System.err.println("connecting SpacesCanBeEverywhereRemoteTests1 request");
+ ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/Spaces%20can%20be%20everywhere1.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";
+ Assert.assertFalse("stderr should NOT contains `" + cc + "`, but did", pr.stderr.contains(cc));
+ Assert.assertFalse("should not be terminated, but was", pr.wasTerminated);
+ Assert.assertEquals((Integer) 0, pr.returnValue);
+ }
+
+ @Test
+ public void SpacesCanBeEverywhereRemoteTests2() throws Exception {
+ System.out.println("connecting SpacesCanBeEverywhereRemoteTests2 request");
+ System.err.println("connecting SpacesCanBeEverywhereRemoteTests2 request");
+ ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/Spaces%20can%20be%20everywhere2.jnlp");
+ System.out.println(pr.stdout);
+ System.err.println(pr.stderr);
+ String s="Spaces can be everywhere.jsr was launched correctly";
+ Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
+ String cc = "ClassNotFoundException";
+ Assert.assertFalse("stderr should NOT contains `" + cc + "`, but did", pr.stderr.contains(cc));
+ Assert.assertFalse("should not be terminated, but was", pr.wasTerminated);
+ Assert.assertEquals((Integer) 0, pr.returnValue);
+ }
+
+ @Test
+ public void SpacesCanBeEverywhereRemoteTests3() throws Exception {
+ System.out.println("connecting SpacesCanBeEverywhereRemoteTests3 request");
+ System.err.println("connecting SpacesCanBeEverywhereRemoteTests3 request");
+ ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/SpacesCanBeEverywhere1.jnlp");
+ System.out.println(pr.stdout);
+ System.err.println(pr.stderr);
+ String s="Spaces can be everywhere.jsr was launched correctly";
+ Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
+ String cc = "ClassNotFoundException";
+ Assert.assertFalse("stderr should NOT contains `" + cc + "`, but did", pr.stderr.contains(cc));
+ Assert.assertFalse("should not be terminated, but was", pr.wasTerminated);
+ Assert.assertEquals((Integer) 0, pr.returnValue);
+ }
+
+
+ @Test
+ public void SpacesCanBeEverywhereLocalTests1() 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";
+ Assert.assertFalse("stderr should NOT contains `" + cc + "`, but did", pr.stderr.contains(cc));
+ Assert.assertFalse("should not be terminated, but was", pr.wasTerminated);
+ Assert.assertEquals((Integer) 0, pr.returnValue);
+ }
+
+ @Test
+ public void SpacesCanBeEverywhereLocalTests2() throws Exception {
+ System.out.println("connecting SpacesCanBeEverywhereLocalTests2 request");
+ System.err.println("connecting SpacesCanBeEverywhereLocalTests2 request");
+ List<String> commands=new ArrayList<String>(4);
+ commands.add(server.getJavawsLocation());
+ commands.add(ServerAccess.HEADLES_OPTION);
+ commands.add("Spaces can be everywhere2.jnlp");
+ ServerAccess.ProcessResult pr = ServerAccess.executeProcess(commands,server.getDir());
+ System.out.println(pr.stdout);
+ System.err.println(pr.stderr);
+ String s="Spaces can be everywhere.jsr was launched correctly";
+ Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
+ String cc = "ClassNotFoundException";
+ Assert.assertFalse("stderr should NOT contains `" + cc + "`, but did", pr.stderr.contains(cc));
+ Assert.assertFalse("should not be terminated, but was", pr.wasTerminated);
+ Assert.assertEquals((Integer) 0, pr.returnValue);
+ }
+
+ @Test
+ public void SpacesCanBeEverywhereLocalTests3() throws Exception {
+ System.out.println("connecting SpacesCanBeEverywhereLocalTests3 request");
+ System.err.println("connecting SpacesCanBeEverywhereLocalTests3 request");
+ List<String> commands=new ArrayList<String>(4);
+ commands.add(server.getJavawsLocation());
+ commands.add(ServerAccess.HEADLES_OPTION);
+ commands.add("SpacesCanBeEverywhere1.jnlp");
+ ServerAccess.ProcessResult pr = ServerAccess.executeProcess(commands,server.getDir());
+ System.out.println(pr.stdout);
+ System.err.println(pr.stderr);
+ String s="Spaces can be everywhere.jsr was launched correctly";
+ Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
+ String cc = "ClassNotFoundException";
+ Assert.assertFalse("stderr should NOT contains `" + cc + "`, but did", pr.stderr.contains(cc));
+ Assert.assertFalse("should not be terminated, but was", pr.wasTerminated);
+ Assert.assertEquals((Integer) 0, pr.returnValue);
+ }
+}
diff -r 5860a2cbe221 -r 22db4e09bbc7 tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ResourcesTest.java
--- a/tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ResourcesTest.java Thu Nov 10 20:57:36 2011 +0100
+++ b/tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ResourcesTest.java Fri Nov 11 14:40:26 2011 +0100
@@ -38,6 +38,7 @@
More information about the distro-pkg-dev
mailing list