400396: consume Trac fixtures from service

Change-Id: Ia3811b53d37bc21b33ae69b5726db73fa8d7cb85
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=400396

2 files changed, 40 insertions, 6 deletions

diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/ui/TracRepositorySettingsPageTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/ui/TracRepositorySettingsPageTest.java
index 33daada4c..bad8bd479 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/ui/TracRepositorySettingsPageTest.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/ui/TracRepositorySettingsPageTest.java
@@ -20,11 +20,16 @@ import org.eclipse.jface.dialogs.IMessageProvider;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.mylyn.commons.net.AuthenticationType;
+import org.eclipse.mylyn.internal.tasks.ui.wizards.EditRepositoryWizard;
+import org.eclipse.mylyn.internal.trac.core.TracRepositoryConnector;
+import org.eclipse.mylyn.internal.trac.core.client.ITracClient;
 import org.eclipse.mylyn.internal.trac.core.client.ITracClient.Version;
 import org.eclipse.mylyn.internal.trac.ui.wizard.TracRepositorySettingsPage;
 import org.eclipse.mylyn.internal.trac.ui.wizard.TracRepositorySettingsPage.TracValidator;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
 import org.eclipse.mylyn.trac.tests.support.TracFixture;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.PlatformUI;
 
 /**
  * @author Steffen Pingel
@@ -190,4 +195,27 @@ public class TracRepositorySettingsPageTest extends TestCase {
 		assertTrue(page.isValidUrl("http://mylyn.org/trac30"));
 		assertTrue(page.isValidUrl("http://www.mylyn.org/trac30"));
 	}
+
+	public void testClientManagerChangeTaskRepositorySettings() throws Exception {
+		TaskRepository repository = TracFixture.TRAC_0_10_WEB.singleRepository();
+		TracRepositoryConnector connector = (TracRepositoryConnector) TracFixture.TRAC_0_10_WEB.connector();
+		ITracClient client = connector.getClientManager().getTracClient(repository);
+		assertEquals(Version.TRAC_0_9, client.getAccessMode());
+
+		EditRepositoryWizard wizard = new EditRepositoryWizard(repository);
+		Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
+		WizardDialog dialog = new WizardDialog(shell, wizard);
+		try {
+			dialog.create();
+
+			((TracRepositorySettingsPage) wizard.getSettingsPage()).setTracVersion(Version.XML_RPC);
+			assertTrue(wizard.performFinish());
+
+			client = connector.getClientManager().getTracClient(repository);
+			assertEquals(Version.XML_RPC, client.getAccessMode());
+		} finally {
+			dialog.close();
+		}
+	}
+
 }
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/ui/TracTaskEditorTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/ui/TracTaskEditorTest.java
index 552cd8274..bbe71a494 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/ui/TracTaskEditorTest.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/ui/TracTaskEditorTest.java
@@ -19,24 +19,30 @@ import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView;
 import org.eclipse.mylyn.tasks.core.ITask;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
 import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
-import org.eclipse.mylyn.tests.util.TestFixture;
 import org.eclipse.mylyn.trac.tests.support.TracFixture;
-import org.eclipse.mylyn.trac.tests.support.TracTestUtil;
+import org.eclipse.mylyn.trac.tests.support.TracHarness;
 
 /**
  * @author Steffen Pingel
  */
 public class TracTaskEditorTest extends TestCase {
 
+	private TracHarness harness;
+
 	@Override
 	protected void setUp() throws Exception {
-		TestFixture.resetTaskList();
+		TracFixture fixture = TracFixture.current();
+		harness = fixture.createHarness();
 	}
 
-	public void testGetSelectedRepository() throws Exception {
-		TaskRepository repository = TracFixture.DEFAULT.singleRepository();
+	@Override
+	protected void tearDown() throws Exception {
+		harness.dispose();
+	}
 
-		ITask task = TracTestUtil.createTask(repository, "1");
+	public void testGetSelectedRepository() throws Exception {
+		TaskRepository repository = harness.repository();
+		ITask task = harness.createTask("testGetSelectedRepository");
 		TasksUiPlugin.getTaskList().addTask(task);
 		TasksUiUtil.openTask(task);