Skip to content

Commit 85ab4e9

Browse files
committed
Delayed tagging #2 (tests fix)
1 parent 70b595f commit 85ab4e9

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

src/test/java/org/scm4j/releaser/WorkflowDelayedTagTest.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,8 @@ public void testTagDelayed() throws Exception {
7474
assertNotNull(dtf.getRevisitonByUrl(compUnTill.getVcsRepository().getUrl()));
7575
assertNotNull(dtf.getRevisitonByUrl(compUBL.getVcsRepository().getUrl()));
7676

77-
// check Delayed Tags are used
78-
action = releaser.getActionTree(compUnTill.clone(env.getUnTillVer().toReleaseZeroPatch()));
79-
assertIsGoingToDoNothing(action);
80-
8177
// tag all
82-
action = releaser.getTagActionTree(compUnTill);
78+
action = releaser.getTagActionTree(UNTILL);
8379
assertIsGoingToTagAll(action);
8480
action.execute(getProgress(action));
8581

@@ -100,7 +96,7 @@ public void testTagFileDeleted() throws Exception {
10096
action.execute(getProgress(action));
10197

10298
// simulate delayed tags file is deleted right after action create
103-
action = releaser.getTagActionTree(compUnTill);
99+
action = releaser.getTagActionTree(UNTILL);
104100
assertIsGoingToTagAll(action);
105101
dtf.delete();
106102
action.execute(getProgress(action));
@@ -120,7 +116,7 @@ public void testTagExistsOnExecute() throws Exception {
120116
action.execute(getProgress(action));
121117

122118
// all is going to tag
123-
action = releaser.getTagActionTree(compUnTill);
119+
action = releaser.getTagActionTree(UNTILL);
124120
assertIsGoingToTagAll(action);
125121

126122
// simulate tag exists already

src/test/java/org/scm4j/releaser/cli/CLITest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ public void testExceptionUnknownComponent() throws Exception {
224224
} catch (EComponentConfig e) {
225225
thrown = e;
226226
}
227-
227+
228228
assertEquals(CLI.EXIT_CODE_ERROR, mockedCLI.exec(args));
229229
verify(mockedPS).println(thrown.getMessage());
230230
verify(mockedPS, never()).println(CommandLine.getUsage());

0 commit comments

Comments
 (0)