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

RM-2586 Replace classification I18N properties with caveat ones.

Browse Source 
Need to check with Gloria that this is the right way to change the key.

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

12
rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationSchemeServiceImplUnitTest.java
View File

@@ -50,9 +50,9 @@ import org.mockito.MockitoAnnotations;
*/
public class ClassificationSchemeServiceImplUnitTest
{
private static final List<ClassificationLevel> DEFAULT_CLASSIFICATION_LEVELS = asLevelList("Top Secret", "rm.classification.topSecret",
"Secret", "rm.classification.secret",
"Confidential", "rm.classification.confidential",
private static final List<ClassificationLevel> DEFAULT_CLASSIFICATION_LEVELS = asLevelList("Top Secret", "rm.caveat.classification.mark.ts.label",
"Secret", "rm.caveat.classification.mark.s.label",
"Confidential", "rm.caveat.classification.mark.c.label",
"No Clearance", "rm.classification.noClearance");
/**
@@ -99,12 +99,12 @@ public class ClassificationSchemeServiceImplUnitTest
*/
@Test public void restrictList_filter()
{
ClassificationLevel targetLevel = new ClassificationLevel("Secret", "rm.classification.secret");
ClassificationLevel targetLevel = new ClassificationLevel("Secret", "rm.caveat.classification.mark.s.label");
List<ClassificationLevel> actual = classificationSchemeServiceImpl.restrictList(DEFAULT_CLASSIFICATION_LEVELS, targetLevel);
List<ClassificationLevel> expected = asLevelList("Secret", "rm.classification.secret",
"Confidential", "rm.classification.confidential",
List<ClassificationLevel> expected = asLevelList("Secret", "rm.caveat.classification.mark.s.label",
"Confidential", "rm.caveat.classification.mark.c.label",
"No Clearance", "rm.classification.noClearance");
assertEquals(expected, actual);
// Check that the returned list can't be modified.

6
rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationServiceBootstrapUnitTest.java
View File

@@ -60,9 +60,9 @@ import org.mockito.MockitoAnnotations;
public class ClassificationServiceBootstrapUnitTest implements ClassifiedContentModel
{
private static final List<ClassificationLevel> DEFAULT_CONFIGURED_CLASSIFICATION_LEVELS =
asLevelList("TS", "rm.classification.topSecret",
"S", "rm.classification.secret",
"C", "rm.classification.confidential");
asLevelList("TS", "rm.caveat.classification.mark.ts.label",
"S", "rm.caveat.classification.mark.s.label",
"C", "rm.caveat.classification.mark.c.label");
@SuppressWarnings("unchecked")
private static final List<ClassificationLevel> DEFAULT_CLASSIFICATION_LEVELS =
union(DEFAULT_CONFIGURED_CLASSIFICATION_LEVELS,