From 71352485d303b3e772983b85fc816a440a3a8c49 Mon Sep 17 00:00:00 2001 From: Will Abson Date: Tue, 1 Jul 2014 15:32:19 +0000 Subject: [PATCH] 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 --- .../alfresco/repo/module/tool/WarHelperImplTest.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/source/test-java/org/alfresco/repo/module/tool/WarHelperImplTest.java b/source/test-java/org/alfresco/repo/module/tool/WarHelperImplTest.java index 04398457cf..6ab3a42469 100644 --- a/source/test-java/org/alfresco/repo/module/tool/WarHelperImplTest.java +++ b/source/test-java/org/alfresco/repo/module/tool/WarHelperImplTest.java @@ -85,7 +85,7 @@ public class WarHelperImplTest extends WarHelperImpl } 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")); @@ -99,7 +99,7 @@ public class WarHelperImplTest extends WarHelperImpl } 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")); @@ -122,7 +122,7 @@ public class WarHelperImplTest extends WarHelperImpl } 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) { - 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")); @@ -154,7 +154,7 @@ public class WarHelperImplTest extends WarHelperImpl } 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")); @@ -177,7 +177,7 @@ public class WarHelperImplTest extends WarHelperImpl } 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");