diff options
author | spingel | 2008-04-05 10:35:31 +0000 |
---|---|---|
committer | spingel | 2008-04-05 10:35:31 +0000 |
commit | 1123d3c7c6d79ffd5300aa690eed4e65a95c3055 (patch) | |
tree | 33ae48597067dfd642dec18981af49a24625c879 /org.eclipse.mylyn.trac.tests | |
parent | 4efe1bfc6577a55622bd2b63ca6525142a67015b (diff) | |
download | org.eclipse.mylyn.tasks-1123d3c7c6d79ffd5300aa690eed4e65a95c3055.tar.gz org.eclipse.mylyn.tasks-1123d3c7c6d79ffd5300aa690eed4e65a95c3055.tar.xz org.eclipse.mylyn.tasks-1123d3c7c6d79ffd5300aa690eed4e65a95c3055.zip |
NEW - bug 225873: implement cancellation support Trac
https://bugs.eclipse.org/bugs/show_bug.cgi?id=225873
Diffstat (limited to 'org.eclipse.mylyn.trac.tests')
10 files changed, 36 insertions, 80 deletions
diff --git a/org.eclipse.mylyn.trac.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.trac.tests/META-INF/MANIFEST.MF index aae2f6289..718036974 100644 --- a/org.eclipse.mylyn.trac.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.trac.tests/META-INF/MANIFEST.MF @@ -1,27 +1,25 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Mylyn Trac Connector Tests -Bundle-SymbolicName: org.eclipse.mylyn.trac.tests +Bundle-SymbolicName: org.eclipse.mylyn.trac.tests;singleton:=true Bundle-Version: 0.0.0 -Require-Bundle: org.junit, - org.eclipse.ui, +Require-Bundle: org.apache.xmlrpc;bundle-version="3.0.0", + org.junit, org.eclipse.core.runtime, + org.eclipse.jface.text, + org.eclipse.search, + org.eclipse.ui, + org.eclipse.ui.workbench.texteditor, org.eclipse.mylyn.context.core, + org.eclipse.mylyn.context.tests, org.eclipse.mylyn.tasks.ui, org.eclipse.mylyn.tasks.core, - org.eclipse.mylyn.context.tests, org.eclipse.mylyn.trac.ui, org.eclipse.mylyn.trac.core, - org.eclipse.search, - org.eclipse.mylyn, - org.eclipse.ui.workbench.texteditor, - org.eclipse.jface.text, - org.eclipse.mylyn.web.core, - org.apache.xmlrpc;bundle-version="3.0.0" + org.eclipse.mylyn.web.core Export-Package: org.eclipse.mylyn.internal.trac.ui;x-internal:=true, org.eclipse.mylyn.trac.tests;x-internal:=true, org.eclipse.mylyn.trac.tests.support;x-internal:=true -Bundle-Activator: org.eclipse.mylyn.trac.tests.TracTestPlugin -Eclipse-LazyStart: true +Eclipse-LazyStart: false Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: Eclipse.org 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 f25af01c4..e4e7e1db2 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 @@ -11,9 +11,7 @@ package org.eclipse.mylyn.trac.tests; import junit.framework.Test; import junit.framework.TestSuite; -import org.eclipse.mylyn.internal.trac.core.TracCorePlugin; import org.eclipse.mylyn.internal.trac.ui.TracHyperlinkUtilTest; -import org.eclipse.mylyn.tasks.core.TaskRepositoryLocationFactory; /** * @author Mik Kersten @@ -22,15 +20,8 @@ import org.eclipse.mylyn.tasks.core.TaskRepositoryLocationFactory; public class AllTracTests { public static Test suite() { -// UrlConnectionUtil.initCommonsLoggingSettings(); - - TracCorePlugin.getDefault() - .getConnector() - .setTaskRepositoryLocationFactory(new TaskRepositoryLocationFactory()); - TestSuite suite = new TestSuite("Test for org.eclipse.mylyn.trac.tests"); // $JUnit-BEGIN$ - // suite.addTestSuite(TracXmlRpcTest.class); suite.addTestSuite(TracSearchTest.class); suite.addTestSuite(TracTicketTest.class); suite.addTestSuite(TracXmlRpcClientTest.class); diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/RepositorySearchQueryTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/RepositorySearchQueryTest.java index a447523c3..5be7183bb 100644 --- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/RepositorySearchQueryTest.java +++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/RepositorySearchQueryTest.java @@ -27,6 +27,8 @@ import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; import org.eclipse.mylyn.tasks.ui.search.SearchHitCollector; import org.eclipse.mylyn.trac.tests.support.TestFixture; import org.eclipse.mylyn.trac.tests.support.XmlRpcServer.TestData; +import org.eclipse.mylyn.web.core.AuthenticationCredentials; +import org.eclipse.mylyn.web.core.AuthenticationType; /** * @author Steffen Pingel @@ -60,7 +62,8 @@ public class RepositorySearchQueryTest extends TestCase { Credentials credentials = TestUtil.readCredentials(PrivilegeLevel.USER); repository = new TaskRepository(TracCorePlugin.REPOSITORY_KIND, url); - repository.setAuthenticationCredentials(credentials.username, credentials.password); + repository.setCredentials(AuthenticationType.REPOSITORY, new AuthenticationCredentials(credentials.username, + credentials.password), false); repository.setTimeZoneId(ITracClient.TIME_ZONE); repository.setCharacterEncoding(ITracClient.CHARSET); repository.setVersion(version.name()); diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracAttachmentHandlerTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracAttachmentHandlerTest.java index ab58df78c..c1f2e7081 100644 --- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracAttachmentHandlerTest.java +++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracAttachmentHandlerTest.java @@ -35,6 +35,8 @@ import org.eclipse.mylyn.tasks.core.TaskRepositoryManager; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; import org.eclipse.mylyn.trac.tests.support.TestFixture; import org.eclipse.mylyn.trac.tests.support.XmlRpcServer.TestData; +import org.eclipse.mylyn.web.core.AuthenticationCredentials; +import org.eclipse.mylyn.web.core.AuthenticationType; /** * @author Steffen Pingel @@ -70,7 +72,8 @@ public class TracAttachmentHandlerTest extends TestCase { Credentials credentials = TestUtil.readCredentials(PrivilegeLevel.USER); repository = new TaskRepository(kind, url); - repository.setAuthenticationCredentials(credentials.username, credentials.password); + repository.setCredentials(AuthenticationType.REPOSITORY, new AuthenticationCredentials(credentials.username, + credentials.password), false); repository.setTimeZoneId(ITracClient.TIME_ZONE); repository.setCharacterEncoding(ITracClient.CHARSET); repository.setVersion(version.name()); diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracClientManagerTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracClientManagerTest.java index 77ea698ec..c9e76891a 100644 --- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracClientManagerTest.java +++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracClientManagerTest.java @@ -21,6 +21,7 @@ import org.eclipse.mylyn.internal.trac.core.ITracClient.Version; import org.eclipse.mylyn.internal.trac.core.model.TracMilestone; import org.eclipse.mylyn.tasks.core.TaskRepository; import org.eclipse.mylyn.tasks.core.TaskRepositoryLocationFactory; +import org.eclipse.mylyn.web.core.AuthenticationType; /** * @author Steffen Pingel @@ -57,6 +58,7 @@ public class TracClientManagerTest extends TestCase { TaskRepository taskRepository = new TaskRepository(TracCorePlugin.REPOSITORY_KIND, TracTestConstants.TEST_TRAC_096_URL); taskRepository.setVersion(Version.TRAC_0_9.name()); + taskRepository.setCredentials(AuthenticationType.REPOSITORY, null, false); File file = File.createTempFile("mylyn", null); file.deleteOnExit(); 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 index ea1793247..f8451317d 100644 --- 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 @@ -7,12 +7,13 @@ *******************************************************************************/ package org.eclipse.mylyn.trac.tests; +import java.net.InetSocketAddress; import java.net.Proxy; +import java.net.Proxy.Type; import org.eclipse.mylyn.internal.trac.core.ITracClient; import org.eclipse.mylyn.internal.trac.core.TracException; import org.eclipse.mylyn.internal.trac.core.ITracClient.Version; -import org.eclipse.mylyn.web.core.WebClientUtil; public class TracClientProxyTest extends AbstractTracClientTest { @@ -62,7 +63,7 @@ public class TracClientProxyTest extends AbstractTracClientTest { private void connectProxy(String url, String expectedMethod) throws Exception { testProxy.setResponse(TestProxy.NOT_FOUND); - proxy = WebClientUtil.getProxy("localhost", proxyPort + "", "", ""); + proxy = new Proxy(Type.HTTP, new InetSocketAddress("localhost", proxyPort)); ITracClient client = connect(url, proxy); try { client.validate(callback); diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryConnectorTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryConnectorTest.java index 728a2b11a..f08d23113 100644 --- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryConnectorTest.java +++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryConnectorTest.java @@ -50,6 +50,8 @@ import org.eclipse.mylyn.tasks.ui.TaskFactory; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; import org.eclipse.mylyn.trac.tests.support.TestFixture; import org.eclipse.mylyn.trac.tests.support.XmlRpcServer.TestData; +import org.eclipse.mylyn.web.core.AuthenticationCredentials; +import org.eclipse.mylyn.web.core.AuthenticationType; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.PlatformUI; @@ -92,7 +94,8 @@ public class TracRepositoryConnectorTest extends TestCase { Credentials credentials = TestUtil.readCredentials(PrivilegeLevel.USER); repository = new TaskRepository(kind, url); - repository.setAuthenticationCredentials(credentials.username, credentials.password); + repository.setCredentials(AuthenticationType.REPOSITORY, new AuthenticationCredentials(credentials.username, + credentials.password), false); repository.setTimeZoneId(ITracClient.TIME_ZONE); repository.setCharacterEncoding(ITracClient.CHARSET); repository.setVersion(version.name()); diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracTaskDataHandlerTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracTaskDataHandlerTest.java index 05a93100b..0b2f05105 100644 --- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracTaskDataHandlerTest.java +++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracTaskDataHandlerTest.java @@ -41,6 +41,8 @@ import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; import org.eclipse.mylyn.trac.tests.support.TestFixture; import org.eclipse.mylyn.trac.tests.support.TracTestUtil; import org.eclipse.mylyn.trac.tests.support.XmlRpcServer.TestData; +import org.eclipse.mylyn.web.core.AuthenticationCredentials; +import org.eclipse.mylyn.web.core.AuthenticationType; /** * @author Steffen Pingel @@ -81,7 +83,8 @@ public class TracTaskDataHandlerTest extends TestCase { Credentials credentials = TestUtil.readCredentials(PrivilegeLevel.USER); repository = new TaskRepository(TracCorePlugin.REPOSITORY_KIND, url); - repository.setAuthenticationCredentials(credentials.username, credentials.password); + repository.setCredentials(AuthenticationType.REPOSITORY, new AuthenticationCredentials(credentials.username, + credentials.password), false); repository.setTimeZoneId(ITracClient.TIME_ZONE); repository.setCharacterEncoding(ITracClient.CHARSET); repository.setVersion(version.name()); @@ -269,7 +272,7 @@ public class TracTaskDataHandlerTest extends TestCase { task.getTaskId()); taskData.setNewComment("new comment"); - repository.setAuthenticationCredentials("foo", "bar"); + repository.setCredentials(AuthenticationType.REPOSITORY, new AuthenticationCredentials("foo", "bar"), false); try { taskDataHandler.postTaskData(repository, taskData, new NullProgressMonitor()); } catch (CoreException expected) { diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracTaskEditorTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracTaskEditorTest.java index dc49f1a73..c05eceb96 100644 --- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracTaskEditorTest.java +++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracTaskEditorTest.java @@ -27,6 +27,8 @@ import org.eclipse.mylyn.tasks.core.TaskRepository; import org.eclipse.mylyn.tasks.core.TaskRepositoryManager; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; import org.eclipse.mylyn.tasks.ui.TasksUiUtil; +import org.eclipse.mylyn.web.core.AuthenticationCredentials; +import org.eclipse.mylyn.web.core.AuthenticationType; /** * @author Steffen Pingel @@ -58,7 +60,8 @@ public class TracTaskEditorTest extends TestCase { Credentials credentials = TestUtil.readCredentials(PrivilegeLevel.USER); repository = new TaskRepository(TracCorePlugin.REPOSITORY_KIND, url); - repository.setAuthenticationCredentials(credentials.username, credentials.password); + repository.setCredentials(AuthenticationType.REPOSITORY, new AuthenticationCredentials(credentials.username, + credentials.password), false); repository.setTimeZoneId(ITracClient.TIME_ZONE); repository.setCharacterEncoding(ITracClient.CHARSET); repository.setVersion(version.name()); diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracTestPlugin.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracTestPlugin.java deleted file mode 100644 index 5df32028e..000000000 --- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracTestPlugin.java +++ /dev/null @@ -1,51 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 Mylyn project committers and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - *******************************************************************************/ - -package org.eclipse.mylyn.trac.tests; - -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -/** - * The activator class controls the plug-in life cycle - * - * @author Steffen Pingel - */ -public class TracTestPlugin extends AbstractUIPlugin { - - // The plug-in ID - public static final String PLUGIN_ID = "org.eclipse.mylyn.trac.tests"; - - // The shared instance - private static TracTestPlugin plugin; - - public TracTestPlugin() { - plugin = this; - } - - @Override - public void start(BundleContext context) throws Exception { - super.start(context); - } - - @Override - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static TracTestPlugin getDefault() { - return plugin; - } - -} |