Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorspingel2007-02-19 12:00:15 -0500
committerspingel2007-02-19 12:00:15 -0500
commitd327b69e65460641b110ea56ed9ef205cee6ebba (patch)
tree61fdbe689aac32834af7a52ed9cb62318e6774aa
parent93865c9555f6ef7b11ddb801081f497fc9461e30 (diff)
downloadorg.eclipse.mylyn.tasks-d327b69e65460641b110ea56ed9ef205cee6ebba.tar.gz
org.eclipse.mylyn.tasks-d327b69e65460641b110ea56ed9ef205cee6ebba.tar.xz
org.eclipse.mylyn.tasks-d327b69e65460641b110ea56ed9ef205cee6ebba.zip
NEW - bug 174620: Mylar ignores proxy settings for Trac connector
https://bugs.eclipse.org/bugs/show_bug.cgi?id=174620
-rw-r--r--org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AbstractTracClientTest.java6
-rw-r--r--org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TestProxy.java220
-rw-r--r--org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracWebClientProxyTest.java41
3 files changed, 266 insertions, 1 deletions
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AbstractTracClientTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AbstractTracClientTest.java
index 51d0db1a9..7be664b15 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AbstractTracClientTest.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AbstractTracClientTest.java
@@ -59,8 +59,12 @@ public abstract class AbstractTracClientTest extends TestCase {
}
public ITracClient connect(String url) throws Exception {
+ return connect(url, Proxy.NO_PROXY);
+ }
+
+ public ITracClient connect(String url, Proxy proxy) throws Exception {
Credentials credentials = MylarTestUtils.readCredentials(PrivilegeLevel.USER);
- return connect(url, credentials.username, credentials.password);
+ return connect(url, credentials.username, credentials.password, proxy);
}
public ITracClient connect(String url, String username, String password) throws Exception {
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
new file mode 100644
index 000000000..087519c28
--- /dev/null
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TestProxy.java
@@ -0,0 +1,220 @@
+package org.eclipse.mylar.trac.tests;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.InterruptedIOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.StringTokenizer;
+
+public class TestProxy implements Runnable {
+
+ private int listenPort;
+
+ private Message request;
+
+ private Message response;
+
+ private Thread runner;
+
+ private IOException exception;
+
+ private volatile boolean stopped = false;
+
+ public TestProxy(int listenPort) {
+ this.listenPort = listenPort;
+ }
+
+ public TestProxy() {
+ }
+
+ public synchronized int getListenPort() throws InterruptedException {
+ while (listenPort == 0) {
+ wait();
+ }
+ return listenPort;
+ }
+
+ public void start() {
+ runner = new Thread(this, "TestProxy :" + listenPort);
+ runner.start();
+ }
+
+ public int startAndWait() throws InterruptedException {
+ start();
+ int port = getListenPort();
+ // wait for socket to enter accept call
+ Thread.sleep(100);
+ return port;
+ }
+
+ public void run() {
+ ServerSocket serverSocket = null;
+ try {
+ serverSocket = new ServerSocket(listenPort);
+ synchronized (this) {
+ listenPort = serverSocket.getLocalPort();
+ notifyAll();
+ }
+ while (!stopped) {
+ Socket socket = serverSocket.accept();
+ try {
+ Message request = readMessage(socket.getInputStream());
+ setRequest(request);
+
+ Message response = waitForResponse();
+ writeMessage(response, socket.getOutputStream());
+ } finally {
+ try {
+ socket.close();
+ } catch (IOException e1) {
+ }
+ }
+ }
+ } catch (InterruptedIOException e) {
+ } catch (IOException e) {
+ setException(e);
+ } catch (InterruptedException e) {
+ } finally {
+ if (serverSocket != null) {
+ try {
+ serverSocket.close();
+ } catch (IOException e) {
+ }
+ }
+ }
+
+ }
+
+ private void writeMessage(Message message, OutputStream out) throws IOException {
+ BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(out));
+ writer.write(message.toString());
+ }
+
+ private synchronized void setException(IOException exception) {
+ this.exception = exception;
+ notifyAll();
+ }
+
+ public synchronized void checkForException() throws IOException {
+ if (exception != null) {
+ throw exception;
+ }
+ }
+
+ private Message readMessage(InputStream in) throws IOException {
+ BufferedReader reader = new BufferedReader(new InputStreamReader(in));
+ Message message = null;
+ String line;
+ while ((line = reader.readLine()) != null) {
+ if (line.length() == 0) {
+ if (message == null) {
+ throw new IOException("Incomplete message");
+ }
+ return message;
+ }
+
+ if (message == null) {
+ message = new Message(line);
+ } else {
+ StringTokenizer t = new StringTokenizer(line, ":");
+ message.headers.put(t.nextToken(), t.nextToken().trim());
+ }
+ }
+ throw new EOFException();
+ }
+
+ public void stop() {
+ stopped = true;
+ runner.interrupt();
+ try {
+ runner.join(500);
+ } catch (InterruptedException e) {
+ }
+ }
+
+ public Message getRequest() {
+ return request;
+ }
+
+ public synchronized Message waitForRequest() throws InterruptedException {
+ while (request == null) {
+ wait();
+ }
+ return request;
+ }
+
+ public synchronized Message waitForResponse() throws InterruptedException {
+ while (response == null) {
+ wait();
+ }
+ return response;
+ }
+
+ public synchronized void setResponse(Message response) {
+ this.response = response;
+ notifyAll();
+ }
+
+ public synchronized void setResponse(String response) {
+ this.response = new Message(response);
+ notifyAll();
+ }
+
+ public synchronized void setRequest(Message request) {
+ this.request = request;
+ notifyAll();
+ }
+
+ public static class Message {
+
+ public Message(String request) {
+ this.request = request;
+ }
+
+ public String request;
+
+ public Map<String, String> headers = new HashMap<String, String>();
+
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder();
+ sb.append(request);
+ sb.append("\n");
+ if (headers != null) {
+ for (String key : headers.keySet()) {
+ sb.append(key + ": " + headers.get(key));
+ sb.append("\n");
+ }
+ }
+ sb.append("\n");
+ return sb.toString();
+ }
+
+ }
+
+ public static void main(String[] args) {
+ TestProxy proxy = new TestProxy(8080);
+ proxy.start();
+ try {
+ proxy.setResponse(new Message("404 / HTTP 1.1"));
+ try {
+ System.out.println(proxy.waitForRequest());
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ } finally {
+ proxy.stop();
+ }
+
+ }
+
+}
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
new file mode 100644
index 000000000..535ef4e16
--- /dev/null
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracWebClientProxyTest.java
@@ -0,0 +1,41 @@
+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();
+ }
+
+}

Back to the top