REOPENED - bug 296894: [releng] fix failing tests for 3.4

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

3 files changed, 33 insertions, 8 deletions

diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/AbstractTracClient.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/AbstractTracClient.java
index a39806c6d..16f8b5844 100644
--- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/AbstractTracClient.java
+++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/AbstractTracClient.java
@@ -15,16 +15,19 @@ import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.Proxy;
 import java.net.URL;
+import java.util.Arrays;
 import java.util.HashMap;
 
 import org.apache.commons.httpclient.Cookie;
 import org.apache.commons.httpclient.HostConfiguration;
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.NameValuePair;
+import org.apache.commons.httpclient.auth.AuthScope;
 import org.apache.commons.httpclient.cookie.CookiePolicy;
 import org.apache.commons.httpclient.methods.PostMethod;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.mylyn.commons.core.CoreUtil;
 import org.eclipse.mylyn.commons.net.AbstractWebLocation;
 import org.eclipse.mylyn.commons.net.AuthenticationCredentials;
 import org.eclipse.mylyn.commons.net.WebUtil;
@@ -141,6 +144,13 @@ public abstract class AbstractTracClient implements ITracClient {
 			}
 		}
 
+		if (CoreUtil.TEST_MODE) {
+			AuthScope authScope = new AuthScope(WebUtil.getHost(repositoryUrl), WebUtil.getPort(repositoryUrl), null,
+					AuthScope.ANY_SCHEME);
+			System.err.println(" Authentication failed: " + httpClient.getState().getCredentials(authScope)); //$NON-NLS-1$
+			System.err.println(" Cookies: " + Arrays.asList(cookies)); //$NON-NLS-1$
+		}
+
 		throw new TracLoginException();
 	}
 
diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/TracWebClient.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/TracWebClient.java
index 0741b068f..6ad5bff45 100644
--- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/TracWebClient.java
+++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/TracWebClient.java
@@ -29,6 +29,7 @@ import java.util.StringTokenizer;
 
 import javax.swing.text.html.HTML.Tag;
 
+import org.apache.commons.httpclient.Credentials;
 import org.apache.commons.httpclient.HostConfiguration;
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.HttpStatus;
@@ -39,6 +40,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.mylyn.commons.core.CoreUtil;
 import org.eclipse.mylyn.commons.core.StatusHandler;
 import org.eclipse.mylyn.commons.net.AbstractWebLocation;
 import org.eclipse.mylyn.commons.net.AuthenticationCredentials;
@@ -95,8 +97,11 @@ public class TracWebClient extends AbstractTracClient {
 						try {
 							authenticate(monitor);
 						} catch (TracLoginException e) {
-							// try again once
-							authenticate(monitor);
+							if (CoreUtil.TEST_MODE) {
+								authenticate(monitor);
+							} else {
+								throw e;
+							}
 						}
 					}
 				}
@@ -140,8 +145,12 @@ public class TracWebClient extends AbstractTracClient {
 				// try standard basic/digest/ntlm authentication first
 				AuthScope authScope = new AuthScope(WebUtil.getHost(repositoryUrl), WebUtil.getPort(repositoryUrl),
 						null, AuthScope.ANY_SCHEME);
-				httpClient.getState().setCredentials(authScope,
-						WebUtil.getHttpClientCredentials(credentials, WebUtil.getHost(repositoryUrl)));
+				Credentials httpCredentials = WebUtil.getHttpClientCredentials(credentials,
+						WebUtil.getHost(repositoryUrl));
+				httpClient.getState().setCredentials(authScope, httpCredentials);
+				if (CoreUtil.TEST_MODE) {
+					System.err.println(" Setting credentials: " + httpCredentials); //$NON-NLS-1$
+				}
 
 				GetMethod method = new GetMethod(WebUtil.getRequestPath(repositoryUrl + LOGIN_URL));
 				method.setFollowRedirects(false);
@@ -743,8 +752,8 @@ public class TracWebClient extends AbstractTracClient {
 		}
 	}
 
-	public void putAttachmentData(int id, String name, String description, InputStream in, IProgressMonitor monitor, boolean replace)
-			throws TracException {
+	public void putAttachmentData(int id, String name, String description, InputStream in, IProgressMonitor monitor,
+			boolean replace) throws TracException {
 		throw new TracException("Unsupported operation"); //$NON-NLS-1$
 	}
 
diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/TracXmlRpcClient.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/TracXmlRpcClient.java
index 007c784a3..52121da1e 100644
--- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/TracXmlRpcClient.java
+++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/TracXmlRpcClient.java
@@ -49,6 +49,7 @@ import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.mylyn.commons.core.CoreUtil;
 import org.eclipse.mylyn.commons.core.StatusHandler;
 import org.eclipse.mylyn.commons.net.AbstractWebLocation;
 import org.eclipse.mylyn.commons.net.AuthenticationCredentials;
@@ -296,8 +297,13 @@ public class TracXmlRpcClient extends AbstractTracClient implements ITracWikiCli
 			AuthenticationCredentials credentials = location.getCredentials(AuthenticationType.REPOSITORY);
 			config.setServerURL(getXmlRpcUrl(credentials));
 			if (credentialsValid(credentials)) {
-				Credentials creds = WebUtil.getHttpClientCredentials(credentials, WebUtil.getHost(location.getUrl()));
-				httpClient.getState().setCredentials(authScope, creds);
+				Credentials httpCredentials = WebUtil.getHttpClientCredentials(credentials,
+						WebUtil.getHost(location.getUrl()));
+				httpClient.getState().setCredentials(authScope, httpCredentials);
+				if (CoreUtil.TEST_MODE) {
+					System.err.println(" Setting credentials: " + httpCredentials); //$NON-NLS-1$
+				}
+				httpClient.getState().setCredentials(authScope, httpCredentials);
 			} else {
 				httpClient.getState().clearCredentials();
 			}