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 HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
108044: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      107731: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3)
         107679: MNT-13820 "Model can be deactivated with a node referencing the model is in trashcan"
         Use the database to check if model is in use, rather than Search
         Fix up existing tests in light of these changes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108075 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-07-09 22:12:29 +00:00
parent 0b09d68864
commit 62d972f622
20 changed files with 1055 additions and 337 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

@@ -326,7 +326,8 @@ public class RepoAdminServiceImplTest extends TestCase
// expected
assertTrue(
"Incorrect exception message: " + are.getMessage(),
are.getMessage().contains("Failed to validate model delete"));
are.getMessage().contains("Cannot delete model") &&
are.getMessage().contains("it is being used"));
}
nodeService.deleteNode(node1);
@@ -345,7 +346,7 @@ public class RepoAdminServiceImplTest extends TestCase
catch (AlfrescoRuntimeException are)
{
// expected
assertTrue(are.getMessage().contains("Failed to validate model delete"));
assertTrue(are.getMessage().contains("Cannot delete model"));
}
nodeService.deleteNode(archiveNode1);
@@ -476,7 +477,7 @@ public class RepoAdminServiceImplTest extends TestCase
{
// expected
assertTrue(are.getMessage().contains("Model undeployment failed"));
assertTrue(are.getCause().getMessage().contains("Failed to validate model delete"));
assertTrue(are.getCause().getMessage().contains("Cannot delete model"));
}
nodeService.deleteNode(node1);
@@ -496,7 +497,7 @@ public class RepoAdminServiceImplTest extends TestCase
{
// expected
assertTrue(are.getMessage().contains("Model undeployment failed"));
assertTrue(are.getCause().getMessage().contains("Failed to validate model delete"));
assertTrue(are.getCause().getMessage().contains("Cannot delete model"));
}
nodeService.deleteNode(archiveNode1);