NEW - bug 174620: Mylar ignores proxy settings for Trac connector

https://bugs.eclipse.org/bugs/show_bug.cgi?id=174620

4 files changed, 74 insertions, 41 deletions

diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AllTracTests.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AllTracTests.java
index 740761ac6..07d56cc1e 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AllTracTests.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AllTracTests.java
@@ -43,6 +43,7 @@ public class AllTracTests {
 		suite.addTestSuite(TracTaskTest.class);
 		suite.addTestSuite(TracQueryHitTest.class);
 		suite.addTestSuite(TracRepositorySettingsPageTest.class);
+		suite.addTestSuite(TracClientProxyTest.class);
 		// $JUnit-END$
 		return suite;
 	}
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TestProxy.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TestProxy.java
index 087519c28..43367471b 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TestProxy.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TestProxy.java
@@ -17,6 +17,8 @@ import java.util.StringTokenizer;
 
 public class TestProxy implements Runnable {
 
+	public static final String NOT_FOUND = "HTTP/1.1 404 Not Found";
+
 	private int listenPort;
 
 	private Message request;
@@ -198,6 +200,11 @@ public class TestProxy implements Runnable {
 			sb.append("\n");
 			return sb.toString();
 		}
+
+		public String getMethod() {
+			int i = request.indexOf(" ");
+			return (i != -1) ? request.substring(0, i) : request;
+		}
 		
 	}
 
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracClientProxyTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracClientProxyTest.java
new file mode 100644
index 000000000..ab7db8644
--- /dev/null
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracClientProxyTest.java
@@ -0,0 +1,66 @@
+package org.eclipse.mylar.trac.tests;
+
+import java.net.Proxy;
+
+import org.eclipse.mylar.core.net.WebClientUtil;
+import org.eclipse.mylar.internal.trac.core.ITracClient;
+import org.eclipse.mylar.internal.trac.core.TracException;
+import org.eclipse.mylar.internal.trac.core.ITracClient.Version;
+
+public class TracClientProxyTest extends AbstractTracClientTest {
+
+	private TestProxy testProxy;
+	private Proxy proxy;
+	private int proxyPort;
+	
+	public TracClientProxyTest() {
+	}
+	
+	@Override
+	protected void setUp() throws Exception {
+		super.setUp();
+		
+		testProxy = new TestProxy();
+		proxyPort = testProxy.startAndWait();
+	}
+	
+	@Override
+	protected void tearDown() throws Exception {
+		super.tearDown();
+		
+		testProxy.stop();
+	}
+	
+	public void testConnectProxyWeb() throws Exception {
+		version = Version.TRAC_0_9;
+		connectProxy(Constants.TEST_TRAC_010_URL, "GET");
+	}
+
+	public void testConnectProxyXmlRpc() throws Exception {
+		version = Version.XML_RPC;
+		connectProxy(Constants.TEST_TRAC_010_URL, "POST");
+	}
+
+	public void testConnectProxySslWeb() throws Exception {
+		version = Version.TRAC_0_9;
+		connectProxy(Constants.TEST_TRAC_010_SSL_URL, "CONNECT");
+	}
+
+	public void testConnectProxySslXmlRpc() throws Exception {
+		version = Version.XML_RPC;
+		connectProxy(Constants.TEST_TRAC_010_SSL_URL, "CONNECT");
+	}
+
+	private void connectProxy(String url, String expectedMethod) throws Exception {
+		testProxy.setResponse(TestProxy.NOT_FOUND);
+		proxy = WebClientUtil.getProxy("localhost", proxyPort + "", "", "");
+		ITracClient client = connect(url, proxy);
+		try {
+			client.validate();
+		} catch (TracException e) {
+		}
+
+		assertEquals(expectedMethod, testProxy.getRequest().getMethod());
+	}
+	
+}
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracWebClientProxyTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracWebClientProxyTest.java
deleted file mode 100644
index 535ef4e16..000000000
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracWebClientProxyTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.eclipse.mylar.trac.tests;
-
-import java.net.Proxy;
-
-import org.eclipse.mylar.core.net.WebClientUtil;
-import org.eclipse.mylar.internal.trac.core.ITracClient;
-import org.eclipse.mylar.internal.trac.core.ITracClient.Version;
-
-public class TracWebClientProxyTest extends AbstractTracClientTest {
-
-	private TestProxy testProxy;
-	private Proxy proxy;
-	private int proxyPort;
-	
-	public TracWebClientProxyTest() {
-		super(Version.TRAC_0_9);
-	}
-	
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		
-		testProxy = new TestProxy();
-		proxyPort = testProxy.startAndWait();
-	}
-	
-	@Override
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		
-		testProxy.stop();
-	}
-	
-	public void testConnectProxy() throws Exception {
-		testProxy.setResponse("404");
-		proxy = WebClientUtil.getProxy("localhost", proxyPort + "", "", "");
-		ITracClient client = connect(Constants.TEST_TRAC_010_URL, proxy);
-		client.validate();
-	}
-	
-}