NEW - bug 290465: fix Bugzilla test suite

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

2 files changed, 10 insertions, 2 deletions

diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/ui/BugzillaTaskHyperlinkDetectorTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/ui/BugzillaTaskHyperlinkDetectorTest.java
index 4552f7017..fbcf363b8 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/ui/BugzillaTaskHyperlinkDetectorTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/ui/BugzillaTaskHyperlinkDetectorTest.java
@@ -247,9 +247,14 @@ public class BugzillaTaskHyperlinkDetectorTest extends TestCase {
 		assertNotNull(links);
 		assertEquals(2, links.length);
 		assertTrue(links[0] instanceof TaskHyperlink);
-		assertEquals(((TaskHyperlink) links[0]).getRepository(), repository1);
 		assertTrue(links[1] instanceof TaskHyperlink);
-		assertEquals(((TaskHyperlink) links[1]).getRepository(), repository2);
+
+		// order of repository is not defined so we must test the two cases
+		if (((TaskHyperlink) links[0]).getRepository() == repository1) {
+			assertEquals(((TaskHyperlink) links[1]).getRepository(), repository2);
+		} else {
+			assertEquals(((TaskHyperlink) links[0]).getRepository(), repository2);
+		}
 	}
 
 	public void testRepositoryInViewTwoRepositoryInManager() {
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaConnectorUi.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaConnectorUi.java
index 87c0dc5d9..6037a022a 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaConnectorUi.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaConnectorUi.java
@@ -196,6 +196,9 @@ public class BugzillaConnectorUi extends AbstractRepositoryConnectorUi {
 			start = m.start() + m.group().indexOf(m.group(TASK_NUM_GROUP));
 		} else {
 			start = m.start();
+			if (m.group().startsWith(" ")) { //$NON-NLS-1$
+				start++;
+			}
 		}
 
 		int end = m.end();