/hg/icedtea-web: Add unit tests for PluginProxySelector
omajid at icedtea.classpath.org
omajid at icedtea.classpath.org
Tue Oct 1 08:51:52 PDT 2013
changeset 14d2babbf9fd in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=14d2babbf9fd
author: Omair Majid <omajid at redhat.com>
date: Tue Oct 01 11:51:00 2013 -0400
Add unit tests for PluginProxySelector
There are no functional changes to PluginProxySelector itself. Refactor
minimial code to make it possible to unit test. Mark suspicious
behaviour with a FIXME or TODO.
diffstat:
ChangeLog | 8 +
plugin/icedteanp/java/sun/applet/PluginProxySelector.java | 7 +-
tests/netx/unit/sun/applet/PluginProxySelectorTest.java | 195 ++++++++++++++
3 files changed, 209 insertions(+), 1 deletions(-)
diffs (238 lines):
diff -r 654630a490cb -r 14d2babbf9fd ChangeLog
--- a/ChangeLog Thu Sep 26 10:25:33 2013 -0400
+++ b/ChangeLog Tue Oct 01 11:51:00 2013 -0400
@@ -1,3 +1,11 @@
+2013-10-01 Omair Majid <omajid at redhat.com>
+
+ * plugin/icedteanp/java/sun/applet/PluginProxySelector.java
+ (getFromBrowser): Move call to
+ PluginAppletViewer.requestPluginProxyInfo into new method.
+ (getProxyFromRemoteCallToBrowser): New method.
+ * tests/netx/unit/sun/applet/PluginProxySelectorTest.java: New file.
+
2013-09-26 Andrew Azores <aazores at redhat.com>
Fix for PR1204. Absolute paths in resource URLs are correctly handled when
diff -r 654630a490cb -r 14d2babbf9fd plugin/icedteanp/java/sun/applet/PluginProxySelector.java
--- a/plugin/icedteanp/java/sun/applet/PluginProxySelector.java Thu Sep 26 10:25:33 2013 -0400
+++ b/plugin/icedteanp/java/sun/applet/PluginProxySelector.java Tue Oct 01 11:51:00 2013 -0400
@@ -85,7 +85,7 @@
// Nothing usable in cache. Fetch info from browser
Proxy proxy = Proxy.NO_PROXY;
- Object o = PluginAppletViewer.requestPluginProxyInfo(uri);
+ Object o = getProxyFromRemoteCallToBrowser(uri);
// If the browser returned anything, try to parse it. If anything in the try block fails, the fallback is direct connection
try {
@@ -118,6 +118,11 @@
return proxyList;
}
+ /** For tests to override */
+ protected Object getProxyFromRemoteCallToBrowser(URI uri) {
+ return PluginAppletViewer.requestPluginProxyInfo(uri);
+ }
+
/**
* Checks to see if proxy information is already cached.
*
diff -r 654630a490cb -r 14d2babbf9fd tests/netx/unit/sun/applet/PluginProxySelectorTest.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/netx/unit/sun/applet/PluginProxySelectorTest.java Tue Oct 01 11:51:00 2013 -0400
@@ -0,0 +1,195 @@
+/* PluginProxySelectorTest
+ Copyright (C) 2013 Red Hat
+
+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. */
+
+package sun.applet;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.net.Proxy.Type;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.List;
+
+import net.sourceforge.jnlp.config.DeploymentConfiguration;
+import net.sourceforge.jnlp.runtime.JNLPProxySelector;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class PluginProxySelectorTest {
+
+ private static class TestSelector extends PluginProxySelector {
+
+ private URI browserResponse = null;
+ private int remoteCallCount = 0;
+
+ public TestSelector(DeploymentConfiguration config) {
+ super(config);
+ }
+
+ @Override
+ protected Object getProxyFromRemoteCallToBrowser(URI uri) {
+ remoteCallCount++;
+ return browserResponse;
+ }
+
+ public void setBrowserResponse(URI response) {
+ browserResponse = response;
+ }
+
+ public int getRemoteCallCount() {
+ return remoteCallCount;
+ }
+ }
+
+ private String PROXY_HOST = "localhost";
+ private int PROXY_PORT = 42;
+
+ private DeploymentConfiguration config;
+ private TestSelector proxySelector;
+
+ @Before
+ public void setUp() {
+ config = new DeploymentConfiguration();
+ config.setProperty(DeploymentConfiguration.KEY_PROXY_TYPE, String.valueOf(JNLPProxySelector.PROXY_TYPE_BROWSER));
+
+ proxySelector = new TestSelector(config);
+ }
+
+ @Test
+ public void testNullResponseFromBrowserMeansNoProxy() throws URISyntaxException {
+ List<Proxy> result = proxySelector.select(new URI("http://example.org"));
+
+ assertNotNull(result);
+ assertEquals(1, result.size());
+ assertEquals(Proxy.NO_PROXY, result.get(0));
+ }
+
+ @Test
+ public void testUnrecognizedURIMeansNoProxy() throws URISyntaxException {
+ TestSelector proxySelector = new TestSelector(config);
+
+ proxySelector.setBrowserResponse(new URI("http://" + PROXY_HOST + ":" + PROXY_PORT));
+
+ List<Proxy> result = proxySelector.select(new URI("foo://example.org"));
+
+ assertNotNull(result);
+ assertEquals(1, result.size());
+ assertEquals(Proxy.NO_PROXY, result.get(0));
+ }
+
+ @Test
+ public void testHttpResponseFromBrowser() throws URISyntaxException {
+ proxySelector.setBrowserResponse(new URI("http://" + PROXY_HOST + ":" + PROXY_PORT));
+
+ List<Proxy> result = proxySelector.select(new URI("http://example.org"));
+
+ Proxy expectedProxy = new Proxy(Type.HTTP, new InetSocketAddress(PROXY_HOST, PROXY_PORT));
+
+ assertNotNull(result);
+ assertEquals(1, result.size());
+ assertEquals(expectedProxy, result.get(0));
+ }
+
+ @Test
+ public void testHttpsResponseFromBrowser() throws URISyntaxException {
+ proxySelector.setBrowserResponse(new URI("https://" + PROXY_HOST + ":" + PROXY_PORT));
+
+ List<Proxy> result = proxySelector.select(new URI("https://example.org"));
+
+ // FIXME if a browser returns a https URI, that does not mean socks
+ Proxy expectedProxy = new Proxy(Type.SOCKS, new InetSocketAddress(PROXY_HOST, PROXY_PORT));
+
+ assertNotNull(result);
+ assertEquals(1, result.size());
+ assertEquals(expectedProxy, result.get(0));
+ }
+
+ @Test
+ public void testFtpResponseFromBrowser() throws URISyntaxException {
+ proxySelector.setBrowserResponse(new URI("ftp://" + PROXY_HOST + ":" + PROXY_PORT));
+
+ List<Proxy> result = proxySelector.select(new URI("ftp://example.org"));
+
+ // FIXME if a browser returns a ftp URI, that doesn't mean socks
+ Proxy expectedProxy = new Proxy(Type.SOCKS, new InetSocketAddress(PROXY_HOST, PROXY_PORT));
+
+ assertNotNull(result);
+ assertEquals(1, result.size());
+ assertEquals(expectedProxy, result.get(0));
+ }
+
+ @Test
+ public void testSocketResponseFromBrowser() throws URISyntaxException {
+ TestSelector proxySelector = new TestSelector(config);
+
+ // TODO does firefox actually return a "socks" URI? or a "socket" uri?
+ proxySelector.setBrowserResponse(new URI("socks://" + PROXY_HOST + ":" + PROXY_PORT));
+
+ List<Proxy> result = proxySelector.select(new URI("socket://example.org"));
+
+ Proxy expectedProxy = new Proxy(Type.SOCKS, new InetSocketAddress(PROXY_HOST, PROXY_PORT));
+
+ assertNotNull(result);
+ assertEquals(1, result.size());
+ assertEquals(expectedProxy, result.get(0));
+ }
+
+ @Test
+ public void testCacheIsUsedOnRepeatedCalls() throws URISyntaxException {
+ proxySelector.setBrowserResponse(new URI("http://" + PROXY_HOST + ":" + PROXY_PORT));
+
+ proxySelector.select(new URI("http://example.org"));
+ proxySelector.select(new URI("http://example.org"));
+
+ assertEquals(1, proxySelector.getRemoteCallCount());
+ }
+
+ @Test
+ public void testCacheIsNotUsedOnDifferentCalls() throws URISyntaxException {
+ proxySelector.setBrowserResponse(new URI("http://" + PROXY_HOST + ":" + PROXY_PORT));
+
+ proxySelector.select(new URI("http://foo.example.org"));
+ proxySelector.select(new URI("http://bar.example.org"));
+
+ assertEquals(2, proxySelector.getRemoteCallCount());
+ }
+
+}
More information about the distro-pkg-dev
mailing list