From ab404e87c2b1c13a15a28e906356e425fb2fb6b7 Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Fri, 10 Apr 2015 10:20:27 +0000 Subject: [PATCH] RM-1994 (Classification hierarchy integration tests) - Removed the contains methods as the test cases are already covered +review RM-19 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@101608 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../ClassificationLevelsTest.java | 51 ++----------------- 1 file changed, 4 insertions(+), 47 deletions(-) diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/ClassificationLevelsTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/ClassificationLevelsTest.java index 4cdae4bc51..f422d80d25 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/ClassificationLevelsTest.java +++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/ClassificationLevelsTest.java @@ -69,30 +69,15 @@ public class ClassificationLevelsTest extends BaseRMTestCase assertNotNull(levels); assertEquals(4, levels.size()); - String topSecretDisplayLabel = getDisplayLabel(TOP_SECRET_DISPLAY_LABEL_KEY); - String secretDisplayLabel = getDisplayLabel(SECRET_DISPLAY_LABEL_KEY); - String confidentialDisplayLabel = getDisplayLabel(CONFIDENTIAL_DISPLAY_LABEL_KEY); - String noClearanceDisplayLabel = getDisplayLabel(NO_CLEARANCE_DISPLAY_LABEL_KEY); - - assertTrue(containsId(levels, CONFIDENTIAL_ID)); - assertTrue(containsId(levels, TOP_SECRET_ID)); - assertTrue(containsId(levels, NO_CLEARANCE_ID)); - assertTrue(containsId(levels, SECRET_ID)); - - assertTrue(containsDisplayLabel(levels, noClearanceDisplayLabel)); - assertTrue(containsDisplayLabel(levels, secretDisplayLabel)); - assertTrue(containsDisplayLabel(levels, topSecretDisplayLabel)); - assertTrue(containsDisplayLabel(levels, confidentialDisplayLabel)); - ClassificationLevel level0 = levels.get(0); ClassificationLevel level1 = levels.get(1); ClassificationLevel level2 = levels.get(2); ClassificationLevel level3 = levels.get(3); - assertEquals(level3.getDisplayLabel(), noClearanceDisplayLabel); - assertEquals(level2.getDisplayLabel(), confidentialDisplayLabel); - assertEquals(level1.getDisplayLabel(), secretDisplayLabel); - assertEquals(level0.getDisplayLabel(), topSecretDisplayLabel); + assertEquals(level3.getDisplayLabel(), getDisplayLabel(NO_CLEARANCE_DISPLAY_LABEL_KEY)); + assertEquals(level2.getDisplayLabel(), getDisplayLabel(CONFIDENTIAL_DISPLAY_LABEL_KEY)); + assertEquals(level1.getDisplayLabel(), getDisplayLabel(SECRET_DISPLAY_LABEL_KEY)); + assertEquals(level0.getDisplayLabel(), getDisplayLabel(TOP_SECRET_DISPLAY_LABEL_KEY)); assertEquals(level0.getId(), TOP_SECRET_ID); assertEquals(level1.getId(), SECRET_ID); @@ -120,32 +105,4 @@ public class ClassificationLevelsTest extends BaseRMTestCase String message = I18NUtil.getMessage(displayLabelKey); return (isNotBlank(message) ? message : displayLabelKey); } - - private boolean containsId(List levels, String id) - { - boolean contains = false; - for (ClassificationLevel level : levels) - { - if (level.getId().equals(id)) - { - contains = true; - break; - } - } - return contains; - } - - private boolean containsDisplayLabel(List levels, String displayLabel) - { - boolean contains = false; - for (ClassificationLevel level : levels) - { - if (level.getDisplayLabel().equals(displayLabel)) - { - contains = true; - break; - } - } - return contains; - } }