Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

75091: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      74392: Update tests for mmt version check logging


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75419 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Will Abson
2014-07-01 15:32:19 +00:00
parent d1e580887c
commit 71352485d3

View File

@@ -85,7 +85,7 @@ public class WarHelperImplTest extends WarHelperImpl
} }
catch (ModuleManagementToolException exception) catch (ModuleManagementToolException exception)
{ {
assertTrue(exception.getMessage().endsWith("must be installed on a war version greater than 10.1")); assertTrue(exception.getMessage().contains("must be installed on a war version greater than 10.1"));
} }
installingModuleDetails.setRepoVersionMin(new VersionNumber("1.1")); installingModuleDetails.setRepoVersionMin(new VersionNumber("1.1"));
@@ -99,7 +99,7 @@ public class WarHelperImplTest extends WarHelperImpl
} }
catch (ModuleManagementToolException exception) catch (ModuleManagementToolException exception)
{ {
assertTrue(exception.getMessage().endsWith("cannot be installed on a war version greater than 3.0")); assertTrue(exception.getMessage().contains("cannot be installed on a war version greater than 3.0"));
} }
installingModuleDetails.setRepoVersionMax(new VersionNumber("99")); installingModuleDetails.setRepoVersionMax(new VersionNumber("99"));
@@ -122,7 +122,7 @@ public class WarHelperImplTest extends WarHelperImpl
} }
catch (ModuleManagementToolException exception) catch (ModuleManagementToolException exception)
{ {
assertTrue(exception.getMessage().endsWith("cannot be installed on a war version greater than 4.0.999")); assertTrue(exception.getMessage().contains("cannot be installed on a war version greater than 4.0.999"));
} }
} }
@@ -140,7 +140,7 @@ public class WarHelperImplTest extends WarHelperImpl
} }
catch (ModuleManagementToolException exception) catch (ModuleManagementToolException exception)
{ {
assertTrue(exception.getMessage().endsWith("must be installed on a war version greater than 10.1")); assertTrue(exception.getMessage().contains("must be installed on a war version greater than 10.1"));
} }
installingModuleDetails.setRepoVersionMin(new VersionNumber("1.1")); installingModuleDetails.setRepoVersionMin(new VersionNumber("1.1"));
@@ -154,7 +154,7 @@ public class WarHelperImplTest extends WarHelperImpl
} }
catch (ModuleManagementToolException exception) catch (ModuleManagementToolException exception)
{ {
assertTrue(exception.getMessage().endsWith("cannot be installed on a war version greater than 3.0")); assertTrue(exception.getMessage().contains("cannot be installed on a war version greater than 3.0"));
} }
installingModuleDetails.setRepoVersionMax(new VersionNumber("99")); installingModuleDetails.setRepoVersionMax(new VersionNumber("99"));
@@ -177,7 +177,7 @@ public class WarHelperImplTest extends WarHelperImpl
} }
catch (ModuleManagementToolException exception) catch (ModuleManagementToolException exception)
{ {
assertTrue(exception.getMessage().endsWith("cannot be installed on a war version greater than 3.4.10")); assertTrue(exception.getMessage().contains("cannot be installed on a war version greater than 3.4.10"));
} }
theWar = getFile(".war", "module/share-4.2.a.war"); theWar = getFile(".war", "module/share-4.2.a.war");