Attachment 159391 Details for Bug 249572 – patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch

clipboard.txt (text/plain), 2.96 KB, created by Shawn Minto

on 2010-02-17 17:31:58 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Shawn Minto

Created: 2010-02-17 17:31:58 EST

Size: 2.96 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylyn.team.tests
>Index: src/org/eclipse/mylyn/team/tests/CommitTemplateTest.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.team.tests/src/org/eclipse/mylyn/team/tests/CommitTemplateTest.java,v
>retrieving revision 1.11
>diff -u -r1.11 CommitTemplateTest.java
>--- src/org/eclipse/mylyn/team/tests/CommitTemplateTest.java	13 Jan 2009 07:05:14 -0000	1.11
>+++ src/org/eclipse/mylyn/team/tests/CommitTemplateTest.java	17 Feb 2010 22:31:33 -0000
>@@ -44,6 +44,36 @@
> 
> 	}
> 
>+	public void testTemplateNullKeyTrailingCharacters() {
>+		String template = "${task.status} - ${connector.task.prefix} ${task.key}: ${task.description}";
>+
>+		String taskId = "12345678";
>+		TaskTask testTask = new TaskTask("no url", taskId, "summary");
>+		testTask.setTaskKey(null);
>+		testTask.setSummary("TestSummary");
>+
>+		String commitComment = FocusedTeamUiPlugin.getDefault().getCommitTemplateManager().generateComment(testTask,
>+				template);
>+		assertTrue(commitComment.contains(testTask.getSummary()));
>+
>+		assertTrue(commitComment.contains(":"));
>+	}
>+
>+	public void testTemplateCollapseWhitespace() {
>+		String template = "${task.status} - ${connector.task.prefix} ${task.key} ${task.key} : ${task.description}";
>+
>+		String taskId = "12345678";
>+		TaskTask testTask = new TaskTask("no url", taskId, "summary");
>+		testTask.setTaskKey(null);
>+		testTask.setSummary("TestSummary");
>+
>+		String commitComment = FocusedTeamUiPlugin.getDefault().getCommitTemplateManager().generateComment(testTask,
>+				template);
>+		assertTrue(commitComment.contains(testTask.getSummary()));
>+
>+		assertFalse(commitComment.contains("  "));
>+	}
>+
> 	public void testRepositoryTaskCommentParsing() {
> 		String template = FocusedTeamUiPlugin.getDefault().getPreferenceStore().getString(
> 				FocusedTeamUiPlugin.COMMIT_TEMPLATE);
>#P org.eclipse.mylyn.team.ui
>Index: src/org/eclipse/mylyn/internal/team/ui/templates/CommitTemplateManager.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/templates/CommitTemplateManager.java,v
>retrieving revision 1.15
>diff -u -r1.15 CommitTemplateManager.java
>--- src/org/eclipse/mylyn/internal/team/ui/templates/CommitTemplateManager.java	7 Dec 2009 19:53:47 -0000	1.15
>+++ src/org/eclipse/mylyn/internal/team/ui/templates/CommitTemplateManager.java	17 Feb 2010 22:31:33 -0000
>@@ -179,11 +179,13 @@
> 				value = processKeyword(task, keyword);
> 			}
> 
>+			String trailingCharacters = segment.substring(brace + 1);
> 			if (value != null) {
> 				evaluated.add(value);
>-				evaluated.add(segment.substring(brace + 1));
>+				evaluated.add(trailingCharacters);
> 			} else if (!evaluated.isEmpty()) {
> 				evaluated.pop();
>+				evaluated.add(trailingCharacters);
> 			}
> //			else {
> //				buffer.append("${");

Actions: View | Diff

Attachments on bug 249572: 159339 | 159391 | 159393