inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-21 18:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

RM-2604 Fix incorrectly named resources.

Browse Source 
Also remove duplication of ids in test where this isn't relevant. Thanks
Oana for spotting this.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/DEV/caveatmarkdatatype@114361 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tom Page
2015-10-14 15:47:31 +00:00
parent 57319d1134
commit b1dc644ebd
4 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/caveat/dao/CaveatDAOFromJSONUnitTest.java
View File

@@ -69,7 +69,7 @@ public class CaveatDAOFromJSONUnitTest
@Test(expected = MalformedConfiguration.class) @Test(expected = MalformedConfiguration.class)
public void testGetCaveatGroups_missingId() public void testGetCaveatGroups_missingId()
{ {
caveatDAOFromJSON.setConfigLocation("/alfresco/caveat/rm-caveats-missingId.json"); caveatDAOFromJSON.setConfigLocation("/alfresco/caveat/rm-caveats-missingMarkId.json");
caveatDAOFromJSON.getCaveatGroups(); caveatDAOFromJSON.getCaveatGroups();
} }

14
rm-server/unit-test/resources/alfresco/caveat/rm-caveats-duplicateGroupId.json
View File

@@ -9,13 +9,19 @@
{ {
"id" : "TS", "id" : "TS",
"displayLabel" : "rm.caveat.classification.mark.ts" "displayLabel" : "rm.caveat.classification.mark.ts"
}
]
}, },
{ {
"displayLabel" : "rm.caveat.classification.mark.s" "id" : "classification",
}, "displayLabel" : "rm.caveat.classification.group",
"description" : "rm.caveat.classification.description",
"type" : "HIERARCHICAL",
"marks" :
[
{ {
"id" : "C", "id" : "XYZ",
"displayLabel" : "rm.caveat.classification.mark.c" "displayLabel" : "rm.caveat.classification.mark.ts"
} }
] ]
} }

28
rm-server/unit-test/resources/alfresco/caveat/rm-caveats-missingId.json
View File

@@ -1,28 +0,0 @@
[
{
"id" : "classification",
"displayLabel" : "rm.caveat.classification.group",
"description" : "rm.caveat.classification.description",
"type" : "HIERARCHICAL",
"marks" :
[
{
"id" : "TS",
"displayLabel" : "rm.caveat.classification.mark.ts"
}
]
},
{
"id" : "classification",
"displayLabel" : "rm.caveat.classification.group",
"description" : "rm.caveat.classification.description",
"type" : "HIERARCHICAL",
"marks" :
[
{
"id" : "TS",
"displayLabel" : "rm.caveat.classification.mark.ts"
}
]
}
]

22
rm-server/unit-test/resources/alfresco/caveat/rm-caveats-missingMarkId.json Normal file
View File

@@ -0,0 +1,22 @@
[
{
"id" : "classification",
"displayLabel" : "rm.caveat.classification.group",
"description" : "rm.caveat.classification.description",
"type" : "HIERARCHICAL",
"marks" :
[
{
"id" : "TS",
"displayLabel" : "rm.caveat.classification.mark.ts"
},
{
"displayLabel" : "rm.caveat.classification.mark.s"
},
{
"id" : "C",
"displayLabel" : "rm.caveat.classification.mark.c"
}
]
}
]