@@ -198,7 +198,10 @@ public void testMinorUpgradeDowngradeException() {
198198 execAndGetActionBuild (compUnTill .clone (env .getUnTillVer ().toRelease ()));
199199 fail ();
200200 } catch (EMinorUpgradeDowngrade e ) {
201- assertEquals (compUBL .clone (crbUBL .getVersion ().toPreviousPatch ()), e .getRootComp ());
201+ if (!e .getRootComp ().equals (compUBL .clone (crbUBL .getVersion ().toPreviousPatch ())) &&
202+ e .getRootComp ().equals (compUBL .clone (crbUnTill .getVersion ().toPreviousPatch ()))) {
203+ fail ();
204+ }
202205 assertEquals (compUnTillDb .clone ("2.59.0" ), e .getProblematicMDep ());
203206 }
204207 }
@@ -209,6 +212,7 @@ public void testPatchDowngradeException() {
209212
210213 // unTill uses 2.59.0 version of UnTillDb
211214 // make UBL use 2.59.1 version of unTillDb
215+ ReleaseBranchCurrent crbUnTill = ReleaseBranchFactory .getCRB (repoUnTill );
212216 ReleaseBranchCurrent crbUBL = ReleaseBranchFactory .getCRB (repoUBL );
213217 ReleaseBranchCurrent crbUnTillDb = ReleaseBranchFactory .getCRB (repoUnTillDb );
214218 MDepsFile mdf = new MDepsFile (env .getUblVCS ().getFileContent (crbUBL .getName (), Constants .MDEPS_FILE_NAME , null ));
@@ -222,7 +226,10 @@ public void testPatchDowngradeException() {
222226 execAndGetActionBuild (compUnTill .clone (env .getUnTillVer ().toRelease ()));
223227 fail ();
224228 } catch (EMinorUpgradeDowngrade e ) {
225- assertEquals (compUBL .clone (crbUBL .getVersion ().toPreviousPatch ()), e .getRootComp ());
229+ if (!e .getRootComp ().equals (compUBL .clone (crbUBL .getVersion ().toPreviousPatch ())) &&
230+ e .getRootComp ().equals (compUBL .clone (crbUnTill .getVersion ().toPreviousPatch ()))) {
231+ fail ();
232+ }
226233 assertEquals (compUnTillDb .clone (crbUnTillDb .getVersion ()), e .getProblematicMDep ());
227234 }
228235 }
0 commit comments