EMinorUpgradeDowngrade on minor ACTUALIZE_PATCHES #56

Author: host6

src/main/java/org/scm4j/releaser/ExtendedStatusBuilder.java

@@ -110,7 +110,7 @@ private ExtendedStatus getMinorStatus(Component comp, CachedStatuses cache, IPro
 			status = BuildStatus.LOCK;
 		} else if (hasMDepsNotInDONEStatus(rb.getMDeps(), cache)) {
 			status = BuildStatus.BUILD_MDEPS;
-		} else if (!areMDepsPatchesActual(comp, repo, rb.getMDeps(), cache)) {
+		} else if (!areMDepsPatchesActualForMinor(rb.getMDeps(), cache)) {
 			status = BuildStatus.ACTUALIZE_PATCHES;
 		} else {
 			status = BuildStatus.BUILD;
@@ -156,7 +156,7 @@ private ExtendedStatus getPatchStatus(Component comp, CachedStatuses cache, IPro
 
 		if (hasMDepsNotInDONEStatus(rb.getMDeps(), cache)) {
 			buildStatus = BuildStatus.BUILD_MDEPS;
-		} else if (!areMDepsPatchesActual(comp, repo, rb.getMDeps(), cache)) {
+		} else if (!areMDepsPatchesActualForPatch(comp, repo, rb.getMDeps(), cache)) {
 			buildStatus = BuildStatus.ACTUALIZE_PATCHES;
 		} else if (reportDuration(() -> noValueableCommitsAfterLastTag(repo, rb), "is release branch modified check", comp, progress)) {
 			buildStatus = BuildStatus.DONE;
@@ -221,7 +221,21 @@ private <T> T walkOnCommits(VCSRepository repo, ReleaseBranchPatch rb, Function<
 		return null;
 	}
 
-	private boolean areMDepsPatchesActual(Component rootComp, VCSRepository repo, List<Component> mDeps, CachedStatuses cache) {
+	private boolean areMDepsPatchesActualForMinor(List<Component> mDeps, CachedStatuses cache) {
+		for (Component mDep : mDeps) {
+			String url = repoFactory.getUrl(mDep);
+			Version nextMDepVersion = cache.get(url).getNextVersion();
+			if (!nextMDepVersion.equals(mDep.getVersion().toNextPatch())) {
+				DelayedTagsFile mdf = new DelayedTagsFile();
+				if (!(nextMDepVersion.getPatch().equals(Constants.ZERO_PATCH) && mdf.getDelayedTagByUrl(url) != null)) {
+					return false;
+				}
+			}
+		}
+		return true;
+	}
+	
+	private boolean areMDepsPatchesActualForPatch(Component rootComp, VCSRepository repo, List<Component> mDeps, CachedStatuses cache) {
 		for (Component mDep : mDeps) {
 			String url = repoFactory.getUrl(mDep);
 			Version nextVersion = cache.get(url).getNextVersion();
@@ -287,7 +301,6 @@ private Boolean isNeedToFork(Component comp, ReleaseBranchCurrent rb, CachedStat
 			return true;
 		} 
 
-
 		if (rb.getVersion().getPatch().equals(Constants.ZERO_PATCH)) {
 			if (!hasDelayedTag) {
 				return false;

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

@@ -5,6 +5,7 @@
 import org.scm4j.releaser.actions.IAction;
 import org.scm4j.releaser.branch.ReleaseBranchCurrent;
 import org.scm4j.releaser.branch.ReleaseBranchFactory;
+import org.scm4j.releaser.cli.CLICommand;
 import org.scm4j.releaser.conf.Component;
 import org.scm4j.releaser.conf.MDepsFile;
 import org.scm4j.releaser.exceptions.EBuildOnNotForkedRelease;
@@ -152,4 +153,19 @@ public void testBuiltRootIfNestedBuiltAndModified() {
 		crb = ReleaseBranchFactory.getCRB(repoUnTillDb);
 		assertEquals(env.getUnTillDbVer().toReleaseZeroPatch().toNextPatch(), crb.getVersion());
 	}
+	
+	@Test
+	public void TestMinorUpgradeIsOK() {
+		fork(compUnTill);
+		build(compUnTillDb);
+		// add feature to trunk and release branch
+		env.generateFeatureCommit(env.getUnTillDbVCS(), null, "feature added");
+		
+		// release next unTillDb version
+		forkAndBuild(compUnTillDb, 2);
+		//execAndGetActionBuildDelayedTag(compUnTillDb);
+		
+		// expect no EMinorUpgradeDowngrade exception because areMDepsPatchesActualForMinor should be used for minor
+		execAndGetAction(CLICommand.STATUS.getCmdLineStr(), compUBL.getCoords().toString());
+	}
 }

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

@@ -377,7 +377,9 @@ private CLI execAndGetCLI(Runnable preExec, String... args) {
 	private IAction execAndGetAction(Runnable preExec, String... args)  {
 		CLI cli = execAndGetCLI(preExec, args);
 		IAction action = cli.getAction();
-		action.toString(); // cover
+		if (action != null) {
+			action.toString(); // cover
+		}
 		return action;
 	}
 
@@ -386,7 +388,7 @@ protected ExtendedStatus execAndGetNode(Runnable preExec, String... args) {
 		return cli.getNode();
 	}
 
-	private IAction execAndGetAction(String... args) {
+	protected IAction execAndGetAction(String... args) {
 		return execAndGetAction(null, args);
 	}