### Eclipse Workspace Patch 1.0 #P org.eclipse.mylyn.bugzilla.tests Index: src/org/eclipse/mylyn/bugzilla/tests/ui/BugzillaHyperlinkDetectorTest.java =================================================================== RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/ui/BugzillaHyperlinkDetectorTest.java,v retrieving revision 1.1 diff -u -r1.1 BugzillaHyperlinkDetectorTest.java --- src/org/eclipse/mylyn/bugzilla/tests/ui/BugzillaHyperlinkDetectorTest.java 26 May 2010 03:38:09 -0000 1.1 +++ src/org/eclipse/mylyn/bugzilla/tests/ui/BugzillaHyperlinkDetectorTest.java 26 May 2010 20:43:33 -0000 @@ -95,7 +95,7 @@ } public void testFindHyperlinksDuplicateOf() { - assertHyperlinks("duplicate of 123", link(0, 15, "123")); + assertHyperlinks("duplicate of 123", link(0, 16, "123")); } public void testFindHyperlinksBugComment() { @@ -134,7 +134,6 @@ assertHyperlinks("attachmen 123"); assertHyperlinks("attachment id"); assertHyperlinks("attachment id"); - assertHyperlinks("Create attachment 123"); } public void testFindHyperlinksNoBug() { Index: src/org/eclipse/mylyn/bugzilla/tests/ui/BugzillaTaskHyperlinkDetectorTest.java =================================================================== RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/ui/BugzillaTaskHyperlinkDetectorTest.java,v retrieving revision 1.8 diff -u -r1.8 BugzillaTaskHyperlinkDetectorTest.java --- src/org/eclipse/mylyn/bugzilla/tests/ui/BugzillaTaskHyperlinkDetectorTest.java 26 May 2010 03:38:09 -0000 1.8 +++ src/org/eclipse/mylyn/bugzilla/tests/ui/BugzillaTaskHyperlinkDetectorTest.java 26 May 2010 20:43:33 -0000 @@ -66,22 +66,6 @@ private final String BUG_FORMAT_1_2 = "bug# 2"; - private final String TASK_FORMAT_1_COMMENT_1 = "task#123c#44556677"; - - private final String TASK_FORMAT_2_COMMENT_1 = "task# 123c#44556677"; - - private final String TASK_FORMAT_3_COMMENT_1 = "task123c#44556677"; - - private final String TASK_FORMAT_4_COMMENT_1 = "task #123c#44556677"; - - private final String BUG_FORMAT_1_COMMENT_1 = "bug# 123c#44556677"; - - private final String BUG_FORMAT_2_COMMENT_1 = "bug # 123c#44556677"; - - private final String BUG_FORMAT_3_COMMENT_1 = "bug123c#44556677"; - - private final String BUG_FORMAT_4_COMMENT_1 = "bug #123c#44556677"; - private final String TASK_FORMAT_1_COMMENT_2 = "task#123 comment #44556677"; private final String TASK_FORMAT_2_COMMENT_2 = "task# 123 comment #44556677"; @@ -193,9 +177,7 @@ commentFormats = new String[] { COMMENT_1, COMMENT_2, COMMENT_3, COMMENT_4 }; bugFormats = new String[] { TASK_FORMAT_1, TASK_FORMAT_2, TASK_FORMAT_3, TASK_FORMAT_4, BUG_FORMAT_1, BUG_FORMAT_2, BUG_FORMAT_3, BUG_FORMAT_4 }; - bugCommentFormats = new String[] { TASK_FORMAT_1_COMMENT_1, TASK_FORMAT_2_COMMENT_1, TASK_FORMAT_3_COMMENT_1, - TASK_FORMAT_4_COMMENT_1, BUG_FORMAT_1_COMMENT_1, BUG_FORMAT_2_COMMENT_1, BUG_FORMAT_3_COMMENT_1, - BUG_FORMAT_4_COMMENT_1, TASK_FORMAT_1_COMMENT_2, TASK_FORMAT_2_COMMENT_2, TASK_FORMAT_3_COMMENT_2, + bugCommentFormats = new String[] { TASK_FORMAT_1_COMMENT_2, TASK_FORMAT_2_COMMENT_2, TASK_FORMAT_3_COMMENT_2, TASK_FORMAT_4_COMMENT_2, BUG_FORMAT_1_COMMENT_2, BUG_FORMAT_2_COMMENT_2, BUG_FORMAT_3_COMMENT_2, BUG_FORMAT_4_COMMENT_2, TASK_FORMAT_1_COMMENT_3, TASK_FORMAT_2_COMMENT_3, TASK_FORMAT_3_COMMENT_3, TASK_FORMAT_4_COMMENT_3, BUG_FORMAT_1_COMMENT_3, BUG_FORMAT_2_COMMENT_3, BUG_FORMAT_3_COMMENT_3, @@ -533,7 +515,7 @@ IHyperlink[] links = detector.detectHyperlinks(viewer, region, false); assertNotNull(links); assertEquals(1, links.length); - assertEquals(testString.indexOf(DUPLICATE_NUMBER), links[0].getHyperlinkRegion().getOffset()); + assertEquals(testString.indexOf(DUPLICATE), links[0].getHyperlinkRegion().getOffset()); } public void testNoRepositoryInViewNoRepositoryInManager() { @@ -645,7 +627,7 @@ IHyperlink[] links = detector.detectHyperlinks(viewer, region, false); assertNotNull(links); assertEquals(1, links.length); - assertEquals(testString.indexOf(ATTACHMENT_NUMBER), links[0].getHyperlinkRegion().getOffset()); + assertEquals(testString.indexOf(ATTACHMENT_OLD), links[0].getHyperlinkRegion().getOffset()); } public void testAttachmentNew() { @@ -655,7 +637,7 @@ IHyperlink[] links = detector.detectHyperlinks(viewer, region, false); assertNotNull(links); assertEquals(1, links.length); - assertEquals(testString.indexOf(ATTACHMENT_NUMBER), links[0].getHyperlinkRegion().getOffset()); + assertEquals(testString.indexOf(ATTACHMENT_NEW), links[0].getHyperlinkRegion().getOffset()); } public void testCommentLotsOfWhitespace() { @@ -664,8 +646,9 @@ Region region = new Region(0, testString.length()); IHyperlink[] links = detector.detectHyperlinks(viewer, region, false); assertNotNull(links); - assertEquals(1, links.length); - assertEquals(testString.indexOf(ATTACHMENT_NUMBER), links[0].getHyperlinkRegion().getOffset()); + assertEquals(2, links.length); + assertEquals(testString.indexOf("bug 123"), links[0].getHyperlinkRegion().getOffset()); + assertEquals(testString.indexOf("bug 245 comment 1"), links[1].getHyperlinkRegion().getOffset()); } }