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

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

2 files changed, 9 insertions, 6 deletions

diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/util/ServiceMessageManagerTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/util/ServiceMessageManagerTest.java
index 251dcd694..72aaf758f 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/util/ServiceMessageManagerTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/util/ServiceMessageManagerTest.java
@@ -30,14 +30,15 @@ import org.eclipse.mylyn.internal.tasks.core.notifications.ServiceMessageXmlHand
  */
 public class ServiceMessageManagerTest extends TestCase {
 
-	private static final String MESSAGE_XML_URL = "http://eclipse.org/mylyn/messageTest.xml";
+	private static final String MESSAGE_XML_URL = "http://mylyn.eclipse.org/message.xml";
 
 	public void testRetrievingMessage() throws Exception {
 		ServiceMessageManager manager = new ServiceMessageManager(MESSAGE_XML_URL, "", "", 0l);
 		int status = manager.updateServiceMessage(new NullProgressMonitor());
 		assertEquals(HttpStatus.SC_OK, status);
-		ServiceMessage message = manager.getServiceMessages().get(0);
+		assertEquals(2, manager.getServiceMessages().size());
 
+		ServiceMessage message = manager.getServiceMessages().get(1);
 		assertEquals("1", message.getId());
 		assertEquals("140 character description here....", message.getDescription());
 		assertEquals("Mylyn 3.4 now available!", message.getTitle());
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 e85bfe019..4ab84d63e 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
@@ -106,7 +106,7 @@ public class TracRepositorySettingsPageTest extends TestCase {
 
 		page.applyValidatorResult(validator);
 		assertEquals(Version.XML_RPC, page.getTracVersion());
-		assertEquals("Repository is valid.", page.getMessage());
+		assertEquals("Authentication credentials are valid.", page.getMessage());
 	}
 
 	public void testValidateWeb() throws Exception {
@@ -118,7 +118,7 @@ public class TracRepositorySettingsPageTest extends TestCase {
 
 		page.applyValidatorResult(validator);
 		assertEquals(Version.TRAC_0_9, page.getTracVersion());
-		assertEquals("Repository is valid.", page.getMessage());
+		assertEquals("Authentication credentials are valid.", page.getMessage());
 	}
 
 	public void testValidateAutomaticUser() throws Exception {
@@ -133,7 +133,7 @@ public class TracRepositorySettingsPageTest extends TestCase {
 
 		page.applyValidatorResult(validator);
 		assertEquals(Version.XML_RPC, page.getTracVersion());
-		assertEquals("Repository is valid.", page.getMessage());
+		assertEquals("Authentication credentials are valid.", page.getMessage());
 	}
 
 	public void testValidateAutomaticAnonymous() throws Exception {
@@ -150,7 +150,9 @@ public class TracRepositorySettingsPageTest extends TestCase {
 
 		page.applyValidatorResult(validator);
 		assertEquals(Version.TRAC_0_9, page.getTracVersion());
-		assertEquals("Repository is valid.", page.getMessage());
+		assertEquals(
+				"Authentication credentials are valid. Note: Insufficient permissions for XML-RPC access, falling back to web access.",
+				page.getMessage());
 	}
 
 	public void testValidateInvalid() throws Exception {