fix tests

2 files changed, 11 insertions, 7 deletions

diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/ui/BugzillaRepositorySettingsPageTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/ui/BugzillaRepositorySettingsPageTest.java
index 00cc3c176..0b416fbe4 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/ui/BugzillaRepositorySettingsPageTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/ui/BugzillaRepositorySettingsPageTest.java
@@ -36,9 +36,14 @@ import org.eclipse.ui.PlatformUI;
 
 /**
  * @author Rob Elves
+ * @author Steffen Pingel
  */
 public class BugzillaRepositorySettingsPageTest extends TestCase {
 
+	private static final String REPOSITORY_URL_ALTERNATIVE = BugzillaFixture.BUGS_3_4.getRepositoryUrl();
+
+	private static final String REPOSITORY_URL = BugzillaFixture.BUGS_4_0.getRepositoryUrl();
+
 	private TaskRepositoryManager manager;
 
 	private TaskRepository repository;
@@ -48,7 +53,7 @@ public class BugzillaRepositorySettingsPageTest extends TestCase {
 		super.setUp();
 		manager = TasksUiPlugin.getRepositoryManager();
 		manager.clearRepositories(TasksUiPlugin.getDefault().getRepositoriesFilePath());
-		repository = new TaskRepository(BugzillaCorePlugin.CONNECTOR_KIND, BugzillaFixture.TEST_BUGZILLA_222_URL);
+		repository = new TaskRepository(BugzillaCorePlugin.CONNECTOR_KIND, REPOSITORY_URL);
 		Credentials credentials = TestUtil.readCredentials();
 		repository.setCredentials(AuthenticationType.REPOSITORY, new AuthenticationCredentials(credentials.username,
 				credentials.password), false);
@@ -152,11 +157,11 @@ public class BugzillaRepositorySettingsPageTest extends TestCase {
 		BugzillaClient client = createClient(page.getRepositoryUrl(), page.getUserName(), page.getPassword(),
 				page.getHttpAuthUserId(), page.getHttpAuthPassword(), page.getCharacterEncoding());
 		client.validate(null);
-		page.setUrl(BugzillaFixture.TEST_BUGZILLA_218_URL);
+		page.setUrl(REPOSITORY_URL_ALTERNATIVE);
 		wizard.performFinish();
 		assertEquals(1, manager.getAllRepositories().size());
 		TaskRepository repositoryTest = manager.getRepository(BugzillaCorePlugin.CONNECTOR_KIND,
-				BugzillaFixture.TEST_BUGZILLA_218_URL);
+				REPOSITORY_URL_ALTERNATIVE);
 		assertNotNull(repositoryTest);
 		assertEquals(tempUid, repositoryTest.getUserName());
 		assertEquals(tempPass, repositoryTest.getPassword());
@@ -174,8 +179,7 @@ public class BugzillaRepositorySettingsPageTest extends TestCase {
 		page.setUserId("bogus");
 		wizard.performFinish();
 		assertEquals(1, manager.getAllRepositories().size());
-		TaskRepository repositoryTest = manager.getRepository(BugzillaCorePlugin.CONNECTOR_KIND,
-				BugzillaFixture.TEST_BUGZILLA_222_URL);
+		TaskRepository repositoryTest = manager.getRepository(BugzillaCorePlugin.CONNECTOR_KIND, REPOSITORY_URL);
 		assertNotNull(repositoryTest);
 		wizard = new EditRepositoryWizard(repositoryTest);
 		dialog = new WizardDialog(PlatformUI.getWorkbench().getDisplay().getActiveShell(), wizard);
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/core/TracTaskDataHandlerXmlRpcTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/core/TracTaskDataHandlerXmlRpcTest.java
index 0303b66c7..e4c75bf1a 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/core/TracTaskDataHandlerXmlRpcTest.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/core/TracTaskDataHandlerXmlRpcTest.java
@@ -128,10 +128,10 @@ public class TracTaskDataHandlerXmlRpcTest extends TestCase {
 		long mostRecentlyModified = 0;
 		// try changing ticket 3x to make sure it gets a new change time
 		for (int i = 0; i < 3; i++) {
+			ticket = client.getTicket(ticket.getId(), null);
 			ticket.putBuiltinValue(Key.DESCRIPTION, lastModified + "");
 			client.updateTicket(ticket, "comment", null);
-			TracTicket updateTicket = client.getTicket(ticket.getId(), null);
-			mostRecentlyModified = TracUtil.toTracTime(updateTicket.getLastChanged());
+			mostRecentlyModified = TracUtil.toTracTime(ticket.getLastChanged());
 			// needs to be at least one second ahead of repository time stamp   
 			if (mostRecentlyModified > lastModified + 1) {
 				break;