From 17ca9d431f8df905506ca200a1a87d005cb5be1d Mon Sep 17 00:00:00 2001 From: Tom Page Date: Mon, 20 Apr 2015 08:39:08 +0000 Subject: [PATCH] RM-2045 Update unit test to use level ids, rather than levels. +review RM-25 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@102158 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../ClassificationServiceImplUnitTest.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationServiceImplUnitTest.java b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationServiceImplUnitTest.java index ffdd3fc9eb..cc13b58611 100644 --- a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationServiceImplUnitTest.java +++ b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationServiceImplUnitTest.java @@ -24,24 +24,29 @@ import static org.junit.Assert.assertTrue; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import java.io.Serializable; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.stream.Stream; import com.google.common.collect.Sets; import org.alfresco.model.ContentModel; import org.alfresco.module.org_alfresco_module_rm.classification.ClassificationServiceException.InvalidNode; import org.alfresco.module.org_alfresco_module_rm.classification.ClassificationServiceException.MissingConfiguration; +import org.alfresco.module.org_alfresco_module_rm.classification.model.ClassifiedContentModel; import org.alfresco.module.org_alfresco_module_rm.test.util.ExceptionUtils; import org.alfresco.module.org_alfresco_module_rm.test.util.MockAuthenticationUtilHelper; import org.alfresco.module.org_alfresco_module_rm.util.AuthenticationUtil; import org.alfresco.service.cmr.attributes.AttributeService; +import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.namespace.QName; import org.apache.log4j.Appender; @@ -262,7 +267,6 @@ public class ClassificationServiceImplUnitTest ClassificationLevel level = new ClassificationLevel("levelId1", "displayLabelKey"); ClassificationReason reason1 = new ClassificationReason("reasonId1", "displayLabelKey1"); ClassificationReason reason2 = new ClassificationReason("reasonId2", "displayLabelKey2"); - Set reasons = Sets.newHashSet(reason1, reason2); // Set up the managers to return these objects when the ids are provided. doReturn(level).when(mockLevelManager).findLevelById("levelId1"); doReturn(reason1).when(mockReasonManager).findReasonById("reasonId1"); @@ -284,10 +288,11 @@ public class ClassificationServiceImplUnitTest ClassifiedContentModel.PROP_CLASSIFICATION_AUTHORITY, ClassifiedContentModel.PROP_CLASSIFICATION_REASONS); assertEquals("Aspect created with unexpected set of keys.", expectedPropertyKeys, properties.keySet()); - assertEquals("Unexpected initial classification.", level, properties.get(ClassifiedContentModel.PROP_INITIAL_CLASSIFICATION)); - assertEquals("Unexpected current classification.", level, properties.get(ClassifiedContentModel.PROP_CURRENT_CLASSIFICATION)); + assertEquals("Unexpected initial classification.", level.getId(), properties.get(ClassifiedContentModel.PROP_INITIAL_CLASSIFICATION)); + assertEquals("Unexpected current classification.", level.getId(), properties.get(ClassifiedContentModel.PROP_CURRENT_CLASSIFICATION)); assertEquals("Unexpected authority.", "classificationAuthority", properties.get(ClassifiedContentModel.PROP_CLASSIFICATION_AUTHORITY)); - assertEquals("Unexpected set of reasons.", reasons, properties.get(ClassifiedContentModel.PROP_CLASSIFICATION_REASONS)); + Set expectedReasonIds = Sets.newHashSet("reasonId1", "reasonId2"); + assertEquals("Unexpected set of reasons.", expectedReasonIds, properties.get(ClassifiedContentModel.PROP_CLASSIFICATION_REASONS)); } /**