From 81dbb5447141373461a7820c177aca07b38201b8 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Tue, 2 Jun 2015 09:21:30 +0000 Subject: [PATCH] Fix failing test on Sonar build. Avoid calling the I18N utility by checking the display label key directly. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@105312 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../classification/ClearanceLevel.java | 11 +++++++++++ .../ClassificationServiceBootstrapUnitTest.java | 6 +++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/ClearanceLevel.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/ClearanceLevel.java index d73fbee19e..86537879e7 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/ClearanceLevel.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/ClearanceLevel.java @@ -84,4 +84,15 @@ public class ClearanceLevel } @Override public int hashCode() { return highestClassificationLevel.hashCode(); } + + /** + * Get the display label key. This method is used for unit testing, where we want to avoid problems introduced by + * the static call to the I18N utility. + * + * @return The key for the display label of this security clearance. + */ + protected String getDisplayLabelKey() + { + return displayLabelKey; + } } diff --git a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationServiceBootstrapUnitTest.java b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationServiceBootstrapUnitTest.java index b327017f36..c316e550ae 100644 --- a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationServiceBootstrapUnitTest.java +++ b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationServiceBootstrapUnitTest.java @@ -235,8 +235,8 @@ public class ClassificationServiceBootstrapUnitTest List clearanceLevels = clearanceLevelCaptor.getValue(); assertEquals("There should be one clearance level for each classification level.", classificationLevels.size(), clearanceLevels.size()); - assertEquals("TopSecret", clearanceLevels.get(0).getDisplayLabel()); - assertEquals("Secret", clearanceLevels.get(1).getDisplayLabel()); - assertEquals("rm.classification.noClearance", clearanceLevels.get(2).getDisplayLabel()); + assertEquals("TopSecret", clearanceLevels.get(0).getDisplayLabelKey()); + assertEquals("Secret", clearanceLevels.get(1).getDisplayLabelKey()); + assertEquals("rm.classification.noClearance", clearanceLevels.get(2).getDisplayLabelKey()); } }