/hg/icedtea-web: Reproducer for URL parameters in document-base.
adomurad at icedtea.classpath.org
adomurad at icedtea.classpath.org
Tue Apr 23 10:39:12 PDT 2013
changeset b16893fb126a in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=b16893fb126a
author: Adam Domurad <adomurad at redhat.com>
date: Tue Apr 23 13:39:45 2013 -0400
Reproducer for URL parameters in document-base.
diffstat:
ChangeLog | 10 +
tests/reproducers/simple/DocumentBaseEncoding/resources/Document Base Encoding.html | 43 +++++
tests/reproducers/simple/DocumentBaseEncoding/srcs/DocumentBaseEncoding.java | 47 +++++
tests/reproducers/simple/DocumentBaseEncoding/testcases/DocumentBaseEncodingTests.java | 84 ++++++++++
4 files changed, 184 insertions(+), 0 deletions(-)
diffs (203 lines):
diff -r 032710c7ed32 -r b16893fb126a ChangeLog
--- a/ChangeLog Tue Apr 23 13:27:20 2013 -0400
+++ b/ChangeLog Tue Apr 23 13:39:45 2013 -0400
@@ -1,3 +1,13 @@
+2013-04-23 Adam Domurad <adomurad at redhat.com>
+
+ Reproducer for URL parameters (eg ?a=b) in document-base.
+ * tests/reproducers/simple/URLParametersInDocumentBase/resources/URLParametersInDocumentBase.html:
+ Page that loads applet.
+ * tests/reproducers/simple/URLParametersInDocumentBase/srcs/URLParametersInDocumentBase.java:
+ Applet that prints code-base & document-base.
+ * tests/reproducers/simple/URLParametersInDocumentBase/testcases/URLParametersInDocumentBaseTests.java:
+ Test-driver.
+
2013-04-23 Adam Domurad <adomurad at redhat.com>
* netx/net/sourceforge/jnlp/NetxPanel.java
diff -r 032710c7ed32 -r b16893fb126a tests/reproducers/simple/DocumentBaseEncoding/resources/Document Base Encoding.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/simple/DocumentBaseEncoding/resources/Document Base Encoding.html Tue Apr 23 13:39:45 2013 -0400
@@ -0,0 +1,43 @@
+<!--
+
+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.
+
+ -->
+<html><head></head><body bgcolor="blue">
+<applet
+ code="DocumentBaseEncoding.class"
+ archive="DocumentBaseEncoding.jar"
+></applet>
+</body></html>
diff -r 032710c7ed32 -r b16893fb126a tests/reproducers/simple/DocumentBaseEncoding/srcs/DocumentBaseEncoding.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/simple/DocumentBaseEncoding/srcs/DocumentBaseEncoding.java Tue Apr 23 13:39:45 2013 -0400
@@ -0,0 +1,47 @@
+/*
+Copyright (C) 2013 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.applet.Applet;
+
+public class DocumentBaseEncoding extends Applet {
+ @Override
+ public void init() {
+ System.out.println("DocumentBase: " + getDocumentBase());
+ System.out.println("CodeBase: " + getCodeBase());
+ System.out.println("*** APPLET FINISHED ***");
+ }
+}
diff -r 032710c7ed32 -r b16893fb126a tests/reproducers/simple/DocumentBaseEncoding/testcases/DocumentBaseEncodingTests.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/simple/DocumentBaseEncoding/testcases/DocumentBaseEncodingTests.java Tue Apr 23 13:39:45 2013 -0400
@@ -0,0 +1,84 @@
+/*
+Copyright (C) 2013 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 net.sourceforge.jnlp.ProcessResult;
+import net.sourceforge.jnlp.ServerAccess.AutoClose;
+import net.sourceforge.jnlp.annotations.TestInBrowsers;
+import net.sourceforge.jnlp.browsertesting.BrowserTest;
+import net.sourceforge.jnlp.browsertesting.Browsers;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class DocumentBaseEncodingTests extends BrowserTest {
+
+ static final private String urlPattern = "http://localhost:\\d+";
+
+ private String escapePattern(String plainText) {
+ return "\\Q" + plainText + "\\E";
+ }
+
+ // Surround a pattern with two plain text matches and wildcards to match any occurence
+ private String surroundPattern(String plainText1, String pattern, String plainText2) {
+ return "(?s).*" + escapePattern(plainText1) + pattern + escapePattern(plainText2) + "\\W.*";
+ }
+
+ private void testEncoding(String urlParam, String encodedUrlParam) throws Exception {
+ ProcessResult pr = server.executeBrowser("Document Base Encoding.html" + urlParam, AutoClose.CLOSE_ON_CORRECT_END);
+ final String codeBasePattern = surroundPattern("CodeBase: ", urlPattern, "/");
+ final String documentBasePattern = surroundPattern("DocumentBase: ", urlPattern, "/Document%20Base%20Encoding.html" + encodedUrlParam);
+
+ Assert.assertTrue("DocumentBaseEncoding stdout should match '" + codeBasePattern + "' but did not.",
+ pr.stdout.matches(codeBasePattern));
+ Assert.assertTrue("DocumentBaseEncoding stdout should match '" + documentBasePattern + "' but did not.",
+ pr.stdout.matches(documentBasePattern));
+ }
+
+ @Test
+ @TestInBrowsers(testIn = { Browsers.one })
+ public void testSpacesInUrl() throws Exception {
+ testEncoding("?spaces test", "?spaces%20test");
+ }
+
+ @Test
+ @TestInBrowsers(testIn = { Browsers.one })
+ public void testComplexParameterInUrl() throws Exception {
+
+ String urlParam = "?testkey=http%3A%2F%2Ftest.com%3Ftest%3Dtest"; // test value is 'http://test.com?test=test' percent-encoded
+ testEncoding(urlParam, urlParam /* Already encoded. */);
+ }
+}
More information about the distro-pkg-dev
mailing list