Skip to content

Commit cca72f8

Browse files
committed
compilation fix
1 parent e6cab82 commit cca72f8

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,26 @@
2020

2121
import static org.junit.Assert.*;
2222

23+
import java.util.List;
24+
2325
public class WorkflowBuildTest extends WorkflowTestBase {
2426

2527
@Test
2628
public void testBuildAll() {
2729
env.generateFeatureCommit(env.getUnTillDbVCS(), compUnTillDb.getVcsRepository().getDevBranch(), "feature added");
28-
SCMWorkflow wf = new SCMWorkflow();
30+
SCMReleaser releaser = new SCMReleaser();
2931

3032
// simulate BRANCHED dev branches statuses
3133
env.generateContent(env.getUblVCS(), compUBL.getVcsRepository().getDevBranch(), "test file", "test content", LogTag.SCM_VER);
3234
env.generateContent(env.getUnTillVCS(), compUnTill.getVcsRepository().getDevBranch(), "test file", "test content", LogTag.SCM_VER);
3335

3436
// fork unTill
35-
IAction action = wf.getProductionReleaseAction(UNTILL);
37+
IAction action = releaser.getProductionReleaseAction(UNTILL);
3638
action.execute(new NullProgress());
3739
checkUnTillForked();
3840

3941
// build unTill
40-
action = wf.getProductionReleaseAction(UNTILL);
42+
action = releaser.getProductionReleaseAction(UNTILL);
4143
action.execute(new NullProgress());
4244
checkUnTillBuilt();
4345
}

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,15 +263,17 @@ public void testPatches() throws Exception {
263263
}
264264

265265
// check unTill uses new untillDb and UBL patches in existing unTill release branch.
266-
ReleaseBranch rbUnTill = new ReleaseBranch(compUnTill);
267-
List<Component> mdeps = rbUnTill.getMDeps();
266+
rbUnTill = new ReleaseBranch(compUnTill);
267+
mdeps = rbUnTill.getMDeps();
268268
for (Component mdep : mdeps) {
269269
if (mdep.getName().equals(UBL)) {
270270
assertEquals(dbUBL.getVersion().toPreviousMinor().toNextPatch().toRelease(), mdep.getVersion());
271271
} else if (mdep.getName().equals(UNTILLDB)) {
272272
assertEquals(dbUnTillDb.getVersion().toPreviousMinor().toNextPatch().toRelease(), mdep.getVersion());
273273
} else {
274274
fail();
275+
}
276+
}
275277
}
276278

277279
@Test

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import static org.junit.Assert.assertEquals;
44
import static org.junit.Assert.assertTrue;
55
import static org.junit.Assert.fail;
6-
import org.scm4j.wf.conf.Version;
6+
import static org.junit.Assert.assertNotNull;
77

88
import java.lang.reflect.Method;
99
import java.util.HashMap;
@@ -19,6 +19,9 @@
1919
import org.scm4j.releaser.conf.Component;
2020
import org.scm4j.releaser.conf.DelayedTagsFile;
2121
import org.scm4j.releaser.conf.VCSRepositories;
22+
import org.scm4j.vcs.api.VCSCommit;
23+
import org.scm4j.vcs.api.VCSTag;
24+
import org.scm4j.vcs.api.WalkDirection;
2225

2326
public class WorkflowTestBase {
2427
protected TestEnvironment env;

0 commit comments

Comments
 (0)