Skip to content
Permalink
Browse files
[JENKINS-15591] Clearcase plugin (greater than 1.3.5) doesn't display
activity chain in change log.
  • Loading branch information
Vlatombe committed Oct 23, 2012
1 parent eecff80 commit 31cddddb10a8d8ce4ac0318c363e4d0f3fd15a17
Showing 3 changed files with 5 additions and 5 deletions.
@@ -68,5 +68,5 @@ public interface OutputFormat {
public static final String UCM_ACTIVITY_CONTRIBUTING = "%[contrib_acts]p";

// UCM Versions
public static final String UCM_VERSION_ACTIVITY = "%[activity]Xp";
public static final String UCM_VERSION_ACTIVITY = "%[activity]p";
}
@@ -50,12 +50,12 @@ public class UcmChangeLogActionTest extends AbstractWorkspaceTest {
@Test
public void assertFormatContainsComment() throws Exception {
when(
cleartool.lshistory(eq("\\\"%Nd\\\" \\\"%En\\\" \\\"%Vn\\\" \\\"%[activity]Xp\\\" \\\"%e\\\" \\\"%o\\\" \\\"%u\\\" \\n%c\\n"), any(Date.class),
cleartool.lshistory(eq("\\\"%Nd\\\" \\\"%En\\\" \\\"%Vn\\\" \\\"%[activity]p\\\" \\\"%e\\\" \\\"%o\\\" \\\"%u\\\" \\n%c\\n"), any(Date.class),
anyString(), anyString(), any(String[].class), anyBoolean(), anyBoolean())).thenReturn(new StringReader(""));

UcmChangeLogAction action = new UcmChangeLogAction(cleartool, null);
action.getChanges(new Date(), "IGNORED", new String[] { "Release_2_1_int" }, new String[] { "vobs/projects/Server" });
verify(cleartool).lshistory(eq("\\\"%Nd\\\" \\\"%En\\\" \\\"%Vn\\\" \\\"%[activity]Xp\\\" \\\"%e\\\" \\\"%o\\\" \\\"%u\\\" \\n%c\\n"), any(Date.class),
verify(cleartool).lshistory(eq("\\\"%Nd\\\" \\\"%En\\\" \\\"%Vn\\\" \\\"%[activity]p\\\" \\\"%e\\\" \\\"%o\\\" \\\"%u\\\" \\n%c\\n"), any(Date.class),
anyString(), anyString(), any(String[].class), anyBoolean(), anyBoolean());
}

@@ -185,13 +185,13 @@ public void assertReaderIsClosed() throws Exception {
public void assertFormatContainsComment() throws Exception {
when(cleartool.doesViewExist("viewTag")).thenReturn(Boolean.TRUE);
when(
cleartool.lshistory(eq("\\\"%Nd\\\" \\\"%u\\\" \\\"%En\\\" \\\"%Vn\\\" \\\"%e\\\" \\\"%o\\\" \\\"%[activity]Xp\\\" \\n%c\\n"), any(Date.class),
cleartool.lshistory(eq("\\\"%Nd\\\" \\\"%u\\\" \\\"%En\\\" \\\"%Vn\\\" \\\"%e\\\" \\\"%o\\\" \\\"%[activity]p\\\" \\n%c\\n"), any(Date.class),
anyString(), anyString(), any(String[].class), anyBoolean(), anyBoolean())).thenReturn(new StringReader(""));

UcmHistoryAction action = createUcmHistoryAction();
action.getChanges(new Date(), "viewPath", "viewTag", new String[] { "Release_2_1_int" }, new String[] { "vobs/projects/Server" });

verify(cleartool).lshistory(eq("\\\"%Nd\\\" \\\"%u\\\" \\\"%En\\\" \\\"%Vn\\\" \\\"%e\\\" \\\"%o\\\" \\\"%[activity]Xp\\\" \\n%c\\n"), any(Date.class),
verify(cleartool).lshistory(eq("\\\"%Nd\\\" \\\"%u\\\" \\\"%En\\\" \\\"%Vn\\\" \\\"%e\\\" \\\"%o\\\" \\\"%[activity]p\\\" \\n%c\\n"), any(Date.class),
anyString(), anyString(), any(String[].class), anyBoolean(), anyBoolean());
}

0 comments on commit 31cdddd

Please sign in to comment.