diff --git a/source/java/org/alfresco/repo/workflow/WorkflowObjectFactory.java b/source/java/org/alfresco/repo/workflow/WorkflowObjectFactory.java index a76079942a..2495025fba 100644 --- a/source/java/org/alfresco/repo/workflow/WorkflowObjectFactory.java +++ b/source/java/org/alfresco/repo/workflow/WorkflowObjectFactory.java @@ -209,7 +209,7 @@ public class WorkflowObjectFactory boolean isDefault, String... baseLabelKeys) { String title = getLabel(baseLabelKeys, TITLE_LABEL, defaultTitle); - String description = getLabel(baseLabelKeys, TITLE_LABEL, defaultDescription); + String description = getLabel(baseLabelKeys, DESC_LABEL, defaultDescription); return new WorkflowTransition(id, title, description, isDefault); } diff --git a/source/test-java/org/alfresco/repo/workflow/WorkflowTestSuite.java b/source/test-java/org/alfresco/repo/workflow/WorkflowTestSuite.java index c1dab5a5b5..708ef1d8fa 100644 --- a/source/test-java/org/alfresco/repo/workflow/WorkflowTestSuite.java +++ b/source/test-java/org/alfresco/repo/workflow/WorkflowTestSuite.java @@ -33,6 +33,7 @@ import org.alfresco.repo.workflow.activiti.ActivitiMultitenantWorkflowTest; import org.alfresco.repo.workflow.activiti.ActivitiSpringTransactionTest; import org.alfresco.repo.workflow.activiti.ActivitiTimerExecutionTest; import org.alfresco.repo.workflow.activiti.ActivitiWorkflowServiceIntegrationTest; +import org.alfresco.repo.workflow.activiti.WorklfowObjectFactoryTest; import org.alfresco.util.ApplicationContextHelper; /** @@ -65,7 +66,10 @@ public class WorkflowTestSuite extends TestSuite // These tests use a different Spring config. suite.addTestSuite( ActivitiMultitenantWorkflowTest.class ); - + + // General workflows tests + suite.addTestSuite(WorklfowObjectFactoryTest.class); + // Note the following workflow tests are not included in this sutie: // ActivitiTaskComponentTest // ActivitiWorkflowComponentTest diff --git a/source/test-java/org/alfresco/repo/workflow/activiti/WorklfowObjectFactoryTest.java b/source/test-java/org/alfresco/repo/workflow/activiti/WorklfowObjectFactoryTest.java new file mode 100644 index 0000000000..704f4885c5 --- /dev/null +++ b/source/test-java/org/alfresco/repo/workflow/activiti/WorklfowObjectFactoryTest.java @@ -0,0 +1,71 @@ +/* + * #%L + * Alfresco Repository + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ +package org.alfresco.repo.workflow.activiti; + +import org.alfresco.repo.i18n.MessageService; +import org.alfresco.repo.workflow.WorkflowObjectFactory; +import org.alfresco.service.cmr.workflow.WorkflowTransition; +import org.mockito.Mockito; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; + +import junit.framework.TestCase; + +public class WorklfowObjectFactoryTest extends TestCase +{ + + /** + * Test to validate ALF-18332 (default description label key). + */ + public void testTransitionDefaultLabel() + { + MessageService mockedMessageService = Mockito.mock(MessageService.class); + Mockito.when(mockedMessageService.getMessage(Mockito.anyString())).thenAnswer(new Answer() + { + + @Override + public String answer(InvocationOnMock invocation) throws Throwable + { + String arg = (String) invocation.getArguments()[0]; + if ("base.key.title".equals(arg)) + { + return "The title"; + } + else if ("base.key.description".equals(arg)) + { + return "The description"; + } + return null; + } + }); + + WorkflowObjectFactory factory = new WorkflowObjectFactory(null, null, mockedMessageService, null, ActivitiConstants.ENGINE_ID, null); + WorkflowTransition createTransition = factory.createTransition("test-transition", "title", null, true, "base.key"); + assertNotNull(createTransition); + assertEquals("The title", createTransition.getTitle()); + assertEquals("The description", createTransition.getDescription()); + } +}