inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.1.N (5.1.1) to HEAD (5.1)

Browse Source 
121494 rneamtu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      120555: Merged DEV to 5.0.N (5.0.4)
         120544 rneamtu: MNT-13723 : Error message not clear, when de-activating a model dynamically deployed and content still exists.
            - Added externalized error message, generic for both delete and deactivate
            - Do not merge this forward, it will be merged manually
      120572: MNT-13723 : Error message not clear, when de-activating a model dynamically deployed and content still exists.
         - Fixed failing tests
         - Do not merge this forward, it will be merged manually


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123643 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-03-11 21:41:53 +00:00
parent f0838f222f
commit 0357d35817
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/test-java/org/alfresco/repo/admin/RepoAdminServiceImplTest.java
View File

@@ -333,8 +333,7 @@ public class RepoAdminServiceImplTest extends TestCase
// expected
assertTrue(
"Incorrect exception message: " + are.getMessage(),
are.getMessage().contains("Cannot delete model") &&
are.getMessage().contains("it is being used"));
are.getMessage().contains(" is in use and cannot be deleted or deactivated."));
}
nodeService.deleteNode(node1);
@@ -353,7 +352,7 @@ public class RepoAdminServiceImplTest extends TestCase
catch (AlfrescoRuntimeException are)
{
// expected
assertTrue(are.getMessage().contains("Cannot delete model"));
assertTrue(are.getMessage().contains("is in use and cannot be deleted or deactivated."));
}
nodeService.deleteNode(archiveNode1);
@@ -484,7 +483,7 @@ public class RepoAdminServiceImplTest extends TestCase
{
// expected
assertTrue(are.getMessage().contains("Model undeployment failed"));
assertTrue(are.getCause().getMessage().contains("Cannot delete model"));
assertTrue(are.getCause().getMessage().contains("is in use and cannot be deleted or deactivated."));
}
nodeService.deleteNode(node1);
@@ -504,7 +503,7 @@ public class RepoAdminServiceImplTest extends TestCase
{
// expected
assertTrue(are.getMessage().contains("Model undeployment failed"));
assertTrue(are.getCause().getMessage().contains("Cannot delete model"));
assertTrue(are.getCause().getMessage().contains("is in use and cannot be deleted or deactivated."));
}
nodeService.deleteNode(archiveNode1);