Skip to content

Commit a157688

Browse files
committed
minor upgrade/downgrade detection: tests update
1 parent d5f6171 commit a157688

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,10 +200,10 @@ public void testMinorUpgradeDowngradeException() {
200200
} catch (EMinorUpgradeDowngrade e) {
201201
if (e.getRootComp().equals(compUBL.clone(crbUBL.getVersion().toPreviousPatch()))) {
202202
assertEquals(compUnTillDb.clone("2.59.0"), e.getProblematicMDep());
203-
} else if (e.getRootComp().equals(compUnTill.clone(crbUnTill.getVersion().toPreviousPatch()))) {
203+
} else if (e.getRootComp().equals(compUnTill.clone(env.getUnTillVer().toRelease()))) {
204204
assertEquals(compUnTillDb.clone("2.60.0"), e.getProblematicMDep());
205205
} else {
206-
assertEquals(e.getRootComp(), compUBL.clone(crbUBL.getVersion().toPreviousPatch()));
206+
fail();
207207
}
208208
}
209209
}
@@ -214,7 +214,6 @@ public void testPatchDowngradeException() {
214214

215215
// unTill uses 2.59.0 version of UnTillDb
216216
// make UBL use 2.59.1 version of unTillDb
217-
ReleaseBranchCurrent crbUnTill = ReleaseBranchFactory.getCRB(repoUnTill);
218217
ReleaseBranchCurrent crbUBL = ReleaseBranchFactory.getCRB(repoUBL);
219218
ReleaseBranchCurrent crbUnTillDb = ReleaseBranchFactory.getCRB(repoUnTillDb);
220219
MDepsFile mdf = new MDepsFile(env.getUblVCS().getFileContent(crbUBL.getName(), Constants.MDEPS_FILE_NAME, null));
@@ -230,7 +229,7 @@ public void testPatchDowngradeException() {
230229
} catch (EMinorUpgradeDowngrade e) {
231230
if (e.getRootComp().equals(compUBL.clone(crbUBL.getVersion().toPreviousPatch()))) {
232231
assertEquals(compUnTillDb.clone("2.59.1"), e.getProblematicMDep());
233-
} else if (e.getRootComp().equals(compUnTill.clone(crbUnTill.getVersion().toPreviousPatch()))) {
232+
} else if (e.getRootComp().equals(compUnTill.clone(env.getUnTillVer().toRelease()))) {
234233
assertEquals(compUnTillDb.clone("2.59.0"), e.getProblematicMDep());
235234
} else {
236235
fail();

0 commit comments

Comments
 (0)