diff options
Diffstat (limited to 'plugins/org.eclipse.osee.ats.core.test')
116 files changed, 3372 insertions, 2278 deletions
diff --git a/plugins/org.eclipse.osee.ats.core.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.core.test/META-INF/MANIFEST.MF index 52592b1f590..aeb10942482 100644 --- a/plugins/org.eclipse.osee.ats.core.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.core.test/META-INF/MANIFEST.MF @@ -1,13 +1,15 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ATS Core Test -Bundle-SymbolicName: org.eclipse.osee.ats.core.test -Bundle-Version: 0.25.4.qualifier +Bundle-SymbolicName: org.eclipse.osee.ats.core.test;singleton:=true +Bundle-ActivationPolicy: lazy +Bundle-Version: 0.26.0.qualifier Fragment-Host: org.eclipse.osee.ats.core Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.junit, - org.mockito;bundle-version="1.9.0", org.hamcrest.core, + org.mockito;visibility:=reexport, org.objenesis Bundle-Vendor: Eclipse Open System Engineering Environment -Import-Package: org.eclipse.osee.ats.mocks +Import-Package: org.eclipse.osee.ats.api.workdef.model, + org.eclipse.osee.framework.core.util.result diff --git a/plugins/org.eclipse.osee.ats.core.test/pom.xml b/plugins/org.eclipse.osee.ats.core.test/pom.xml index 1904ef8ee30..6e76f6bd8c5 100644 --- a/plugins/org.eclipse.osee.ats.core.test/pom.xml +++ b/plugins/org.eclipse.osee.ats.core.test/pom.xml @@ -5,9 +5,9 @@ <parent> <groupId>org.eclipse.osee</groupId> - <artifactId>org.eclipse.osee.x.ats.parent</artifactId> - <version>0.25.4-SNAPSHOT</version> - <relativePath>../../plugins/org.eclipse.osee.x.ats.parent</relativePath> + <artifactId>org.eclipse.osee.ats.server.parent</artifactId> + <version>0.26.0-SNAPSHOT</version> + <relativePath>../../plugins/org.eclipse.osee.ats.server.parent</relativePath> </parent> <artifactId>org.eclipse.osee.ats.core.test</artifactId> diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/AbstractUserTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/AbstractUserTest.java deleted file mode 100644 index e44aa37c4cf..00000000000 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/AbstractUserTest.java +++ /dev/null @@ -1,41 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.ats.core; - -import static org.mockito.Mockito.when; -import org.eclipse.osee.ats.api.user.IAtsUser; -import org.junit.Before; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; - -/** - * @author Donald G. Dunne - */ -public abstract class AbstractUserTest { - - // @formatter:off - @Mock protected IAtsUser joe, steve, alice; - // @formatter:on - - @Before - public void setup() { - MockitoAnnotations.initMocks(this); - when(joe.getName()).thenReturn("joe"); - when(joe.getUserId()).thenReturn("joe"); - - when(steve.getName()).thenReturn("steve"); - when(steve.getUserId()).thenReturn("steve"); - - when(alice.getName()).thenReturn("alice"); - when(alice.getUserId()).thenReturn("alice"); - - } -} diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/AllAtsCoreTestSuite.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/AllAtsCoreTestSuite.java index bc5625cf1b5..dab22a65cc2 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/AllAtsCoreTestSuite.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/AllAtsCoreTestSuite.java @@ -1,17 +1,21 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2004, 2007 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core; import org.eclipse.osee.ats.core.ai.AtsCore_AI_Suite; import org.eclipse.osee.ats.core.column.AtsCore_Column_JT_Suite; +import org.eclipse.osee.ats.core.commit.operations.AtsCore_Commit_JT_Suite; import org.eclipse.osee.ats.core.config.AtsCore_Config_JT_Suite; import org.eclipse.osee.ats.core.internal.column.ev.AtsCore_InternalColumnEv_JT_Suite; import org.eclipse.osee.ats.core.internal.log.AtsTest_Internal_Log_Suite; @@ -34,6 +38,7 @@ import org.junit.runners.Suite; @Suite.SuiteClasses({ AtsCore_AI_Suite.class, AtsCore_Column_JT_Suite.class, + AtsCore_Commit_JT_Suite.class, AtsCore_Config_JT_Suite.class, AtsTest_Internal_Log_Suite.class, AtsCore_Internal_State_Suite.class, diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/ai/AtsCore_AI_Suite.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/ai/AtsCore_AI_Suite.java index bbecab76eeb..bbfc0309a7f 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/ai/AtsCore_AI_Suite.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/ai/AtsCore_AI_Suite.java @@ -1,13 +1,16 @@ -/******************************************************************************* - * Copyright (c) 20013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.ai; import org.junit.runner.RunWith; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/ai/ModifyActionableItemsTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/ai/ModifyActionableItemsTest.java index a885da865a7..5c76f5174d9 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/ai/ModifyActionableItemsTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/ai/ModifyActionableItemsTest.java @@ -1,27 +1,31 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.ai; import static org.mockito.Mockito.when; import java.util.Arrays; import java.util.Collections; import java.util.List; +import org.eclipse.osee.ats.api.AtsApi; import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.team.CreateTeamData; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; -import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinitionService; +import org.eclipse.osee.ats.api.user.AtsUser; import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; import org.eclipse.osee.ats.core.config.ITeamDefinitionUtility; -import org.eclipse.osee.framework.core.util.XResultData; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; +import org.eclipse.osee.framework.jdk.core.result.XResultData; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -37,19 +41,23 @@ public class ModifyActionableItemsTest { // @formatter:off @Mock private IAtsTeamWorkflow teamWf; - @Mock private IAtsUser modifiedBy; + @Mock private AtsUser modifiedBy; @Mock private IAtsActionableItem ai1, ai2, ai3; @Mock private ITeamDefinitionUtility teamDefUtil; @Mock private IAtsTeamDefinition teamDef; + @Mock private AtsApi atsApi; + @Mock private IAtsTeamDefinitionService teamDefinitionService; // @formatter:on @Before public void setup() { MockitoAnnotations.initMocks(this); + when(atsApi.getTeamDefinitionService()).thenReturn(teamDefinitionService); + when(teamDefinitionService.getLeads(teamDef)).thenReturn(Collections.emptyList()); } @Test - public void test_addAi() throws OseeCoreException { + public void test_addAi() { when(teamWf.getActionableItems()).thenReturn(org.eclipse.osee.framework.jdk.core.util.Collections.hashSet(ai1)); XResultData results = new XResultData(false); List<IAtsActionableItem> currAIsForAllWfs = Arrays.asList(ai1); @@ -57,7 +65,7 @@ public class ModifyActionableItemsTest { List<IAtsActionableItem> newAIs = Collections.emptyList(); ModifyActionableItems job = new ModifyActionableItems(results, teamWf, currAIsForAllWfs, currWorkflowDesiredAIs, - newAIs, modifiedBy, teamDefUtil); + newAIs, modifiedBy, teamDefUtil, atsApi); job.performModification(); Assert.assertEquals(1, job.getAddAis().size()); @@ -66,7 +74,7 @@ public class ModifyActionableItemsTest { } @Test - public void test_removeAi() throws OseeCoreException { + public void test_removeAi() { when(teamWf.getActionableItems()).thenReturn( org.eclipse.osee.framework.jdk.core.util.Collections.hashSet(ai1, ai2)); XResultData results = new XResultData(false); @@ -75,7 +83,7 @@ public class ModifyActionableItemsTest { List<IAtsActionableItem> newAIs = Collections.emptyList(); ModifyActionableItems job = new ModifyActionableItems(results, teamWf, currAIsForAllWfs, currWorkflowDesiredAIs, - newAIs, modifiedBy, teamDefUtil); + newAIs, modifiedBy, teamDefUtil, atsApi); job.performModification(); Assert.assertEquals(0, job.getAddAis().size()); @@ -84,7 +92,7 @@ public class ModifyActionableItemsTest { } @Test - public void test_removeAllAi() throws OseeCoreException { + public void test_removeAllAi() { when(teamWf.getActionableItems()).thenReturn( org.eclipse.osee.framework.jdk.core.util.Collections.hashSet(ai1, ai2)); XResultData results = new XResultData(false); @@ -93,7 +101,7 @@ public class ModifyActionableItemsTest { List<IAtsActionableItem> newAIs = Collections.emptyList(); ModifyActionableItems job = new ModifyActionableItems(results, teamWf, currAIsForAllWfs, currWorkflowDesiredAIs, - newAIs, modifiedBy, teamDefUtil); + newAIs, modifiedBy, teamDefUtil, atsApi); job.performModification(); Assert.assertTrue(results.toString().contains("Error: All AIs can not be removed")); @@ -103,7 +111,7 @@ public class ModifyActionableItemsTest { } @Test - public void test_newAi() throws OseeCoreException { + public void test_newAi() { when(teamWf.getActionableItems()).thenReturn( org.eclipse.osee.framework.jdk.core.util.Collections.hashSet(ai1, ai2)); when(ai3.isActionable()).thenReturn(true); @@ -116,7 +124,7 @@ public class ModifyActionableItemsTest { List<IAtsActionableItem> newAIs = Arrays.asList(ai3); ModifyActionableItems job = new ModifyActionableItems(results, teamWf, currAIsForAllWfs, currWorkflowDesiredAIs, - newAIs, modifiedBy, teamDefUtil); + newAIs, modifiedBy, teamDefUtil, atsApi); job.performModification(); Assert.assertEquals(0, job.getAddAis().size()); @@ -132,7 +140,7 @@ public class ModifyActionableItemsTest { } @Test - public void test_duplicateAi() throws OseeCoreException { + public void test_duplicateAi() { when(teamWf.getActionableItems()).thenReturn( org.eclipse.osee.framework.jdk.core.util.Collections.hashSet(ai1, ai2)); when(ai2.isActionable()).thenReturn(true); @@ -145,7 +153,7 @@ public class ModifyActionableItemsTest { List<IAtsActionableItem> newAIs = Arrays.asList(ai2); ModifyActionableItems job = new ModifyActionableItems(results, teamWf, currAIsForAllWfs, currWorkflowDesiredAIs, - newAIs, modifiedBy, teamDefUtil); + newAIs, modifiedBy, teamDefUtil, atsApi); job.performModification(); Assert.assertEquals(0, job.getAddAis().size()); diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ActionableItemsColumnTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ActionableItemsColumnTest.java index 1b586c85447..e24f29ddc71 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ActionableItemsColumnTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ActionableItemsColumnTest.java @@ -1,13 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2010 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2010 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.column; import static org.mockito.Mockito.when; @@ -18,7 +21,6 @@ import org.eclipse.osee.ats.api.review.IAtsDecisionReview; import org.eclipse.osee.ats.api.review.IAtsPeerToPeerReview; import org.eclipse.osee.ats.api.workflow.IAtsAction; import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.junit.Assert; import org.junit.Before; import org.mockito.Mock; @@ -44,7 +46,7 @@ public class ActionableItemsColumnTest { // @formatter:on @Before - public void setup() throws OseeCoreException { + public void setup() { MockitoAnnotations.initMocks(this); when(action.getTeamWorkflows()).thenReturn(Arrays.asList(teamWf1, teamWf2)); @@ -79,6 +81,7 @@ public class ActionableItemsColumnTest { public void testGetActionableItems_review_peerToPeerInheritsParent() throws Exception { IAtsPeerToPeerReview peer = Mockito.mock(IAtsPeerToPeerReview.class); when(peer.getParentTeamWorkflow()).thenReturn(teamWf1); + when(teamWf1.notEqual(peer)).thenReturn(true); Collection<IAtsActionableItem> ais = ActionableItemsColumn.getActionableItems(peer); diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ActivityIdColumnTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ActivityIdColumnTest.java index ebddaf12d3d..f0fbbdde226 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ActivityIdColumnTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ActivityIdColumnTest.java @@ -1,13 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.column; import static org.mockito.Mockito.when; @@ -21,7 +24,6 @@ import org.eclipse.osee.ats.api.workflow.IAtsAction; import org.eclipse.osee.ats.api.workflow.IAtsTask; import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; import org.eclipse.osee.ats.core.internal.column.ev.WorkPackageColumn; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -53,7 +55,7 @@ public class ActivityIdColumnTest { // @formatter:on @Before - public void setup() throws OseeCoreException { + public void setup() { MockitoAnnotations.initMocks(this); when(action.getTeamWorkflows()).thenReturn(Arrays.asList(teamWf1, teamWf2)); @@ -73,7 +75,7 @@ public class ActivityIdColumnTest { } @Test - public void testGetWorkPackages_teamWf1() throws OseeCoreException { + public void testGetWorkPackages_teamWf1() { WorkPackageColumn col = new WorkPackageColumn(earnedValueServiceProvider); Set<IAtsWorkPackage> workPackages = new HashSet<>(); @@ -84,7 +86,7 @@ public class ActivityIdColumnTest { } @Test - public void testGetWorkPackages_task() throws OseeCoreException { + public void testGetWorkPackages_task() { WorkPackageColumn col = new WorkPackageColumn(earnedValueServiceProvider); Set<IAtsWorkPackage> workPackages = new HashSet<>(); diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/AssigneeColumnTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/AssigneeColumnTest.java index ce480f13603..246ad834e9c 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/AssigneeColumnTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/AssigneeColumnTest.java @@ -1,33 +1,34 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.column; import static org.mockito.Mockito.when; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.eclipse.osee.ats.api.IAtsServices; -import org.eclipse.osee.ats.api.IAtsWorkItem; -import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.AtsApi; +import org.eclipse.osee.ats.api.user.AtsUser; import org.eclipse.osee.ats.api.user.IAtsUserService; import org.eclipse.osee.ats.api.workdef.StateType; +import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; import org.eclipse.osee.ats.api.workflow.state.IAtsStateManager; -import org.eclipse.osee.ats.core.AbstractUserTest; -import org.eclipse.osee.ats.core.model.impl.AtsActionGroup; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; -import org.eclipse.osee.framework.jdk.core.util.GUID; -import org.eclipse.osee.framework.jdk.core.util.Lib; +import org.eclipse.osee.ats.core.users.AbstractUserTest; +import org.eclipse.osee.ats.core.workflow.Action; import org.junit.Assert; import org.junit.Before; import org.mockito.Mock; +import org.mockito.MockitoAnnotations; /** * @tests AssigneeColumn @@ -36,36 +37,36 @@ import org.mockito.Mock; public class AssigneeColumnTest extends AbstractUserTest { // @formatter:off - @Mock private IAtsWorkItem workItem; + @Mock private IAtsTeamWorkflow workItem; @Mock private IAtsStateManager stateMgr; - @Mock private IAtsWorkItem workItem2; + @Mock private IAtsTeamWorkflow workItem2; @Mock private IAtsStateManager stateMgr2; - @Mock private AtsActionGroup group; - @Mock private IAtsServices services; + @Mock private Action action; + @Mock private AtsApi atsApi; @Mock private IAtsUserService userService; // @formatter:on AssigneeColumn assigneeColumn; - @Override @Before public void setup() { - super.setup(); + MockitoAnnotations.initMocks(this); + when(workItem.getStateMgr()).thenReturn(stateMgr); when(workItem2.getStateMgr()).thenReturn(stateMgr2); - when(services.getUserService()).thenReturn(userService); - assigneeColumn = new AssigneeColumn(services); - + when(atsApi.getUserService()).thenReturn(userService); + when(action.getTeamWorkflows()).thenReturn(Arrays.asList(workItem, workItem2)); + assigneeColumn = new AssigneeColumn(atsApi); } @org.junit.Test - public void testGetAssigneeStr_null() throws OseeCoreException { + public void testGetAssigneeStr_null() { Assert.assertEquals("", assigneeColumn.getAssigneeStr(null)); } @org.junit.Test - public void testGetAssigneeStrFromInWorkWorkflow() throws OseeCoreException { - List<IAtsUser> assigneesToReturn = new ArrayList<>(); + public void testGetAssigneeStrFromInWorkWorkflow() { + List<AtsUser> assigneesToReturn = new ArrayList<>(); assigneesToReturn.addAll(Arrays.asList(joe, steve, alice)); when(stateMgr.getStateType()).thenReturn(StateType.Working); when(workItem.getAssignees()).thenReturn(assigneesToReturn); @@ -74,13 +75,13 @@ public class AssigneeColumnTest extends AbstractUserTest { } @org.junit.Test - public void testGetAssigneeStrFromCompletedWorkflow() throws OseeCoreException { - List<IAtsUser> assigneesToReturn = new ArrayList<>(); + public void testGetAssigneeStrFromCompletedWorkflow() { + List<AtsUser> assigneesToReturn = new ArrayList<>(); when(stateMgr.getStateType()).thenReturn(StateType.Working); when(workItem.getAssignees()).thenReturn(assigneesToReturn); Assert.assertEquals("", assigneeColumn.getAssigneeStr(workItem)); - List<IAtsUser> implementersToReturn = new ArrayList<>(); + List<AtsUser> implementersToReturn = new ArrayList<>(); when(workItem.getImplementers()).thenReturn(implementersToReturn); when(stateMgr.getStateType()).thenReturn(StateType.Completed); when(workItem.getCompletedBy()).thenReturn(steve); @@ -90,7 +91,7 @@ public class AssigneeColumnTest extends AbstractUserTest { // add alice as completedFromState assignee implementersToReturn.add(steve); when(workItem.getCompletedFromState()).thenReturn("Implement"); - List<IAtsUser> implementStateImplementers = new ArrayList<>(); + List<AtsUser> implementStateImplementers = new ArrayList<>(); implementStateImplementers.add(alice); when(stateMgr.getAssigneesForState("Implement")).thenReturn(implementStateImplementers); Assert.assertTrue(assigneeColumn.getAssigneeStr(workItem).contains("alice")); @@ -103,13 +104,13 @@ public class AssigneeColumnTest extends AbstractUserTest { } @org.junit.Test - public void testGetAssigneeStrFromCancelledWorkflow() throws OseeCoreException { - List<IAtsUser> assigneesToReturn = new ArrayList<>(); + public void testGetAssigneeStrFromCancelledWorkflow() { + List<AtsUser> assigneesToReturn = new ArrayList<>(); when(stateMgr.getStateType()).thenReturn(StateType.Working); when(workItem.getAssignees()).thenReturn(assigneesToReturn); Assert.assertEquals("", assigneeColumn.getAssigneeStr(workItem)); - List<IAtsUser> implementersToReturn = new ArrayList<>(); + List<AtsUser> implementersToReturn = new ArrayList<>(); when(workItem.getImplementers()).thenReturn(implementersToReturn); when(stateMgr.getStateType()).thenReturn(StateType.Cancelled); when(workItem.getCancelledBy()).thenReturn(steve); @@ -118,7 +119,7 @@ public class AssigneeColumnTest extends AbstractUserTest { // add alice as completedFromState assignee implementersToReturn.add(steve); when(workItem.getCancelledFromState()).thenReturn("Implement"); - List<IAtsUser> implementStateImplementers = new ArrayList<>(); + List<AtsUser> implementStateImplementers = new ArrayList<>(); implementStateImplementers.add(alice); when(stateMgr.getAssigneesForState("Implement")).thenReturn(implementStateImplementers); Assert.assertTrue(assigneeColumn.getAssigneeStr(workItem).contains("alice")); @@ -131,75 +132,61 @@ public class AssigneeColumnTest extends AbstractUserTest { } @org.junit.Test - public void testGetAssigneesStr_hasActions_oneWorkingOneCancelled() throws OseeCoreException { + public void testGetAssigneesStr_hasActions_oneWorkingOneCancelled() { - List<IAtsUser> assigneesToReturn = new ArrayList<>(); + List<AtsUser> assigneesToReturn = new ArrayList<>(); when(stateMgr.getStateType()).thenReturn(StateType.Working); when(workItem.getAssignees()).thenReturn(assigneesToReturn); when(stateMgr2.getStateType()).thenReturn(StateType.Cancelled); when(workItem2.getCancelledFromState()).thenReturn("Implement"); - List<IAtsUser> implementStateImplementers = new ArrayList<>(); + List<AtsUser> implementStateImplementers = new ArrayList<>(); implementStateImplementers.add(joe); when(workItem2.getImplementers()).thenReturn(implementStateImplementers); - - AtsActionGroup group = new AtsActionGroup(GUID.create(), "group", Lib.generateUuid()); - group.addAction(workItem); - group.addAction(workItem2); - - Assert.assertEquals("(joe)", assigneeColumn.getAssigneeStr(group)); + Assert.assertEquals("(joe)", assigneeColumn.getAssigneeStr(action)); } @org.junit.Test - public void testGetAssigneesStr_hasActions_duplicateImplementers() throws OseeCoreException { - - when(group.getActions()).thenReturn(Arrays.asList(workItem, workItem2)); + public void testGetAssigneesStr_hasActions_duplicateImplementers() { when(workItem.getStateMgr().getStateType()).thenReturn(StateType.Cancelled); when(workItem.getImplementers()).thenReturn(Arrays.asList(joe)); when(workItem2.getStateMgr().getStateType()).thenReturn(StateType.Cancelled); when(workItem2.getImplementers()).thenReturn(Arrays.asList(joe)); - Assert.assertEquals("(joe)", assigneeColumn.getAssigneeStr(group)); + Assert.assertEquals("(joe)", assigneeColumn.getAssigneeStr(action)); } @org.junit.Test - public void testGetAssigneesStr_hasActions_twoCancelled() throws OseeCoreException { + public void testGetAssigneesStr_hasActions_twoCancelled() { - when(group.getActions()).thenReturn(Arrays.asList(workItem, workItem2)); when(workItem.getStateMgr().getStateType()).thenReturn(StateType.Cancelled); when(workItem.getImplementers()).thenReturn(Arrays.asList(steve)); when(workItem2.getStateMgr().getStateType()).thenReturn(StateType.Cancelled); when(workItem2.getImplementers()).thenReturn(Arrays.asList(joe)); - Assert.assertTrue(assigneeColumn.getAssigneeStr(group).contains("joe")); - Assert.assertTrue(assigneeColumn.getAssigneeStr(group).contains("steve")); + Assert.assertTrue(assigneeColumn.getAssigneeStr(action).contains("joe")); + Assert.assertTrue(assigneeColumn.getAssigneeStr(action).contains("steve")); } @org.junit.Test - public void testGetAssigneesStr_hasActions_twoWorkingDuplicates() throws OseeCoreException { + public void testGetAssigneesStr_hasActions_twoWorkingDuplicates() { - List<IAtsUser> assigneesToReturn = new ArrayList<>(); + List<AtsUser> assigneesToReturn = new ArrayList<>(); assigneesToReturn.add(steve); when(workItem.getAssignees()).thenReturn(assigneesToReturn); when(stateMgr.getStateType()).thenReturn(StateType.Working); - List<IAtsUser> assigneesToReturn2 = new ArrayList<>(); + List<AtsUser> assigneesToReturn2 = new ArrayList<>(); assigneesToReturn2.add(steve); when(workItem2.getAssignees()).thenReturn(assigneesToReturn2); when(stateMgr2.getStateType()).thenReturn(StateType.Working); - - AtsActionGroup group = new AtsActionGroup(GUID.create(), "group", Lib.generateUuid()); - group.addAction(workItem); - group.addAction(workItem2); - - Assert.assertEquals("steve", assigneeColumn.getAssigneeStr(group)); + Assert.assertEquals("steve", assigneeColumn.getAssigneeStr(action)); } @org.junit.Test - public void testGetAssigneesStr_invalidImplementersString() throws OseeCoreException { - AssigneeColumn column = new AssigneeColumn((IAtsServices) null); + public void testGetAssigneesStr_invalidImplementersString() { + AssigneeColumn column = new AssigneeColumn((AtsApi) null); when(stateMgr.getStateType()).thenReturn(StateType.Cancelled); Assert.assertEquals("", column.getAssigneeStr(workItem)); } - -} +}
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/AtsCore_Column_JT_Suite.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/AtsCore_Column_JT_Suite.java index c3bf0fd06f1..c23b5658548 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/AtsCore_Column_JT_Suite.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/AtsCore_Column_JT_Suite.java @@ -1,13 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2004, 2007 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.column; import org.eclipse.osee.ats.core.internal.column.TeamColumnUtilityTest; @@ -28,8 +31,7 @@ import org.junit.runners.Suite; InsertionActivityColumnTest.class, ParentTopTeamColumnTest.class, ProgramColumnTest.class, - TeamColumnUtilityTest.class, - ColorTeamColumnTest.class}) + TeamColumnUtilityTest.class}) /** * This test suite contains tests that can be run as stand-alone JUnit tests (JT) * diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/BacklogColumnTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/BacklogColumnTest.java index 3a0cc5b871c..52a52f41f2d 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/BacklogColumnTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/BacklogColumnTest.java @@ -1,27 +1,29 @@ -/******************************************************************************* - * Copyright (c) 2015 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2015 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.column; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.when; import java.util.Arrays; +import org.eclipse.osee.ats.api.AtsApi; import org.eclipse.osee.ats.api.IAtsObject; -import org.eclipse.osee.ats.api.IAtsServices; import org.eclipse.osee.ats.api.IAtsWorkItem; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsRelationTypes; import org.eclipse.osee.ats.api.util.IAtsStoreService; import org.eclipse.osee.ats.api.workdef.IRelationResolver; import org.eclipse.osee.framework.core.data.ArtifactToken; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; @@ -39,51 +41,52 @@ public class BacklogColumnTest extends ProgramColumn { @Mock private IAtsWorkItem goal, backlog; @Mock private IAtsObject object; @Mock private IRelationResolver relResolver; - @Mock private IAtsServices services; + @Mock private AtsApi atsApi; @Mock private IAtsStoreService storeService; @Mock private ArtifactToken artId; // @formatter:on @Before - public void setup() throws OseeCoreException { + public void setup() { MockitoAnnotations.initMocks(this); - when(services.getRelationResolver()).thenReturn(relResolver); + when(atsApi.getRelationResolver()).thenReturn(relResolver); } @Test public void test() { - String str = BacklogColumn.getColumnText(object, services, true); + String str = BacklogColumn.getColumnText(object, atsApi, true); assertEquals(str, ""); when(relResolver.getRelated(workItem, AtsRelationTypes.Goal_Goal, IAtsWorkItem.class)).thenReturn( Arrays.asList()); - str = BacklogColumn.getColumnText(workItem, services, true); + str = BacklogColumn.getColumnText(workItem, atsApi, true); assertEquals(str, ""); when(relResolver.getRelated(workItem, AtsRelationTypes.Goal_Goal, IAtsWorkItem.class)).thenReturn( Arrays.asList(goal)); when(relResolver.getRelatedCount(goal, AtsRelationTypes.AgileTeamToBacklog_AgileTeam)).thenReturn(0); when(goal.getName()).thenReturn("My Goal"); - when(services.getStoreService()).thenReturn(storeService); + when(atsApi.getStoreService()).thenReturn(storeService); when(goal.getStoreObject()).thenReturn(artId); - when(storeService.isOfType(artId, AtsArtifactTypes.AgileBacklog)).thenReturn(false); - str = BacklogColumn.getColumnText(workItem, services, false); + when(artId.isOfType(AtsArtifactTypes.AgileBacklog)).thenReturn(false); + str = BacklogColumn.getColumnText(workItem, atsApi, false); assertEquals("My Goal", str); when(relResolver.getRelated(workItem, AtsRelationTypes.Goal_Goal, IAtsWorkItem.class)).thenReturn( Arrays.asList(backlog)); + when(backlog.getStoreObject()).thenReturn(artId); when(relResolver.getRelatedCount(backlog, AtsRelationTypes.AgileTeamToBacklog_AgileTeam)).thenReturn(1); when(backlog.getName()).thenReturn("My Backlog"); - str = BacklogColumn.getColumnText(workItem, services, true); + str = BacklogColumn.getColumnText(workItem, atsApi, true); assertEquals("My Backlog", str); when(relResolver.getRelated(workItem, AtsRelationTypes.Goal_Goal, IAtsWorkItem.class)).thenReturn( Arrays.asList(backlog, goal)); when(relResolver.getRelatedCount(backlog, AtsRelationTypes.AgileTeamToBacklog_AgileTeam)).thenReturn(1); - str = BacklogColumn.getColumnText(workItem, services, true); + str = BacklogColumn.getColumnText(workItem, atsApi, true); assertEquals("My Backlog", str); - str = BacklogColumn.getColumnText(workItem, services, false); + str = BacklogColumn.getColumnText(workItem, atsApi, false); assertEquals("My Goal", str); } } diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ColorTeamColumnTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ColorTeamColumnTest.java deleted file mode 100644 index 524c35464f4..00000000000 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ColorTeamColumnTest.java +++ /dev/null @@ -1,124 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.ats.core.column; - -import static org.junit.Assert.assertEquals; -import static org.mockito.Mockito.when; -import org.eclipse.osee.ats.api.IAtsServices; -import org.eclipse.osee.ats.api.IAtsWorkItem; -import org.eclipse.osee.ats.api.data.AtsAttributeTypes; -import org.eclipse.osee.ats.api.review.IAtsPeerToPeerReview; -import org.eclipse.osee.ats.api.workdef.IAttributeResolver; -import org.eclipse.osee.ats.api.workflow.IAtsAction; -import org.eclipse.osee.ats.api.workflow.IAtsTask; -import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; -import org.eclipse.osee.framework.core.data.ArtifactToken; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; -import org.eclipse.osee.framework.jdk.core.type.Pair; -import org.junit.Before; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; - -/** - * Test Case for {@link ColorTeamColumn} - * - * @author Donald G. Dunne - */ -public class ColorTeamColumnTest { - - // @formatter:off - @Mock private IAtsAction action; - - @Mock private IAtsTeamWorkflow teamWf1; - @Mock private IAtsTask childWorkItem; - @Mock private IAtsPeerToPeerReview peerReview; - - @Mock private IAtsServices atsServices; - @Mock private IAttributeResolver attributeResolver; - - @Mock private ArtifactToken workPackageArt; - - // @formatter:on - - @Before - public void setup() throws OseeCoreException { - MockitoAnnotations.initMocks(this); - - when(atsServices.getAttributeResolver()).thenReturn(attributeResolver); - } - - @org.junit.Test - public void testTeamWorkflow() throws Exception { - when(attributeResolver.getSoleAttributeValue(teamWf1, AtsAttributeTypes.WorkPackageGuid, null)).thenReturn(null); - - Pair<String, Boolean> result = ColorTeamColumn.getWorkItemColorTeam(teamWf1, atsServices); - assertEquals("", result.getFirst()); - - when(attributeResolver.getSoleAttributeValue(teamWf1, AtsAttributeTypes.WorkPackageGuid, null)).thenReturn( - "guid"); - when(atsServices.getArtifactById("guid")).thenReturn(null); - - result = ColorTeamColumn.getWorkItemColorTeam(teamWf1, atsServices); - assertEquals("", result.getFirst()); - - when(atsServices.getArtifactById("guid")).thenReturn(workPackageArt); - when(attributeResolver.getSoleAttributeValue(workPackageArt, AtsAttributeTypes.ColorTeam, "")).thenReturn(""); - - result = ColorTeamColumn.getWorkItemColorTeam(teamWf1, atsServices); - assertEquals("", result.getFirst()); - - when(attributeResolver.getSoleAttributeValue(workPackageArt, AtsAttributeTypes.ColorTeam, "")).thenReturn("red"); - - result = ColorTeamColumn.getWorkItemColorTeam(teamWf1, atsServices); - assertEquals("red", result.getFirst()); - } - - @org.junit.Test - public void testTask() throws Exception { - testChildWorkItem(childWorkItem); - } - - @org.junit.Test - public void testReview() throws Exception { - testChildWorkItem(peerReview); - } - - private void testChildWorkItem(IAtsWorkItem childWorkItem) { - when(attributeResolver.getSoleAttributeValue(childWorkItem, AtsAttributeTypes.WorkPackageGuid, null)).thenReturn( - null); - - Pair<String, Boolean> result = ColorTeamColumn.getWorkItemColorTeam(childWorkItem, atsServices); - assertEquals("", result.getFirst()); - - when(childWorkItem.getParentTeamWorkflow()).thenReturn(teamWf1); - result = ColorTeamColumn.getWorkItemColorTeam(childWorkItem, atsServices); - assertEquals("", result.getFirst()); - - when(attributeResolver.getSoleAttributeValue(teamWf1, AtsAttributeTypes.WorkPackageGuid, null)).thenReturn( - "guid"); - when(atsServices.getArtifactById("guid")).thenReturn(null); - - result = ColorTeamColumn.getWorkItemColorTeam(childWorkItem, atsServices); - assertEquals("", result.getFirst()); - - when(atsServices.getArtifactById("guid")).thenReturn(workPackageArt); - when(attributeResolver.getSoleAttributeValue(workPackageArt, AtsAttributeTypes.ColorTeam, "")).thenReturn(""); - - result = ColorTeamColumn.getWorkItemColorTeam(childWorkItem, atsServices); - assertEquals("", result.getFirst()); - - when(attributeResolver.getSoleAttributeValue(workPackageArt, AtsAttributeTypes.ColorTeam, "")).thenReturn("red"); - - result = ColorTeamColumn.getWorkItemColorTeam(childWorkItem, atsServices); - assertEquals("red", result.getFirst()); - } - -} diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/CountryColumnTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/CountryColumnTest.java index b61ddf0c88a..65a9056b57a 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/CountryColumnTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/CountryColumnTest.java @@ -1,23 +1,25 @@ -/******************************************************************************* - * Copyright (c) 2015 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2015 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.column; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.when; +import org.eclipse.osee.ats.api.AtsApi; import org.eclipse.osee.ats.api.IAtsObject; -import org.eclipse.osee.ats.api.IAtsServices; import org.eclipse.osee.ats.api.IAtsWorkItem; import org.eclipse.osee.ats.api.country.IAtsCountry; import org.eclipse.osee.ats.core.config.WorkPackageUtility; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.type.Pair; import org.junit.Before; import org.junit.Test; @@ -33,34 +35,34 @@ public class CountryColumnTest extends CountryColumn { // @formatter:off @Mock private WorkPackageUtility util; - @Mock private IAtsServices services; + @Mock private AtsApi atsApi; @Mock private IAtsWorkItem workItem; @Mock private IAtsObject object; @Mock private IAtsCountry country; // @formatter:on @Before - public void setup() throws OseeCoreException { + public void setup() { MockitoAnnotations.initMocks(this); } @Test public void test() { - String str = CountryColumn.getCountryStr(object, services, util); + String str = CountryColumn.getCountryStr(object, atsApi, util); assertEquals(str, ""); - when(util.getCountry(services, workItem)).thenReturn(new Pair<IAtsCountry, Boolean>(null, false)); + when(util.getCountry(atsApi, workItem)).thenReturn(new Pair<IAtsCountry, Boolean>(null, false)); - str = CountryColumn.getCountryStr(workItem, services, util); + str = CountryColumn.getCountryStr(workItem, atsApi, util); assertEquals(str, ""); - when(util.getCountry(services, workItem)).thenReturn(new Pair<IAtsCountry, Boolean>(country, false)); + when(util.getCountry(atsApi, workItem)).thenReturn(new Pair<>(country, false)); when(country.getName()).thenReturn("Country"); - str = CountryColumn.getCountryStr(workItem, services, util); + str = CountryColumn.getCountryStr(workItem, atsApi, util); assertEquals(str, "Country"); - when(util.getCountry(services, workItem)).thenReturn(new Pair<IAtsCountry, Boolean>(country, true)); - str = CountryColumn.getCountryStr(workItem, services, util); + when(util.getCountry(atsApi, workItem)).thenReturn(new Pair<>(country, true)); + str = CountryColumn.getCountryStr(workItem, atsApi, util); assertEquals(str, "Country (I)"); } diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ImplementersColumnTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ImplementersColumnTest.java index 15d85c88681..3d54b75941a 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ImplementersColumnTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ImplementersColumnTest.java @@ -1,34 +1,37 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.column; import static org.mockito.Mockito.when; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.eclipse.osee.ats.api.IAtsServices; -import org.eclipse.osee.ats.api.IAtsWorkItem; -import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.AtsApi; +import org.eclipse.osee.ats.api.user.AtsCoreUsers; +import org.eclipse.osee.ats.api.user.AtsUser; import org.eclipse.osee.ats.api.user.IAtsUserService; import org.eclipse.osee.ats.api.workdef.IAttributeResolver; import org.eclipse.osee.ats.api.workdef.StateType; +import org.eclipse.osee.ats.api.workflow.IAtsAction; +import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; import org.eclipse.osee.ats.api.workflow.state.IAtsStateManager; -import org.eclipse.osee.ats.core.AbstractUserTest; -import org.eclipse.osee.ats.core.model.impl.AtsActionGroup; -import org.eclipse.osee.ats.core.users.AtsCoreUsers; +import org.eclipse.osee.ats.core.users.AbstractUserTest; import org.eclipse.osee.ats.core.workflow.AtsImplementersService; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.junit.Assert; import org.junit.Before; import org.mockito.Mock; +import org.mockito.MockitoAnnotations; /** * @tests ImplementersColumn @@ -37,12 +40,12 @@ import org.mockito.Mock; public class ImplementersColumnTest extends AbstractUserTest { // @formatter:off - @Mock private IAtsWorkItem workItem; + @Mock private IAtsTeamWorkflow workItem; @Mock private IAtsStateManager stateMgr; - @Mock private IAtsWorkItem workItem2; + @Mock private IAtsTeamWorkflow workItem2; @Mock private IAtsStateManager stateMgr2; - @Mock private AtsActionGroup group; - @Mock private IAtsServices services; + @Mock private IAtsAction group; + @Mock private AtsApi atsApi; @Mock private IAtsUserService userService; @Mock private IAttributeResolver attributeResolver; // @formatter:on @@ -50,21 +53,22 @@ public class ImplementersColumnTest extends AbstractUserTest { AtsImplementersService impService; AssigneeColumn assigneeColumn; - @Override @Before public void setup() { - super.setup(); - when(services.getUserService()).thenReturn(userService); + MockitoAnnotations.initMocks(this); + + when(atsApi.getUserService()).thenReturn(userService); when(workItem.getStateMgr()).thenReturn(stateMgr); when(workItem2.getStateMgr()).thenReturn(stateMgr2); - when(services.getUserService()).thenReturn(userService); - when(services.getAttributeResolver()).thenReturn(attributeResolver); + when(atsApi.getUserService()).thenReturn(userService); + when(atsApi.getAttributeResolver()).thenReturn(attributeResolver); + when(group.getTeamWorkflows()).thenReturn(Arrays.asList(workItem, workItem2)); - impService = new AtsImplementersService(services); - assigneeColumn = new AssigneeColumn(services); + impService = new AtsImplementersService(); + assigneeColumn = new AssigneeColumn(atsApi); } - public void testGetImplementersStrFromInWorkWorkflow_null() throws OseeCoreException { + public void testGetImplementersStrFromInWorkWorkflow_null() { Assert.assertEquals("", impService.getImplementersStr(null)); } @@ -72,7 +76,7 @@ public class ImplementersColumnTest extends AbstractUserTest { * Should be blank if in Working state */ @org.junit.Test - public void testGetImplementersStrFromInWorkWorkflow_workItem() throws OseeCoreException { + public void testGetImplementersStrFromInWorkWorkflow_workItem() { when(workItem.getStateMgr().getStateType()).thenReturn(StateType.Working); Assert.assertEquals("", impService.getImplementersStr(workItem)); } @@ -81,8 +85,8 @@ public class ImplementersColumnTest extends AbstractUserTest { * Should be blank if in Working state and Assigned */ @org.junit.Test - public void testGetImplementersStrFromInWorkWorkflow_blankIfAssigned() throws OseeCoreException { - List<IAtsUser> assigneesToReturn = new ArrayList<>(); + public void testGetImplementersStrFromInWorkWorkflow_blankIfAssigned() { + List<AtsUser> assigneesToReturn = new ArrayList<>(); assigneesToReturn.addAll(Arrays.asList(steve, alice)); when(workItem.getStateMgr().getStateType()).thenReturn(StateType.Working); when(workItem.getAssignees()).thenReturn(assigneesToReturn); @@ -93,7 +97,7 @@ public class ImplementersColumnTest extends AbstractUserTest { * Test no completedBy, no completedFromState and no workItem.getImplementers() */ @org.junit.Test - public void testGetImplementersStrFromCompletedCancelledWorkflow_blankIfNothingToShow() throws OseeCoreException { + public void testGetImplementersStrFromCompletedCancelledWorkflow_blankIfNothingToShow() { when(workItem.getStateMgr().getStateType()).thenReturn(StateType.Completed); Assert.assertEquals("", impService.getImplementersStr(workItem)); @@ -105,7 +109,7 @@ public class ImplementersColumnTest extends AbstractUserTest { * Test if CompletedBy set */ @org.junit.Test - public void testGetImplementersStrFromCompletedCancelledWorkflow_completedBySet() throws OseeCoreException { + public void testGetImplementersStrFromCompletedCancelledWorkflow_completedBySet() { when(workItem.getStateMgr().getStateType()).thenReturn(StateType.Completed); when(workItem.getCompletedBy()).thenReturn(steve); Assert.assertEquals("steve", impService.getImplementersStr(workItem)); @@ -120,8 +124,8 @@ public class ImplementersColumnTest extends AbstractUserTest { * Test one CompletedBy and assignees from completedFromState */ @org.junit.Test - public void testGetImplementersStrFromCompletedCancelledWorkflow_completedByAndAssignee() throws OseeCoreException { - List<IAtsUser> implementStateImplementers = new ArrayList<>(); + public void testGetImplementersStrFromCompletedCancelledWorkflow_completedByAndAssignee() { + List<AtsUser> implementStateImplementers = new ArrayList<>(); implementStateImplementers.add(alice); when(workItem.getStateMgr().getStateType()).thenReturn(StateType.Completed); @@ -143,12 +147,12 @@ public class ImplementersColumnTest extends AbstractUserTest { * Test one CompletedBy (steve) and assignees (alice, unassigned) from completedFromState */ @org.junit.Test - public void testGetImplementersStrFromCompletedCancelledWorkflow_completedByAndAssigneeWithUnassigned() throws OseeCoreException { + public void testGetImplementersStrFromCompletedCancelledWorkflow_completedByAndAssigneeWithUnassigned() { when(workItem.isCompleted()).thenReturn(true); when(workItem.getStateMgr().getStateType()).thenReturn(StateType.Completed); // Add alice and unassigned as Implement assignees - List<IAtsUser> implementStateImplementers = new ArrayList<>(); + List<AtsUser> implementStateImplementers = new ArrayList<>(); implementStateImplementers.add(alice); implementStateImplementers.add(AtsCoreUsers.UNASSIGNED_USER); when(stateMgr.getAssigneesForState("Implement")).thenReturn(implementStateImplementers); @@ -174,8 +178,8 @@ public class ImplementersColumnTest extends AbstractUserTest { * Test steve as completedBy and completedFrom only registers once in implementersStr */ @org.junit.Test - public void testGetImplementersStrFromCompletedCancelledWorkflow_duplicatesHandled() throws OseeCoreException { - List<IAtsUser> implementStateImplementers = new ArrayList<>(); + public void testGetImplementersStrFromCompletedCancelledWorkflow_duplicatesHandled() { + List<AtsUser> implementStateImplementers = new ArrayList<>(); implementStateImplementers.add(alice); implementStateImplementers.add(steve); @@ -198,14 +202,14 @@ public class ImplementersColumnTest extends AbstractUserTest { * Test one CompletedBy and assignees from completedFromState */ @org.junit.Test - public void testGetImplementersStrFromCompletedCancelledWorkflow_fromAll() throws OseeCoreException { + public void testGetImplementersStrFromCompletedCancelledWorkflow_fromAll() { // completed by is steve when(workItem.getStateMgr().getStateType()).thenReturn(StateType.Completed); when(workItem.getCompletedBy()).thenReturn(steve); // "completed from state" had assignees alice and joe - List<IAtsUser> implementStateImplementers = new ArrayList<>(); + List<AtsUser> implementStateImplementers = new ArrayList<>(); implementStateImplementers.add(alice); implementStateImplementers.add(joe); when(workItem.getCompletedFromState()).thenReturn("Implement"); @@ -235,10 +239,10 @@ public class ImplementersColumnTest extends AbstractUserTest { } @org.junit.Test - public void testGetImplementersStrFromCompletedWorkflow_duplicates() throws OseeCoreException { - List<IAtsUser> implementersToReturn = new ArrayList<>(); + public void testGetImplementersStrFromCompletedWorkflow_duplicates() { + List<AtsUser> implementersToReturn = new ArrayList<>(); implementersToReturn.add(alice); - List<IAtsUser> implementStateImplementers = new ArrayList<>(); + List<AtsUser> implementStateImplementers = new ArrayList<>(); implementStateImplementers.add(alice); when(workItem.getImplementers()).thenReturn(implementersToReturn); @@ -257,15 +261,15 @@ public class ImplementersColumnTest extends AbstractUserTest { } @org.junit.Test - public void testGetImplementers_fromCompletedCancelledBy_noDuplicatesIfInImplementersAndCompletedBy() throws OseeCoreException { - List<IAtsUser> implementStateImplementers = new ArrayList<>(); + public void testGetImplementers_fromCompletedCancelledBy_noDuplicatesIfInImplementersAndCompletedBy() { + List<AtsUser> implementStateImplementers = new ArrayList<>(); implementStateImplementers.add(alice); when(workItem.getStateMgr().getStateType()).thenReturn(StateType.Completed); when(workItem.getCompletedFromState()).thenReturn("Implement"); when(workItem.getCompletedBy()).thenReturn(alice); when(stateMgr.getAssigneesForState("Implement")).thenReturn(implementStateImplementers); - List<IAtsUser> implementers = new ArrayList<>(); + List<AtsUser> implementers = new ArrayList<>(); impService.getImplementers_fromCompletedCancelledBy(workItem, implementers); Assert.assertEquals(implementers.iterator().next(), alice); @@ -280,9 +284,7 @@ public class ImplementersColumnTest extends AbstractUserTest { } @org.junit.Test - public void testGetImplementersFromActionGroup() throws OseeCoreException { - - when(group.getActions()).thenReturn(Arrays.asList(workItem, workItem2)); + public void testGetImplementersFromActionGroup() { when(workItem.getStateMgr().getStateType()).thenReturn(StateType.Working); when(workItem.getCancelledBy()).thenReturn(alice); when(workItem2.getStateMgr().getStateType()).thenReturn(StateType.Working); @@ -297,17 +299,14 @@ public class ImplementersColumnTest extends AbstractUserTest { } @org.junit.Test - public void testGetImplementersFromActionGroup_noDuplicates() throws OseeCoreException { - - when(group.getActions()).thenReturn(Arrays.asList(workItem, workItem2)); + public void testGetImplementersFromActionGroup_noDuplicates() { when(workItem.getStateMgr().getStateType()).thenReturn(StateType.Cancelled); when(workItem.getCancelledBy()).thenReturn(steve); when(workItem2.getStateMgr().getStateType()).thenReturn(StateType.Cancelled); when(workItem2.getCancelledBy()).thenReturn(steve); - List<IAtsUser> implementers = impService.getActionGroupImplementers(group); + List<AtsUser> implementers = impService.getActionGroupImplementers(group); Assert.assertEquals(1, implementers.size()); Assert.assertEquals(steve, implementers.iterator().next()); } - -} +}
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/InsertionActivityColumnTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/InsertionActivityColumnTest.java index a1a4cd72a2c..f55c81b14ad 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/InsertionActivityColumnTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/InsertionActivityColumnTest.java @@ -1,23 +1,25 @@ -/******************************************************************************* - * Copyright (c) 2015 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2015 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.column; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.when; +import org.eclipse.osee.ats.api.AtsApi; import org.eclipse.osee.ats.api.IAtsObject; -import org.eclipse.osee.ats.api.IAtsServices; import org.eclipse.osee.ats.api.IAtsWorkItem; import org.eclipse.osee.ats.api.insertion.IAtsInsertionActivity; import org.eclipse.osee.ats.core.config.WorkPackageUtility; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.type.Pair; import org.junit.Before; import org.junit.Test; @@ -33,37 +35,37 @@ public class InsertionActivityColumnTest { // @formatter:off @Mock private WorkPackageUtility util; - @Mock private IAtsServices services; + @Mock private AtsApi atsApi; @Mock private IAtsWorkItem workItem; @Mock private IAtsObject object; @Mock private IAtsInsertionActivity program; // @formatter:on @Before - public void setup() throws OseeCoreException { + public void setup() { MockitoAnnotations.initMocks(this); } @Test public void test() { - String str = InsertionActivityColumn.getInsertionActivityStr(object, services, util); + String str = InsertionActivityColumn.getInsertionActivityStr(object, atsApi, util); assertEquals(str, ""); - when(util.getInsertionActivity(services, workItem)).thenReturn( + when(util.getInsertionActivity(atsApi, workItem)).thenReturn( new Pair<IAtsInsertionActivity, Boolean>(null, false)); - str = InsertionActivityColumn.getInsertionActivityStr(workItem, services, util); + str = InsertionActivityColumn.getInsertionActivityStr(workItem, atsApi, util); assertEquals(str, ""); - when(util.getInsertionActivity(services, workItem)).thenReturn( - new Pair<IAtsInsertionActivity, Boolean>(program, false)); + when(util.getInsertionActivity(atsApi, workItem)).thenReturn( + new Pair<>(program, false)); when(program.getName()).thenReturn("Country"); - str = InsertionActivityColumn.getInsertionActivityStr(workItem, services, util); + str = InsertionActivityColumn.getInsertionActivityStr(workItem, atsApi, util); assertEquals(str, "Country"); - when(util.getInsertionActivity(services, workItem)).thenReturn( - new Pair<IAtsInsertionActivity, Boolean>(program, true)); - str = InsertionActivityColumn.getInsertionActivityStr(workItem, services, util); + when(util.getInsertionActivity(atsApi, workItem)).thenReturn( + new Pair<>(program, true)); + str = InsertionActivityColumn.getInsertionActivityStr(workItem, atsApi, util); assertEquals(str, "Country (I)"); } diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/InsertionColumnTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/InsertionColumnTest.java index 71a04fd8f46..2d63d6e1e34 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/InsertionColumnTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/InsertionColumnTest.java @@ -1,23 +1,25 @@ -/******************************************************************************* - * Copyright (c) 2015 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2015 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.column; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.when; +import org.eclipse.osee.ats.api.AtsApi; import org.eclipse.osee.ats.api.IAtsObject; -import org.eclipse.osee.ats.api.IAtsServices; import org.eclipse.osee.ats.api.IAtsWorkItem; import org.eclipse.osee.ats.api.insertion.IAtsInsertion; import org.eclipse.osee.ats.core.config.WorkPackageUtility; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.type.Pair; import org.junit.Before; import org.junit.Test; @@ -33,34 +35,34 @@ public class InsertionColumnTest { // @formatter:off @Mock private WorkPackageUtility util; - @Mock private IAtsServices services; + @Mock private AtsApi atsApi; @Mock private IAtsWorkItem workItem; @Mock private IAtsObject object; @Mock private IAtsInsertion program; // @formatter:on @Before - public void setup() throws OseeCoreException { + public void setup() { MockitoAnnotations.initMocks(this); } @Test public void test() { - String str = InsertionColumn.getInsertionStr(object, services, util); + String str = InsertionColumn.getInsertionStr(object, atsApi, util); assertEquals(str, ""); - when(util.getInsertion(services, workItem)).thenReturn(new Pair<IAtsInsertion, Boolean>(null, false)); + when(util.getInsertion(atsApi, workItem)).thenReturn(new Pair<IAtsInsertion, Boolean>(null, false)); - str = InsertionColumn.getInsertionStr(workItem, services, util); + str = InsertionColumn.getInsertionStr(workItem, atsApi, util); assertEquals(str, ""); - when(util.getInsertion(services, workItem)).thenReturn(new Pair<IAtsInsertion, Boolean>(program, false)); + when(util.getInsertion(atsApi, workItem)).thenReturn(new Pair<>(program, false)); when(program.getName()).thenReturn("Country"); - str = InsertionColumn.getInsertionStr(workItem, services, util); + str = InsertionColumn.getInsertionStr(workItem, atsApi, util); assertEquals(str, "Country"); - when(util.getInsertion(services, workItem)).thenReturn(new Pair<IAtsInsertion, Boolean>(program, true)); - str = InsertionColumn.getInsertionStr(workItem, services, util); + when(util.getInsertion(atsApi, workItem)).thenReturn(new Pair<>(program, true)); + str = InsertionColumn.getInsertionStr(workItem, atsApi, util); assertEquals(str, "Country (I)"); } diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ParentTopTeamColumnTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ParentTopTeamColumnTest.java index a575d3cd031..c0a2215b4ed 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ParentTopTeamColumnTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ParentTopTeamColumnTest.java @@ -1,28 +1,35 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.column; import static org.mockito.Mockito.when; import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; +import org.eclipse.osee.ats.api.AtsApi; import org.eclipse.osee.ats.api.ai.IAtsActionableItem; +import org.eclipse.osee.ats.api.ai.IAtsActionableItemService; import org.eclipse.osee.ats.api.review.IAtsAbstractReview; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinitionService; import org.eclipse.osee.ats.api.version.IAtsVersion; +import org.eclipse.osee.ats.api.version.IAtsVersionService; import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Collections; import org.junit.Assert; import org.junit.Before; import org.mockito.Mock; -import org.mockito.Mockito; import org.mockito.MockitoAnnotations; /** @@ -35,23 +42,35 @@ public class ParentTopTeamColumnTest { // @formatter:off @Mock private IAtsTeamWorkflow teamWf1; - @Mock private IAtsTeamDefinition teamDef_top; - @Mock private IAtsTeamDefinition teamDef_child; + @Mock private IAtsTeamDefinition teamDefTop; + @Mock private IAtsTeamDefinition teamDefChild; + @Mock private IAtsTeamDefinition noVersionsTeamDef; @Mock private IAtsActionableItem aia1; @Mock private IAtsActionableItem aia_parent; @Mock private IAtsVersion ver1; @Mock private IAtsAbstractReview rev1; + @Mock private IAtsTeamDefinitionService teamDefinitionService; + @Mock private AtsApi atsApi; + @Mock private IAtsVersionService versionService; + @Mock private IAtsActionableItemService actionableItemService; // @formatter:on @Before - public void setup() throws OseeCoreException { + public void setup() { MockitoAnnotations.initMocks(this); when(teamWf1.getParentTeamWorkflow()).thenReturn(teamWf1); - when(teamWf1.getTeamDefinition()).thenReturn(teamDef_child); - when(teamDef_child.getTeamDefinitionHoldingVersions()).thenReturn(teamDef_top); - when(teamDef_child.getName()).thenReturn("TEAM child"); - when(teamDef_top.getName()).thenReturn("TEAM top"); + when(teamWf1.getTeamDefinition()).thenReturn(teamDefChild); + when(teamDefTop.getAtsApi()).thenReturn(atsApi); + when(teamDefChild.getAtsApi()).thenReturn(atsApi); + when(atsApi.getTeamDefinitionService()).thenReturn(teamDefinitionService); + when(teamDefinitionService.getTeamDefHoldingVersions(teamDefChild)).thenReturn(teamDefTop); + when(teamDefChild.getName()).thenReturn("TEAM child"); + when(teamDefTop.getName()).thenReturn("TEAM top"); + when(atsApi.getVersionService()).thenReturn(versionService); + when(noVersionsTeamDef.getAtsApi()).thenReturn(atsApi); + when(aia1.getAtsApi()).thenReturn(atsApi); + when(atsApi.getActionableItemService()).thenReturn(actionableItemService); } /** @@ -59,7 +78,9 @@ public class ParentTopTeamColumnTest { */ @org.junit.Test public void testGetColumnText_fromTeamWf() throws Exception { - when(teamDef_top.getVersions()).thenReturn(Arrays.asList(ver1)); + Set<IAtsVersion> ver = new HashSet<>(); + ver.addAll(Arrays.asList(ver1)); + when(versionService.getVersions(teamDefTop)).thenReturn(ver); String columnText = ParentTopTeamColumn.getColumnText(teamWf1); @@ -71,7 +92,9 @@ public class ParentTopTeamColumnTest { */ @org.junit.Test public void testGetColumnText_fromRelatedReview() throws Exception { - when(teamDef_top.getVersions()).thenReturn(Arrays.asList(ver1)); + Set<IAtsVersion> ver = new HashSet<>(); + ver.addAll(Arrays.asList(ver1)); + when(versionService.getVersions(teamDefTop)).thenReturn(ver); when(rev1.getParentTeamWorkflow()).thenReturn(teamWf1); String columnText = ParentTopTeamColumn.getColumnText(rev1); @@ -85,7 +108,7 @@ public class ParentTopTeamColumnTest { */ @org.junit.Test public void testGetColumnText_fromStandAloneReview() throws Exception { - when(aia1.getTeamDefinition()).thenReturn(teamDef_child); + when(aia1.getTeamDefinition()).thenReturn(teamDefChild); when(rev1.getActionableItems()).thenReturn(Collections.asHashSet(aia1)); String columnText = ParentTopTeamColumn.getColumnText(rev1); @@ -100,7 +123,7 @@ public class ParentTopTeamColumnTest { @org.junit.Test public void testGetColumnText_fromStandAloneReview_inheritedAi() throws Exception { when(rev1.getActionableItems()).thenReturn(Collections.asHashSet(aia1)); - when(aia1.getTeamDefinitionInherited()).thenReturn(teamDef_child); + when(aia1.getAtsApi().getActionableItemService().getTeamDefinitionInherited(aia1)).thenReturn(teamDefChild); String columnText = ParentTopTeamColumn.getColumnText(rev1); @@ -113,7 +136,7 @@ public class ParentTopTeamColumnTest { @org.junit.Test public void testGetColumnText_fromStandAloneReview_noAis() throws Exception { when(rev1.getActionableItems()).thenReturn(java.util.Collections.<IAtsActionableItem> emptySet()); - when(aia1.getTeamDefinitionInherited()).thenReturn(teamDef_child); + when(aia1.getAtsApi().getActionableItemService().getTeamDefinitionInherited(aia1)).thenReturn(teamDefChild); String columnText = ParentTopTeamColumn.getColumnText(rev1); @@ -125,11 +148,10 @@ public class ParentTopTeamColumnTest { */ @org.junit.Test public void testGetTopTeamDefName_noVersions() throws Exception { - IAtsTeamDefinition noVersions = Mockito.mock(IAtsTeamDefinition.class); - when(noVersions.getName()).thenReturn("TEAM"); - when(noVersions.getTeamDefinitionHoldingVersions()).thenReturn(null); + when(noVersionsTeamDef.getName()).thenReturn("TEAM"); + when(teamDefinitionService.getTeamBranchId(noVersionsTeamDef)).thenReturn(null); - String topTeamDefName = ParentTopTeamColumn.getTopTeamDefName(noVersions); + String topTeamDefName = ParentTopTeamColumn.getTopTeamDefName(noVersionsTeamDef); Assert.assertEquals("TEAM", topTeamDefName); } diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ProgramColumnTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ProgramColumnTest.java index 01c97d0980d..9b06e5af49c 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ProgramColumnTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ProgramColumnTest.java @@ -1,23 +1,25 @@ -/******************************************************************************* - * Copyright (c) 2015 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2015 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.column; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.when; +import org.eclipse.osee.ats.api.AtsApi; import org.eclipse.osee.ats.api.IAtsObject; -import org.eclipse.osee.ats.api.IAtsServices; import org.eclipse.osee.ats.api.IAtsWorkItem; import org.eclipse.osee.ats.api.program.IAtsProgram; import org.eclipse.osee.ats.core.config.WorkPackageUtility; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.type.Pair; import org.junit.Before; import org.junit.Test; @@ -33,34 +35,34 @@ public class ProgramColumnTest extends ProgramColumn { // @formatter:off @Mock private WorkPackageUtility util; - @Mock private IAtsServices services; + @Mock private AtsApi atsApi; @Mock private IAtsWorkItem workItem; @Mock private IAtsObject object; @Mock private IAtsProgram program; // @formatter:on @Before - public void setup() throws OseeCoreException { + public void setup() { MockitoAnnotations.initMocks(this); } @Test public void test() { - String str = ProgramColumn.getProgramStr(object, services, util); + String str = ProgramColumn.getProgramStr(object, atsApi, util); assertEquals(str, ""); - when(util.getProgram(services, workItem)).thenReturn(new Pair<IAtsProgram, Boolean>(null, false)); + when(util.getProgram(atsApi, workItem)).thenReturn(new Pair<IAtsProgram, Boolean>(null, false)); - str = ProgramColumn.getProgramStr(workItem, services, util); + str = ProgramColumn.getProgramStr(workItem, atsApi, util); assertEquals(str, ""); - when(util.getProgram(services, workItem)).thenReturn(new Pair<IAtsProgram, Boolean>(program, false)); + when(util.getProgram(atsApi, workItem)).thenReturn(new Pair<>(program, false)); when(program.getName()).thenReturn("Country"); - str = ProgramColumn.getProgramStr(workItem, services, util); + str = ProgramColumn.getProgramStr(workItem, atsApi, util); assertEquals(str, "Country"); - when(util.getProgram(services, workItem)).thenReturn(new Pair<IAtsProgram, Boolean>(program, true)); - str = ProgramColumn.getProgramStr(workItem, services, util); + when(util.getProgram(atsApi, workItem)).thenReturn(new Pair<>(program, true)); + str = ProgramColumn.getProgramStr(workItem, atsApi, util); assertEquals(str, "Country (I)"); } diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/commit/operations/AtsCore_Commit_JT_Suite.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/commit/operations/AtsCore_Commit_JT_Suite.java new file mode 100644 index 00000000000..010f429780c --- /dev/null +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/commit/operations/AtsCore_Commit_JT_Suite.java @@ -0,0 +1,39 @@ +/********************************************************************* + * Copyright (c) 2018 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Boeing - initial API and implementation + **********************************************************************/ + +package org.eclipse.osee.ats.core.commit.operations; + +import org.eclipse.osee.framework.jdk.core.util.OseeProperties; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +@RunWith(Suite.class) +@Suite.SuiteClasses({CommitOverrideOperationsImplTest.class}) + +/** + * @author Donald G. Dunne + */ +public class AtsCore_Commit_JT_Suite { + @BeforeClass + public static void setUp() throws Exception { + OseeProperties.setIsInTest(true); + System.out.println("\n\nBegin " + AtsCore_Commit_JT_Suite.class.getSimpleName()); + } + + @AfterClass + public static void tearDown() throws Exception { + System.out.println("End " + AtsCore_Commit_JT_Suite.class.getSimpleName()); + } +} diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/commit/operations/CommitOverrideOperationsImplTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/commit/operations/CommitOverrideOperationsImplTest.java new file mode 100644 index 00000000000..34795fc9340 --- /dev/null +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/commit/operations/CommitOverrideOperationsImplTest.java @@ -0,0 +1,82 @@ +/********************************************************************* + * Copyright (c) 2018 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Boeing - initial API and implementation + **********************************************************************/ + +package org.eclipse.osee.ats.core.commit.operations; + +import static org.mockito.Mockito.when; +import java.util.Arrays; +import java.util.Collection; +import org.eclipse.osee.ats.api.AtsApi; +import org.eclipse.osee.ats.api.commit.CommitOverride; +import org.eclipse.osee.ats.api.data.AtsAttributeTypes; +import org.eclipse.osee.ats.api.workdef.IAttributeResolver; +import org.eclipse.osee.ats.api.workdef.IRelationResolver; +import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; +import org.eclipse.osee.framework.core.data.BranchId; +import org.eclipse.osee.framework.core.enums.DemoUsers; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +/** + * Test Unit for {@link CommitOverrideOperationsImpl} + * + * @author Donald G. Dunne + */ +public class CommitOverrideOperationsImplTest { + + // @formatter:off + @Mock private IAtsTeamWorkflow teamWf; + + @Mock private AtsApi atsApi; + @Mock private IAttributeResolver attributeResolver; + @Mock private IRelationResolver relationResolver; + @Mock private BranchId branch; + // @formatter:on + + @Before + public void setup() { + MockitoAnnotations.initMocks(this); + when(teamWf.isTeamWorkflow()).thenReturn(true); + when(attributeResolver.getAttributesToStringList(teamWf, AtsAttributeTypes.CommitOverride)).thenReturn( + Arrays.asList(Commit_Override_1, Commit_Override_2)); + + when(atsApi.getAttributeResolver()).thenReturn(attributeResolver); + when(atsApi.getRelationResolver()).thenReturn(relationResolver); + + when(branch.getIdString()).thenReturn("345"); + } + + @Test + public void testGetCommitOverrides() { + CommitOverrideOperationsImpl ops = new CommitOverrideOperationsImpl(atsApi); + Collection<CommitOverride> commitOverrides = ops.getCommitOverrides(teamWf); + Assert.assertEquals(2, commitOverrides.size()); + } + + @Test + public void testGetCommitOverrideAndUser() { + CommitOverrideOperationsImpl ops = new CommitOverrideOperationsImpl(atsApi); + CommitOverride commitOverride = ops.getCommitOverride(teamWf, branch); + Assert.assertEquals(commitOverride.getBranchId(), branch.getIdString()); + Assert.assertEquals(DemoUsers.Joe_Smith.getIdString(), commitOverride.getUser().getIdString()); + + commitOverride = ops.getCommitOverride(teamWf, BranchId.valueOf(222L)); + Assert.assertNull(commitOverride); + } + + private static String Commit_Override_1 = "{\"user\":\"61106791\",\"branchId\":\"345\",\"reason\":\"asdfads\"}"; + private static String Commit_Override_2 = "{\"user\":\"61106791\",\"branchId\":\"645\",\"reason\":\"testing\"}"; +} diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/config/AtsCore_Config_JT_Suite.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/config/AtsCore_Config_JT_Suite.java index fc99b1ccb96..2f565aa4e55 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/config/AtsCore_Config_JT_Suite.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/config/AtsCore_Config_JT_Suite.java @@ -1,13 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2015 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2015 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.config; import org.eclipse.osee.framework.jdk.core.util.OseeProperties; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/config/WorkPackageUtilityTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/config/WorkPackageUtilityTest.java index a2fd0c0a586..afcad45996e 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/config/WorkPackageUtilityTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/config/WorkPackageUtilityTest.java @@ -1,26 +1,31 @@ -/******************************************************************************* - * Copyright (c) 2015 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2015 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.config; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.mockito.Mockito.when; -import org.eclipse.osee.ats.api.IAtsServices; +import org.eclipse.osee.ats.api.AtsApi; import org.eclipse.osee.ats.api.country.IAtsCountry; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.data.AtsRelationTypes; +import org.eclipse.osee.ats.api.ev.IAtsEarnedValueService; import org.eclipse.osee.ats.api.insertion.IAtsInsertion; import org.eclipse.osee.ats.api.insertion.IAtsInsertionActivity; import org.eclipse.osee.ats.api.program.IAtsProgram; -import org.eclipse.osee.ats.api.team.IAtsConfigItemFactory; +import org.eclipse.osee.ats.api.program.IAtsProgramService; +import org.eclipse.osee.ats.api.query.IAtsQueryService; import org.eclipse.osee.ats.api.workdef.IAttributeResolver; import org.eclipse.osee.ats.api.workdef.IRelationResolver; import org.eclipse.osee.ats.api.workflow.IAtsGoal; @@ -28,7 +33,7 @@ import org.eclipse.osee.ats.api.workflow.IAtsTask; import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.core.data.ArtifactToken; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; +import org.eclipse.osee.framework.core.enums.CoreBranches; import org.eclipse.osee.framework.jdk.core.type.Pair; import org.junit.Before; import org.junit.Test; @@ -42,13 +47,14 @@ import org.mockito.MockitoAnnotations; */ public class WorkPackageUtilityTest { + public static final ArtifactToken workPackageArt = ArtifactToken.valueOf(5, "Work Package", CoreBranches.COMMON); + // @formatter:off @Mock private IAtsGoal goal; @Mock private IAtsTeamWorkflow teamWf; @Mock private IAtsTask task; - @Mock private ArtifactToken workPackageArt; - @Mock private IAtsServices services; + @Mock private AtsApi atsApi; @Mock private IAttributeResolver attributeResolver; @Mock private IRelationResolver relationResolver; @@ -59,144 +65,157 @@ public class WorkPackageUtilityTest { @Mock private IAtsProgram program; @Mock private IAtsCountry country; - @Mock private IAtsConfigItemFactory factory; + @Mock private IAtsEarnedValueService evService; + @Mock private IAtsProgramService programService; + @Mock private IAtsQueryService queryService; + // @formatter:on private WorkPackageUtility util; @Before - public void setup() throws OseeCoreException { + public void setup() { MockitoAnnotations.initMocks(this); when(teamWf.isTeamWorkflow()).thenReturn(true); when(task.getParentTeamWorkflow()).thenReturn(teamWf); when(task.isTeamWorkflow()).thenReturn(false); - when(services.getAttributeResolver()).thenReturn(attributeResolver); - when(services.getRelationResolver()).thenReturn(relationResolver); - when(services.getConfigItemFactory()).thenReturn(factory); + when(atsApi.getAttributeResolver()).thenReturn(attributeResolver); + when(atsApi.getRelationResolver()).thenReturn(relationResolver); + when(atsApi.getEarnedValueService()).thenReturn(evService); + when(atsApi.getQueryService()).thenReturn(queryService); + when(atsApi.getProgramService()).thenReturn(programService); util = new WorkPackageUtility(); } @org.junit.Test public void testGetWorkPackageArtifact() throws Exception { - when(attributeResolver.getSoleAttributeValue(teamWf, AtsAttributeTypes.WorkPackageGuid, null)).thenReturn(null); - Pair<ArtifactId, Boolean> result = util.getWorkPackageArtifact(services, teamWf); + when(attributeResolver.getSoleAttributeValue(teamWf, AtsAttributeTypes.WorkPackageReference, + ArtifactId.SENTINEL)).thenReturn(ArtifactId.SENTINEL); + Pair<ArtifactId, Boolean> result = util.getWorkPackageArtifact(atsApi, teamWf); assertResult(result, null, false); - when(attributeResolver.getSoleAttributeValue(teamWf, AtsAttributeTypes.WorkPackageGuid, null)).thenReturn("guid"); - when(services.getArtifactByGuid("guid")).thenReturn(null); - result = util.getWorkPackageArtifact(services, teamWf); + result = util.getWorkPackageArtifact(atsApi, teamWf); assertResult(result, null, false); - when(services.getArtifactByGuid("guid")).thenReturn(workPackageArt); - result = util.getWorkPackageArtifact(services, teamWf); + when(attributeResolver.getSoleAttributeValue(teamWf, AtsAttributeTypes.WorkPackageReference, + ArtifactId.SENTINEL)).thenReturn(workPackageArt); + result = util.getWorkPackageArtifact(atsApi, teamWf); assertResult(result, workPackageArt, false); - when(attributeResolver.getSoleAttributeValue(task, AtsAttributeTypes.WorkPackageGuid, null)).thenReturn(null); - result = util.getWorkPackageArtifact(services, task); + when(attributeResolver.getSoleAttributeValue(task, AtsAttributeTypes.WorkPackageReference, + ArtifactId.SENTINEL)).thenReturn(ArtifactId.SENTINEL); + result = util.getWorkPackageArtifact(atsApi, task); assertResult(result, workPackageArt, true); } @org.junit.Test public void testGetInsertionActivity() throws Exception { - when(attributeResolver.getSoleAttributeValue(teamWf, AtsAttributeTypes.WorkPackageGuid, null)).thenReturn("guid"); - when(services.getArtifactByGuid("guid")).thenReturn(null); - Pair<IAtsInsertionActivity, Boolean> result = util.getInsertionActivity(services, teamWf); + when(attributeResolver.getSoleAttributeValue(teamWf, AtsAttributeTypes.WorkPackageReference, + ArtifactId.SENTINEL)).thenReturn(ArtifactId.SENTINEL); + Pair<IAtsInsertionActivity, Boolean> result = util.getInsertionActivity(atsApi, teamWf); assertResult(result, null, false); - when(services.getArtifactByGuid("guid")).thenReturn(workPackageArt); + when(attributeResolver.getSoleAttributeValue(teamWf, AtsAttributeTypes.WorkPackageReference, + ArtifactId.SENTINEL)).thenReturn(workPackageArt); + when(relationResolver.getRelatedOrNull(workPackageArt, AtsRelationTypes.InsertionActivityToWorkPackage_InsertionActivity)).thenReturn(null); - result = util.getInsertionActivity(services, teamWf); + result = util.getInsertionActivity(atsApi, teamWf); assertResult(result, null, false); when(relationResolver.getRelatedOrNull(workPackageArt, AtsRelationTypes.InsertionActivityToWorkPackage_InsertionActivity)).thenReturn(activityArt); - when(factory.getInsertionActivity(activityArt)).thenReturn(activity); - result = util.getInsertionActivity(services, teamWf); + when(programService.getInsertionActivityById(activityArt)).thenReturn(activity); + result = util.getInsertionActivity(atsApi, teamWf); assertResult(result, activity, false); - when(attributeResolver.getSoleAttributeValue(task, AtsAttributeTypes.WorkPackageGuid, null)).thenReturn(null); - result = util.getInsertionActivity(services, task); + when(attributeResolver.getSoleAttributeValue(task, AtsAttributeTypes.WorkPackageReference, + ArtifactId.SENTINEL)).thenReturn(ArtifactId.SENTINEL); + result = util.getInsertionActivity(atsApi, task); assertResult(result, activity, true); } @Test public void testGetInsertion() throws Exception { - when(attributeResolver.getSoleAttributeValue(teamWf, AtsAttributeTypes.WorkPackageGuid, null)).thenReturn("guid"); + when(attributeResolver.getSoleAttributeValue(teamWf, AtsAttributeTypes.WorkPackageReference, + ArtifactId.SENTINEL)).thenReturn(workPackageArt); when(relationResolver.getRelatedOrNull(workPackageArt, AtsRelationTypes.InsertionActivityToWorkPackage_InsertionActivity)).thenReturn(activityArt); - when(services.getArtifactByGuid("guid")).thenReturn(workPackageArt); - when(factory.getInsertionActivity(activityArt)).thenReturn(null); + when(programService.getInsertionActivityById(activityArt)).thenReturn(null); - Pair<IAtsInsertion, Boolean> result = util.getInsertion(services, teamWf); + Pair<IAtsInsertion, Boolean> result = util.getInsertion(atsApi, teamWf); assertResult(result, null, false); - when(factory.getInsertionActivity(activityArt)).thenReturn(activity); + when(programService.getInsertionActivityById(activityArt)).thenReturn(activity); when(relationResolver.getRelatedOrNull(activity, AtsRelationTypes.InsertionToInsertionActivity_Insertion, IAtsInsertion.class)).thenReturn(insertion); - result = util.getInsertion(services, teamWf); + result = util.getInsertion(atsApi, teamWf); assertResult(result, insertion, false); - when(attributeResolver.getSoleAttributeValue(task, AtsAttributeTypes.WorkPackageGuid, null)).thenReturn(null); - result = util.getInsertion(services, task); + when(attributeResolver.getSoleAttributeValue(task, AtsAttributeTypes.WorkPackageReference, + ArtifactId.SENTINEL)).thenReturn(ArtifactId.SENTINEL); + result = util.getInsertion(atsApi, task); assertResult(result, insertion, true); } @Test public void testGetProgram() throws Exception { - when(attributeResolver.getSoleAttributeValue(teamWf, AtsAttributeTypes.WorkPackageGuid, null)).thenReturn("guid"); + when(attributeResolver.getSoleAttributeValue(teamWf, AtsAttributeTypes.WorkPackageReference, + ArtifactId.SENTINEL)).thenReturn(workPackageArt); when(relationResolver.getRelatedOrNull(workPackageArt, AtsRelationTypes.InsertionActivityToWorkPackage_InsertionActivity)).thenReturn(activityArt); - when(services.getArtifactByGuid("guid")).thenReturn(workPackageArt); - when(factory.getInsertionActivity(activityArt)).thenReturn(activity); + when(programService.getInsertionActivityById(activityArt)).thenReturn(activity); when(relationResolver.getRelatedOrNull(activity, AtsRelationTypes.InsertionToInsertionActivity_Insertion, IAtsInsertion.class)).thenReturn(insertion); - Pair<IAtsProgram, Boolean> result = util.getProgram(services, teamWf); + Pair<IAtsProgram, Boolean> result = util.getProgram(atsApi, teamWf); assertResult(result, null, false); when(relationResolver.getRelatedOrNull(insertion, AtsRelationTypes.ProgramToInsertion_Program, IAtsProgram.class)).thenReturn(program); - result = util.getProgram(services, teamWf); + result = util.getProgram(atsApi, teamWf); assertResult(result, program, false); - when(attributeResolver.getSoleAttributeValue(task, AtsAttributeTypes.WorkPackageGuid, null)).thenReturn(null); - result = util.getProgram(services, task); + when(attributeResolver.getSoleAttributeValue(task, AtsAttributeTypes.WorkPackageReference, + ArtifactId.SENTINEL)).thenReturn(ArtifactId.SENTINEL); + result = util.getProgram(atsApi, task); assertResult(result, program, true); } @Test public void testGetCountry() throws Exception { - when(attributeResolver.getSoleAttributeValue(teamWf, AtsAttributeTypes.WorkPackageGuid, null)).thenReturn("guid"); + when(attributeResolver.getSoleAttributeValue(teamWf, AtsAttributeTypes.WorkPackageReference, + ArtifactId.SENTINEL)).thenReturn(workPackageArt); when(relationResolver.getRelatedOrNull(workPackageArt, AtsRelationTypes.InsertionActivityToWorkPackage_InsertionActivity)).thenReturn(activityArt); - when(services.getArtifactByGuid("guid")).thenReturn(workPackageArt); - when(factory.getInsertionActivity(activityArt)).thenReturn(null); - when(factory.getInsertionActivity(activityArt)).thenReturn(activity); + when(atsApi.getQueryService().getArtifact(37L)).thenReturn(workPackageArt); + when(programService.getInsertionActivityById(activityArt)).thenReturn(null); + when(programService.getInsertionActivityById(activityArt)).thenReturn(activity); when(relationResolver.getRelatedOrNull(activity, AtsRelationTypes.InsertionToInsertionActivity_Insertion, IAtsInsertion.class)).thenReturn(insertion); when(relationResolver.getRelatedOrNull(insertion, AtsRelationTypes.ProgramToInsertion_Program, IAtsProgram.class)).thenReturn(program); - Pair<IAtsCountry, Boolean> result = util.getCountry(services, teamWf); + Pair<IAtsCountry, Boolean> result = util.getCountry(atsApi, teamWf); assertResult(result, null, false); when(relationResolver.getRelatedOrNull(program, AtsRelationTypes.CountryToProgram_Country, IAtsCountry.class)).thenReturn(country); - result = util.getCountry(services, teamWf); + result = util.getCountry(atsApi, teamWf); assertResult(result, country, false); - when(attributeResolver.getSoleAttributeValue(task, AtsAttributeTypes.WorkPackageGuid, null)).thenReturn(null); - result = util.getCountry(services, task); + when(attributeResolver.getSoleAttributeValue(task, AtsAttributeTypes.WorkPackageReference, + ArtifactId.SENTINEL)).thenReturn(ArtifactId.SENTINEL); + result = util.getCountry(atsApi, task); assertResult(result, country, true); } - private void assertResult(Pair<? extends Object, Boolean> result, Object object, boolean inherited) { + private void assertResult(Pair<? extends Object, Boolean> result, Object expected, boolean inherited) { assertNotNull(result); - assertEquals(result.getFirst(), object); + assertEquals(expected, result.getFirst()); assertEquals(inherited, result.getSecond()); } diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/TeamColumnUtilityTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/TeamColumnUtilityTest.java index c3df084f62c..2fca6d51af7 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/TeamColumnUtilityTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/TeamColumnUtilityTest.java @@ -1,20 +1,25 @@ -/******************************************************************************* - * Copyright (c) 2010 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2010 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.internal.column; import static org.mockito.Mockito.when; import java.util.Collections; -import org.eclipse.osee.ats.api.IAtsServices; +import org.eclipse.osee.ats.api.AtsApi; import org.eclipse.osee.ats.api.ai.IAtsActionableItem; +import org.eclipse.osee.ats.api.ai.IAtsActionableItemService; import org.eclipse.osee.ats.api.review.IAtsAbstractReview; +import org.eclipse.osee.ats.api.review.IAtsPeerToPeerReview; import org.eclipse.osee.ats.api.review.IAtsReviewService; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; @@ -37,11 +42,12 @@ public class TeamColumnUtilityTest { @Mock private IAtsTeamWorkflow teamWf; @Mock private IAtsTeamDefinition teamDef; @Mock private IAtsAbstractReview review; - @Mock private IAtsAbstractReview standAloneReview; + @Mock private IAtsPeerToPeerReview standAloneReview; @Mock private IAtsActionableItem ai; @Mock private IAtsWorkItemService workItemService; @Mock private IAtsReviewService reviewService; - @Mock private IAtsServices services; + @Mock private AtsApi atsApi; + @Mock private IAtsActionableItemService actionableItemService; // @formatter:on @Before @@ -54,14 +60,16 @@ public class TeamColumnUtilityTest { when(standAloneReview.getActionableItems()).thenReturn(Collections.singleton(ai)); when(teamDef.getName()).thenReturn(TEAM_NAME); when(reviewService.isStandAloneReview(standAloneReview)).thenReturn(true); - when(ai.getTeamDefinitionInherited()).thenReturn(teamDef); + when(ai.getAtsApi()).thenReturn(atsApi); + when(atsApi.getActionableItemService()).thenReturn(actionableItemService); + when(actionableItemService.getTeamDefinitionInherited(ai)).thenReturn(teamDef); when(ai.getTeamDefinition()).thenReturn(teamDef); - when(services.getReviewService()).thenReturn(reviewService); + when(atsApi.getReviewService()).thenReturn(reviewService); } @Test public void testGetColumnText() throws Exception { - TeamColumn utility = new TeamColumn(services); + TeamColumn utility = new TeamColumn(atsApi); Assert.assertEquals(TEAM_NAME, utility.getColumnText(teamWf)); Assert.assertEquals(TEAM_NAME, utility.getColumnText(review)); diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/AbstractWorkPackageUtilityTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/AbstractWorkPackageUtilityTest.java index ad94e5c8616..f58832028ee 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/AbstractWorkPackageUtilityTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/AbstractWorkPackageUtilityTest.java @@ -1,13 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.internal.column.ev; import static org.mockito.Mockito.when; @@ -16,7 +19,8 @@ import org.eclipse.osee.ats.api.column.IAtsColumn; import org.eclipse.osee.ats.api.ev.IAtsEarnedValueService; import org.eclipse.osee.ats.api.ev.IAtsEarnedValueServiceProvider; import org.eclipse.osee.ats.api.ev.IAtsWorkPackage; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; +import org.eclipse.osee.framework.core.data.ArtifactId; +import org.eclipse.osee.framework.core.data.ArtifactToken; import org.junit.Before; import org.mockito.Mock; import org.mockito.MockitoAnnotations; @@ -31,14 +35,16 @@ public abstract class AbstractWorkPackageUtilityTest { @Mock protected IAtsEarnedValueService earnedValueService; @Mock protected IAtsWorkItem workItem; @Mock protected IAtsWorkPackage workPkg; + @Mock protected ArtifactToken workPkgArt; // @formatter:on @Before - public void setup() throws OseeCoreException { + public void setup() { MockitoAnnotations.initMocks(this); when(earnedValueServiceProvider.getEarnedValueService()).thenReturn(earnedValueService); - when(earnedValueService.getWorkPackageId(workItem)).thenReturn("345"); + when(earnedValueService.getWorkPackageId(workItem)).thenReturn(ArtifactId.valueOf(345)); when(earnedValueService.getWorkPackage(workItem)).thenReturn(workPkg); + when(workPkg.getStoreObject()).thenReturn(workPkgArt); } public abstract IAtsColumn getUtil(); diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/AtsCore_InternalColumnEv_JT_Suite.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/AtsCore_InternalColumnEv_JT_Suite.java index 5cbc729bee8..1cd55757107 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/AtsCore_InternalColumnEv_JT_Suite.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/AtsCore_InternalColumnEv_JT_Suite.java @@ -1,13 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2004, 2007 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.internal.column.ev; import org.eclipse.osee.framework.jdk.core.util.OseeProperties; @@ -21,7 +24,7 @@ import org.junit.runners.Suite; WorkPackageIdUtilityTest.class, WorkPackageNameUtilityTest.class, WorkPackageProgramUtilityTest.class, - WorkPackageGuidUtilityTest.class, + WorkPackageArtIdUtilityTest.class, WorkPackageTypeUtilityTest.class}) /** * This test suite contains tests that can be run as stand-alone JUnit tests (JT) diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageArtIdUtilityTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageArtIdUtilityTest.java new file mode 100644 index 00000000000..56196326e99 --- /dev/null +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageArtIdUtilityTest.java @@ -0,0 +1,52 @@ +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Boeing - initial API and implementation + **********************************************************************/ + +package org.eclipse.osee.ats.core.internal.column.ev; + +import static org.mockito.Mockito.when; +import org.eclipse.osee.ats.api.column.IAtsColumn; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +/** + * Test case for {@link WorkPackageArtIdColumn} + * + * @author Donald G. Dunne + */ +public class WorkPackageArtIdUtilityTest extends AbstractWorkPackageUtilityTest { + + WorkPackageArtIdColumn util; + + @Override + @Before + public void setup() { + super.setup(); + util = new WorkPackageArtIdColumn(earnedValueServiceProvider, null); + } + + @Test + public void testGetColumnText() { + when(workPkg.getIdString()).thenReturn(""); + Assert.assertEquals("", util.getColumnText(workItem)); + + when(workPkg.getIdString()).thenReturn("334534"); + Assert.assertEquals("334534", util.getColumnText(workItem)); + } + + @Override + public IAtsColumn getUtil() { + return util; + } + +} diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageGuidUtilityTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageGuidUtilityTest.java deleted file mode 100644 index 961d3a2790e..00000000000 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageGuidUtilityTest.java +++ /dev/null @@ -1,50 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.ats.core.internal.column.ev; - -import static org.mockito.Mockito.when; -import org.eclipse.osee.ats.api.column.IAtsColumn; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -/** - * Test case for {@link WorkPackageGuidColumn} - * - * @author Donald G. Dunne - */ -public class WorkPackageGuidUtilityTest extends AbstractWorkPackageUtilityTest { - - WorkPackageGuidColumn util; - - @Override - @Before - public void setup() throws OseeCoreException { - super.setup(); - util = new WorkPackageGuidColumn(earnedValueServiceProvider, null); - } - - @Test - public void testGetColumnText() { - when(workPkg.getGuid()).thenReturn(""); - Assert.assertEquals("", util.getColumnText(workItem)); - - when(workPkg.getGuid()).thenReturn("AHSXGTSD34"); - Assert.assertEquals("AHSXGTSD34", util.getColumnText(workItem)); - } - - @Override - public IAtsColumn getUtil() { - return util; - } - -} diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageIdUtilityTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageIdUtilityTest.java index 1d767d6faee..fb0dde7dcfa 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageIdUtilityTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageIdUtilityTest.java @@ -1,18 +1,20 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.internal.column.ev; import static org.mockito.Mockito.when; import org.eclipse.osee.ats.api.column.IAtsColumn; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -28,13 +30,13 @@ public class WorkPackageIdUtilityTest extends AbstractWorkPackageUtilityTest { @Override @Before - public void setup() throws OseeCoreException { + public void setup() { super.setup(); util = new WorkPackageIdColumn(earnedValueServiceProvider, null); } @Test - public void testGetColumnText() throws OseeCoreException { + public void testGetColumnText() { when(workPkg.getWorkPackageId()).thenReturn(""); Assert.assertEquals("", util.getColumnText(workItem)); diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageNameUtilityTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageNameUtilityTest.java index 4624b5de8fc..bd719a376bf 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageNameUtilityTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageNameUtilityTest.java @@ -1,18 +1,20 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.internal.column.ev; import static org.mockito.Mockito.when; import org.eclipse.osee.ats.api.column.IAtsColumn; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -28,7 +30,7 @@ public class WorkPackageNameUtilityTest extends AbstractWorkPackageUtilityTest { @Override @Before - public void setup() throws OseeCoreException { + public void setup() { super.setup(); util = new WorkPackageNameColumn(earnedValueServiceProvider, null); } diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageProgramUtilityTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageProgramUtilityTest.java index 3f55aebf985..af00b9e8470 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageProgramUtilityTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageProgramUtilityTest.java @@ -1,18 +1,20 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.internal.column.ev; import static org.mockito.Mockito.when; import org.eclipse.osee.ats.api.column.IAtsColumn; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -28,13 +30,13 @@ public class WorkPackageProgramUtilityTest extends AbstractWorkPackageUtilityTes @Override @Before - public void setup() throws OseeCoreException { + public void setup() { super.setup(); util = new WorkPackageProgramColumn(earnedValueServiceProvider, null); } @Test - public void testGetColumnText() throws OseeCoreException { + public void testGetColumnText() { when(workPkg.getWorkPackageProgram()).thenReturn(""); Assert.assertEquals("", util.getColumnText(workItem)); diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageTypeUtilityTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageTypeUtilityTest.java index 4355848dc65..4952d0bc305 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageTypeUtilityTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageTypeUtilityTest.java @@ -1,19 +1,21 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.internal.column.ev; import static org.mockito.Mockito.when; import org.eclipse.osee.ats.api.column.IAtsColumn; import org.eclipse.osee.ats.api.ev.AtsWorkPackageType; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -29,13 +31,13 @@ public class WorkPackageTypeUtilityTest extends AbstractWorkPackageUtilityTest { @Override @Before - public void setup() throws OseeCoreException { + public void setup() { super.setup(); util = new WorkPackageTypeColumn(earnedValueServiceProvider, null); } @Test - public void testGetColumnText() throws OseeCoreException { + public void testGetColumnText() { when(workPkg.getWorkPackageType()).thenReturn(AtsWorkPackageType.LOE); Assert.assertEquals(AtsWorkPackageType.LOE.name(), util.getColumnText(workItem)); diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/log/AtsLogFactoryTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/log/AtsLogFactoryTest.java index 32332beb1ee..aeb87e06c5b 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/log/AtsLogFactoryTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/log/AtsLogFactoryTest.java @@ -1,13 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.internal.log; import static org.mockito.Mockito.verify; @@ -17,13 +20,12 @@ import java.util.Date; import java.util.List; import org.eclipse.osee.ats.api.IAtsWorkItem; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; -import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.user.AtsUser; import org.eclipse.osee.ats.api.util.IAtsChangeSet; import org.eclipse.osee.ats.api.workdef.IAttributeResolver; import org.eclipse.osee.ats.api.workflow.log.IAtsLog; import org.eclipse.osee.ats.api.workflow.log.IAtsLogItem; import org.eclipse.osee.ats.api.workflow.log.LogType; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -40,13 +42,13 @@ public class AtsLogFactoryTest { // @formatter:off @Mock IAtsWorkItem workItem; @Mock IAttributeResolver attrResolver; - @Mock IAtsUser Joe; + @Mock AtsUser Joe; @Mock IAtsChangeSet changes; @Mock IAtsLog log; // @formatter:on @Before - public void setup() throws OseeCoreException { + public void setup() { MockitoAnnotations.initMocks(this); List<IAtsLogItem> items = new ArrayList<>(); diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/log/AtsLogHtmlTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/log/AtsLogHtmlTest.java index b08b32912cb..6c4d67c57d1 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/log/AtsLogHtmlTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/log/AtsLogHtmlTest.java @@ -1,13 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.internal.log; import static org.mockito.Mockito.when; @@ -15,14 +18,13 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; import org.eclipse.osee.ats.api.IAtsWorkItem; -import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.user.AtsUser; import org.eclipse.osee.ats.api.user.IAtsUserService; import org.eclipse.osee.ats.api.util.IAtsChangeSet; import org.eclipse.osee.ats.api.workdef.IAttributeResolver; import org.eclipse.osee.ats.api.workflow.log.IAtsLogItem; import org.eclipse.osee.ats.api.workflow.log.ILogStorageProvider; import org.eclipse.osee.ats.api.workflow.log.LogType; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.DateUtil; import org.junit.Assert; import org.junit.Before; @@ -32,7 +34,7 @@ import org.mockito.MockitoAnnotations; /** * Test Case for {@link AtsLogHtml} - * + * * @author Donald G. Dunne */ public class AtsLogHtmlTest { @@ -40,7 +42,7 @@ public class AtsLogHtmlTest { // @formatter:off @Mock IAtsWorkItem workItem; @Mock IAttributeResolver attrResolver; - @Mock IAtsUser Joe; + @Mock AtsUser Joe; @Mock IAtsChangeSet changes; @Mock ILogStorageProvider storeProvider; @Mock IAtsUserService atsUserService; @@ -48,7 +50,7 @@ public class AtsLogHtmlTest { private AtsLog log; @Before - public void setup() throws OseeCoreException { + public void setup() { MockitoAnnotations.initMocks(this); log = new AtsLog(); @@ -68,7 +70,7 @@ public class AtsLogHtmlTest { @Test public void testSave() { // without title and with user name resolution - when(atsUserService.getUserById("456")).thenReturn(Joe); + when(atsUserService.getUserByUserId("456")).thenReturn(Joe); IAtsLogItem item = log.addLog(LogType.Originated, "", "", "456"); Date testDate2011 = getTestDate2011(); String dateString = new SimpleDateFormat(DateUtil.MMDDYYHHMM, Locale.US).format(testDate2011); @@ -85,7 +87,7 @@ public class AtsLogHtmlTest { Assert.assertEquals(getHtmlStrWithTitle(dateString), html); // No user name - when(atsUserService.getUserById("456")).thenReturn(null); + when(atsUserService.getUserByUserId("456")).thenReturn(null); writer = new AtsLogHtml(log, storeProvider, atsUserService, false); html = writer.get(); Assert.assertTrue(html.contains("456")); @@ -96,7 +98,7 @@ public class AtsLogHtmlTest { Assert.assertTrue(html.contains("456")); // No user name - when(atsUserService.getUserById("456")).thenReturn(Joe); + when(atsUserService.getUserByUserId("456")).thenReturn(Joe); when(Joe.getName()).thenReturn(null); writer = new AtsLogHtml(log, storeProvider, atsUserService, false); html = writer.get(); diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/log/AtsLogReaderTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/log/AtsLogReaderTest.java index e26bd91c6d0..68e767ece76 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/log/AtsLogReaderTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/log/AtsLogReaderTest.java @@ -1,25 +1,27 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.internal.log; import static org.mockito.Mockito.when; import java.util.List; import org.eclipse.osee.ats.api.IAtsWorkItem; -import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.user.AtsUser; import org.eclipse.osee.ats.api.util.IAtsChangeSet; import org.eclipse.osee.ats.api.workdef.IAttributeResolver; import org.eclipse.osee.ats.api.workflow.log.IAtsLogItem; import org.eclipse.osee.ats.api.workflow.log.ILogStorageProvider; import org.eclipse.osee.ats.api.workflow.log.LogType; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -36,14 +38,14 @@ public class AtsLogReaderTest { // @formatter:off @Mock IAtsWorkItem workItem; @Mock IAttributeResolver attrResolver; - @Mock IAtsUser Joe; + @Mock AtsUser Joe; @Mock IAtsChangeSet changes; @Mock ILogStorageProvider storeProvider; // @formatter:on private AtsLog log; @Before - public void setup() throws OseeCoreException { + public void setup() { MockitoAnnotations.initMocks(this); log = new AtsLog(); diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/log/AtsLogTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/log/AtsLogTest.java index 328fe7197c4..09aa4bde0a3 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/log/AtsLogTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/log/AtsLogTest.java @@ -1,27 +1,26 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.internal.log; -import static org.mockito.Mockito.when; +import static org.eclipse.osee.ats.core.users.AbstractUserTest.joe; import java.util.Calendar; import java.util.Date; -import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.user.AtsUser; import org.eclipse.osee.ats.api.workflow.log.IAtsLogItem; import org.eclipse.osee.ats.api.workflow.log.LogType; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.junit.Assert; -import org.junit.Before; import org.junit.Test; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; /** * Test Case for {@link AtsLog} @@ -30,24 +29,11 @@ import org.mockito.MockitoAnnotations; */ public class AtsLogTest { - // @formatter:off - @Mock IAtsUser Joe, Kay; - // @formatter:on - - @Before - public void setup() throws OseeCoreException { - MockitoAnnotations.initMocks(this); - when(Joe.getName()).thenReturn("joe"); - when(Joe.getUserId()).thenReturn("joe"); - when(Kay.getName()).thenReturn("kay"); - when(Kay.getUserId()).thenReturn("kay"); - } - - public static IAtsLogItem getAnalyzeTestLogItem(Date date, IAtsUser user) throws OseeCoreException { + public static IAtsLogItem getAnalyzeTestLogItem(Date date, AtsUser user) { return new LogItem(LogType.Error, date, user.getUserId(), "Analyze", "my msg"); } - public static IAtsLogItem getImplementTestLogItem(Date date, IAtsUser user) throws OseeCoreException { + public static IAtsLogItem getImplementTestLogItem(Date date, AtsUser user) { return new LogItem(LogType.Error, date, user.getUserId(), "Implement", "my msg2"); } @@ -64,10 +50,10 @@ public class AtsLogTest { AtsLog log = new AtsLog(); Assert.assertNull(log.getLastStatusDate()); Date testDate2011 = getTestDate2011(); - IAtsLogItem analyzeTestLogItem = getAnalyzeTestLogItem(testDate2011, Joe); + IAtsLogItem analyzeTestLogItem = getAnalyzeTestLogItem(testDate2011, joe); analyzeTestLogItem.setType(LogType.Metrics); log.addLogItem(analyzeTestLogItem); - IAtsLogItem implementTestLogItem = getImplementTestLogItem(getTestDate2012(), Joe); + IAtsLogItem implementTestLogItem = getImplementTestLogItem(getTestDate2012(), joe); implementTestLogItem.setType(LogType.Metrics); log.addLogItem(implementTestLogItem); Assert.assertTrue(log.isDirty()); @@ -82,8 +68,8 @@ public class AtsLogTest { private AtsLog getTestLog() { AtsLog log = new AtsLog(); - log.addLogItem(getAnalyzeTestLogItem(getTestDate2011(), Joe)); - log.addLogItem(getImplementTestLogItem(getTestDate2011(), Joe)); + log.addLogItem(getAnalyzeTestLogItem(getTestDate2011(), joe)); + log.addLogItem(getImplementTestLogItem(getTestDate2011(), joe)); return log; } @@ -93,7 +79,7 @@ public class AtsLogTest { log.internalResetCreatedDate(new Date()); log.addLog(LogType.StateCancelled, "analyze", "msg", "345"); - IAtsLogItem item = log.addLog(LogType.Originated, "analyze", "msg", Joe.getUserId()); + IAtsLogItem item = log.addLog(LogType.Originated, "analyze", "msg", joe.getUserId()); Assert.assertTrue(log.isDirty()); Date testDate2011 = getTestDate2011(); item.setDate(testDate2011); @@ -108,7 +94,7 @@ public class AtsLogTest { public void testInternalGetCancelledReason() { AtsLog log = new AtsLog(); Assert.assertEquals("", log.internalGetCancelledReason()); - log.addLog(LogType.StateCancelled, "analyze", "cancel reason", Joe.getUserId()); + log.addLog(LogType.StateCancelled, "analyze", "cancel reason", joe.getUserId()); Assert.assertEquals("cancel reason", log.internalGetCancelledReason()); } @@ -116,9 +102,9 @@ public class AtsLogTest { public void testInternalGetCompletedFromState() { AtsLog log = new AtsLog(); Assert.assertEquals("", log.internalGetCompletedFromState()); - log.addLog(LogType.StateEntered, "analyze", "", Joe.getUserId()); - log.addLog(LogType.StateComplete, "analyze", "", Joe.getUserId()); - log.addLog(LogType.StateEntered, "completed", "", Joe.getUserId()); + log.addLog(LogType.StateEntered, "analyze", "", joe.getUserId()); + log.addLog(LogType.StateComplete, "analyze", "", joe.getUserId()); + log.addLog(LogType.StateEntered, "completed", "", joe.getUserId()); Assert.assertEquals("analyze", log.internalGetCompletedFromState()); Assert.assertTrue(log.isDirty()); } @@ -136,7 +122,7 @@ public class AtsLogTest { public void testGetLastEvent() { AtsLog log = getTestLog(); Assert.assertEquals("Implement", log.getLastEvent(LogType.Error).getState()); - log.addLog(LogType.Error, "complete", "msg", Joe.getUserId()); + log.addLog(LogType.Error, "complete", "msg", joe.getUserId()); Assert.assertEquals("complete", log.getLastEvent(LogType.Error).getState()); Assert.assertNull(log.getLastEvent(LogType.Metrics)); } @@ -147,7 +133,7 @@ public class AtsLogTest { Assert.assertEquals(null, log.getStateEvent(LogType.Error, "Analyze")); log = getTestLog(); - IAtsLogItem secondLog = log.addLogItem(getAnalyzeTestLogItem(getTestDate2011(), Joe)); + IAtsLogItem secondLog = log.addLogItem(getAnalyzeTestLogItem(getTestDate2011(), joe)); secondLog.setMsg("2nd msg"); Assert.assertEquals("2nd msg", log.getStateEvent(LogType.Error, "Analyze").getMsg()); @@ -191,5 +177,4 @@ public class AtsLogTest { Date date = cal.getTime(); return date; } - -} +}
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/log/AtsLogWriterTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/log/AtsLogWriterTest.java index b6405321794..d5c4ad744d7 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/log/AtsLogWriterTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/log/AtsLogWriterTest.java @@ -1,13 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.internal.log; import static org.mockito.Matchers.any; @@ -16,14 +19,13 @@ import static org.mockito.Mockito.when; import java.util.Calendar; import java.util.Date; import org.eclipse.osee.ats.api.IAtsWorkItem; -import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.user.AtsUser; import org.eclipse.osee.ats.api.util.IAtsChangeSet; import org.eclipse.osee.ats.api.workdef.IAttributeResolver; import org.eclipse.osee.ats.api.workflow.log.IAtsLogItem; import org.eclipse.osee.ats.api.workflow.log.ILogStorageProvider; import org.eclipse.osee.ats.api.workflow.log.LogType; import org.eclipse.osee.framework.core.util.Result; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; @@ -39,14 +41,14 @@ public class AtsLogWriterTest { // @formatter:off @Mock IAtsWorkItem workItem; @Mock IAttributeResolver attrResolver; - @Mock IAtsUser Joe; + @Mock AtsUser Joe; @Mock IAtsChangeSet changes; @Mock ILogStorageProvider storeProvider; // @formatter:on private AtsLog log; @Before - public void setup() throws OseeCoreException { + public void setup() { MockitoAnnotations.initMocks(this); log = new AtsLog(); diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/log/AtsTest_Internal_Log_Suite.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/log/AtsTest_Internal_Log_Suite.java index 6bdb2f8a136..34fbf891779 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/log/AtsTest_Internal_Log_Suite.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/log/AtsTest_Internal_Log_Suite.java @@ -1,13 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2012 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2012 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.internal.log; import org.eclipse.osee.framework.jdk.core.util.OseeProperties; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/log/LogItemTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/log/LogItemTest.java index a3748e1a7ad..9ab55f1979c 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/log/LogItemTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/log/LogItemTest.java @@ -1,22 +1,24 @@ -/******************************************************************************* - * Copyright (c) 2010 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2010 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.internal.log; import static org.mockito.Mockito.when; import java.util.Calendar; import java.util.Date; -import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.user.AtsUser; import org.eclipse.osee.ats.api.workflow.log.IAtsLogItem; import org.eclipse.osee.ats.api.workflow.log.LogType; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.DateUtil; import org.junit.Assert; import org.junit.Before; @@ -32,11 +34,11 @@ import org.mockito.MockitoAnnotations; public class LogItemTest { // @formatter:off - @Mock IAtsUser user; + @Mock AtsUser user; // @formatter:on @Before - public void setup() throws OseeCoreException { + public void setup() { MockitoAnnotations.initMocks(this); when(user.getName()).thenReturn("joe"); @@ -45,14 +47,14 @@ public class LogItemTest { } @Test - public void testLogItemLogTypeDateUserStringStringString() throws OseeCoreException { + public void testLogItemLogTypeDateUserStringStringString() { Date date = new Date(); IAtsLogItem item = getTestLogItem(date, user); validateItem(user, item, date); } - public static void validateItem(IAtsUser user, IAtsLogItem item, Date date) throws OseeCoreException { + public static void validateItem(AtsUser user, IAtsLogItem item, Date date) { Assert.assertEquals(LogType.Error, item.getType()); Assert.assertEquals(date, item.getDate()); Assert.assertEquals(user.getUserId(), item.getUserId()); @@ -61,7 +63,7 @@ public class LogItemTest { } @Test - public void testLogItemLogTypeStringStringStringStringString() throws OseeCoreException { + public void testLogItemLogTypeStringStringStringStringString() { Date date = new Date(); IAtsLogItem item = new LogItem(LogType.Error, String.valueOf(date.getTime()), user.getUserId(), "Analyze", "my msg"); @@ -70,7 +72,7 @@ public class LogItemTest { } @Test - public void testLogItemStringStringStringStringStringString() throws OseeCoreException { + public void testLogItemStringStringStringStringStringString() { Date date = new Date(); IAtsLogItem item = new LogItem(LogType.Error.name(), String.valueOf(date.getTime()), user.getUserId(), "Analyze", "my msg"); @@ -78,12 +80,12 @@ public class LogItemTest { validateItem(user, item, date); } - public static IAtsLogItem getTestLogItem(Date date, IAtsUser user) throws OseeCoreException { + public static IAtsLogItem getTestLogItem(Date date, AtsUser user) { return new LogItem(LogType.Error, date, user.getUserId(), "Analyze", "my msg"); } @Test - public void testToString() throws OseeCoreException { + public void testToString() { Date date = new Date(); IAtsLogItem item = getTestLogItem(date, user); @@ -92,7 +94,7 @@ public class LogItemTest { } @Test - public void testSetsAndGets() throws OseeCoreException { + public void testSetsAndGets() { Date date = new Date(); IAtsLogItem item = getTestLogItem(date, user); item.setMsg("new msg"); diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/state/AtsCore_Internal_State_Suite.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/state/AtsCore_Internal_State_Suite.java index c50f7b9042d..850b506ad1b 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/state/AtsCore_Internal_State_Suite.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/state/AtsCore_Internal_State_Suite.java @@ -1,13 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.internal.state; import org.junit.runner.RunWith; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/state/AtsWorkStateFactoryTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/state/AtsWorkStateFactoryTest.java index c53f04f5378..d5538b7dccf 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/state/AtsWorkStateFactoryTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/state/AtsWorkStateFactoryTest.java @@ -1,25 +1,28 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.internal.state; +import static org.eclipse.osee.ats.core.users.AbstractUserTest.joe; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.when; import java.util.Arrays; import java.util.List; -import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.user.AtsUser; import org.eclipse.osee.ats.api.user.IAtsUserService; import org.eclipse.osee.ats.api.workflow.state.IAtsStateManager; import org.eclipse.osee.ats.core.model.impl.WorkStateImpl; import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -28,19 +31,19 @@ import org.mockito.MockitoAnnotations; /** * Test unit for {@link AtsWorkStateFactory} - * + * * @author Donald G. Dunne */ public class AtsWorkStateFactoryTest { // @formatter:off @Mock IAtsStateManager stateMgr; - @Mock IAtsUser Joe, Kay; + @Mock AtsUser Kay; @Mock IAtsUserService userService; // @formatter:on @Before - public void setup() throws OseeCoreException { + public void setup() { MockitoAnnotations.initMocks(this); } @@ -50,25 +53,24 @@ public class AtsWorkStateFactoryTest { String xml = atsWorkStateFactory.toStoreStr(stateMgr, "Implement"); Assert.assertEquals("Implement;;;", xml); - when(Joe.getUserId()).thenReturn("asdf"); when(Kay.getUserId()).thenReturn("qwer"); - List<IAtsUser> asList = Arrays.asList(Joe, Kay); + List<AtsUser> asList = Arrays.asList(joe, Kay); when(stateMgr.getAssignees("Implement")).thenReturn(asList); xml = atsWorkStateFactory.toStoreStr(stateMgr, "Implement"); - Assert.assertEquals("Implement;<asdf><qwer>;;", xml); + Assert.assertEquals("Implement;<joe><qwer>;;", xml); when(stateMgr.getHoursSpent("Implement")).thenReturn(1.3); when(stateMgr.getHoursSpentStr("Implement")).thenReturn("1.3"); xml = atsWorkStateFactory.toStoreStr(stateMgr, "Implement"); - Assert.assertEquals("Implement;<asdf><qwer>;1.3;", xml); + Assert.assertEquals("Implement;<joe><qwer>;1.3;", xml); when(stateMgr.getPercentComplete("Implement")).thenReturn(23); xml = atsWorkStateFactory.toStoreStr(stateMgr, "Implement"); - Assert.assertEquals("Implement;<asdf><qwer>;1.3;23", xml); + Assert.assertEquals("Implement;<joe><qwer>;1.3;23", xml); when(stateMgr.getPercentComplete("Implement")).thenReturn(0); xml = atsWorkStateFactory.toStoreStr(stateMgr, "Implement"); - Assert.assertEquals("Implement;<asdf><qwer>;1.3;", xml); + Assert.assertEquals("Implement;<joe><qwer>;1.3;", xml); } @Test @@ -81,9 +83,9 @@ public class AtsWorkStateFactoryTest { Assert.assertEquals(0, state.getAssignees().size()); Assert.assertEquals(0, state.getPercentComplete()); - when(userService.getUserById(eq("asdf"))).thenReturn(Joe); - when(userService.getUserById(eq("qwer"))).thenReturn(Kay); - state = atsWorkStateFactory.fromStoreStr("Implement;<asdf><qwer>;1.3;20"); + when(userService.getUserByUserId(eq("joe"))).thenReturn(joe); + when(userService.getUserByUserId(eq("qwer"))).thenReturn(Kay); + state = atsWorkStateFactory.fromStoreStr("Implement;<joe><qwer>;1.3;20"); Assert.assertEquals("Implement", state.getName()); Assert.assertEquals(1.3, state.getHoursSpent(), 0.01); @@ -100,7 +102,6 @@ public class AtsWorkStateFactoryTest { @Test(expected = OseeArgumentException.class) public void testGetFromXml_Exception() { AtsWorkStateFactory atsWorkStateFactory = new AtsWorkStateFactory(userService); - atsWorkStateFactory.fromStoreStr("asdfa;"); + atsWorkStateFactory.fromStoreStr("joey;"); } - -} +}
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/state/StateManagerStoreTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/state/StateManagerStoreTest.java index 3fafe59a417..ad87e3d7c50 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/state/StateManagerStoreTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/state/StateManagerStoreTest.java @@ -1,13 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.internal.state; import static org.mockito.Matchers.any; @@ -15,12 +18,12 @@ import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import java.util.Arrays; -import org.eclipse.osee.ats.api.IAtsServices; +import org.eclipse.osee.ats.api.AtsApi; import org.eclipse.osee.ats.api.IAtsWorkItem; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.notify.AtsNotificationCollector; import org.eclipse.osee.ats.api.notify.AtsWorkItemNotificationEvent; -import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.user.AtsUser; import org.eclipse.osee.ats.api.user.IAtsUserService; import org.eclipse.osee.ats.api.util.IAtsChangeSet; import org.eclipse.osee.ats.api.util.IExecuteListener; @@ -35,7 +38,6 @@ import org.eclipse.osee.ats.api.workflow.state.IAtsWorkStateFactory; import org.eclipse.osee.ats.core.model.impl.WorkStateImpl; import org.eclipse.osee.ats.core.workflow.TestState; import org.eclipse.osee.ats.core.workflow.state.StateManagerUtility; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -51,7 +53,7 @@ public class StateManagerStoreTest { // @formatter:off @Mock IAtsWorkItem workItem; - @Mock IAtsUser Joe, Kay, asUser; + @Mock AtsUser Joe, Kay, asUser; @Mock IAtsChangeSet changes; @Mock IAtsWorkDefinition workDef; @Mock IAtsStateDefinition analyzeState, completedState; @@ -61,11 +63,11 @@ public class StateManagerStoreTest { @Mock IAtsUserService userService; @Mock AtsNotificationCollector notifications; @Mock IAtsLogFactory logFactory; - @Mock IAtsServices services; + @Mock AtsApi atsApi; // @formatter:on @Before - public void setup() throws OseeCoreException { + public void setup() { MockitoAnnotations.initMocks(this); when(workItem.getWorkDefinition()).thenReturn(workDef); when(workItem.getStateMgr()).thenReturn(stateMgr); @@ -75,8 +77,8 @@ public class StateManagerStoreTest { when(workDef.getStateByName("Completed")).thenReturn(completedState); when(completedState.getStateType()).thenReturn(StateType.Completed); - when(services.getAttributeResolver()).thenReturn(attrResolver); - when(services.getUserService()).thenReturn(userService); + when(atsApi.getAttributeResolver()).thenReturn(attrResolver); + when(atsApi.getUserService()).thenReturn(userService); } @@ -87,7 +89,7 @@ public class StateManagerStoreTest { @Test public void testWriteToStore() { - StateManager stateMgr = new StateManager(workItem, logFactory, services); + StateManager stateMgr = new StateManager(workItem, logFactory, atsApi); TestState state = new TestState("Analyze", StateType.Working); StateManagerUtility.initializeStateMachine(stateMgr, state, Arrays.asList(Joe, Kay), Joe, changes); Assert.assertEquals("Analyze", stateMgr.getCurrentStateName()); @@ -101,7 +103,7 @@ public class StateManagerStoreTest { @Test public void testLoad() { - StateManager stateMgr = new StateManager(workItem, logFactory, services); + StateManager stateMgr = new StateManager(workItem, logFactory, atsApi); stateMgr.setCurrentStateName("Analyze"); TestState state = new TestState("Analyze", StateType.Working); StateManagerUtility.initializeStateMachine(stateMgr, state, Arrays.asList(Joe, Kay), Joe, changes); @@ -109,6 +111,8 @@ public class StateManagerStoreTest { Assert.assertEquals(2, stateMgr.getAssignees().size()); when(attrResolver.getSoleAttributeValue(workItem, AtsAttributeTypes.CurrentState, "")).thenReturn( "Analyze;<Joe><Kay>;;"); + when(attrResolver.getSoleAttributeValue(workItem, AtsAttributeTypes.CurrentStateType, null)).thenReturn( + StateType.Working.name()); WorkState currentState = new WorkStateImpl("Analyze", Arrays.asList(Joe, Kay), 0, 0); when(workStateFactory.fromStoreStr(eq("Analyze;<Joe><Kay>;;"))).thenReturn(currentState); @@ -119,7 +123,7 @@ public class StateManagerStoreTest { @Test public void testPostPersistNotifyReset() { - StateManager stateMgr = new StateManager(workItem, logFactory, services); + StateManager stateMgr = new StateManager(workItem, logFactory, atsApi); stateMgr.setCurrentStateName("Analyze"); TestState state = new TestState("Analyze", StateType.Working); StateManagerUtility.initializeStateMachine(stateMgr, state, Arrays.asList(Joe, Kay), Joe, changes); @@ -127,6 +131,8 @@ public class StateManagerStoreTest { Assert.assertEquals(2, stateMgr.getAssignees().size()); when(attrResolver.getSoleAttributeValue(workItem, AtsAttributeTypes.CurrentState, "")).thenReturn( "Analyze;<Joe><Kay>;;"); + when(attrResolver.getSoleAttributeValue(workItem, AtsAttributeTypes.CurrentStateType, null)).thenReturn( + StateType.Working.name()); WorkState currentState = new WorkStateImpl("Analyze", Arrays.asList(Joe, Kay), 0, 0); when(workStateFactory.fromStoreStr(eq("Analyze;<Joe><Kay>;;"))).thenReturn(currentState); when(changes.getNotifications()).thenReturn(notifications); @@ -140,7 +146,7 @@ public class StateManagerStoreTest { @Test public void testGetPostPersistExecutionListener() { - StateManager stateMgr = new StateManager(workItem, logFactory, services); + StateManager stateMgr = new StateManager(workItem, logFactory, atsApi); stateMgr.setCurrentStateName("Analyze"); TestState state = new TestState("Analyze", StateType.Working); StateManagerUtility.initializeStateMachine(stateMgr, state, Arrays.asList(Joe, Kay), Joe, changes); @@ -153,6 +159,8 @@ public class StateManagerStoreTest { when(attrResolver.getSoleAttributeValue(workItem, AtsAttributeTypes.CurrentState, "")).thenReturn( "Analyze;<Joe><Kay>;;"); + when(attrResolver.getSoleAttributeValue(workItem, AtsAttributeTypes.CurrentStateType, null)).thenReturn( + StateType.Working.name()); WorkState currentState = new WorkStateImpl("Analyze", Arrays.asList(Joe, Kay), 0, 0); when(workStateFactory.fromStoreStr(eq("Analyze;<Joe><Kay>;;"))).thenReturn(currentState); when(changes.getNotifications()).thenReturn(notifications); diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/state/StateManagerTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/state/StateManagerTest.java index 374029d7cb0..11e1ade6599 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/state/StateManagerTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/state/StateManagerTest.java @@ -1,13 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.internal.state; import static org.junit.Assert.assertFalse; @@ -19,25 +22,25 @@ import java.util.Arrays; import java.util.Collections; import java.util.LinkedList; import java.util.List; -import org.eclipse.osee.ats.api.IAtsServices; +import org.eclipse.osee.ats.api.AtsApi; import org.eclipse.osee.ats.api.IAtsWorkItem; -import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.user.AtsCoreUsers; +import org.eclipse.osee.ats.api.user.AtsUser; import org.eclipse.osee.ats.api.workdef.IAtsStateDefinition; import org.eclipse.osee.ats.api.workdef.IAtsWorkDefinition; import org.eclipse.osee.ats.api.workdef.StateType; import org.eclipse.osee.ats.api.workflow.log.IAtsLogFactory; -import org.eclipse.osee.ats.core.AbstractUserTest; import org.eclipse.osee.ats.core.mock.MockWorkItem; import org.eclipse.osee.ats.core.model.impl.WorkStateImpl; -import org.eclipse.osee.ats.core.users.AtsCoreUsers; +import org.eclipse.osee.ats.core.users.AbstractUserTest; import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.type.OseeStateException; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.Mockito; +import org.mockito.MockitoAnnotations; /** * @author Donald G. Dunne @@ -51,27 +54,25 @@ public class StateManagerTest extends AbstractUserTest { @Mock private IAtsStateDefinition endorseStateDef; @Mock private IAtsStateDefinition analyzeStateDef; @Mock private IAtsLogFactory logFactory; - @Mock private IAtsServices services; + @Mock private AtsApi atsApi; // @formatter:on - @Override @Before public void setup() { - super.setup(); + MockitoAnnotations.initMocks(this); + + MockWorkItem workItem = new MockWorkItem("mock work item", "Endorse", workDef, StateType.Working); + stateMgr = new StateManager(workItem, logFactory, atsApi); - MockWorkItem workItem = Mockito.spy(new MockWorkItem("mock work item", "Endorse", StateType.Working)); - stateMgr = Mockito.spy(new StateManager(workItem, logFactory, services)); - when(workItem.getWorkDefinition()).thenReturn(workDef); when(workDef.getStateByName("endorse")).thenReturn(endorseStateDef); when(endorseStateDef.getStateType()).thenReturn(StateType.Working); when(workDef.getStateByName("analyze")).thenReturn(analyzeStateDef); when(analyzeStateDef.getStateType()).thenReturn(StateType.Working); - } @Test - public void testSetNotificationListener() throws OseeCoreException { + public void testSetNotificationListener() { stateMgr.addState(new WorkStateImpl("endorse")); stateMgr.setCurrentStateName("endorse"); stateMgr.addAssignee(steve); @@ -85,7 +86,7 @@ public class StateManagerTest extends AbstractUserTest { } @Test - public void testAddAssignee() throws OseeCoreException { + public void testAddAssignee() { stateMgr.addState(new WorkStateImpl("endorse")); stateMgr.setCurrentStateName("endorse"); @@ -93,7 +94,7 @@ public class StateManagerTest extends AbstractUserTest { stateMgr.addAssignees("endorse", null); Assert.assertTrue(stateMgr.getAssignees().isEmpty()); - List<IAtsUser> users = new ArrayList<>(); + List<AtsUser> users = new ArrayList<>(); stateMgr.addAssignees("endorse", users); Assert.assertTrue(stateMgr.getAssignees().isEmpty()); @@ -107,7 +108,7 @@ public class StateManagerTest extends AbstractUserTest { } @Test(expected = OseeArgumentException.class) - public void testAddAssignee_exception() throws OseeCoreException { + public void testAddAssignee_exception() { stateMgr.addState(new WorkStateImpl("endorse")); stateMgr.setCurrentStateName("endorse"); @@ -115,7 +116,7 @@ public class StateManagerTest extends AbstractUserTest { } @Test - public void testSetAssignee() throws OseeCoreException { + public void testSetAssignee() { stateMgr.addState(new WorkStateImpl("endorse")); stateMgr.setCurrentStateName("endorse"); @@ -125,7 +126,7 @@ public class StateManagerTest extends AbstractUserTest { stateMgr.setAssignee(null); Assert.assertTrue(stateMgr.getAssignees().isEmpty()); - List<IAtsUser> users = new ArrayList<>(); + List<AtsUser> users = new ArrayList<>(); stateMgr.setAssignees("endorse", users); Assert.assertTrue(stateMgr.getAssignees().isEmpty()); @@ -141,7 +142,7 @@ public class StateManagerTest extends AbstractUserTest { } @Test - public void testSetAssignee_removeUnassigned() throws OseeCoreException { + public void testSetAssignee_removeUnassigned() { stateMgr.addState(new WorkStateImpl("endorse")); stateMgr.setCurrentStateName("endorse"); @@ -155,11 +156,11 @@ public class StateManagerTest extends AbstractUserTest { } @Test - public void testSetAssignees_nextStateNotification() throws OseeCoreException { + public void testSetAssignees_nextStateNotification() { // create state with two assignees stateMgr.addState(new WorkStateImpl("endorse")); stateMgr.setCurrentStateName("endorse"); - List<IAtsUser> currentAssignees = Arrays.asList(joe, steve); + List<AtsUser> currentAssignees = Arrays.asList(joe, steve); stateMgr.setAssignees(currentAssignees); stateMgr.getInitialAssignees().addAll(currentAssignees); @@ -173,15 +174,15 @@ public class StateManagerTest extends AbstractUserTest { } @Test - public void testSetAssignees_sameStateNotification() throws OseeCoreException { + public void testSetAssignees_sameStateNotification() { // create state with two assignees stateMgr.addState(new WorkStateImpl("endorse")); stateMgr.setCurrentStateName("endorse"); - List<IAtsUser> currentAssignees = Arrays.asList(joe); + List<AtsUser> currentAssignees = Arrays.asList(joe); stateMgr.setAssignees(currentAssignees); stateMgr.getInitialAssignees().addAll(currentAssignees); - List<IAtsUser> newAssignees = Arrays.asList(joe, steve); + List<AtsUser> newAssignees = Arrays.asList(joe, steve); stateMgr.setAssignees("endorse", newAssignees); Assert.assertTrue(stateMgr.getAssignees().contains(joe)); Assert.assertTrue(stateMgr.getAssignees().contains(steve)); @@ -199,11 +200,11 @@ public class StateManagerTest extends AbstractUserTest { public void testAddState_exception2() { stateMgr.addState(new WorkStateImpl("endorse")); - stateMgr.addState("endorse", new LinkedList<IAtsUser>(), 34, 23, false); + stateMgr.addState("endorse", new LinkedList<AtsUser>(), 34, 23, false); } @Test(expected = OseeArgumentException.class) - public void testSetAssignee_exception() throws OseeCoreException { + public void testSetAssignee_exception() { stateMgr.addState(new WorkStateImpl("endorse")); stateMgr.setCurrentStateName("endorse"); @@ -211,7 +212,7 @@ public class StateManagerTest extends AbstractUserTest { } @Test - public void testIsUnAssigned() throws OseeCoreException { + public void testIsUnAssigned() { stateMgr.addState(new WorkStateImpl("endorse")); stateMgr.setCurrentStateName("endorse"); Assert.assertFalse(stateMgr.isUnAssigned()); @@ -220,7 +221,7 @@ public class StateManagerTest extends AbstractUserTest { } @Test - public void testIsUnAssignedSolely() throws OseeCoreException { + public void testIsUnAssignedSolely() { stateMgr.addState(new WorkStateImpl("endorse")); stateMgr.setCurrentStateName("endorse"); Assert.assertFalse(stateMgr.isUnAssignedSolely()); @@ -233,7 +234,7 @@ public class StateManagerTest extends AbstractUserTest { } @Test - public void testGetAssigneesStrString() throws OseeCoreException { + public void testGetAssigneesStrString() { stateMgr.addState(new WorkStateImpl("endorse")); stateMgr.setCurrentStateName("endorse"); stateMgr.addAssignee(steve); @@ -246,7 +247,7 @@ public class StateManagerTest extends AbstractUserTest { } @Test - public void testAddAssignees() throws OseeCoreException { + public void testAddAssignees() { stateMgr.addState(new WorkStateImpl("endorse")); stateMgr.setCurrentStateName("endorse"); stateMgr.addAssignees(Arrays.asList(joe, alice)); @@ -254,7 +255,7 @@ public class StateManagerTest extends AbstractUserTest { } @Test - public void testAddAssignees_state() throws OseeCoreException { + public void testAddAssignees_state() { stateMgr.addState(new WorkStateImpl("endorse")); stateMgr.setCurrentStateName("endorse"); stateMgr.addAssignees("endorse", Arrays.asList(joe, alice)); @@ -262,7 +263,7 @@ public class StateManagerTest extends AbstractUserTest { } @Test - public void testSetAssigneesIAtsUser() throws OseeCoreException { + public void testSetAssigneesAtsUser() { stateMgr.addState(new WorkStateImpl("endorse")); stateMgr.setCurrentStateName("endorse"); stateMgr.setAssignee(joe); @@ -272,7 +273,7 @@ public class StateManagerTest extends AbstractUserTest { } @Test - public void testSetAssigneeStringIAtsUser() throws OseeCoreException { + public void testSetAssigneeStringAtsUser() { stateMgr.addState(new WorkStateImpl("endorse")); stateMgr.setCurrentStateName("endorse"); stateMgr.setAssignee("endorse", joe); @@ -282,7 +283,7 @@ public class StateManagerTest extends AbstractUserTest { } @Test - public void testSetAssigneesListOfQextendsIAtsUser() throws OseeCoreException { + public void testSetAssigneesListOfQextendsAtsUser() { stateMgr.addState(new WorkStateImpl("endorse")); stateMgr.setCurrentStateName("endorse"); stateMgr.addAssignees(Arrays.asList(joe, alice)); @@ -292,7 +293,7 @@ public class StateManagerTest extends AbstractUserTest { } @Test - public void testSetAssigneesStringListOfQextendsIAtsUser() throws OseeCoreException { + public void testSetAssigneesStringListOfQextendsAtsUser() { stateMgr.addState(new WorkStateImpl("endorse")); stateMgr.setCurrentStateName("endorse"); stateMgr.setAssignee("endorse", joe); @@ -302,7 +303,7 @@ public class StateManagerTest extends AbstractUserTest { } @Test - public void testRemoveAssigneeIAtsUser() throws OseeCoreException { + public void testRemoveAssigneeAtsUser() { stateMgr.addState(new WorkStateImpl("endorse")); stateMgr.setCurrentStateName("endorse"); stateMgr.setAssignees("endorse", Arrays.asList(joe, alice)); @@ -312,7 +313,7 @@ public class StateManagerTest extends AbstractUserTest { } @Test - public void testClearAssignees() throws OseeCoreException { + public void testClearAssignees() { stateMgr.addState(new WorkStateImpl("endorse")); stateMgr.setCurrentStateName("endorse"); stateMgr.setAssignees("endorse", Arrays.asList(joe, alice)); @@ -341,7 +342,7 @@ public class StateManagerTest extends AbstractUserTest { } @Test - public void testAddStateStringListOfQextendsIAtsUserDoubleInt() { + public void testAddStateStringListOfQextendsAtsUserDoubleInt() { stateMgr.addState("endorse", Arrays.asList(joe), 4.2, 4); Assert.assertTrue(stateMgr.isStateVisited("endorse")); Assert.assertEquals(1, stateMgr.getVisitedStateNames().size()); @@ -351,7 +352,7 @@ public class StateManagerTest extends AbstractUserTest { } @Test(expected = OseeStateException.class) - public void testGetAssigneesForState() throws OseeStateException { + public void testGetAssigneesForState() { stateMgr.getAssignees(); } @@ -371,12 +372,12 @@ public class StateManagerTest extends AbstractUserTest { } @Test(expected = OseeStateException.class) - public void setPercentComplete_exception() throws OseeStateException { + public void setPercentComplete_exception() { stateMgr.setPercentComplete("endorse", 34); } @Test - public void setPercentComplete() throws OseeCoreException { + public void setPercentComplete() { stateMgr.addState(new WorkStateImpl("endorse")); stateMgr.setCurrentStateName("endorse"); stateMgr.setPercentComplete("endorse", 34); @@ -390,12 +391,12 @@ public class StateManagerTest extends AbstractUserTest { } @Test(expected = OseeStateException.class) - public void setHoursSpent_exception() throws OseeStateException { + public void setHoursSpent_exception() { stateMgr.setHoursSpent("endorse", 8.0); } @Test - public void setHoursSpent() throws OseeCoreException { + public void setHoursSpent() { stateMgr.addState(new WorkStateImpl("endorse")); stateMgr.setCurrentStateName("endorse"); stateMgr.setHoursSpent("endorse", 8.0); @@ -404,14 +405,14 @@ public class StateManagerTest extends AbstractUserTest { } @Test(expected = OseeStateException.class) - public void removeAssignee_exception() throws OseeCoreException { + public void removeAssignee_exception() { stateMgr.removeAssignee(joe); } @Test public void testIsHoursEqual() { IAtsWorkItem awa = Mockito.mock(IAtsWorkItem.class); - StateManager mgr = new StateManager(awa, logFactory, services); + StateManager mgr = new StateManager(awa, logFactory, atsApi); assertTrue(mgr.isHoursEqual(1.0, 1.0)); assertTrue(mgr.isHoursEqual(01.0, 1.0)); @@ -425,14 +426,14 @@ public class StateManagerTest extends AbstractUserTest { } @Test - public void testSetMetrics() throws OseeCoreException { + public void testSetMetrics() { IAtsWorkItem awa = mock(IAtsWorkItem.class); - StateManager mgr = new StateManager(awa, logFactory, services); + StateManager mgr = new StateManager(awa, logFactory, atsApi); IAtsStateDefinition state = mock(IAtsStateDefinition.class); when(state.getName()).thenReturn("Endorse"); - List<IAtsUser> assignees = Collections.emptyList(); + List<AtsUser> assignees = Collections.emptyList(); mgr.addState("Endorse", assignees); mgr.setHoursSpent("Endorse", 1.0); mgr.setPercentComplete("Endorse", 46); diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/util/AtsCore_Internal_Util_Suite.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/util/AtsCore_Internal_Util_Suite.java index 3c024358dbb..fc7dc83b59d 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/util/AtsCore_Internal_Util_Suite.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/util/AtsCore_Internal_Util_Suite.java @@ -1,13 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2014 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2014 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.internal.util; import org.junit.runner.RunWith; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/util/AtsIdProviderTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/util/AtsIdProviderTest.java index 08a31dec5a5..ffbc3f03d75 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/util/AtsIdProviderTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/util/AtsIdProviderTest.java @@ -1,27 +1,33 @@ -/******************************************************************************* - * Copyright (c) 2014 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2014 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.internal.util; import static org.mockito.Matchers.any; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import org.eclipse.osee.ats.api.AtsApi; import org.eclipse.osee.ats.api.IAtsObject; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinitionService; import org.eclipse.osee.ats.api.util.IAtsChangeSet; import org.eclipse.osee.ats.api.util.ISequenceProvider; import org.eclipse.osee.ats.api.workdef.IAttributeResolver; -import org.eclipse.osee.framework.core.data.AttributeTypeId; +import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; +import org.eclipse.osee.framework.core.data.AttributeTypeToken; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -38,10 +44,12 @@ public class AtsIdProviderTest { // @formatter:off @Mock private ISequenceProvider sequenceProvider; @Mock private IAttributeResolver attrResolver; - @Mock private IAtsObject newObject; + @Mock private IAtsTeamWorkflow newObject; @Mock private IAtsTeamDefinition teamDef; @Mock private IAtsTeamDefinition parentTeamDef; @Mock private IAtsChangeSet changes; + @Mock private IAtsTeamDefinitionService teamDefinitionService; + @Mock private AtsApi atsApi; // @formatter:on AtsIdProvider atsIdProvider = null; @@ -52,7 +60,10 @@ public class AtsIdProviderTest { atsIdProvider = new AtsIdProvider(sequenceProvider, attrResolver, newObject, teamDef); + when(newObject.isOfType(AtsArtifactTypes.TeamWorkflow)).thenReturn(true); when(sequenceProvider.getNext("ATS_SEQ")).thenReturn(345L); + when(teamDef.getAtsApi()).thenReturn(atsApi); + when(atsApi.getTeamDefinitionService()).thenReturn(teamDefinitionService); } @Test @@ -65,11 +76,11 @@ public class AtsIdProviderTest { when( attrResolver.getSoleAttributeValueAsString(teamDef, AtsAttributeTypes.AtsIdPrefix, (String) null)).thenReturn( null); - when(teamDef.getTeamDefinitionHoldingVersions()).thenReturn(null); + when(teamDefinitionService.getTeamDefHoldingVersions(teamDef)).thenReturn(null); Assert.assertNull(atsIdProvider.getAttrValueFromTeamDef(AtsAttributeTypes.AtsIdPrefix)); - when(teamDef.getTeamDefinitionHoldingVersions()).thenReturn(parentTeamDef); + when(teamDefinitionService.getTeamDefHoldingVersions(teamDef)).thenReturn(parentTeamDef); when(attrResolver.getSoleAttributeValueAsString(parentTeamDef, AtsAttributeTypes.AtsIdPrefix, (String) null)).thenReturn("ATS"); @@ -108,19 +119,19 @@ public class AtsIdProviderTest { when(sequenceProvider.getNext(AtsIdProvider.DEFAULT_ACTION_SEQ_NAME)).thenReturn(333L); when(newObject.isOfType(AtsArtifactTypes.TeamWorkflow)).thenReturn(false); - when(newObject.isOfType(AtsArtifactTypes.Action)).thenReturn(true); + when(newObject.isTypeEqual(AtsArtifactTypes.Action)).thenReturn(true); Assert.assertEquals(AtsIdProvider.DEFAULT_ACTION_ID_PREFIX + "333", atsIdProvider.getNextAtsId()); when(sequenceProvider.getNext(AtsIdProvider.DEFAULT_REVIEW_SEQ_NAME)).thenReturn(333L); when(newObject.isOfType(AtsArtifactTypes.TeamWorkflow)).thenReturn(false); - when(newObject.isOfType(AtsArtifactTypes.Action)).thenReturn(false); - when(newObject.isOfType(AtsArtifactTypes.ReviewArtifact)).thenReturn(true); + when(newObject.isTypeEqual(AtsArtifactTypes.Action)).thenReturn(false); + when(newObject.isOfType(AtsArtifactTypes.AbstractReview)).thenReturn(true); Assert.assertEquals(AtsIdProvider.DEFAULT_REVIEW_ID_PREFIX + "333", atsIdProvider.getNextAtsId()); when(sequenceProvider.getNext(AtsIdProvider.DEFAULT_TASK_SEQ_NAME)).thenReturn(333L); when(newObject.isOfType(AtsArtifactTypes.TeamWorkflow)).thenReturn(false); - when(newObject.isOfType(AtsArtifactTypes.Action)).thenReturn(false); - when(newObject.isOfType(AtsArtifactTypes.ReviewArtifact)).thenReturn(false); + when(newObject.isTypeEqual(AtsArtifactTypes.Action)).thenReturn(false); + when(newObject.isOfType(AtsArtifactTypes.AbstractReview)).thenReturn(false); when(newObject.isOfType(AtsArtifactTypes.Task)).thenReturn(true); Assert.assertEquals(AtsIdProvider.DEFAULT_TASK_ID_PREFIX + "333", atsIdProvider.getNextAtsId()); } @@ -135,7 +146,7 @@ public class AtsIdProviderTest { when(attrResolver.getSoleAttributeValueAsString(teamDef, AtsAttributeTypes.AtsIdSequenceName, (String) null)).thenReturn("ASDF_SEQ"); when(sequenceProvider.getNext("ASDF_SEQ")).thenReturn(333L); - when(teamDef.getTeamDefinitionHoldingVersions()).thenReturn(parentTeamDef); + when(teamDefinitionService.getTeamDefHoldingVersions(teamDef)).thenReturn(parentTeamDef); atsIdProvider.setAtsId(changes); @@ -153,11 +164,11 @@ public class AtsIdProviderTest { when(attrResolver.getSoleAttributeValueAsString(teamDef, AtsAttributeTypes.AtsIdSequenceName, (String) null)).thenReturn("ASDF_SEQ"); when(sequenceProvider.getNext("ASDF_SEQ")).thenReturn(333L); - when(teamDef.getTeamDefinitionHoldingVersions()).thenReturn(parentTeamDef); + when(teamDefinitionService.getTeamDefHoldingVersions(teamDef)).thenReturn(parentTeamDef); atsIdProvider.setAtsId(changes); - verify(attrResolver, never()).setSoleAttributeValue(any(IAtsObject.class), any(AttributeTypeId.class), + verify(attrResolver, never()).setSoleAttributeValue(any(IAtsObject.class), any(AttributeTypeToken.class), any(String.class), any(IAtsChangeSet.class)); } } diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/mock/MockWorkItem.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/mock/MockWorkItem.java index 58381fd15c3..930173b00dc 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/mock/MockWorkItem.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/mock/MockWorkItem.java @@ -1,22 +1,28 @@ -/******************************************************************************* - * Copyright (c) 2012 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2012 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.mock; +import java.util.Collection; import java.util.Date; import java.util.List; +import org.eclipse.osee.ats.api.AtsApi; import org.eclipse.osee.ats.api.IAtsWorkItem; -import org.eclipse.osee.ats.api.user.IAtsUser; -import org.eclipse.osee.ats.api.util.IAtsChangeSet; +import org.eclipse.osee.ats.api.config.WorkType; +import org.eclipse.osee.ats.api.user.AtsUser; import org.eclipse.osee.ats.api.workdef.IAtsStateDefinition; import org.eclipse.osee.ats.api.workdef.IAtsWorkDefinition; +import org.eclipse.osee.ats.api.workdef.IStateToken; import org.eclipse.osee.ats.api.workdef.StateType; import org.eclipse.osee.ats.api.workflow.IAtsAction; import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; @@ -25,37 +31,28 @@ import org.eclipse.osee.ats.api.workflow.state.IAtsStateManager; import org.eclipse.osee.ats.core.internal.log.AtsLogFactory; import org.eclipse.osee.ats.core.internal.state.StateManager; import org.eclipse.osee.ats.core.util.AtsUserGroup; -import org.eclipse.osee.framework.core.data.ArtifactTypeId; -import org.eclipse.osee.framework.core.data.IArtifactType; +import org.eclipse.osee.framework.core.data.ArtifactTypeToken; import org.eclipse.osee.framework.jdk.core.type.Named; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; /** * @author Donald G. Dunne */ public class MockWorkItem implements IAtsWorkItem { - private final String name; - private String atsId; + private final String atsId; private IAtsStateManager stateMgr; private final AtsUserGroup implementers = new AtsUserGroup(); - private IAtsUser completedBy; - private IAtsUser cancelledBy; + private final IAtsWorkDefinition workDefinition; + private AtsUser completedBy; + private AtsUser cancelledBy; private String completeFromState; private String cancelledFromState; - public MockWorkItem(String name, String currentStateName, StateType StateType) { - this(name); - } - - public MockWorkItem(String name, String currentStateName, List<? extends IAtsUser> assignees) { - this(name); - } - - public MockWorkItem(String name) { + public MockWorkItem(String name, String currentStateName, IAtsWorkDefinition workDefinition, StateType StateType) { this.name = name; atsId = name; this.stateMgr = new StateManager(this, new AtsLogFactory(), null); + this.workDefinition = workDefinition; } @Override @@ -69,20 +66,20 @@ public class MockWorkItem implements IAtsWorkItem { } @Override - public List<IAtsUser> getImplementers() { + public List<AtsUser> getImplementers() { return implementers.getUsers(); } - public void setImplementers(List<? extends IAtsUser> implementers) { + public void setImplementers(List<? extends AtsUser> implementers) { this.implementers.setUsers(implementers); } @Override - public List<IAtsUser> getAssignees() throws OseeCoreException { + public List<AtsUser> getAssignees() { return stateMgr.getAssignees(); } - public void addImplementer(IAtsUser joe) { + public void addImplementer(AtsUser joe) { implementers.addUser(joe); } @@ -108,12 +105,7 @@ public class MockWorkItem implements IAtsWorkItem { @Override public IAtsWorkDefinition getWorkDefinition() { - return null; - } - - @Override - public void setAtsId(String atsId, IAtsChangeSet changes) { - this.atsId = atsId; + return workDefinition; } @Override @@ -127,7 +119,7 @@ public class MockWorkItem implements IAtsWorkItem { } @Override - public IAtsUser getCreatedBy() { + public AtsUser getCreatedBy() { return null; } @@ -137,12 +129,12 @@ public class MockWorkItem implements IAtsWorkItem { } @Override - public IAtsUser getCompletedBy() { + public AtsUser getCompletedBy() { return completedBy; } @Override - public IAtsUser getCancelledBy() { + public AtsUser getCancelledBy() { return cancelledBy; } @@ -166,11 +158,11 @@ public class MockWorkItem implements IAtsWorkItem { return null; } - public void setCompletedBy(IAtsUser user) { + public void setCompletedBy(AtsUser user) { this.completedBy = user; } - public void setCancelledBy(IAtsUser user) { + public void setCancelledBy(AtsUser user) { this.cancelledBy = user; } @@ -193,11 +185,6 @@ public class MockWorkItem implements IAtsWorkItem { } @Override - public void setStateManager(IAtsStateManager stateManager) { - this.stateMgr = stateManager; - } - - @Override public Long getId() { return Long.valueOf(456); } @@ -254,21 +241,51 @@ public class MockWorkItem implements IAtsWorkItem { @Override public String toStringWithId() { - return String.format("[%s]-[%s]", getName(), getId()); + return String.format("[%s]-[%s]", getName(), getIdString()); } @Override - public IArtifactType getArtifactType() { + public ArtifactTypeToken getArtifactType() { return null; } @Override - public boolean isOfType(ArtifactTypeId... artifactTypes) { - return false; + public void setStateMgr(IAtsStateManager stateMgr) { + this.stateMgr = stateMgr; } @Override public void clearCaches() { // do nothing } -} + + @Override + public AtsApi getAtsApi() { + return null; + } + + @Override + public boolean isInState(IStateToken state) { + return false; + } + + @Override + public Collection<WorkType> getWorkTypes() { + return null; + } + + @Override + public boolean isWorkType(WorkType workType) { + return false; + } + + @Override + public Collection<String> getTags() { + return null; + } + + @Override + public boolean hasTag(String tag) { + return false; + } +}
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/model/impl/AtsActionGroupTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/model/impl/AtsActionGroupTest.java deleted file mode 100644 index b2aff82856b..00000000000 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/model/impl/AtsActionGroupTest.java +++ /dev/null @@ -1,56 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.ats.core.model.impl; - -import java.util.Arrays; -import org.eclipse.osee.ats.api.workdef.StateType; -import org.eclipse.osee.ats.core.mock.MockWorkItem; -import org.eclipse.osee.framework.jdk.core.util.GUID; -import org.eclipse.osee.framework.jdk.core.util.Lib; -import org.junit.Assert; -import org.junit.Test; - -/** - * Test case for {@link AtsActionGroup} - * - * @author Donald G. Dunne - */ -public class AtsActionGroupTest { - - @Test - public void testGetFirstAction() { - AtsActionGroup group = new AtsActionGroup(GUID.create(), "do this", Lib.generateUuid()); - Assert.assertEquals(0, group.getActions().size()); - Assert.assertEquals(null, group.getFirstAction()); - - MockWorkItem item1 = new MockWorkItem("item 1", "Endorse", StateType.Working); - MockWorkItem item2 = new MockWorkItem("item 2", "Endorse", StateType.Working); - group.addAction(item1); - group.addAction(item2); - Assert.assertEquals(2, group.getActions().size()); - Assert.assertEquals(item1, group.getFirstAction()); - } - - @Test - public void testSetActions() { - AtsActionGroup group = new AtsActionGroup(GUID.create(), "do this", Lib.generateUuid()); - - MockWorkItem item1 = new MockWorkItem("item 1", "Endorse", StateType.Working); - MockWorkItem item2 = new MockWorkItem("item 2", "Endorse", StateType.Working); - group.setActions(Arrays.asList(item1, item2)); - Assert.assertEquals(2, group.getActions().size()); - - group.setActions(Arrays.asList(item1)); - Assert.assertEquals(1, group.getActions().size()); - - } - -} diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/model/impl/AtsCore_ModelImpl_JT_Suite.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/model/impl/AtsCore_ModelImpl_JT_Suite.java index 73fad294f4d..31624a08cdc 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/model/impl/AtsCore_ModelImpl_JT_Suite.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/model/impl/AtsCore_ModelImpl_JT_Suite.java @@ -1,13 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2004, 2007 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.model.impl; import org.eclipse.osee.ats.core.internal.state.StateManagerTest; @@ -15,7 +18,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Suite; @RunWith(Suite.class) -@Suite.SuiteClasses({StateManagerTest.class, AtsActionGroupTest.class, AtsObjectTest.class, WorkStateImplTest.class}) +@Suite.SuiteClasses({StateManagerTest.class, AtsObjectTest.class, WorkStateImplTest.class}) /** * This test suite contains tests that can be run as stand-alone JUnit tests (JT) * diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/model/impl/AtsObjectTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/model/impl/AtsObjectTest.java index 9079cae7687..2b0711b694c 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/model/impl/AtsObjectTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/model/impl/AtsObjectTest.java @@ -1,13 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.model.impl; import org.eclipse.osee.framework.jdk.core.util.Lib; @@ -22,18 +25,18 @@ import org.junit.Test; public class AtsObjectTest { @Test - public void testGetNameGuidId() { + public void testGetNameId() { AtsObject obj = new AtsObject("hello", 456); Assert.assertEquals("hello", obj.getName()); Assert.assertEquals(456, obj.getId().longValue()); - obj = new AtsObject("hello", Lib.generateUuid()); + obj = new AtsObject("hello", Lib.generateId()); Assert.assertEquals("hello", obj.getName()); } @Test public void testGetSetDescription() { - AtsObject obj = new AtsObject("hello", Lib.generateUuid()); + AtsObject obj = new AtsObject("hello", Lib.generateId()); Assert.assertNull(obj.getDescription()); obj.setDescription("desc"); diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/model/impl/WorkStateImplTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/model/impl/WorkStateImplTest.java index 63ed3cb540d..39f21860a3d 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/model/impl/WorkStateImplTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/model/impl/WorkStateImplTest.java @@ -1,17 +1,20 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.model.impl; import java.util.Arrays; -import org.eclipse.osee.ats.core.AbstractUserTest; +import org.eclipse.osee.ats.core.users.AbstractUserTest; import org.junit.Assert; import org.junit.Test; @@ -21,7 +24,7 @@ import org.junit.Test; public class WorkStateImplTest extends AbstractUserTest { @Test - public void testWorkStateImplStringListOfQextendsIAtsUser() { + public void testWorkStateImplStringListOfQextendsAtsUser() { WorkStateImpl state = new WorkStateImpl("Endorse", Arrays.asList(joe)); Assert.assertEquals("Endorse", state.getName()); Assert.assertEquals(0.0, state.getHoursSpent(), 0); diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/query/AtsCore_Query_JT_Suite.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/query/AtsCore_Query_JT_Suite.java index 7dab1602227..db2cdbdb72a 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/query/AtsCore_Query_JT_Suite.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/query/AtsCore_Query_JT_Suite.java @@ -1,13 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2016 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2016 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.query; import org.junit.runner.RunWith; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/query/AtsWorkItemFilterTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/query/AtsWorkItemFilterTest.java index 0daa07f2ceb..49395ce7873 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/query/AtsWorkItemFilterTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/query/AtsWorkItemFilterTest.java @@ -1,21 +1,25 @@ -/******************************************************************************* - * Copyright (c) 2016 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2016 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.query; import static org.mockito.Mockito.when; import java.util.Arrays; import java.util.Collection; import java.util.Collections; -import org.eclipse.osee.ats.api.IAtsServices; +import org.eclipse.osee.ats.api.AtsApi; import org.eclipse.osee.ats.api.IAtsWorkItem; +import org.eclipse.osee.ats.api.config.TeamDefinition; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; @@ -26,6 +30,11 @@ import org.eclipse.osee.ats.api.workflow.IAtsAction; import org.eclipse.osee.ats.api.workflow.IAtsTask; import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; import org.eclipse.osee.ats.api.workflow.state.IAtsStateManager; +import org.eclipse.osee.ats.core.workflow.Task; +import org.eclipse.osee.ats.core.workflow.TeamWorkflow; +import org.eclipse.osee.framework.core.data.ArtifactToken; +import org.eclipse.osee.framework.core.enums.CoreArtifactTokens; +import org.eclipse.osee.framework.core.enums.CoreUserGroups; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -39,23 +48,25 @@ public class AtsWorkItemFilterTest { // @formatter:off @Mock IAtsTeamWorkflow teamWf1; - @Mock IAtsTeamDefinition teamDef1; + @Mock IAtsStateManager teamWf1StateMgr; @Mock IAtsAction action1; @Mock IAtsTeamWorkflow teamWf2; - @Mock IAtsTeamDefinition teamDef2; @Mock IAtsStateManager teamWf2StateMgr; @Mock IAtsAction action2; @Mock IAtsTask task1; - @Mock IAtsServices services; + @Mock AtsApi atsApi; @Mock IAtsStateManager task1StateMgr; @Mock IArtifactResolver artifactResolver; @Mock IAttributeResolver attributeResolver; // @formatter:on + private final IAtsTeamDefinition teamDef1 = new TeamDefinition(CoreArtifactTokens.UserGroups, atsApi); + private final IAtsTeamDefinition teamDef2 = new TeamDefinition(CoreUserGroups.Everyone, atsApi); + @Before public void setup() { MockitoAnnotations.initMocks(this); @@ -72,21 +83,20 @@ public class AtsWorkItemFilterTest { @Test public void testIsOfType() { - when(services.getArtifactResolver()).thenReturn(artifactResolver); - when(artifactResolver.isOfType(teamWf1, AtsArtifactTypes.TeamWorkflow)).thenReturn(true); - when(artifactResolver.isOfType(teamWf1, AtsArtifactTypes.Task)).thenReturn(false); - when(artifactResolver.isOfType(teamWf2, AtsArtifactTypes.TeamWorkflow)).thenReturn(true); - when(artifactResolver.isOfType(teamWf2, AtsArtifactTypes.Task)).thenReturn(false); - when(artifactResolver.isOfType(task1, AtsArtifactTypes.Task)).thenReturn(true); - when(artifactResolver.isOfType(task1, AtsArtifactTypes.TeamWorkflow)).thenReturn(false); + IAtsTeamWorkflow teamWf1 = + new TeamWorkflow(null, atsApi, ArtifactToken.valueOf(1, "test temworkflow 1", AtsArtifactTypes.TeamWorkflow)); + IAtsTeamWorkflow teamWf2 = + new TeamWorkflow(null, atsApi, ArtifactToken.valueOf(2, "test temworkflow 2", AtsArtifactTypes.TeamWorkflow)); + + IAtsTask task1 = new Task(null, atsApi, ArtifactToken.valueOf(3, "task 1", AtsArtifactTypes.Task)); - AtsWorkItemFilter filter = new AtsWorkItemFilter(Arrays.asList(teamWf1, teamWf2, task1), services); + AtsWorkItemFilter filter = new AtsWorkItemFilter(Arrays.asList(teamWf1, teamWf2, task1), atsApi); Collection<IAtsTask> tasks = filter.isOfType(AtsArtifactTypes.Task).getItems(); Assert.assertEquals(1, tasks.size()); Assert.assertEquals(task1, tasks.iterator().next()); - filter = new AtsWorkItemFilter(Arrays.asList(teamWf1, teamWf2, task1), services); + filter = new AtsWorkItemFilter(Arrays.asList(teamWf1, teamWf2, task1), atsApi); Collection<IAtsWorkItem> workItems = filter.isOfType(AtsArtifactTypes.Task, AtsArtifactTypes.TeamWorkflow).getItems(); @@ -95,18 +105,15 @@ public class AtsWorkItemFilterTest { @Test public void testUnion() { - AtsWorkItemFilter filter1 = new AtsWorkItemFilter(Arrays.asList(teamWf1, teamWf2), services); - AtsWorkItemFilter filter2 = new AtsWorkItemFilter(Arrays.asList(teamWf2, task1), services); + AtsWorkItemFilter filter1 = new AtsWorkItemFilter(Arrays.asList(teamWf1, teamWf2), atsApi); + AtsWorkItemFilter filter2 = new AtsWorkItemFilter(Arrays.asList(teamWf2, task1), atsApi); filter1.union(filter2); Assert.assertEquals(3, filter1.getItems().size()); } @Test public void testFromTeam() { - when(teamDef1.getId()).thenReturn(23L); - when(teamDef2.getId()).thenReturn(55L); - - AtsWorkItemFilter filter = new AtsWorkItemFilter(Arrays.asList(teamWf1, teamWf2, task1), services); + AtsWorkItemFilter filter = new AtsWorkItemFilter(Arrays.asList(teamWf1, teamWf2, task1), atsApi); filter.fromTeam(teamDef1); Assert.assertEquals(2, filter.getItems().size()); } @@ -122,36 +129,36 @@ public class AtsWorkItemFilterTest { when(task1.getStateMgr()).thenReturn(task1StateMgr); when(task1StateMgr.getStateType()).thenReturn(StateType.Working); - AtsWorkItemFilter filter1 = new AtsWorkItemFilter(Arrays.asList(teamWf1, teamWf2, task1), services); + AtsWorkItemFilter filter1 = new AtsWorkItemFilter(Arrays.asList(teamWf1, teamWf2, task1), atsApi); filter1.isStateType(StateType.Completed); Assert.assertEquals(1, filter1.getItems().size()); - AtsWorkItemFilter filter2 = new AtsWorkItemFilter(Arrays.asList(teamWf1, teamWf2, task1), services); + AtsWorkItemFilter filter2 = new AtsWorkItemFilter(Arrays.asList(teamWf1, teamWf2, task1), atsApi); filter2.isStateType(StateType.Completed, StateType.Cancelled); Assert.assertEquals(2, filter2.getItems().size()); - AtsWorkItemFilter filter3 = new AtsWorkItemFilter(Arrays.asList(teamWf1, teamWf2, task1), services); + AtsWorkItemFilter filter3 = new AtsWorkItemFilter(Arrays.asList(teamWf1, teamWf2, task1), atsApi); filter3.isStateType(StateType.Completed, StateType.Cancelled, StateType.Working); Assert.assertEquals(3, filter3.getItems().size()); } @Test public void testWithOrValue() { - when(services.getAttributeResolver()).thenReturn(attributeResolver); + when(atsApi.getAttributeResolver()).thenReturn(attributeResolver); when(attributeResolver.getAttributeValues(teamWf1, AtsAttributeTypes.Category1)).thenReturn( Arrays.asList("asdf", "green")); when(attributeResolver.getAttributeValues(teamWf2, AtsAttributeTypes.Category1)).thenReturn( Arrays.asList("asdf", "blue")); - AtsWorkItemFilter filter = new AtsWorkItemFilter(Arrays.asList(teamWf1, teamWf2, task1), services); + AtsWorkItemFilter filter = new AtsWorkItemFilter(Arrays.asList(teamWf1, teamWf2, task1), atsApi); filter.withOrValue(AtsAttributeTypes.Category1, Collections.singleton("asdf")); Assert.assertEquals(2, filter.getItems().size()); - filter = new AtsWorkItemFilter(Arrays.asList(teamWf1, teamWf2, task1), services); + filter = new AtsWorkItemFilter(Arrays.asList(teamWf1, teamWf2, task1), atsApi); filter.withOrValue(AtsAttributeTypes.Category1, Collections.singleton("blue")); Assert.assertEquals(1, filter.getItems().size()); - filter = new AtsWorkItemFilter(Arrays.asList(teamWf1, teamWf2, task1), services); + filter = new AtsWorkItemFilter(Arrays.asList(teamWf1, teamWf2, task1), atsApi); filter.withOrValue(AtsAttributeTypes.Category1, Arrays.asList("green", "blue")); Assert.assertEquals(2, filter.getItems().size()); @@ -163,13 +170,13 @@ public class AtsWorkItemFilterTest { when(teamWf2.getParentAction()).thenReturn(action2); when(task1.getParentAction()).thenReturn(action1); - AtsWorkItemFilter filter2 = new AtsWorkItemFilter(Arrays.asList(teamWf1, teamWf2, task1), services); + AtsWorkItemFilter filter2 = new AtsWorkItemFilter(Arrays.asList(teamWf1, teamWf2, task1), atsApi); Assert.assertEquals(2, filter2.getActions().size()); } @Test public void testGetTeamWorkflows() { - AtsWorkItemFilter filter2 = new AtsWorkItemFilter(Arrays.asList(teamWf1, teamWf2, task1), services); + AtsWorkItemFilter filter2 = new AtsWorkItemFilter(Arrays.asList(teamWf1, teamWf2, task1), atsApi); Assert.assertEquals(2, filter2.getTeamWorkflows().size()); } diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/transition/AtsCore_Transition_JT_Suite.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/transition/AtsCore_Transition_JT_Suite.java index 83c8bdcfcad..cd07b982bd9 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/transition/AtsCore_Transition_JT_Suite.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/transition/AtsCore_Transition_JT_Suite.java @@ -1,13 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2004, 2007 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.transition; import org.junit.runner.RunWith; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/transition/TransitionResultTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/transition/TransitionResultTest.java index 65c838361b0..ed76abe6d0f 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/transition/TransitionResultTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/transition/TransitionResultTest.java @@ -1,13 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.transition; import org.eclipse.osee.ats.api.workflow.transition.TransitionResult; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/users/AbstractUserTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/users/AbstractUserTest.java new file mode 100644 index 00000000000..994f0e68204 --- /dev/null +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/users/AbstractUserTest.java @@ -0,0 +1,26 @@ +/********************************************************************* + * Copyright (c) 2004, 2007 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Boeing - initial API and implementation + **********************************************************************/ + +package org.eclipse.osee.ats.core.users; + + +import org.eclipse.osee.ats.api.user.AtsUser; + +/** + * @author Donald G. Dunne + */ +public abstract class AbstractUserTest { + public static final AtsUser joe = new AtsUser(123456L, "joe", "joe", "b@b.com", true); + public static final AtsUser steve = new AtsUser(234567L, "steve", "steve", "asdf", false); + public static final AtsUser alice = new AtsUser(345678L, "alice", "alice", null, true); +}
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/users/AtsCore_Users_JT_Suite.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/users/AtsCore_Users_JT_Suite.java index 6251f876aa2..64ecd057208 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/users/AtsCore_Users_JT_Suite.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/users/AtsCore_Users_JT_Suite.java @@ -1,13 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2004, 2007 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.users; import org.eclipse.osee.framework.jdk.core.util.OseeProperties; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/users/AtsUsersUtilityTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/users/AtsUsersUtilityTest.java index 43144f0e848..b7a774e6fb1 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/users/AtsUsersUtilityTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/users/AtsUsersUtilityTest.java @@ -1,20 +1,28 @@ -/* - * Created on Apr 9, 2013 +/********************************************************************* + * Copyright (c) 2018 Boeing * - * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE - */ + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Boeing - initial API and implementation + **********************************************************************/ + package org.eclipse.osee.ats.core.users; -import static org.mockito.Mockito.when; import java.util.Collection; import java.util.HashSet; import java.util.Set; -import org.eclipse.osee.ats.api.user.IAtsUser; -import org.eclipse.osee.ats.core.AbstractUserTest; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; +import org.eclipse.osee.ats.api.user.AtsUser; import org.junit.Assert; import org.junit.Test; +/** + * @author Donald G. Dunne + */ public class AtsUsersUtilityTest extends AbstractUserTest { @Test @@ -25,38 +33,26 @@ public class AtsUsersUtilityTest extends AbstractUserTest { } @Test - public void testGetValidEmailUsers() throws OseeCoreException { - Set<IAtsUser> users = new HashSet<>(); + public void testGetValidEmailUsers() { + Set<AtsUser> users = new HashSet<>(); users.add(joe); users.add(steve); users.add(alice); - Assert.assertTrue(AtsUsersUtility.getValidEmailUsers(users).isEmpty()); - - when(joe.getEmail()).thenReturn("b@b.com"); - when(steve.getEmail()).thenReturn("asdf"); - when(alice.getEmail()).thenReturn(null); Assert.assertEquals(1, AtsUsersUtility.getValidEmailUsers(users).size()); Assert.assertEquals(joe, AtsUsersUtility.getValidEmailUsers(users).iterator().next()); } @Test - public void testGetActiveEmailUsers() throws OseeCoreException { - Set<IAtsUser> users = new HashSet<>(); + public void testGetActiveEmailUsers() { + Set<AtsUser> users = new HashSet<>(); users.add(joe); users.add(steve); users.add(alice); - when(joe.getEmail()).thenReturn("b@b.com"); - when(joe.isActive()).thenReturn(true); - when(steve.getEmail()).thenReturn("b@b.com"); - when(steve.isActive()).thenReturn(false); - when(alice.getEmail()).thenReturn("b@b.com"); - when(alice.isActive()).thenReturn(true); - - Collection<IAtsUser> activeEmailUsers = AtsUsersUtility.getActiveEmailUsers(users); + + Collection<AtsUser> activeEmailUsers = AtsUsersUtility.getActiveEmailUsers(users); Assert.assertEquals(2, activeEmailUsers.size()); Assert.assertTrue(activeEmailUsers.contains(joe)); Assert.assertTrue(activeEmailUsers.contains(alice)); } - -} +}
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/users/CoreAtsUsersTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/users/CoreAtsUsersTest.java index e3d9fc44534..89c545c0db6 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/users/CoreAtsUsersTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/users/CoreAtsUsersTest.java @@ -1,19 +1,22 @@ -/******************************************************************************* - * Copyright (c) 2012 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2012 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.users; import java.util.HashMap; -import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.user.AtsCoreUsers; +import org.eclipse.osee.ats.api.user.AtsUser; import org.eclipse.osee.framework.core.enums.SystemUser; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.type.OseeStateException; import org.junit.Assert; import org.junit.Test; @@ -29,13 +32,6 @@ import org.junit.Test; public class CoreAtsUsersTest { @Test - public void testGetDescription() { - Assert.assertEquals(SystemUser.OseeSystem.getName(), AtsCoreUsers.SYSTEM_USER.getDescription()); - Assert.assertEquals(SystemUser.Anonymous.getName(), AtsCoreUsers.ANONYMOUS_USER.getDescription()); - Assert.assertEquals(SystemUser.UnAssigned.getName(), AtsCoreUsers.UNASSIGNED_USER.getDescription()); - } - - @Test public void testIsActive() { AtsCoreUsers.SYSTEM_USER.isActive(); AtsCoreUsers.ANONYMOUS_USER.isActive(); @@ -51,7 +47,7 @@ public class CoreAtsUsersTest { } @Test - public void testGetUuid() { + public void testGetId() { Assert.assertEquals(SystemUser.OseeSystem.getId(), AtsCoreUsers.SYSTEM_USER.getId()); Assert.assertEquals(SystemUser.Anonymous.getId(), AtsCoreUsers.ANONYMOUS_USER.getId()); } @@ -78,35 +74,26 @@ public class CoreAtsUsersTest { } @Test - public void testToString() { - Assert.assertEquals("User [Anonymous - 99999998 - ]", AtsCoreUsers.ANONYMOUS_USER.toString()); - } - - @Test public void testHashCode() { TestUser user = new TestUser(); user.setUserId(null); - Assert.assertEquals(user.hashCode(), 31); - user.setUserId("99999998"); - Assert.assertEquals(user.hashCode(), 31 * 1 + user.getUserId().hashCode()); + Assert.assertEquals(user.getId().intValue(), user.hashCode()); } @Test public void testEqualsObject() { TestUser user = new TestUser(); user.setUserId("99999999"); + user.setId(11L); Assert.assertTrue(AtsCoreUsers.SYSTEM_USER.equals(user)); user.setUserId("234"); + user.setId(95645L); Assert.assertFalse(AtsCoreUsers.SYSTEM_USER.equals(user)); Assert.assertFalse(AtsCoreUsers.SYSTEM_USER.equals("asfd")); Assert.assertFalse(AtsCoreUsers.SYSTEM_USER.equals(null)); Assert.assertTrue(AtsCoreUsers.SYSTEM_USER.equals(AtsCoreUsers.SYSTEM_USER)); user.setUserId(null); Assert.assertFalse(user.equals(AtsCoreUsers.SYSTEM_USER)); - - TestUser user2 = new TestUser(); - user2.setUserId(null); - Assert.assertTrue(user.equals(user2)); } @org.junit.Test @@ -114,30 +101,29 @@ public class CoreAtsUsersTest { TestUser user = new TestUser(); user.setUserId("234"); - TestUser user1 = new TestUser(); - user1.setUserId("234"); + TestUser user1MapToE = new TestUser(); + user1MapToE.setUserId("234"); - TestUser user2 = new TestUser(); - user2.setUserId(SystemUser.OseeSystem.getUserId()); - - IAtsUser mapToPi = AtsCoreUsers.SYSTEM_USER; - IAtsUser alsoMapToPi = user2; - - IAtsUser mapToE = user1; - IAtsUser alsoMapToE = user1; - - HashMap<IAtsUser, Double> hash = new HashMap<>(); - hash.put(mapToPi, Math.PI); - hash.put(mapToE, Math.E); - - Assert.assertTrue(hash.get(mapToPi).equals(Math.PI)); - Assert.assertTrue(hash.get(mapToE).equals(Math.E)); - Assert.assertTrue(hash.get(alsoMapToPi).equals(Math.PI)); - Assert.assertTrue(hash.get(alsoMapToE).equals(Math.E)); - Assert.assertFalse(hash.get(mapToPi).equals(Math.E)); - Assert.assertFalse(hash.get(mapToE).equals(Math.PI)); - Assert.assertFalse(mapToPi.equals(mapToE)); - Assert.assertTrue(mapToPi.equals(mapToPi)); + TestUser user2MapToPi = new TestUser(); + user2MapToPi.setUserId(SystemUser.OseeSystem.getUserId()); + + AtsUser user3MapToPi = AtsCoreUsers.SYSTEM_USER; + + HashMap<AtsUser, Double> hash = new HashMap<>(); + hash.put(user1MapToE, Math.E); + hash.put(user2MapToPi, Math.E); + hash.put(user3MapToPi, Math.PI); + + Assert.assertFalse(hash.get(user1MapToE).equals(Math.PI)); + Assert.assertFalse(hash.get(user2MapToPi).equals(Math.PI)); + Assert.assertTrue(hash.get(user3MapToPi).equals(Math.PI)); + + Assert.assertTrue(hash.get(user1MapToE).equals(Math.E)); + Assert.assertTrue(hash.get(user2MapToPi).equals(Math.E)); + Assert.assertFalse(hash.get(user3MapToPi).equals(Math.E)); + + Assert.assertFalse(user3MapToPi.equals(user1MapToE)); + Assert.assertTrue(user3MapToPi.equals(user3MapToPi)); } @Test @@ -160,7 +146,7 @@ public class CoreAtsUsersTest { } @Override - public String getUserId() throws OseeCoreException { + public String getUserId() { throw new OseeStateException("this is the exception under test"); } }; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/AtsCoreServiceImplTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/AtsCoreServiceImplTest.java index 4022f713e67..bfa2b37f1e2 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/AtsCoreServiceImplTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/AtsCoreServiceImplTest.java @@ -1,13 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2015 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2015 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.util; import static org.eclipse.osee.framework.core.enums.CoreBranches.COMMON; @@ -23,7 +26,7 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; /** - * Test Case for {@link AtsCoreServiceImpl} + * Test Case for {@link AtsApiImpl} * * @author Donald G. Dunne */ @@ -41,21 +44,21 @@ public class AtsCoreServiceImplTest { @Test public void testGetAtsId() { - ArtifactToken artifact = ArtifactToken.valueOf(0, null, COMMON); + ArtifactToken artifact = ArtifactToken.valueOf(345, null, COMMON); when(attrResolver.getSoleAttributeValue(artifact, AtsAttributeTypes.AtsId, null)).thenReturn(null); - String result = AtsCoreServiceImpl.getAtsId(attrResolver, artifact); - assertEquals(result, artifact.getGuid()); + String result = AtsApiImpl.getAtsId(attrResolver, artifact); + assertEquals("345", result); when(attrResolver.getSoleAttributeValue(atsObject, AtsAttributeTypes.AtsId, null)).thenReturn(null); when(atsObject.getStoreObject()).thenReturn(artifact); - result = AtsCoreServiceImpl.getAtsId(attrResolver, atsObject); - assertEquals(result, artifact.getGuid()); + result = AtsApiImpl.getAtsId(attrResolver, atsObject); + assertEquals("345", result); when(attrResolver.getSoleAttributeValue(artifact, AtsAttributeTypes.AtsId, null)).thenReturn("ATS23"); - result = AtsCoreServiceImpl.getAtsId(attrResolver, artifact); - assertEquals(result, "ATS23"); + result = AtsApiImpl.getAtsId(attrResolver, artifact); + assertEquals("ATS23", result); when(attrResolver.getSoleAttributeValue(artifact, AtsAttributeTypes.AtsId, null)).thenReturn("ATS23"); - assertEquals(result, "ATS23"); + assertEquals("ATS23", result); } }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/AtsCoreServiceImplTest.java.orig b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/AtsCoreServiceImplTest.java.orig deleted file mode 100644 index b7ffdc74628..00000000000 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/AtsCoreServiceImplTest.java.orig +++ /dev/null @@ -1,67 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.ats.core.util; - -import static org.eclipse.osee.framework.core.enums.CoreBranches.COMMON; -import static org.junit.Assert.assertEquals; -import static org.mockito.Mockito.when; -import org.eclipse.osee.ats.api.IAtsObject; -import org.eclipse.osee.ats.api.data.AtsAttributeTypes; -import org.eclipse.osee.ats.api.workdef.IAttributeResolver; -import org.eclipse.osee.framework.core.data.ArtifactToken; -import org.junit.Before; -import org.junit.Test; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; - -/** - * Test Case for {@link AtsCoreServiceImpl} - * - * @author Donald G. Dunne - */ -public class AtsCoreServiceImplTest { - - // @formatter:off - @Mock private IAtsObject atsObject; - @Mock private IAttributeResolver attrResolver; - // @formatter:on - - @Before - public void setup() { - MockitoAnnotations.initMocks(this); - } - - @Test - public void testGetAtsId() { -<<<<<<< HEAD - ArtifactToken artifact = ArtifactToken.valueOf(0, "guid", null, COMMON, null); -||||||| parent of be5246f... refactor: Remove more IArtifact usage - ArtifactToken artifact = ArtifactToken.valueOf(0, "guid", null, null, null); -======= - ArtifactToken artifact = ArtifactToken.valueOf(0, null, null); ->>>>>>> be5246f... refactor: Remove more IArtifact usage - when(attrResolver.getSoleAttributeValue(artifact, AtsAttributeTypes.AtsId, null)).thenReturn(null); - String result = AtsCoreServiceImpl.getAtsId(attrResolver, artifact); - assertEquals(result, artifact.getGuid()); - - when(attrResolver.getSoleAttributeValue(atsObject, AtsAttributeTypes.AtsId, null)).thenReturn(null); - when(atsObject.getStoreObject()).thenReturn(artifact); - result = AtsCoreServiceImpl.getAtsId(attrResolver, atsObject); - assertEquals(result, artifact.getGuid()); - - when(attrResolver.getSoleAttributeValue(artifact, AtsAttributeTypes.AtsId, null)).thenReturn("ATS23"); - result = AtsCoreServiceImpl.getAtsId(attrResolver, artifact); - assertEquals(result, "ATS23"); - - when(attrResolver.getSoleAttributeValue(artifact, AtsAttributeTypes.AtsId, null)).thenReturn("ATS23"); - assertEquals(result, "ATS23"); - } -}
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/AtsCore_Util_JT_Suite.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/AtsCore_Util_JT_Suite.java index 2b840881122..a0ea6db55ca 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/AtsCore_Util_JT_Suite.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/AtsCore_Util_JT_Suite.java @@ -1,13 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2004, 2007 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.util; import org.junit.runner.RunWith; @@ -16,7 +19,7 @@ import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses({ AtsCoreServiceImplTest.class, - VisitedItemCacheTest.class, + RecentlyVisitedItemsTest.class, AtsObjectsTest.class, AtsUserGroupTest.class, HoursSpentUtilTest.class}) diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/AtsObjectsTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/AtsObjectsTest.java index 980afc11bed..580694fd082 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/AtsObjectsTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/AtsObjectsTest.java @@ -1,13 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.util; import java.util.ArrayList; @@ -15,7 +18,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; import org.eclipse.osee.ats.api.IAtsObject; -import org.eclipse.osee.ats.core.users.AtsCoreUsers; +import org.eclipse.osee.ats.api.user.AtsCoreUsers; import org.junit.Assert; import org.junit.Test; @@ -30,12 +33,12 @@ public class AtsObjectsTest { } @Test - public void testToUuids() { + public void testToIds() { List<IAtsObject> objs = new ArrayList<>(); objs.add(AtsCoreUsers.SYSTEM_USER); objs.add(AtsCoreUsers.ANONYMOUS_USER); Assert.assertEquals(Arrays.asList(AtsCoreUsers.SYSTEM_USER.getId(), AtsCoreUsers.ANONYMOUS_USER.getId()), - AtsObjects.toUuids(objs)); + AtsObjects.toIds(objs)); } @Test diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/AtsUserGroupTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/AtsUserGroupTest.java index f2e9f34d611..daed93c5350 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/AtsUserGroupTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/AtsUserGroupTest.java @@ -1,17 +1,20 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.util; import java.util.Arrays; -import org.eclipse.osee.ats.core.AbstractUserTest; +import org.eclipse.osee.ats.core.users.AbstractUserTest; import org.junit.Assert; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/HoursSpentUtilTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/HoursSpentUtilTest.java index 233d72a2043..4786859a586 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/HoursSpentUtilTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/HoursSpentUtilTest.java @@ -1,27 +1,28 @@ -/******************************************************************************* - * Copyright (c) 2014 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2014 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.util; import static org.mockito.Mockito.when; import java.util.ArrayList; import java.util.Arrays; -import org.eclipse.osee.ats.api.IAtsServices; +import org.eclipse.osee.ats.api.AtsApi; import org.eclipse.osee.ats.api.review.IAtsAbstractReview; -import org.eclipse.osee.ats.api.review.IAtsReviewServiceProvider; import org.eclipse.osee.ats.api.task.IAtsTaskService; import org.eclipse.osee.ats.api.user.IAtsUserService; import org.eclipse.osee.ats.api.workdef.IAtsWorkDefinitionService; import org.eclipse.osee.ats.api.workdef.IAttributeResolver; import org.eclipse.osee.ats.api.workdef.StateType; -import org.eclipse.osee.ats.api.workflow.IAtsBranchServiceProvider; import org.eclipse.osee.ats.api.workflow.IAtsTask; import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; import org.eclipse.osee.ats.api.workflow.IAtsWorkItemService; @@ -55,9 +56,7 @@ public class HoursSpentUtilTest { @Mock IAtsWorkDefinitionService workDefService; @Mock IAtsWorkItemServiceProvider workItemServiceProvider; @Mock IAttributeResolver attrResolver; - @Mock IAtsBranchServiceProvider branchServiceProvider; - @Mock IAtsReviewServiceProvider reviewServiceProvider; - @Mock IAtsServices services; + @Mock AtsApi atsApi; // @formatter:on @@ -78,17 +77,17 @@ public class HoursSpentUtilTest { when(wfStateMgr.getHoursSpent("Authorize")).thenReturn(0.0); when(wfStateMgr.getHoursSpent("Implement")).thenReturn(18.0); - when(services.getAttributeResolver()).thenReturn(attrResolver); - when(services.getUserService()).thenReturn(userService); - when(services.getTaskService()).thenReturn(taskService); - when(services.getWorkItemService()).thenReturn(workItemService); + when(atsApi.getAttributeResolver()).thenReturn(attrResolver); + when(atsApi.getUserService()).thenReturn(userService); + when(atsApi.getTaskService()).thenReturn(taskService); + when(atsApi.getWorkItemService()).thenReturn(workItemService); } @Test public void testGetHoursSpentTotalWithState() { double hours = - HoursSpentUtil.getHoursSpentTotal(teamWf, new SimpleTeamState("Implement", StateType.Working), services); + HoursSpentUtil.getHoursSpentTotal(teamWf, new SimpleTeamState("Implement", StateType.Working), atsApi); Assert.assertEquals(20.0, hours, 0); } @@ -107,7 +106,7 @@ public class HoursSpentUtilTest { when(prStateMgr.getHoursSpent("In-Work")).thenReturn(5.0); when(prStateMgr.getHoursSpent("Complete")).thenReturn(4.0); - double hours = HoursSpentUtil.getHoursSpentTotal(teamWf, services); + double hours = HoursSpentUtil.getHoursSpentTotal(teamWf, atsApi); Assert.assertEquals(35.0, hours, 0); } @@ -120,7 +119,7 @@ public class HoursSpentUtilTest { when(taskStateMgr.getHoursSpent("In-Work")).thenReturn(6.0); when(taskStateMgr.getHoursSpent("Complete")).thenReturn(4.0); - double hours = HoursSpentUtil.getHoursSpentFromTasks(teamWf, services); + double hours = HoursSpentUtil.getHoursSpentFromTasks(teamWf, atsApi); Assert.assertEquals(10.0, hours, 0); } @@ -137,17 +136,17 @@ public class HoursSpentUtilTest { SimpleTeamState relatedToState = new SimpleTeamState("In-Work", StateType.Working); when(taskService.getTasks(teamWf, relatedToState)).thenReturn(Arrays.asList(task2)); - double hours = HoursSpentUtil.getHoursSpentFromStateTasks(teamWf, relatedToState, services); + double hours = HoursSpentUtil.getHoursSpentFromStateTasks(teamWf, relatedToState, atsApi); Assert.assertEquals(6.0, hours, 0); relatedToState = new SimpleTeamState("Complete", StateType.Working); when(taskService.getTasks(teamWf, relatedToState)).thenReturn(Arrays.asList(task2, task3)); - hours = HoursSpentUtil.getHoursSpentFromStateTasks(teamWf, relatedToState, services); + hours = HoursSpentUtil.getHoursSpentFromStateTasks(teamWf, relatedToState, atsApi); Assert.assertEquals(12.0, hours, 0); relatedToState = new SimpleTeamState("Implement", StateType.Working); when(taskService.getTasks(teamWf, relatedToState)).thenReturn(new ArrayList<IAtsTask>()); - hours = HoursSpentUtil.getHoursSpentFromStateTasks(teamWf, relatedToState, services); + hours = HoursSpentUtil.getHoursSpentFromStateTasks(teamWf, relatedToState, atsApi); Assert.assertEquals(0.0, hours, 0); } @@ -157,12 +156,12 @@ public class HoursSpentUtilTest { SimpleTeamState relatedToState = new SimpleTeamState("In-Work", StateType.Working); when(workItemService.getReviews(teamWf, relatedToState)).thenReturn(Arrays.asList(pr1)); - double hours = HoursSpentUtil.getHoursSpentStateReview(teamWf, relatedToState, services); + double hours = HoursSpentUtil.getHoursSpentStateReview(teamWf, relatedToState, atsApi); Assert.assertEquals(2.0, hours, 0); relatedToState = new SimpleTeamState("Implement", StateType.Working); when(workItemService.getReviews(teamWf, relatedToState)).thenReturn(new ArrayList<IAtsAbstractReview>()); - hours = HoursSpentUtil.getHoursSpentStateReview(teamWf, relatedToState, services); + hours = HoursSpentUtil.getHoursSpentStateReview(teamWf, relatedToState, atsApi); Assert.assertEquals(0.0, hours, 0); } @@ -175,7 +174,7 @@ public class HoursSpentUtilTest { when(prStateMgr.getHoursSpent("In-Work")).thenReturn(0.0); when(prStateMgr.getHoursSpent("Complete")).thenReturn(15.0); - double hours = HoursSpentUtil.getHoursSpentReview(teamWf, services); + double hours = HoursSpentUtil.getHoursSpentReview(teamWf, atsApi); Assert.assertEquals(15.0, hours, 0); } diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/RecentlyVisitedItemsTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/RecentlyVisitedItemsTest.java new file mode 100644 index 00000000000..47c733bb86c --- /dev/null +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/RecentlyVisitedItemsTest.java @@ -0,0 +1,72 @@ +/********************************************************************* + * Copyright (c) 2015 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Boeing - initial API and implementation + **********************************************************************/ + +package org.eclipse.osee.ats.core.util; + +import static org.junit.Assert.assertEquals; +import static org.mockito.Mockito.when; +import java.util.Iterator; +import org.eclipse.osee.ats.api.IAtsWorkItem; +import org.eclipse.osee.ats.api.data.AtsArtifactTypes; +import org.eclipse.osee.framework.core.data.ArtifactToken; +import org.junit.Before; +import org.junit.Test; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +/** + * @author Donald G. Dunne + */ +public class RecentlyVisitedItemsTest { + + // @formatter:off + @Mock private IAtsWorkItem workItem1, workItem2, workItem3; + // @formatter:on + + @Before + public void setup() { + MockitoAnnotations.initMocks(this); + when(workItem1.getId()).thenReturn(12L); + when(workItem1.getArtifactToken()).thenReturn(ArtifactToken.valueOf(12L, "My Workflow")); + when(workItem1.getArtifactType()).thenReturn(AtsArtifactTypes.TeamWorkflow); + when(workItem2.getId()).thenReturn(13L); + when(workItem2.getArtifactToken()).thenReturn(ArtifactToken.valueOf(13, "My Task")); + when(workItem2.getArtifactType()).thenReturn(AtsArtifactTypes.Task); + when(workItem3.getId()).thenReturn(14L); + when(workItem3.getArtifactToken()).thenReturn(ArtifactToken.valueOf(14L, "My Review")); + when(workItem3.getArtifactType()).thenReturn(AtsArtifactTypes.PeerToPeerReview); + } + + @Test + public void test() { + RecentlyVisitedItems cache = new RecentlyVisitedItems(); + assertEquals(0, cache.visited.size()); + + cache.addVisited(workItem1); + assertEquals(1, cache.getReverseVisited().size()); + assertEquals(workItem1.getId(), cache.getReverseVisited().iterator().next().getIdToken().getId()); + + cache.addVisited(workItem2); + cache.addVisited(workItem3); + assertEquals(3, cache.getReverseVisited().size()); + Iterator<RecentlyVisistedItem> iterator = cache.getReverseVisited().iterator(); + assertEquals(workItem3.getId(), iterator.next().getIdToken().getId()); + assertEquals(workItem2.getId(), iterator.next().getIdToken().getId()); + assertEquals(workItem1.getId(), iterator.next().getIdToken().getId()); + + cache.clearVisited(); + assertEquals(0, cache.getReverseVisited().size()); + + } + +} diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/VisitedItemCacheTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/VisitedItemCacheTest.java deleted file mode 100644 index 020b0e20022..00000000000 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/VisitedItemCacheTest.java +++ /dev/null @@ -1,61 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.ats.core.util; - -import static org.junit.Assert.assertEquals; -import static org.mockito.Mockito.when; -import java.util.Iterator; -import org.eclipse.osee.ats.api.IAtsWorkItem; -import org.junit.Before; -import org.junit.Test; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; - -/** - * @author Donald G. Dunne - */ -public class VisitedItemCacheTest { - - // @formatter:off - @Mock private IAtsWorkItem workItem1, workItem2, workItem3; - // @formatter:on - - @Before - public void setup() { - MockitoAnnotations.initMocks(this); - when(workItem1.getId()).thenReturn(12L); - when(workItem2.getId()).thenReturn(13L); - when(workItem3.getId()).thenReturn(14L); - } - - @Test - public void test() { - VisitedItemCache cache = new VisitedItemCache(); - assertEquals(0, cache.visitedUuids.size()); - - cache.addVisited(workItem1); - assertEquals(1, cache.getReverseVisited().size()); - assertEquals(workItem1.getId(), cache.getReverseVisited().iterator().next().getId()); - - cache.addVisited(workItem2); - cache.addVisited(workItem3); - assertEquals(3, cache.getReverseVisited().size()); - Iterator<IAtsWorkItem> iterator = cache.getReverseVisited().iterator(); - assertEquals(workItem3.getId(), iterator.next().getId()); - assertEquals(workItem2.getId(), iterator.next().getId()); - assertEquals(workItem1.getId(), iterator.next().getId()); - - cache.clearVisited(); - assertEquals(0, cache.getReverseVisited().size()); - - } - -} diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsCoreXWidgetValidatorProviderTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsCoreXWidgetValidatorProviderTest.java index 3158e8fdcad..57bc2cb196c 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsCoreXWidgetValidatorProviderTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsCoreXWidgetValidatorProviderTest.java @@ -1,13 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.validator; import org.junit.Assert; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsCore_Validator_JT_Suite.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsCore_Validator_JT_Suite.java index c1ebba65187..52fc0867f5c 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsCore_Validator_JT_Suite.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsCore_Validator_JT_Suite.java @@ -1,13 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2004, 2007 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.validator; import org.eclipse.osee.framework.jdk.core.util.OseeProperties; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXComboBooleanValidatorTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXComboBooleanValidatorTest.java index b50de1421b1..2dda9f26df8 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXComboBooleanValidatorTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXComboBooleanValidatorTest.java @@ -1,27 +1,29 @@ -/******************************************************************************* - * Copyright (c) 2011 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2011 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.validator; import static org.mockito.MockitoAnnotations.initMocks; import java.util.Arrays; -import org.eclipse.osee.ats.api.IAtsServices; +import org.eclipse.osee.ats.api.AtsApi; import org.eclipse.osee.ats.api.IAtsWorkItem; import org.eclipse.osee.ats.api.workdef.StateType; import org.eclipse.osee.ats.api.workdef.WidgetOption; import org.eclipse.osee.ats.api.workdef.WidgetResult; import org.eclipse.osee.ats.api.workdef.WidgetStatus; -import org.eclipse.osee.ats.mocks.MockStateDefinition; -import org.eclipse.osee.ats.mocks.MockValueProvider; -import org.eclipse.osee.ats.mocks.MockWidgetDefinition; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; +import org.eclipse.osee.ats.api.workdef.model.StateDefinition; +import org.eclipse.osee.ats.api.workdef.model.WidgetDefinition; +import org.eclipse.osee.ats.core.util.StringValueProvider; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -35,7 +37,7 @@ import org.mockito.Mock; public class AtsXComboBooleanValidatorTest { private AtsXComboBooleanValidator validator; - private IAtsServices atsServices; + private AtsApi atsServices; // @formatter:off @Mock IAtsWorkItem workItem; @@ -50,13 +52,13 @@ public class AtsXComboBooleanValidatorTest { } @Test - public void testValidateTransition() throws OseeCoreException { - MockWidgetDefinition widgetDef = new MockWidgetDefinition("test"); + public void testValidateTransition() { + WidgetDefinition widgetDef = new WidgetDefinition("test"); widgetDef.setXWidgetName("xLabel"); - MockStateDefinition fromStateDef = new MockStateDefinition("from"); + StateDefinition fromStateDef = new StateDefinition("from"); fromStateDef.setStateType(StateType.Working); - MockStateDefinition toStateDef = new MockStateDefinition("to"); + StateDefinition toStateDef = new StateDefinition("to"); toStateDef.setStateType(StateType.Working); // Valid for anything not XIntegerDam @@ -78,17 +80,17 @@ public class AtsXComboBooleanValidatorTest { Assert.assertEquals(WidgetStatus.Invalid_Incompleted, result.getStatus()); // Check for "true" value - MockValueProvider valueProvider = new MockValueProvider(Arrays.asList("true")); + StringValueProvider valueProvider = new StringValueProvider(Arrays.asList("true")); result = validator.validateTransition(workItem, valueProvider, widgetDef, fromStateDef, toStateDef, atsServices); - Assert.assertEquals(WidgetStatus.Valid, result.getStatus()); + Assert.assertEquals(WidgetStatus.Success, result.getStatus()); // Check for "false" value - valueProvider = new MockValueProvider(Arrays.asList("false")); + valueProvider = new StringValueProvider(Arrays.asList("false")); result = validator.validateTransition(workItem, valueProvider, widgetDef, fromStateDef, toStateDef, atsServices); - Assert.assertEquals(WidgetStatus.Valid, result.getStatus()); + Assert.assertEquals(WidgetStatus.Success, result.getStatus()); // Check for "junk" value - valueProvider = new MockValueProvider(Arrays.asList("junk")); + valueProvider = new StringValueProvider(Arrays.asList("junk")); result = validator.validateTransition(workItem, valueProvider, widgetDef, fromStateDef, toStateDef, atsServices); Assert.assertEquals(WidgetStatus.Invalid_Range, result.getStatus()); } diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXComboValidatorTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXComboValidatorTest.java index 2524ffa7dd3..ba95a6b5374 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXComboValidatorTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXComboValidatorTest.java @@ -1,24 +1,26 @@ -/******************************************************************************* - * Copyright (c) 2011 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2011 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.validator; -import org.eclipse.osee.ats.api.IAtsServices; +import org.eclipse.osee.ats.api.AtsApi; import org.eclipse.osee.ats.api.IAtsWorkItem; import org.eclipse.osee.ats.api.workdef.StateType; import org.eclipse.osee.ats.api.workdef.WidgetOption; import org.eclipse.osee.ats.api.workdef.WidgetResult; import org.eclipse.osee.ats.api.workdef.WidgetStatus; -import org.eclipse.osee.ats.mocks.MockStateDefinition; -import org.eclipse.osee.ats.mocks.MockWidgetDefinition; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; +import org.eclipse.osee.ats.api.workdef.model.StateDefinition; +import org.eclipse.osee.ats.api.workdef.model.WidgetDefinition; import org.junit.Assert; import org.mockito.Mock; @@ -26,22 +28,22 @@ import org.mockito.Mock; * @author Donald G. Dunne */ public class AtsXComboValidatorTest { - private IAtsServices atsServices; + private AtsApi atsServices; // @formatter:off @Mock IAtsWorkItem workItem; // @formatter:on @org.junit.Test - public void testValidateTransition() throws OseeCoreException { + public void testValidateTransition() { AtsXComboValidator validator = new AtsXComboValidator(); - MockWidgetDefinition widgetDef = new MockWidgetDefinition("test"); + WidgetDefinition widgetDef = new WidgetDefinition("test"); widgetDef.setXWidgetName("xLabel"); - MockStateDefinition fromStateDef = new MockStateDefinition("from"); + StateDefinition fromStateDef = new StateDefinition("from"); fromStateDef.setStateType(StateType.Working); - MockStateDefinition toStateDef = new MockStateDefinition("to"); + StateDefinition toStateDef = new StateDefinition("to"); toStateDef.setStateType(StateType.Working); // Valid for anything not XIntegerDam diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXDateValidatorTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXDateValidatorTest.java index 5c3585a3651..719cf18be7d 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXDateValidatorTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXDateValidatorTest.java @@ -1,28 +1,30 @@ -/******************************************************************************* - * Copyright (c) 2011 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2011 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.validator; import java.util.Arrays; import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; -import org.eclipse.osee.ats.api.IAtsServices; +import org.eclipse.osee.ats.api.AtsApi; import org.eclipse.osee.ats.api.IAtsWorkItem; import org.eclipse.osee.ats.api.workdef.StateType; import org.eclipse.osee.ats.api.workdef.WidgetOption; import org.eclipse.osee.ats.api.workdef.WidgetResult; import org.eclipse.osee.ats.api.workdef.WidgetStatus; -import org.eclipse.osee.ats.mocks.MockStateDefinition; -import org.eclipse.osee.ats.mocks.MockWidgetDefinition; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; +import org.eclipse.osee.ats.api.workdef.model.StateDefinition; +import org.eclipse.osee.ats.api.workdef.model.WidgetDefinition; import org.junit.Assert; import org.mockito.Mock; @@ -30,22 +32,22 @@ import org.mockito.Mock; * @author Donald G. Dunne */ public class AtsXDateValidatorTest { - private IAtsServices atsServices; + private AtsApi atsServices; // @formatter:off @Mock IAtsWorkItem workItem; // @formatter:on @org.junit.Test - public void testValidateTransition() throws OseeCoreException { + public void testValidateTransition() { AtsXDateValidator validator = new AtsXDateValidator(); - MockWidgetDefinition widgetDef = new MockWidgetDefinition("test"); + WidgetDefinition widgetDef = new WidgetDefinition("test"); widgetDef.setXWidgetName("xList"); - MockStateDefinition fromStateDef = new MockStateDefinition("from"); + StateDefinition fromStateDef = new StateDefinition("from"); fromStateDef.setStateType(StateType.Working); - MockStateDefinition toStateDef = new MockStateDefinition("to"); + StateDefinition toStateDef = new StateDefinition("to"); toStateDef.setStateType(StateType.Working); // Valid for anything not XIntegerDam @@ -68,15 +70,15 @@ public class AtsXDateValidatorTest { } @org.junit.Test - public void testValidateTransition_validDate() throws OseeCoreException { + public void testValidateTransition_validDate() { AtsXDateValidator validator = new AtsXDateValidator(); - MockWidgetDefinition widgetDef = new MockWidgetDefinition("test"); + WidgetDefinition widgetDef = new WidgetDefinition("test"); widgetDef.setXWidgetName("XDateDam"); - MockStateDefinition fromStateDef = new MockStateDefinition("from"); + StateDefinition fromStateDef = new StateDefinition("from"); fromStateDef.setStateType(StateType.Working); - MockStateDefinition toStateDef = new MockStateDefinition("to"); + StateDefinition toStateDef = new StateDefinition("to"); toStateDef.setStateType(StateType.Working); MockDateValueProvider dateProvider = new MockDateValueProvider(Arrays.asList(new Date())); @@ -84,20 +86,20 @@ public class AtsXDateValidatorTest { // Valid for valid date WidgetResult result = validator.validateTransition(workItem, dateProvider, widgetDef, fromStateDef, toStateDef, atsServices); - Assert.assertEquals(WidgetStatus.Valid, result.getStatus()); + Assert.assertEquals(WidgetStatus.Success, result.getStatus()); } @org.junit.Test - public void testValidateTransition_validRange() throws OseeCoreException { + public void testValidateTransition_validRange() { AtsXDateValidator validator = new AtsXDateValidator(); - MockWidgetDefinition widgetDef = new MockWidgetDefinition("test"); + WidgetDefinition widgetDef = new WidgetDefinition("test"); widgetDef.setXWidgetName("XDateDam"); widgetDef.getOptions().add(WidgetOption.FUTURE_DATE_REQUIRED); - MockStateDefinition fromStateDef = new MockStateDefinition("from"); + StateDefinition fromStateDef = new StateDefinition("from"); fromStateDef.setStateType(StateType.Working); - MockStateDefinition toStateDef = new MockStateDefinition("to"); + StateDefinition toStateDef = new StateDefinition("to"); toStateDef.setStateType(StateType.Working); Calendar cal = new GregorianCalendar(2010, 02, 05); diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXListValidatorTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXListValidatorTest.java index d5ba247f1a1..87b426491c4 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXListValidatorTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXListValidatorTest.java @@ -1,26 +1,28 @@ -/******************************************************************************* - * Copyright (c) 2011 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2011 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.validator; import java.util.Arrays; -import org.eclipse.osee.ats.api.IAtsServices; +import org.eclipse.osee.ats.api.AtsApi; import org.eclipse.osee.ats.api.IAtsWorkItem; import org.eclipse.osee.ats.api.workdef.StateType; import org.eclipse.osee.ats.api.workdef.WidgetOption; import org.eclipse.osee.ats.api.workdef.WidgetResult; import org.eclipse.osee.ats.api.workdef.WidgetStatus; -import org.eclipse.osee.ats.mocks.MockStateDefinition; -import org.eclipse.osee.ats.mocks.MockValueProvider; -import org.eclipse.osee.ats.mocks.MockWidgetDefinition; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; +import org.eclipse.osee.ats.api.workdef.model.StateDefinition; +import org.eclipse.osee.ats.api.workdef.model.WidgetDefinition; +import org.eclipse.osee.ats.core.util.StringValueProvider; import org.junit.Assert; import org.mockito.Mock; @@ -28,21 +30,21 @@ import org.mockito.Mock; * @author Donald G. Dunne */ public class AtsXListValidatorTest { - private IAtsServices atsServices; + private AtsApi atsServices; // @formatter:off @Mock IAtsWorkItem workItem; // @formatter:on @org.junit.Test - public void testValidateTransition() throws OseeCoreException { + public void testValidateTransition() { AtsXListValidator validator = new AtsXListValidator(); - MockWidgetDefinition widgetDef = new MockWidgetDefinition("test"); + WidgetDefinition widgetDef = new WidgetDefinition("test"); widgetDef.setXWidgetName("xLabel"); - MockStateDefinition fromStateDef = new MockStateDefinition("from"); + StateDefinition fromStateDef = new StateDefinition("from"); fromStateDef.setStateType(StateType.Working); - MockStateDefinition toStateDef = new MockStateDefinition("to"); + StateDefinition toStateDef = new StateDefinition("to"); toStateDef.setStateType(StateType.Working); // Valid for anything not XIntegerDam @@ -65,16 +67,16 @@ public class AtsXListValidatorTest { } @org.junit.Test - public void testValidateTransition_MinMaxConstraint() throws OseeCoreException { + public void testValidateTransition_MinMaxConstraint() { AtsXListValidator validator = new AtsXListValidator(); - MockWidgetDefinition widgetDef = new MockWidgetDefinition("test"); + WidgetDefinition widgetDef = new WidgetDefinition("test"); widgetDef.setXWidgetName("XListDam"); widgetDef.setConstraint(0, 0); - MockStateDefinition fromStateDef = new MockStateDefinition("from"); + StateDefinition fromStateDef = new StateDefinition("from"); fromStateDef.setStateType(StateType.Working); - MockStateDefinition toStateDef = new MockStateDefinition("to"); + StateDefinition toStateDef = new StateDefinition("to"); toStateDef.setStateType(StateType.Working); // Valid is nothing entered @@ -84,19 +86,19 @@ public class AtsXListValidatorTest { //Invalid_Range if select more than supposed to widgetDef.setConstraint(0, 2); - MockValueProvider provider = new MockValueProvider(Arrays.asList("this", "is", "selected")); + StringValueProvider provider = new StringValueProvider(Arrays.asList("this", "is", "selected")); result = validator.validateTransition(workItem, provider, widgetDef, fromStateDef, toStateDef, atsServices); Assert.assertEquals(WidgetStatus.Invalid_Range, result.getStatus()); //Invalid_Range if less than supposed to widgetDef.setConstraint(2, 2); - provider = new MockValueProvider(Arrays.asList("this")); + provider = new StringValueProvider(Arrays.asList("this")); result = validator.validateTransition(workItem, provider, widgetDef, fromStateDef, toStateDef, atsServices); Assert.assertEquals(WidgetStatus.Invalid_Range, result.getStatus()); //Valid if less what supposed to widgetDef.setConstraint(2, 2); - provider = new MockValueProvider(Arrays.asList("this", "is")); + provider = new StringValueProvider(Arrays.asList("this", "is")); result = validator.validateTransition(workItem, provider, widgetDef, fromStateDef, toStateDef, atsServices); ValidatorTestUtil.assertValidResult(result); } diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXNumberValidatorTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXNumberValidatorTest.java index 2c7763da719..506c4b12a50 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXNumberValidatorTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXNumberValidatorTest.java @@ -1,26 +1,28 @@ -/******************************************************************************* - * Copyright (c) 2011 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2011 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.validator; import java.util.Arrays; -import org.eclipse.osee.ats.api.IAtsServices; +import org.eclipse.osee.ats.api.AtsApi; import org.eclipse.osee.ats.api.IAtsWorkItem; import org.eclipse.osee.ats.api.workdef.StateType; import org.eclipse.osee.ats.api.workdef.WidgetOption; import org.eclipse.osee.ats.api.workdef.WidgetResult; import org.eclipse.osee.ats.api.workdef.WidgetStatus; -import org.eclipse.osee.ats.mocks.MockStateDefinition; -import org.eclipse.osee.ats.mocks.MockValueProvider; -import org.eclipse.osee.ats.mocks.MockWidgetDefinition; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; +import org.eclipse.osee.ats.api.workdef.model.StateDefinition; +import org.eclipse.osee.ats.api.workdef.model.WidgetDefinition; +import org.eclipse.osee.ats.core.util.StringValueProvider; import org.junit.Assert; import org.mockito.Mock; @@ -28,21 +30,21 @@ import org.mockito.Mock; * @author Donald G. Dunne */ public class AtsXNumberValidatorTest { - private IAtsServices atsServices; + private AtsApi atsServices; // @formatter:off @Mock IAtsWorkItem workItem; // @formatter:on @org.junit.Test - public void testValidateTransition() throws OseeCoreException { + public void testValidateTransition() { AtsXNumberValidator validator = new AtsXNumberValidator(); - MockWidgetDefinition widgetDef = new MockWidgetDefinition("test"); + WidgetDefinition widgetDef = new WidgetDefinition("test"); widgetDef.setXWidgetName("xList"); - MockStateDefinition fromStateDef = new MockStateDefinition("from"); + StateDefinition fromStateDef = new StateDefinition("from"); fromStateDef.setStateType(StateType.Working); - MockStateDefinition toStateDef = new MockStateDefinition("to"); + StateDefinition toStateDef = new StateDefinition("to"); toStateDef.setStateType(StateType.Working); // Valid for anything not XIntegerDam @@ -65,16 +67,16 @@ public class AtsXNumberValidatorTest { } @org.junit.Test - public void testValidateTransition_MinMaxConstraint() throws OseeCoreException { + public void testValidateTransition_MinMaxConstraint() { AtsXNumberValidator validator = new AtsXNumberValidator(); - MockWidgetDefinition widgetDef = new MockWidgetDefinition("test"); + WidgetDefinition widgetDef = new WidgetDefinition("test"); widgetDef.setXWidgetName("XFloatDam"); widgetDef.setConstraint(0.0, 0.0); - MockStateDefinition fromStateDef = new MockStateDefinition("from"); + StateDefinition fromStateDef = new StateDefinition("from"); fromStateDef.setStateType(StateType.Working); - MockStateDefinition toStateDef = new MockStateDefinition("to"); + StateDefinition toStateDef = new StateDefinition("to"); toStateDef.setStateType(StateType.Working); // Valid is nothing entered @@ -84,19 +86,19 @@ public class AtsXNumberValidatorTest { //Invalid_Range if > than what should be widgetDef.setConstraint(0.0, 2.0); - MockValueProvider provider = new MockValueProvider(Arrays.asList("0.0", "2.0", "3.0")); + StringValueProvider provider = new StringValueProvider(Arrays.asList("0.0", "2.0", "3.0")); result = validator.validateTransition(workItem, provider, widgetDef, fromStateDef, toStateDef, atsServices); Assert.assertEquals(WidgetStatus.Invalid_Range, result.getStatus()); //Invalid_Range if less than supposed to widgetDef.setConstraint(1.0, 2.0); - provider = new MockValueProvider(Arrays.asList("0.0")); + provider = new StringValueProvider(Arrays.asList("0.0")); result = validator.validateTransition(workItem, provider, widgetDef, fromStateDef, toStateDef, atsServices); Assert.assertEquals(WidgetStatus.Invalid_Range, result.getStatus()); //Valid if == what supposed to be widgetDef.setConstraint(2.0, 2.0); - provider = new MockValueProvider(Arrays.asList("2.0", "2.0")); + provider = new StringValueProvider(Arrays.asList("2.0", "2.0")); result = validator.validateTransition(workItem, provider, widgetDef, fromStateDef, toStateDef, atsServices); ValidatorTestUtil.assertValidResult(result); } diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXTextValidatorTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXTextValidatorTest.java index 56159af3e9e..0340314bf40 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXTextValidatorTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXTextValidatorTest.java @@ -1,24 +1,26 @@ -/******************************************************************************* - * Copyright (c) 2011 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2011 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.validator; -import org.eclipse.osee.ats.api.IAtsServices; +import org.eclipse.osee.ats.api.AtsApi; import org.eclipse.osee.ats.api.IAtsWorkItem; import org.eclipse.osee.ats.api.workdef.StateType; import org.eclipse.osee.ats.api.workdef.WidgetOption; import org.eclipse.osee.ats.api.workdef.WidgetResult; import org.eclipse.osee.ats.api.workdef.WidgetStatus; -import org.eclipse.osee.ats.mocks.MockStateDefinition; -import org.eclipse.osee.ats.mocks.MockWidgetDefinition; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; +import org.eclipse.osee.ats.api.workdef.model.StateDefinition; +import org.eclipse.osee.ats.api.workdef.model.WidgetDefinition; import org.junit.Assert; import org.mockito.Mock; @@ -26,21 +28,21 @@ import org.mockito.Mock; * @author Donald G. Dunne */ public class AtsXTextValidatorTest { - private IAtsServices atsServices; + private AtsApi atsServices; // @formatter:off @Mock IAtsWorkItem workItem; // @formatter:on @org.junit.Test - public void testValidateTransition() throws OseeCoreException { + public void testValidateTransition() { AtsXTextValidator validator = new AtsXTextValidator(); - MockWidgetDefinition widgetDef = new MockWidgetDefinition("test"); + WidgetDefinition widgetDef = new WidgetDefinition("test"); widgetDef.setXWidgetName("xList"); - MockStateDefinition fromStateDef = new MockStateDefinition("from"); + StateDefinition fromStateDef = new StateDefinition("from"); fromStateDef.setStateType(StateType.Working); - MockStateDefinition toStateDef = new MockStateDefinition("to"); + StateDefinition toStateDef = new StateDefinition("to"); toStateDef.setStateType(StateType.Working); // Valid for anything not XIntegerDam diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXWidgetValidateManagerTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXWidgetValidateManagerTest.java index dee41d2c283..e4fc958ff5b 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXWidgetValidateManagerTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXWidgetValidateManagerTest.java @@ -1,28 +1,31 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.validator; import java.util.Collection; import java.util.LinkedList; import java.util.List; -import org.eclipse.osee.ats.api.IAtsServices; +import org.eclipse.osee.ats.api.AtsApi; import org.eclipse.osee.ats.api.IAtsWorkItem; import org.eclipse.osee.ats.api.util.IValueProvider; import org.eclipse.osee.ats.api.workdef.IAtsStateDefinition; import org.eclipse.osee.ats.api.workdef.IAtsWidgetDefinition; import org.eclipse.osee.ats.api.workdef.WidgetResult; import org.eclipse.osee.ats.api.workdef.WidgetStatus; +import org.eclipse.osee.ats.api.workdef.model.WidgetDefinition; import org.eclipse.osee.ats.api.workflow.transition.IAtsXWidgetValidator; import org.eclipse.osee.ats.api.workflow.transition.IAtsXWidgetValidatorProvider; -import org.eclipse.osee.ats.mocks.MockWidgetDefinition; import org.eclipse.osee.framework.jdk.core.type.OseeStateException; import org.junit.Assert; import org.junit.Test; @@ -34,7 +37,7 @@ import org.mockito.Mock; * @author Donald G. Dunne */ public class AtsXWidgetValidateManagerTest { - IAtsServices atsServices; + AtsApi atsServices; // @formatter:off @Mock IAtsWorkItem workItem; // @formatter:on @@ -83,39 +86,39 @@ public class AtsXWidgetValidateManagerTest { TestValidatorProvider provider = new TestValidatorProvider(new AtsExceptionValidator()); manager.addWidgetValidatorProvider(provider); - MockWidgetDefinition widgetDef = new MockWidgetDefinition("Widget Name"); + WidgetDefinition widgetDef = new WidgetDefinition("Widget Name"); widgetDef.setXWidgetName("XTestWidget"); AtsXWidgetValidateManager.validateTransition(workItem, results, ValidatorTestUtil.emptyValueProvider, widgetDef, null, null, atsServices); Assert.assertFalse(results.isEmpty()); Assert.assertEquals(results.iterator().next().getStatus(), WidgetStatus.Exception); Assert.assertEquals( - "Exception - Widget Name - Exception retriving validation for widget [AtsExceptionValidator] Exception [problem]", + "Exception - Exception retrieving validation for widget [AtsExceptionValidator] Exception [problem]", results.iterator().next().toString()); - Assert.assertTrue(results.iterator().next().getException() instanceof OseeStateException); + Assert.assertTrue(results.iterator().next().getException().contains("OseeStateException")); manager.removeWidgetValidatorProvider(provider); } private class AtsValidator implements IAtsXWidgetValidator { @Override - public WidgetResult validateTransition(IAtsWorkItem workItem, IValueProvider provider, IAtsWidgetDefinition widgetDef, IAtsStateDefinition fromStateDef, IAtsStateDefinition toStateDef, IAtsServices atsServices) { - return new WidgetResult(WidgetStatus.Valid, null, "Here it is"); + public WidgetResult validateTransition(IAtsWorkItem workItem, IValueProvider provider, IAtsWidgetDefinition widgetDef, IAtsStateDefinition fromStateDef, IAtsStateDefinition toStateDef, AtsApi atsServices) { + return new WidgetResult(WidgetStatus.Success, "Here it is"); } } private class AtsErrorValidator implements IAtsXWidgetValidator { @Override - public WidgetResult validateTransition(IAtsWorkItem workItem, IValueProvider provider, IAtsWidgetDefinition widgetDef, IAtsStateDefinition fromStateDef, IAtsStateDefinition toStateDef, IAtsServices atsServices) { - return new WidgetResult(WidgetStatus.Invalid_Incompleted, null, "Here it is"); + public WidgetResult validateTransition(IAtsWorkItem workItem, IValueProvider provider, IAtsWidgetDefinition widgetDef, IAtsStateDefinition fromStateDef, IAtsStateDefinition toStateDef, AtsApi atsServices) { + return new WidgetResult(WidgetStatus.Invalid_Incompleted, "Here it is"); } } private class AtsExceptionValidator implements IAtsXWidgetValidator { @Override - public WidgetResult validateTransition(IAtsWorkItem workItem, IValueProvider provider, IAtsWidgetDefinition widgetDef, IAtsStateDefinition fromStateDef, IAtsStateDefinition toStateDef, IAtsServices atsServices) throws OseeStateException { + public WidgetResult validateTransition(IAtsWorkItem workItem, IValueProvider provider, IAtsWidgetDefinition widgetDef, IAtsStateDefinition fromStateDef, IAtsStateDefinition toStateDef, AtsApi atsServices) { throw new OseeStateException("problem"); } diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXWidgetValidatorTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXWidgetValidatorTest.java index f3dd697256d..f5604689c82 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXWidgetValidatorTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXWidgetValidatorTest.java @@ -1,18 +1,21 @@ -/******************************************************************************* - * Copyright (c) 2011 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2011 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.validator; import java.util.Arrays; import java.util.Date; -import org.eclipse.osee.ats.api.IAtsServices; +import org.eclipse.osee.ats.api.AtsApi; import org.eclipse.osee.ats.api.IAtsWorkItem; import org.eclipse.osee.ats.api.util.IValueProvider; import org.eclipse.osee.ats.api.workdef.IAtsStateDefinition; @@ -21,10 +24,9 @@ import org.eclipse.osee.ats.api.workdef.StateType; import org.eclipse.osee.ats.api.workdef.WidgetOption; import org.eclipse.osee.ats.api.workdef.WidgetResult; import org.eclipse.osee.ats.api.workdef.WidgetStatus; -import org.eclipse.osee.ats.mocks.MockStateDefinition; -import org.eclipse.osee.ats.mocks.MockValueProvider; -import org.eclipse.osee.ats.mocks.MockWidgetDefinition; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; +import org.eclipse.osee.ats.api.workdef.model.StateDefinition; +import org.eclipse.osee.ats.api.workdef.model.WidgetDefinition; +import org.eclipse.osee.ats.core.util.StringValueProvider; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.junit.Assert; @@ -38,14 +40,14 @@ public class AtsXWidgetValidatorTest { private static AtsXWidgetValidator validator = new AtsXWidgetValidator() { @Override - public WidgetResult validateTransition(IAtsWorkItem workItem, IValueProvider valueProvider, IAtsWidgetDefinition widgetDef, IAtsStateDefinition fromStateDef, IAtsStateDefinition toStateDef, IAtsServices atsServices) { + public WidgetResult validateTransition(IAtsWorkItem workItem, IValueProvider valueProvider, IAtsWidgetDefinition widgetDef, IAtsStateDefinition fromStateDef, IAtsStateDefinition toStateDef, AtsApi atsServices) { return null; } }; @org.junit.Test public void testIsTransitionToComplete() { - MockStateDefinition stateDef = new MockStateDefinition("test state"); + StateDefinition stateDef = new StateDefinition("test state"); stateDef.setStateType(StateType.Working); Assert.assertFalse(validator.isTransitionToComplete(stateDef)); stateDef.setStateType(StateType.Completed); @@ -56,7 +58,7 @@ public class AtsXWidgetValidatorTest { @org.junit.Test public void testIsRequiredForTransition() { - MockWidgetDefinition widgetDef = new MockWidgetDefinition("test widget"); + WidgetDefinition widgetDef = new WidgetDefinition("test widget"); Assert.assertFalse(validator.isRequiredForTransition(widgetDef)); widgetDef.getOptions().add(WidgetOption.REQUIRED_FOR_TRANSITION); @@ -65,7 +67,7 @@ public class AtsXWidgetValidatorTest { @org.junit.Test public void testIsRequiredForCompleted() { - MockWidgetDefinition widgetDef = new MockWidgetDefinition("test widget"); + WidgetDefinition widgetDef = new WidgetDefinition("test widget"); Assert.assertFalse(validator.isRequiredForCompletion(widgetDef)); widgetDef.getOptions().add(WidgetOption.REQUIRED_FOR_COMPLETION); @@ -73,27 +75,26 @@ public class AtsXWidgetValidatorTest { } @org.junit.Test - public void testIsEmptyValue() throws OseeCoreException { + public void testIsEmptyValue() { Assert.assertTrue(validator.isEmptyValue(ValidatorTestUtil.emptyValueProvider)); - Assert.assertFalse(validator.isEmptyValue(new MockValueProvider(Arrays.asList("hello")))); + Assert.assertFalse(validator.isEmptyValue(new StringValueProvider(Arrays.asList("hello")))); } @org.junit.Test - public void testValidateWidgetIsRequired() throws OseeCoreException { - MockWidgetDefinition widgetDef = new MockWidgetDefinition("test"); + public void testValidateWidgetIsRequired() { + WidgetDefinition widgetDef = new WidgetDefinition("test"); widgetDef.getOptions().add(WidgetOption.REQUIRED_FOR_TRANSITION); - MockStateDefinition fromStateDef = new MockStateDefinition("from"); + StateDefinition fromStateDef = new StateDefinition("from"); fromStateDef.setStateType(StateType.Working); - MockStateDefinition toStateDef = new MockStateDefinition("to"); + StateDefinition toStateDef = new StateDefinition("to"); toStateDef.setStateType(StateType.Working); // widget required_for_transition, state is working state returns incomplete state and details WidgetResult result = validator.validateWidgetIsRequired(ValidatorTestUtil.emptyValueProvider, widgetDef, fromStateDef, toStateDef); Assert.assertEquals(WidgetStatus.Invalid_Incompleted, result.getStatus()); - Assert.assertEquals(widgetDef.getName(), result.getWidgetDef().getName()); Assert.assertTrue(Strings.isValid(result.getDetails())); toStateDef.setName("completed"); @@ -103,7 +104,6 @@ public class AtsXWidgetValidatorTest { result = validator.validateWidgetIsRequired(ValidatorTestUtil.emptyValueProvider, widgetDef, fromStateDef, toStateDef); Assert.assertEquals(WidgetStatus.Invalid_Incompleted, result.getStatus()); - Assert.assertEquals(widgetDef.getName(), result.getWidgetDef().getName()); Assert.assertTrue(Strings.isValid(result.getDetails())); // change widget to required_for_completed, turn off required_for_transition @@ -125,16 +125,15 @@ public class AtsXWidgetValidatorTest { result = validator.validateWidgetIsRequired(ValidatorTestUtil.emptyValueProvider, widgetDef, fromStateDef, toStateDef); Assert.assertEquals(WidgetStatus.Invalid_Incompleted, result.getStatus()); - Assert.assertEquals(widgetDef.getName(), result.getWidgetDef().getName()); Assert.assertTrue(Strings.isValid(result.getDetails())); } @org.junit.Test - public void testIsValidDate() throws OseeCoreException { - MockWidgetDefinition widgetDef = new MockWidgetDefinition("test"); + public void testIsValidDate() { + WidgetDefinition widgetDef = new WidgetDefinition("test"); WidgetResult result = validator.isValidDate(new MockDateValueProvider(Arrays.asList(new Date())), widgetDef); - Assert.assertEquals(WidgetStatus.Valid, result.getStatus()); + Assert.assertEquals(WidgetStatus.Success, result.getStatus()); } diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/MockDateValueProvider.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/MockDateValueProvider.java index b73f9524e62..3866801d66c 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/MockDateValueProvider.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/MockDateValueProvider.java @@ -1,23 +1,26 @@ -/******************************************************************************* - * Copyright (c) 2011 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2011 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.validator; import java.util.Collection; import java.util.Date; -import org.eclipse.osee.ats.mocks.MockValueProvider; +import org.eclipse.osee.ats.core.util.StringValueProvider; /** * @author Donald G. Dunne */ -public class MockDateValueProvider extends MockValueProvider { +public class MockDateValueProvider extends StringValueProvider { private final Collection<Date> dateValues; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/ValidatorTestUtil.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/ValidatorTestUtil.java index 81075290d11..035f835c141 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/ValidatorTestUtil.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/ValidatorTestUtil.java @@ -1,19 +1,22 @@ -/******************************************************************************* - * Copyright (c) 2011 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2011 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.validator; import java.util.ArrayList; import org.eclipse.osee.ats.api.workdef.WidgetResult; import org.eclipse.osee.ats.api.workdef.WidgetStatus; -import org.eclipse.osee.ats.mocks.MockValueProvider; +import org.eclipse.osee.ats.core.util.StringValueProvider; import org.junit.Assert; /** @@ -21,12 +24,11 @@ import org.junit.Assert; */ public class ValidatorTestUtil { - public static MockValueProvider emptyValueProvider = new MockValueProvider(new ArrayList<String>()); + public static StringValueProvider emptyValueProvider = new StringValueProvider(new ArrayList<String>()); public static void assertValidResult(WidgetResult result) { - Assert.assertEquals(WidgetStatus.Valid, result.getStatus()); - Assert.assertNull(result.getWidgetDef()); - Assert.assertEquals(WidgetStatus.Valid.name(), result.getDetails()); + Assert.assertEquals(WidgetStatus.Success, result.getStatus()); + Assert.assertEquals(WidgetStatus.Success.getName(), result.getDetails()); } } diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/WidgetStatusTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/WidgetStatusTest.java index 7706d27f4d4..0b1fbccf1ae 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/WidgetStatusTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/WidgetStatusTest.java @@ -1,13 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.validator; import org.eclipse.osee.ats.api.workdef.WidgetStatus; @@ -21,21 +24,22 @@ public class WidgetStatusTest { @Test public void test() { - Assert.assertTrue(WidgetStatus.Valid.isValid()); - Assert.assertFalse(WidgetStatus.Empty.isValid()); + Assert.assertTrue(WidgetStatus.Success.isSuccess()); + Assert.assertFalse(WidgetStatus.Empty.isSuccess()); Assert.assertTrue(WidgetStatus.Empty.isEmpty()); - Assert.assertFalse(WidgetStatus.Valid.isEmpty()); + Assert.assertFalse(WidgetStatus.Success.isEmpty()); } @Test public void testValues() { - Assert.assertEquals(6, WidgetStatus.values().length); + Assert.assertEquals(7, WidgetStatus.instance.values().size()); } @Test - public void testValueOf() { - Assert.assertEquals(WidgetStatus.Empty, WidgetStatus.valueOf(WidgetStatus.Empty.name())); + public void testOrdinals() { + Assert.assertEquals(new Long(0), WidgetStatus.None.getId()); + Assert.assertEquals(new Long(1), WidgetStatus.Success.getId()); } } diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/AbstractWorkDefItemTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/AbstractWorkDefItemTest.java new file mode 100644 index 00000000000..eea730d61d0 --- /dev/null +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/AbstractWorkDefItemTest.java @@ -0,0 +1,35 @@ +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Boeing - initial API and implementation + **********************************************************************/ + +package org.eclipse.osee.ats.core.workdef; + +import org.eclipse.osee.ats.api.workdef.model.AbstractWorkDefItem; +import org.junit.Assert; +import org.junit.Test; + +/** + * Test case for {@link AbstractWorkDefItem} + * + * @author Donald G. Dunne + */ +public class AbstractWorkDefItemTest { + + @Test + public void testToString() { + AbstractWorkDefItem item = new AbstractWorkDefItem(15L, "name"); + Assert.assertEquals("name", item.toString()); + item.setName("that"); + Assert.assertEquals("that", item.toString()); + } + +} diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/AtsCore_WorkDef_JT_Suite.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/AtsCore_WorkDef_JT_Suite.java index 2f3b4a68f90..b3df5a399b2 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/AtsCore_WorkDef_JT_Suite.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/AtsCore_WorkDef_JT_Suite.java @@ -1,13 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2004, 2007 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.workdef; import org.junit.runner.RunWith; @@ -15,13 +18,21 @@ import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses({ - AtsWorkDefinitionAdminImplTest.class, - WorkDefinitionMatchTest.class, - WorkDefinitionSheetTest.class, + AtsWorkDefinitionServiceImplTest.class, + WorkDefBuilderTest.class, StateEventTypeTest.class, StateColorTest.class, RuleDefinitionOptionTest.class, - ReviewBlockTypeTest.class}) + ReviewBlockTypeTest.class, + AbstractWorkDefItemTest.class, + CompositeStateItemTest.class, + DecisionReviewDefinitionTest.class, + DecisionReviewOptionTest.class, + PeerReviewDefinitionTest.class, + StateDefinitionTest.class, + WidgetOptionHandlerTest.class, + WidgetOptionTest.class, + WidgetDefinitionTest.class}) /** * This test suite contains tests that can be run as stand-alone JUnit tests (JT) * diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/AtsWorkDefinitionAdminImplTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/AtsWorkDefinitionAdminImplTest.java deleted file mode 100644 index d2c7be2007d..00000000000 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/AtsWorkDefinitionAdminImplTest.java +++ /dev/null @@ -1,238 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2012 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.ats.core.workdef; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; -import static org.mockito.Mockito.when; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import org.eclipse.osee.ats.api.IAtsServices; -import org.eclipse.osee.ats.api.ai.IAtsActionableItem; -import org.eclipse.osee.ats.api.data.AtsAttributeTypes; -import org.eclipse.osee.ats.api.review.IAtsPeerToPeerReview; -import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; -import org.eclipse.osee.ats.api.workdef.IAtsWorkDefinition; -import org.eclipse.osee.ats.api.workdef.IAtsWorkDefinitionAdmin; -import org.eclipse.osee.ats.api.workdef.IAtsWorkDefinitionService; -import org.eclipse.osee.ats.api.workdef.IAtsWorkDefinitionStore; -import org.eclipse.osee.ats.api.workdef.IAttributeResolver; -import org.eclipse.osee.ats.api.workdef.IWorkDefinitionMatch; -import org.eclipse.osee.ats.api.workflow.IAtsTask; -import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; -import org.eclipse.osee.ats.api.workflow.IAtsWorkItemService; -import org.eclipse.osee.ats.api.workflow.ITeamWorkflowProvidersLazy; -import org.eclipse.osee.framework.core.util.XResultData; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; -import org.junit.Before; -import org.junit.Test; -import org.mockito.Matchers; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; - -/** - * Test case for {@link AtsWorkDefinitionAdminImpl} - * - * @author Donald G. Dunne - */ -public class AtsWorkDefinitionAdminImplTest { - - private static final String MyPeerToPeerWorkDefId = "myPeerToPeerWorkDef"; - private static final String MyTaskWorkDefId = "WorkDef_Task_Test_Review"; - - // @formatter:off - @Mock IAtsTeamDefinition topTeamDef; - @Mock IAtsTeamDefinition projTeamDef; - @Mock IAtsTeamDefinition featureTeamDef; - @Mock IAtsWorkItemService workItemService; - @Mock IAtsWorkDefinitionService workDefinitionService; - @Mock IAtsWorkDefinitionStore workDefinitionStore; - @Mock IAtsActionableItem actionableItem; - @Mock IAtsPeerToPeerReview peerReview; - @Mock XResultData resultData; - @Mock IAtsTeamWorkflow teamWf; - @Mock IAtsWorkDefinition defaultPeerToPeerWorkDef; - @Mock IAtsWorkDefinition myPeerToPeerWorkDef; - @Mock IAtsWorkDefinition myTaskWorkDef; - @Mock ITeamWorkflowProvidersLazy teamWorkflowProviders; - @Mock AtsWorkDefinitionCache workDefCache; - @Mock IAttributeResolver attributeResolver; - @Mock IAtsTask task; - @Mock IAtsServices services; - - private AtsWorkDefinitionAdminImpl workDefAmin; - - // @formatter:on - - @Before - public void setup() throws Exception { - MockitoAnnotations.initMocks(this); - when(topTeamDef.getParentTeamDef()).thenReturn(null); - when(projTeamDef.getParentTeamDef()).thenReturn(topTeamDef); - when(featureTeamDef.getParentTeamDef()).thenReturn(projTeamDef); - // always return default when requested - when(workDefinitionService.getWorkDef(eq(IAtsWorkDefinitionAdmin.PeerToPeerDefaultWorkflowDefinitionId), - any(XResultData.class))).thenReturn(defaultPeerToPeerWorkDef); - // always return myPeerToPeerWorkDef when requested - when(workDefinitionService.getWorkDef(eq(MyPeerToPeerWorkDefId), any(XResultData.class))).thenReturn( - myPeerToPeerWorkDef); - - workDefAmin = - new AtsWorkDefinitionAdminImpl(workDefCache, workDefinitionService, attributeResolver, teamWorkflowProviders); - } - - @Test - public void testGetDefaultPeerToPeerWorkflowDefinitionMatch() throws OseeCoreException { - assertEquals(defaultPeerToPeerWorkDef, - workDefAmin.getDefaultPeerToPeerWorkflowDefinitionMatch().getWorkDefinition()); - } - - /** - * When peerReview has no WorkDefinition attribute set, then default peer review WorkDefinition is returned - */ - @Test - public void testGetWorkDefinitionForPeerToPeerReview_deafault() throws Exception { - when(attributeResolver.getAttributeValues(peerReview, AtsAttributeTypes.WorkflowDefinition)).thenReturn( - Collections.emptyList()); - - IWorkDefinitionMatch match = workDefAmin.getWorkDefinitionForPeerToPeerReview(peerReview); - - assertEquals(defaultPeerToPeerWorkDef, match.getWorkDefinition()); - } - - /** - * Test that peer review WorkDefinition id comes from teamDefinition hierarchy - */ - @Test - public void testGetWorkDefinitionForPeerToPeerReviewNotYetCreated() throws Exception { - when(teamWf.getTeamDefinition()).thenReturn(topTeamDef); - when( - attributeResolver.getAttributeValues(topTeamDef, AtsAttributeTypes.RelatedPeerWorkflowDefinition)).thenReturn( - Collections.emptyList()); - - IWorkDefinitionMatch match = workDefAmin.getWorkDefinitionForPeerToPeerReviewNotYetCreated(teamWf); - - assertEquals(defaultPeerToPeerWorkDef, match.getWorkDefinition()); - } - - /** - * When peerReview WorkDefinition attribute is set, then that WorkDefinition is returned instead of default - */ - @Test - public void testGetWorkDefinitionForPeerToPeerReviewIAtsTeamWorkflowIAtsPeerToPeerReview__fromReview() throws Exception { - List<Object> attrValues = new ArrayList<>(); - attrValues.add(MyPeerToPeerWorkDefId); - when(attributeResolver.getAttributeValues(peerReview, AtsAttributeTypes.WorkflowDefinition)).thenReturn( - attrValues); - - IWorkDefinitionMatch match = workDefAmin.getWorkDefinitionForPeerToPeerReview(peerReview); - - assertEquals(myPeerToPeerWorkDef, match.getWorkDefinition()); - } - - /** - * Test that stand alone peer WorkDefinition comes from actionableItem's Team Definition hierarchy - */ - @Test - public void testGetWorkDefinitionForPeerToPeerReviewNotYetCreatedAndStandalone() throws Exception { - when(teamWf.getTeamDefinition()).thenReturn(featureTeamDef); - List<Object> attrValues = new ArrayList<>(); - attrValues.add(MyPeerToPeerWorkDefId); - when( - attributeResolver.getAttributeValues(topTeamDef, AtsAttributeTypes.RelatedPeerWorkflowDefinition)).thenReturn( - attrValues); - when(actionableItem.getTeamDefinitionInherited()).thenReturn(topTeamDef); - when(topTeamDef.getRelatedPeerWorkDefinition()).thenReturn(MyPeerToPeerWorkDefId); - - IWorkDefinitionMatch match = - workDefAmin.getWorkDefinitionForPeerToPeerReviewNotYetCreatedAndStandalone(actionableItem); - - assertEquals(myPeerToPeerWorkDef, match.getWorkDefinition()); - } - - /** - * When no team definition in team definition hierarchy has a Peer WorkDefinition defined, return No-Match<br> - * When top team definition has a Peer WorkDefinition defined, return it's value. - */ - @Test - public void testGetPeerToPeerWorkDefinitionFromTeamDefinitionAttributeValueRecurse() throws Exception { - // Setup all teamDefinitions to not have values defined - when( - attributeResolver.getAttributeValues(topTeamDef, AtsAttributeTypes.RelatedPeerWorkflowDefinition)).thenReturn( - Collections.emptyList()); - when( - attributeResolver.getAttributeValues(projTeamDef, AtsAttributeTypes.RelatedPeerWorkflowDefinition)).thenReturn( - Collections.emptyList()); - when(attributeResolver.getAttributeValues(featureTeamDef, - AtsAttributeTypes.RelatedPeerWorkflowDefinition)).thenReturn(Collections.emptyList()); - - // Test that no-match is returned - IWorkDefinitionMatch peerToPeerWorkDefinitionFromTeamDefinitionAttributeValueRecurse = - workDefAmin.getPeerToPeerWorkDefinitionFromTeamDefinitionAttributeValueRecurse(topTeamDef); - assertFalse(peerToPeerWorkDefinitionFromTeamDefinitionAttributeValueRecurse.isMatched()); - assertFalse( - workDefAmin.getPeerToPeerWorkDefinitionFromTeamDefinitionAttributeValueRecurse(projTeamDef).isMatched()); - assertFalse( - workDefAmin.getPeerToPeerWorkDefinitionFromTeamDefinitionAttributeValueRecurse(featureTeamDef).isMatched()); - - // Setup that top team definition has WorkDefinition defined - List<Object> attrValues = new ArrayList<>(); - attrValues.add(MyPeerToPeerWorkDefId); - when( - attributeResolver.getAttributeValues(topTeamDef, AtsAttributeTypes.RelatedPeerWorkflowDefinition)).thenReturn( - attrValues); - when(workDefinitionService.getWorkDef(eq(MyPeerToPeerWorkDefId), any(XResultData.class))).thenReturn( - myPeerToPeerWorkDef); - when(topTeamDef.getRelatedPeerWorkDefinition()).thenReturn(MyPeerToPeerWorkDefId); - - // Test that match is returned - peerToPeerWorkDefinitionFromTeamDefinitionAttributeValueRecurse = - workDefAmin.getPeerToPeerWorkDefinitionFromTeamDefinitionAttributeValueRecurse(topTeamDef); - assertTrue(peerToPeerWorkDefinitionFromTeamDefinitionAttributeValueRecurse.isMatched()); - assertTrue( - workDefAmin.getPeerToPeerWorkDefinitionFromTeamDefinitionAttributeValueRecurse(projTeamDef).isMatched()); - assertTrue( - workDefAmin.getPeerToPeerWorkDefinitionFromTeamDefinitionAttributeValueRecurse(featureTeamDef).isMatched()); - assertEquals(myPeerToPeerWorkDef, workDefAmin.getPeerToPeerWorkDefinitionFromTeamDefinitionAttributeValueRecurse( - featureTeamDef).getWorkDefinition()); - } - - @Test - public void testGetWorkDefinitionIAtsWorkItem() throws Exception { - when(peerReview.getParentTeamWorkflow()).thenReturn(teamWf); - when(teamWf.getTeamDefinition()).thenReturn(topTeamDef); - when( - attributeResolver.getAttributeValues(topTeamDef, AtsAttributeTypes.RelatedPeerWorkflowDefinition)).thenReturn( - Collections.emptyList()); - when(workDefinitionService.getWorkDef(Matchers.eq(IAtsWorkDefinitionAdmin.PeerToPeerDefaultWorkflowDefinitionId), - (XResultData) Matchers.anyObject())).thenReturn(defaultPeerToPeerWorkDef); - - IWorkDefinitionMatch match = workDefAmin.getWorkDefinition(peerReview); - assertEquals(defaultPeerToPeerWorkDef, match.getWorkDefinition()); - } - - @Test - public void testGetWorkDefinitionForTaskWithSpecifiedId() throws Exception { - List<Object> attrValues = new ArrayList<>(); - attrValues.add(MyTaskWorkDefId); - - when(attributeResolver.getAttributeValues(task, AtsAttributeTypes.WorkflowDefinition)).thenReturn(attrValues); - when(workDefinitionService.getWorkDef(eq(MyTaskWorkDefId), any(XResultData.class))).thenReturn(myTaskWorkDef); - - IWorkDefinitionMatch match = workDefAmin.getWorkDefinitionForTask(task); - assertEquals(match.getWorkDefinition(), myTaskWorkDef); - } - -} diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/AtsWorkDefinitionServiceImplTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/AtsWorkDefinitionServiceImplTest.java new file mode 100644 index 00000000000..388321fe8f8 --- /dev/null +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/AtsWorkDefinitionServiceImplTest.java @@ -0,0 +1,307 @@ +/********************************************************************* + * Copyright (c) 2012 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Boeing - initial API and implementation + **********************************************************************/ + +package org.eclipse.osee.ats.core.workdef; + +import static org.junit.Assert.assertEquals; +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.when; +import java.util.List; +import org.eclipse.osee.ats.api.AtsApi; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; +import org.eclipse.osee.ats.api.ai.IAtsActionableItemService; +import org.eclipse.osee.ats.api.config.TeamDefinition; +import org.eclipse.osee.ats.api.data.AtsAttributeTypes; +import org.eclipse.osee.ats.api.review.IAtsPeerToPeerReview; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinitionService; +import org.eclipse.osee.ats.api.workdef.AtsWorkDefinitionTokens; +import org.eclipse.osee.ats.api.workdef.IAtsCompositeLayoutItem; +import org.eclipse.osee.ats.api.workdef.IAtsStateDefinition; +import org.eclipse.osee.ats.api.workdef.IAtsWidgetDefinition; +import org.eclipse.osee.ats.api.workdef.IAtsWorkDefinition; +import org.eclipse.osee.ats.api.workdef.IAtsWorkDefinitionProviderService; +import org.eclipse.osee.ats.api.workdef.IAtsWorkDefinitionService; +import org.eclipse.osee.ats.api.workdef.IAttributeResolver; +import org.eclipse.osee.ats.api.workdef.StateType; +import org.eclipse.osee.ats.api.workdef.model.CompositeLayoutItem; +import org.eclipse.osee.ats.api.workdef.model.StateDefinition; +import org.eclipse.osee.ats.api.workdef.model.WidgetDefinition; +import org.eclipse.osee.ats.api.workdef.model.WorkDefinition; +import org.eclipse.osee.ats.api.workflow.IAtsTask; +import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; +import org.eclipse.osee.ats.api.workflow.IAtsWorkItemService; +import org.eclipse.osee.ats.api.workflow.ITeamWorkflowProvidersLazy; +import org.eclipse.osee.framework.core.data.ArtifactId; +import org.eclipse.osee.framework.jdk.core.result.XResultData; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.MockitoAnnotations; + +/** + * Test case for {@link AtsWorkDefinitionServiceImpl} + * + * @author Donald G. Dunne + */ +public class AtsWorkDefinitionServiceImplTest { + + private static final ArtifactId MyPeerToPeerWorkDefArt = ArtifactId.valueOf(266434L); + private static final ArtifactId MyTaskWorkDefArt = ArtifactId.valueOf(34345L); + + // @formatter:off + @Mock TeamDefinition topTeamDef; + @Mock TeamDefinition projTeamDef; + @Mock IAtsTeamDefinition featureTeamDef; + @Mock IAtsWorkItemService workItemService; + @Mock IAtsWorkDefinitionService workDefinitionService; + @Mock IAtsWorkDefinitionProviderService workDefinitionProviderService; + @Mock IAtsActionableItem actionableItem; + @Mock IAtsPeerToPeerReview peerReview; + @Mock XResultData resultData; + @Mock IAtsTeamWorkflow teamWf; + @Mock IAtsWorkDefinition defaultPeerToPeerWorkDef; + @Mock IAtsWorkDefinition myPeerToPeerWorkDef; + @Mock IAtsWorkDefinition myTaskWorkDef; + @Mock ITeamWorkflowProvidersLazy teamWorkflowProviders; + @Mock IAttributeResolver attributeResolver; + @Mock IAtsTask task; + @Mock AtsApi atsApi; + @Mock IAtsWorkDefinitionService workDefService; + @Mock IAtsTeamDefinitionService teamDefinitionService; + @Mock IAtsActionableItemService actionableItemService; + + // @formatter:on + + @Before + public void setup() throws Exception { + MockitoAnnotations.initMocks(this); + when(atsApi.getTeamDefinitionService()).thenReturn(teamDefinitionService); + when(atsApi.getTeamDefinitionService().getParentTeamDef(topTeamDef)).thenReturn(null); + when(atsApi.getTeamDefinitionService().getParentTeamDef(projTeamDef)).thenReturn(topTeamDef); + when(atsApi.getTeamDefinitionService().getParentTeamDef(featureTeamDef)).thenReturn(projTeamDef); + when(actionableItem.getAtsApi()).thenReturn(atsApi); + when(atsApi.getActionableItemService()).thenReturn(actionableItemService); + // always return default when requested + when(workDefinitionService.getWorkDefinitionByName( + eq(AtsWorkDefinitionTokens.WorkDef_Review_PeerToPeer.getName()))).thenReturn(defaultPeerToPeerWorkDef); + + workDefService = new AtsWorkDefinitionServiceImpl(atsApi, teamWorkflowProviders); + when(atsApi.getAttributeResolver()).thenReturn(attributeResolver); + when(atsApi.getWorkDefinitionProviderService()).thenReturn(workDefinitionProviderService); + + // always return myPeerToPeerWorkDef when requested + workDefService = Mockito.spy(workDefService); + Mockito.doReturn(defaultPeerToPeerWorkDef).when(workDefService).getWorkDefinitionByName( + eq(AtsWorkDefinitionTokens.WorkDef_Review_PeerToPeer.getName())); + Mockito.doReturn(defaultPeerToPeerWorkDef).when(workDefService).getWorkDefinition( + eq(AtsWorkDefinitionTokens.WorkDef_Review_PeerToPeer.getId())); + } + + @Test + public void testGetDefaultPeerToPeerWorkflowDefinitionMatch() { + assertEquals(defaultPeerToPeerWorkDef, workDefService.getDefaultPeerToPeerWorkflowDefinition()); + } + + /** + * Test that peer review WorkDefinition id comes from teamDefinition hierarchy + */ + @Test + public void testGetWorkDefinitionForPeerToPeerReviewNotYetCreated() throws Exception { + when(teamWf.getTeamDefinition()).thenReturn(topTeamDef); + when(attributeResolver.getSoleArtifactIdReference(topTeamDef, + AtsAttributeTypes.RelatedPeerWorkflowDefinitionReference, ArtifactId.SENTINEL)).thenReturn( + ArtifactId.SENTINEL); + + IAtsWorkDefinition workDef = workDefService.getWorkDefinitionForPeerToPeerReviewNotYetCreated(teamWf); + assertEquals(defaultPeerToPeerWorkDef, workDef); + } + + /** + * Test that stand alone peer WorkDefinition comes from actionableItem's Team Definition hierarchy + */ + @Test + public void testGetWorkDefinitionForPeerToPeerReviewNotYetCreatedAndStandalone() throws Exception { + when(teamWf.getTeamDefinition()).thenReturn(featureTeamDef); + when(attributeResolver.getSoleAttributeValueAsString(topTeamDef, + AtsAttributeTypes.RelatedPeerWorkflowDefinitionReference, "")).thenReturn( + MyPeerToPeerWorkDefArt.getIdString()); + + when(actionableItemService.getTeamDefinitionInherited(actionableItem)).thenReturn(topTeamDef); + when(attributeResolver.getSoleAttributeValueAsString(topTeamDef, + AtsAttributeTypes.RelatedPeerWorkflowDefinitionReference, "")).thenReturn( + MyPeerToPeerWorkDefArt.getIdString()); + + when(workDefinitionService.getWorkDefinition(MyPeerToPeerWorkDefArt.getId())).thenReturn(myPeerToPeerWorkDef); + when(workDefinitionProviderService.getWorkDefinition(MyPeerToPeerWorkDefArt.getId())).thenReturn( + myPeerToPeerWorkDef); + + IAtsWorkDefinition workDef = + workDefService.getWorkDefinitionForPeerToPeerReviewNotYetCreatedAndStandalone(actionableItem); + + assertEquals(myPeerToPeerWorkDef, workDef); + + } + + /** + * When no team definition in team definition hierarchy has a Peer WorkDefinition defined, return No-Match<br> + * When top team definition has a Peer WorkDefinition defined, return it's value. + */ + @Test + public void testGetPeerToPeerWorkDefinitionFromTeamDefinitionAttributeValueRecurse() throws Exception { + // Setup all teamDefinitions to not have values defined + when(attributeResolver.getSoleArtifactIdReference(topTeamDef, + AtsAttributeTypes.RelatedPeerWorkflowDefinitionReference, ArtifactId.SENTINEL)).thenReturn( + ArtifactId.SENTINEL); + when(attributeResolver.getSoleArtifactIdReference(projTeamDef, + AtsAttributeTypes.RelatedPeerWorkflowDefinitionReference, ArtifactId.SENTINEL)).thenReturn( + ArtifactId.SENTINEL); + + when(attributeResolver.getSoleArtifactIdReference(featureTeamDef, + AtsAttributeTypes.RelatedPeerWorkflowDefinitionReference, ArtifactId.SENTINEL)).thenReturn( + ArtifactId.SENTINEL); + when(attributeResolver.getSoleArtifactIdReference(featureTeamDef, + AtsAttributeTypes.RelatedPeerWorkflowDefinitionReference, ArtifactId.SENTINEL)).thenReturn( + ArtifactId.SENTINEL); + + } + + @Test + public void testHasWidgetNamed() { + StateDefinition def = new StateDefinition("endorse"); + Assert.assertFalse(new AtsWorkDefinitionServiceImpl(atsApi, null).hasWidgetNamed(def, "item 2")); + + IAtsCompositeLayoutItem stateItem2 = new CompositeLayoutItem(2); + def.getLayoutItems().add(stateItem2); + IAtsWidgetDefinition widget2 = new WidgetDefinition("item 2"); + stateItem2.getaLayoutItems().add(widget2); + IAtsWidgetDefinition widget3 = new WidgetDefinition("item 3"); + stateItem2.getaLayoutItems().add(widget3); + + Assert.assertFalse(new AtsWorkDefinitionServiceImpl(atsApi, null).hasWidgetNamed(def, "item 45")); + Assert.assertTrue(new AtsWorkDefinitionServiceImpl(atsApi, null).hasWidgetNamed(def, "item 2")); + } + + @Test + public void testGetStatesOrderedByOrdinal() { + StateDefinition endorse = new StateDefinition("endorse"); + endorse.setStateType(StateType.Working); + StateDefinition analyze = new StateDefinition("analyze"); + analyze.setStateType(StateType.Working); + StateDefinition implement = new StateDefinition("implement"); + implement.setStateType(StateType.Working); + StateDefinition completed = new StateDefinition("completed"); + completed.setStateType(StateType.Completed); + + WorkDefinition def = new WorkDefinition(15L, "this"); + def.addState(completed); + def.addState(analyze); + def.addState(endorse); + def.addState(implement); + endorse.setOrdinal(1); + analyze.setOrdinal(2); + implement.setOrdinal(3); + Assert.assertEquals(4, def.getStates().size()); + List<IAtsStateDefinition> states = new AtsWorkDefinitionServiceImpl(atsApi, null).getStatesOrderedByOrdinal(def); + Assert.assertEquals(endorse, states.get(0)); + Assert.assertEquals(analyze, states.get(1)); + Assert.assertEquals(implement, states.get(2)); + Assert.assertEquals(completed, states.get(3)); + } + + @Test + public void testGetStateNames() { + WorkDefinition def = new WorkDefinition(15L, "this"); + def.addState(new StateDefinition("endorse")); + def.addState(new StateDefinition("analyze")); + Assert.assertEquals(2, new AtsWorkDefinitionServiceImpl(atsApi, null).getStateNames(def).size()); + Assert.assertTrue(new AtsWorkDefinitionServiceImpl(atsApi, null).getStateNames(def).contains("endorse")); + Assert.assertTrue(new AtsWorkDefinitionServiceImpl(atsApi, null).getStateNames(def).contains("analyze")); + } + + @Test + public void testGetStates() { + StateDefinition endorse = new StateDefinition("endorse"); + WorkDefinition def = new WorkDefinition(15L, "this"); + def.addState(endorse); + Assert.assertEquals(1, def.getStates().size()); + Assert.assertEquals(endorse, def.getStates().iterator().next()); + } + + @Test + public void testGetStateByName() { + WorkDefinition def = new WorkDefinition(15L, "this"); + StateDefinition endorse = new StateDefinition("endorse"); + StateDefinition analyze = new StateDefinition("analyze"); + def.addState(endorse); + def.addState(analyze); + Assert.assertEquals(endorse, def.getStateByName("endorse")); + Assert.assertNull(def.getStateByName("asdf")); + Assert.assertNull(def.getStateByName(null)); + } + + @Test + public void testGetStartState() { + WorkDefinition def = new WorkDefinition(15L, "this"); + Assert.assertNull(def.getStartState()); + StateDefinition endorse = new StateDefinition("endorse"); + def.addState(endorse); + def.setStartState(endorse); + Assert.assertEquals(endorse, def.getStartState()); + } + + @Test + public void testGetIds() { + WorkDefinition def = new WorkDefinition(15L, "this"); + Assert.assertEquals((Long) 15L, def.getId()); + } + + @Test + public void testIsStateWeightingEnabled() { + WorkDefinition def = new WorkDefinition(15L, "this"); + Assert.assertFalse(new AtsWorkDefinitionServiceImpl(atsApi, null).isStateWeightingEnabled(def)); + StateDefinition endorse = new StateDefinition("endorse"); + def.addState(endorse); + endorse.setStateWeight(34); + Assert.assertTrue(new AtsWorkDefinitionServiceImpl(atsApi, null).isStateWeightingEnabled(def)); + + endorse.setStateWeight(0); + Assert.assertFalse(new AtsWorkDefinitionServiceImpl(atsApi, null).isStateWeightingEnabled(def)); + } + + @Test + public void testEqualsObject() { + IAtsWorkDefinition obj = new WorkDefinition(15L, "hello"); + Assert.assertTrue(obj.equals(obj)); + + IAtsWorkDefinition obj2 = new WorkDefinition(15L, "hello"); + + Assert.assertTrue(obj.equals(obj2)); + Assert.assertFalse(obj.equals(null)); + Assert.assertFalse(obj.equals("str")); + + WorkDefinition obj3 = new WorkDefinition(16L, "hello"); + Assert.assertFalse(obj.equals(obj3)); + Assert.assertFalse(obj3.equals(obj)); + + } + + @Test + public void testHashCode() { + WorkDefinition obj = new WorkDefinition(15L, "hello"); + Assert.assertEquals(15L, obj.hashCode()); + } + +} diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/CompositeStateItemTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/CompositeStateItemTest.java new file mode 100644 index 00000000000..2ad1cd0b04a --- /dev/null +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/CompositeStateItemTest.java @@ -0,0 +1,56 @@ +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Boeing - initial API and implementation + **********************************************************************/ + +package org.eclipse.osee.ats.core.workdef; + +import org.eclipse.osee.ats.api.workdef.IAtsCompositeLayoutItem; +import org.eclipse.osee.ats.api.workdef.model.CompositeLayoutItem; +import org.junit.Assert; +import org.junit.Test; + +/** + * Test case for {@link CompositeLayoutItem} + * + * @author Donald G. Dunne + */ +public class CompositeStateItemTest { + + @Test + public void testToString() { + IAtsCompositeLayoutItem compositeStateItem = new CompositeLayoutItem(); + Assert.assertEquals("Composite 2", compositeStateItem.toString()); + } + + @Test + public void testConstructors() { + new CompositeLayoutItem(); + } + + @Test + public void testGetSetNumColumns() { + IAtsCompositeLayoutItem compositeStateItem = new CompositeLayoutItem(); + Assert.assertEquals(2, compositeStateItem.getNumColumns()); + compositeStateItem.setNumColumns(3); + Assert.assertEquals(3, compositeStateItem.getNumColumns()); + + compositeStateItem = new CompositeLayoutItem(5); + Assert.assertEquals(5, compositeStateItem.getNumColumns()); + } + + @Test + public void testGetStateItems() { + IAtsCompositeLayoutItem comp = new CompositeLayoutItem(); + Assert.assertEquals(0, comp.getaLayoutItems().size()); + } + +} diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/DecisionReviewDefinitionTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/DecisionReviewDefinitionTest.java new file mode 100644 index 00000000000..77b93cad8a8 --- /dev/null +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/DecisionReviewDefinitionTest.java @@ -0,0 +1,109 @@ +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Boeing - initial API and implementation + **********************************************************************/ + +package org.eclipse.osee.ats.core.workdef; + +import org.eclipse.osee.ats.api.review.DecisionReviewOption; +import org.eclipse.osee.ats.api.workdef.StateEventType; +import org.eclipse.osee.ats.api.workdef.model.DecisionReviewDefinition; +import org.eclipse.osee.ats.api.workdef.model.ReviewBlockType; +import org.junit.Assert; +import org.junit.Test; + +/** + * Test case for {@link DecisionReviewDefinition} + * + * @author Donald G. Dunne + */ +public class DecisionReviewDefinitionTest { + + @Test + public void testGetSetName() { + DecisionReviewDefinition rev = new DecisionReviewDefinition("review"); + Assert.assertEquals("review", rev.getName()); + rev.setName("new rev"); + Assert.assertEquals("new rev", rev.getName()); + } + + @Test + public void testGetSetDescription() { + DecisionReviewDefinition item = new DecisionReviewDefinition("review"); + Assert.assertEquals("", item.getDescription()); + item.setDescription("desc"); + Assert.assertEquals("desc", item.getDescription()); + } + + @Test + public void testGetSetBlockingType() { + DecisionReviewDefinition item = new DecisionReviewDefinition("review"); + Assert.assertNull(item.getBlockingType()); + item.setBlockingType(ReviewBlockType.Commit); + Assert.assertEquals(ReviewBlockType.Commit, item.getBlockingType()); + } + + @Test + public void testGetSetStateEventType() { + DecisionReviewDefinition item = new DecisionReviewDefinition("review"); + Assert.assertNull(item.getStateEventType()); + item.setStateEventType(StateEventType.CommitBranch); + Assert.assertEquals(StateEventType.CommitBranch, item.getStateEventType()); + } + + @Test + public void testIsAutoTransitionToDecision() { + DecisionReviewDefinition item = new DecisionReviewDefinition("review"); + Assert.assertFalse(item.isAutoTransitionToDecision()); + item.setAutoTransitionToDecision(true); + Assert.assertTrue(item.isAutoTransitionToDecision()); + } + + @Test + public void testGetAssignees() { + DecisionReviewDefinition item = new DecisionReviewDefinition("review"); + Assert.assertTrue(item.getAssignees().isEmpty()); + item.getAssignees().add("Joe"); + Assert.assertEquals(1, item.getAssignees().size()); + Assert.assertEquals("Joe", item.getAssignees().iterator().next()); + } + + @Test + public void testGetOptions() { + DecisionReviewDefinition item = new DecisionReviewDefinition("review"); + Assert.assertTrue(item.getOptions().isEmpty()); + item.getOptions().add(new DecisionReviewOption("Completed")); + Assert.assertEquals(1, item.getOptions().size()); + } + + @Test + public void testToString() { + DecisionReviewDefinition item = new DecisionReviewDefinition("review"); + Assert.assertEquals("review", item.toString()); + } + + @Test + public void testGetTitle() { + DecisionReviewDefinition item = new DecisionReviewDefinition("review"); + Assert.assertNull(item.getReviewTitle()); + item.setReviewTitle("title"); + Assert.assertEquals("title", item.getReviewTitle()); + } + + @Test + public void testGetSetRelatedToState() { + DecisionReviewDefinition item = new DecisionReviewDefinition("review"); + Assert.assertNull(item.getRelatedToState()); + item.setRelatedToState("Implement"); + Assert.assertEquals("Implement", item.getRelatedToState()); + } + +} diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/DecisionReviewOptionTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/DecisionReviewOptionTest.java new file mode 100644 index 00000000000..f0e4a830350 --- /dev/null +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/DecisionReviewOptionTest.java @@ -0,0 +1,62 @@ +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Boeing - initial API and implementation + **********************************************************************/ + +package org.eclipse.osee.ats.core.workdef; + +import java.util.Arrays; +import org.eclipse.osee.ats.api.review.DecisionReviewOption; +import org.eclipse.osee.ats.api.workdef.IAtsDecisionReviewOption; +import org.junit.Assert; +import org.junit.Test; + +/** + * Test case for {@link DecisionReviewOption} + * + * @author Donald G. Dunne + */ +public class DecisionReviewOptionTest { + + @Test + public void test() { + IAtsDecisionReviewOption option = new DecisionReviewOption("opt", false, Arrays.asList("123", "345")); + Assert.assertEquals("opt", option.getName()); + option.setName("opt2"); + Assert.assertEquals("opt2", option.getName()); + + Assert.assertTrue(option.getUserIds().contains("123")); + Assert.assertTrue(option.getUserIds().contains("345")); + + option.setUserIds(Arrays.asList("333", "444")); + Assert.assertFalse(option.getUserIds().contains("123")); + Assert.assertFalse(option.getUserIds().contains("345")); + Assert.assertTrue(option.getUserIds().contains("333")); + Assert.assertTrue(option.getUserIds().contains("444")); + + Assert.assertFalse(option.isFollowupRequired()); + option.setFollowupRequired(true); + Assert.assertTrue(option.isFollowupRequired()); + + Assert.assertEquals("opt2", option.toString()); + + Assert.assertTrue(option.getUserNames().isEmpty()); + option.setUserNames(Arrays.asList("joe", "alice")); + Assert.assertTrue(option.getUserNames().contains("joe")); + Assert.assertTrue(option.getUserNames().contains("joe")); + + option = new DecisionReviewOption("opt", false, null); + Assert.assertTrue(option.getUserIds().isEmpty()); + + option.setFollowupRequired(false); + Assert.assertEquals("opt", option.toString()); + } +} diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/PeerReviewDefinitionTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/PeerReviewDefinitionTest.java new file mode 100644 index 00000000000..58c4b3f6e61 --- /dev/null +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/PeerReviewDefinitionTest.java @@ -0,0 +1,100 @@ +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Boeing - initial API and implementation + **********************************************************************/ + +package org.eclipse.osee.ats.core.workdef; + +import org.eclipse.osee.ats.api.workdef.StateEventType; +import org.eclipse.osee.ats.api.workdef.model.PeerReviewDefinition; +import org.eclipse.osee.ats.api.workdef.model.ReviewBlockType; +import org.junit.Assert; +import org.junit.Test; + +/** + * Test case for {@link PeerReviewDefinition} + * + * @author Donald G. Dunne + */ +public class PeerReviewDefinitionTest { + + @Test + public void testGetSetName() { + PeerReviewDefinition rev = new PeerReviewDefinition("review"); + Assert.assertEquals("review", rev.getName()); + rev.setName("new rev"); + Assert.assertEquals("new rev", rev.getName()); + } + + @Test + public void testGetSetDescription() { + PeerReviewDefinition item = new PeerReviewDefinition("review"); + Assert.assertEquals("", item.getDescription()); + item.setDescription("desc"); + Assert.assertEquals("desc", item.getDescription()); + } + + @Test + public void testGetSetLocation() { + PeerReviewDefinition item = new PeerReviewDefinition("review"); + Assert.assertEquals("", item.getLocation()); + item.setLocation("loc"); + Assert.assertEquals("loc", item.getLocation()); + } + + @Test + public void testGetSetBlockingType() { + PeerReviewDefinition item = new PeerReviewDefinition("review"); + Assert.assertNull(item.getBlockingType()); + item.setBlockingType(ReviewBlockType.Commit); + Assert.assertEquals(ReviewBlockType.Commit, item.getBlockingType()); + } + + @Test + public void testGetSetStateEventType() { + PeerReviewDefinition item = new PeerReviewDefinition("review"); + Assert.assertNull(item.getStateEventType()); + item.setStateEventType(StateEventType.CommitBranch); + Assert.assertEquals(StateEventType.CommitBranch, item.getStateEventType()); + } + + @Test + public void testGetAssignees() { + PeerReviewDefinition item = new PeerReviewDefinition("review"); + Assert.assertTrue(item.getAssignees().isEmpty()); + item.addAssignee("Joe"); + Assert.assertEquals(1, item.getAssignees().size()); + Assert.assertEquals("Joe", item.getAssignees().iterator().next()); + } + + @Test + public void testToString() { + PeerReviewDefinition item = new PeerReviewDefinition("review"); + Assert.assertEquals("review", item.toString()); + } + + @Test + public void testGetTitle() { + PeerReviewDefinition item = new PeerReviewDefinition("review"); + Assert.assertNull(item.getReviewTitle()); + item.setReviewTitle("title"); + Assert.assertEquals("title", item.getReviewTitle()); + } + + @Test + public void testGetSetRelatedToState() { + PeerReviewDefinition item = new PeerReviewDefinition("review"); + Assert.assertNull(item.getRelatedToState()); + item.setRelatedToState("Implement"); + Assert.assertEquals("Implement", item.getRelatedToState()); + } + +} diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/ReviewBlockTypeTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/ReviewBlockTypeTest.java index c40d0c3afbb..a86651f8798 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/ReviewBlockTypeTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/ReviewBlockTypeTest.java @@ -1,13 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.workdef; import org.eclipse.osee.ats.api.workdef.model.ReviewBlockType; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/RuleDefinitionOptionTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/RuleDefinitionOptionTest.java index c0d90f96137..c6df71e79c3 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/RuleDefinitionOptionTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/RuleDefinitionOptionTest.java @@ -1,13 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.workdef; import org.eclipse.osee.ats.api.workdef.model.RuleDefinitionOption; @@ -30,7 +33,7 @@ public class RuleDefinitionOptionTest { @Test public void testValues() { - Assert.assertEquals(12, RuleDefinitionOption.values().length); + Assert.assertEquals(9, RuleDefinitionOption.values().length); } @Test diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/StateColorTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/StateColorTest.java index 332a45b77fe..b456ced48ec 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/StateColorTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/StateColorTest.java @@ -1,13 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.workdef; import org.eclipse.osee.ats.api.workdef.StateColor; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/StateDefinitionTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/StateDefinitionTest.java new file mode 100644 index 00000000000..916d0bb18e6 --- /dev/null +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/StateDefinitionTest.java @@ -0,0 +1,242 @@ +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Boeing - initial API and implementation + **********************************************************************/ + +package org.eclipse.osee.ats.core.workdef; + +import org.eclipse.osee.ats.api.AtsApi; +import org.eclipse.osee.ats.api.workdef.IAtsCompositeLayoutItem; +import org.eclipse.osee.ats.api.workdef.IAtsWidgetDefinition; +import org.eclipse.osee.ats.api.workdef.StateColor; +import org.eclipse.osee.ats.api.workdef.StateType; +import org.eclipse.osee.ats.api.workdef.model.CompositeLayoutItem; +import org.eclipse.osee.ats.api.workdef.model.DecisionReviewDefinition; +import org.eclipse.osee.ats.api.workdef.model.LayoutItem; +import org.eclipse.osee.ats.api.workdef.model.PeerReviewDefinition; +import org.eclipse.osee.ats.api.workdef.model.RuleDefinitionOption; +import org.eclipse.osee.ats.api.workdef.model.StateDefinition; +import org.eclipse.osee.ats.api.workdef.model.WidgetDefinition; +import org.eclipse.osee.ats.api.workdef.model.WorkDefinition; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +/** + * @author Donald G. Dunne + */ +public class StateDefinitionTest { + + // @formatter:off + @Mock AtsApi atsApi; + // @formatter:on + + @Before + public void setup() throws Exception { + MockitoAnnotations.initMocks(this); + } + + @Test + public void testToString() { + StateDefinition def = new StateDefinition("endorse"); + Assert.assertEquals("endorse - (null)", def.toString()); + def.setStateType(StateType.Working); + Assert.assertEquals("endorse - (Working)", def.toString()); + } + + @Test + public void testGetStateItems() { + StateDefinition def = new StateDefinition("endorse"); + Assert.assertEquals(0, def.getLayoutItems().size()); + def.getLayoutItems().add(new LayoutItem("item")); + Assert.assertEquals(1, def.getLayoutItems().size()); + } + + @Test + public void testAddRemoveRule() { + StateDefinition def = new StateDefinition("endorse"); + Assert.assertEquals(0, def.getRules().size()); + def.addRule("rule"); + Assert.assertEquals(1, def.getRules().size()); + def.addRule(RuleDefinitionOption.AddDecisionValidateBlockingReview.name()); + Assert.assertEquals(2, def.getRules().size()); + + Assert.assertTrue(def.hasRule(RuleDefinitionOption.AddDecisionValidateBlockingReview.name())); + Assert.assertFalse(def.hasRule(RuleDefinitionOption.AddDecisionValidateNonBlockingReview.name())); + + def.removeRule(RuleDefinitionOption.AddDecisionValidateBlockingReview.name()); + Assert.assertFalse(def.hasRule(RuleDefinitionOption.AddDecisionValidateBlockingReview.name())); + } + + @Test + public void testGetSetStateType() { + StateDefinition def = new StateDefinition("endorse"); + Assert.assertNull(def.getStateType()); + def.setStateType(StateType.Working); + Assert.assertEquals(StateType.Working, def.getStateType()); + } + + @Test + public void testGetSetOrdinal() { + StateDefinition def = new StateDefinition("endorse"); + Assert.assertEquals(0, def.getOrdinal()); + def.setOrdinal(3); + Assert.assertEquals(3, def.getOrdinal()); + } + + @Test + public void testGetToStates() { + StateDefinition endorse = new StateDefinition("endorse"); + StateDefinition analyze = new StateDefinition("endorse"); + StateDefinition completed = new StateDefinition("endorse"); + endorse.getToStates().add(analyze); + endorse.getToStates().add(completed); + Assert.assertTrue(endorse.getToStates().contains(analyze)); + Assert.assertTrue(endorse.getToStates().contains(completed)); + } + + @Test + public void testGetPageName() { + StateDefinition endorse = new StateDefinition("endorse"); + Assert.assertEquals("endorse", endorse.getName()); + } + + @Test + public void testGetSetWorkDefinition() { + WorkDefinition workDef = new WorkDefinition(15L, "mine"); + StateDefinition state = new StateDefinition("endorse"); + Assert.assertNull(state.getWorkDefinition()); + state.setWorkDefinition(workDef); + Assert.assertEquals(workDef, state.getWorkDefinition()); + + Assert.assertEquals("mine.endorse", state.getFullName()); + } + + @Test + public void testStateType() { + StateDefinition state = new StateDefinition("endorse"); + state.setStateType(StateType.Working); + + Assert.assertTrue(state.getStateType().isWorkingState()); + Assert.assertFalse(state.getStateType().isCancelledState()); + Assert.assertFalse(state.getStateType().isCompletedState()); + Assert.assertFalse(state.getStateType().isCompletedOrCancelledState()); + + state.setStateType(StateType.Completed); + Assert.assertTrue(StateType.Completed.isCompletedState()); + Assert.assertTrue(StateType.Completed.isCompletedOrCancelledState()); + + state.setStateType(StateType.Cancelled); + Assert.assertTrue(StateType.Cancelled.isCancelledState()); + Assert.assertTrue(StateType.Cancelled.isCompletedOrCancelledState()); + } + + @Test + public void testGetWidgetsFromStateItems() { + StateDefinition def = new StateDefinition("endorse"); + Assert.assertEquals(0, new AtsWorkDefinitionServiceImpl(atsApi, null).getWidgetsFromLayoutItems(def).size()); + + IAtsWidgetDefinition widget1 = new WidgetDefinition("item 1"); + def.getLayoutItems().add(widget1); + + IAtsCompositeLayoutItem stateItem2 = new CompositeLayoutItem(2); + def.getLayoutItems().add(stateItem2); + IAtsWidgetDefinition widget2 = new WidgetDefinition("item 2"); + stateItem2.getaLayoutItems().add(widget2); + IAtsWidgetDefinition widget3 = new WidgetDefinition("item 3"); + stateItem2.getaLayoutItems().add(widget3); + + CompositeLayoutItem stateItem3 = new CompositeLayoutItem(2); + stateItem2.getaLayoutItems().add(stateItem3); + // StateItem is an base class, so it's widgets won't be seen + LayoutItem widget4 = new LayoutItem("item 4"); + stateItem3.getaLayoutItems().add(widget4); + + Assert.assertEquals(3, new AtsWorkDefinitionServiceImpl(atsApi, null).getWidgetsFromLayoutItems(def).size()); + } + + @Test + public void testGetDecisionReviews() { + StateDefinition def = new StateDefinition("endorse"); + Assert.assertEquals(0, def.getDecisionReviews().size()); + def.getDecisionReviews().add(new DecisionReviewDefinition("review 1")); + def.getDecisionReviews().add(new DecisionReviewDefinition("review 2")); + Assert.assertEquals(2, def.getDecisionReviews().size()); + } + + @Test + public void testGetPeerReviews() { + StateDefinition def = new StateDefinition("endorse"); + Assert.assertEquals(0, def.getPeerReviews().size()); + def.getPeerReviews().add(new PeerReviewDefinition("review 1")); + def.getPeerReviews().add(new PeerReviewDefinition("review 2")); + Assert.assertEquals(2, def.getPeerReviews().size()); + } + + @Test + public void testGetSetPercentWeight() { + StateDefinition def = new StateDefinition("endorse"); + Assert.assertEquals(0, def.getStateWeight()); + def.setStateWeight(34); + Assert.assertEquals(34, def.getStateWeight()); + + } + + @Test + public void testGetSetRecommendedPercentComplete() { + StateDefinition endorse = new StateDefinition("endorse"); + Assert.assertEquals((Integer) null, endorse.getRecommendedPercentComplete()); + endorse.setRecommendedPercentComplete(34); + Assert.assertEquals((Integer) 34, endorse.getRecommendedPercentComplete()); + } + + @Test + public void testGetSetColor() { + StateDefinition endorse = new StateDefinition("endorse"); + Assert.assertNull(endorse.getColor()); + endorse.setColor(StateColor.BLUE); + Assert.assertEquals(StateColor.BLUE, endorse.getColor()); + } + + @Test + public void testEqualsObject() { + StateDefinition obj = new StateDefinition("hello"); + Assert.assertTrue(obj.equals(obj)); + + StateDefinition obj2 = new StateDefinition("hello"); + + Assert.assertTrue(obj.equals(obj2)); + Assert.assertFalse(obj.equals(null)); + Assert.assertFalse(obj.equals("str")); + + StateDefinition obj3 = new StateDefinition("hello"); + obj3.setName(null); + Assert.assertFalse(obj.equals(obj3)); + Assert.assertFalse(obj3.equals(obj)); + + StateDefinition obj4 = new StateDefinition("hello"); + obj4.setName(null); + Assert.assertFalse(obj3.equals(obj4)); + } + + @Test + public void testHashCode() { + StateDefinition obj = new StateDefinition("hello"); + Assert.assertEquals(99162353, obj.hashCode()); + + obj = new StateDefinition("hello"); + obj.setName(null); + Assert.assertEquals(31, obj.hashCode()); + } + +} diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/StateEventTypeTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/StateEventTypeTest.java index 5096ca3d22f..af4bcd66e17 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/StateEventTypeTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/StateEventTypeTest.java @@ -1,13 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.workdef; import org.eclipse.osee.ats.api.workdef.StateEventType; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/WidgetDefinitionTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/WidgetDefinitionTest.java new file mode 100644 index 00000000000..990c1caf3c6 --- /dev/null +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/WidgetDefinitionTest.java @@ -0,0 +1,82 @@ +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Boeing - initial API and implementation + **********************************************************************/ + +package org.eclipse.osee.ats.core.workdef; + +import org.eclipse.osee.ats.api.workdef.WidgetOption; +import org.eclipse.osee.ats.api.workdef.model.WidgetDefinition; +import org.junit.Assert; +import org.junit.Test; + +/** + * Test case for {@link WidgetDefinition} + * + * @author Donald G. Dunne + */ +public class WidgetDefinitionTest { + + @Test + public void testGetSetDescription() { + WidgetDefinition item = new WidgetDefinition("review"); + Assert.assertEquals(null, item.getDescription()); + item.setDescription("desc"); + Assert.assertEquals("desc", item.getDescription()); + } + + @Test + public void testToString() { + WidgetDefinition item = new WidgetDefinition("review"); + Assert.assertEquals("[review][]", item.toString()); + } + + @Test + public void testGetSetTooltip() { + WidgetDefinition item = new WidgetDefinition("review"); + Assert.assertEquals(null, item.getToolTip()); + item.setToolTip("desc"); + Assert.assertEquals("desc", item.getToolTip()); + } + + @Test + public void testGetSetWidgetname() { + WidgetDefinition item = new WidgetDefinition("review"); + Assert.assertEquals("", item.getXWidgetName()); + item.setXWidgetName("desc"); + Assert.assertEquals("desc", item.getXWidgetName()); + } + + @Test + public void testGetSetDefaultName() { + WidgetDefinition item = new WidgetDefinition("review"); + Assert.assertEquals(null, item.getDefaultValue()); + item.setDefaultValue("desc"); + Assert.assertEquals("desc", item.getDefaultValue()); + } + + @Test + public void testGetSetHeight() { + WidgetDefinition item = new WidgetDefinition("review"); + Assert.assertEquals(0, item.getHeight()); + item.setHeight(4); + Assert.assertEquals(4, item.getHeight()); + } + + @Test + public void testSet() { + WidgetDefinition item = new WidgetDefinition("review"); + Assert.assertFalse(item.is(WidgetOption.ALIGN_CENTER)); + item.set(WidgetOption.ALIGN_CENTER); + Assert.assertTrue(item.is(WidgetOption.ALIGN_CENTER)); + } + +} diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/WidgetOptionHandlerTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/WidgetOptionHandlerTest.java new file mode 100644 index 00000000000..ecb16904e2d --- /dev/null +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/WidgetOptionHandlerTest.java @@ -0,0 +1,139 @@ +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Boeing - initial API and implementation + **********************************************************************/ + +package org.eclipse.osee.ats.core.workdef; + +import java.util.Arrays; +import java.util.Collection; +import org.eclipse.osee.ats.api.workdef.WidgetOption; +import org.eclipse.osee.ats.api.workdef.WidgetOptionHandler; +import org.junit.Assert; +import org.junit.Test; + +/** + * @author Donald G. Dunne + */ +public class WidgetOptionHandlerTest { + + @Test + public void testWidgetOptionHandler() { + WidgetOptionHandler handler = new WidgetOptionHandler(); + + handler.add(WidgetOption.ADD_DEFAULT_VALUE); + Assert.assertTrue(handler.contains(WidgetOption.ADD_DEFAULT_VALUE)); + Assert.assertFalse(handler.contains(WidgetOption.FILL_HORIZONTALLY)); + } + + @Test + public void testAddWidgetOptionArray() { + WidgetOptionHandler handler = new WidgetOptionHandler(); + handler.add(Arrays.asList(WidgetOption.ADD_DEFAULT_VALUE, WidgetOption.FILL_HORIZONTALLY)); + + Assert.assertTrue(handler.contains(WidgetOption.ADD_DEFAULT_VALUE)); + Assert.assertTrue(handler.contains(WidgetOption.FILL_HORIZONTALLY)); + + handler = new WidgetOptionHandler(WidgetOption.ADD_DEFAULT_VALUE, WidgetOption.FILL_HORIZONTALLY); + + Assert.assertTrue(handler.contains(WidgetOption.ADD_DEFAULT_VALUE)); + Assert.assertTrue(handler.contains(WidgetOption.FILL_HORIZONTALLY)); + } + + @Test + public void testGetCollection() { + Collection<WidgetOption> collection = + WidgetOptionHandler.getCollection(WidgetOption.ADD_DEFAULT_VALUE, WidgetOption.FILL_HORIZONTALLY); + Assert.assertTrue(collection.contains(WidgetOption.ADD_DEFAULT_VALUE)); + Assert.assertTrue(collection.contains(WidgetOption.FILL_HORIZONTALLY)); + Assert.assertFalse(collection.contains(WidgetOption.NOT_REQUIRED_FOR_COMPLETION)); + } + + @Test + public void testAdd_ENABLED() { + WidgetOptionHandler handler = new WidgetOptionHandler(); + handler.add(WidgetOption.ENABLED); + Assert.assertTrue(handler.contains(WidgetOption.ENABLED)); + handler.add(WidgetOption.NOT_ENABLED); + Assert.assertFalse(handler.contains(WidgetOption.ENABLED)); + Assert.assertTrue(handler.contains(WidgetOption.NOT_ENABLED)); + } + + @Test + public void testAdd_FUTURE_DATE_REQUIRED() { + WidgetOptionHandler handler = new WidgetOptionHandler(); + handler.add(WidgetOption.FUTURE_DATE_REQUIRED); + Assert.assertTrue(handler.contains(WidgetOption.FUTURE_DATE_REQUIRED)); + handler.add(WidgetOption.NOT_FUTURE_DATE_REQUIRED); + Assert.assertFalse(handler.contains(WidgetOption.FUTURE_DATE_REQUIRED)); + Assert.assertTrue(handler.contains(WidgetOption.NOT_FUTURE_DATE_REQUIRED)); + } + + @Test + public void testAdd_VERTICAL_LABEL() { + WidgetOptionHandler handler = new WidgetOptionHandler(); + handler.add(WidgetOption.VERTICAL_LABEL); + Assert.assertTrue(handler.contains(WidgetOption.VERTICAL_LABEL)); + handler.add(WidgetOption.HORIZONTAL_LABEL); + Assert.assertFalse(handler.contains(WidgetOption.VERTICAL_LABEL)); + Assert.assertTrue(handler.contains(WidgetOption.HORIZONTAL_LABEL)); + } + + @Test + public void testAdd_REQUIRED_FOR_COMPLETION() { + WidgetOptionHandler handler = new WidgetOptionHandler(); + handler.add(WidgetOption.REQUIRED_FOR_COMPLETION); + Assert.assertTrue(handler.contains(WidgetOption.REQUIRED_FOR_COMPLETION)); + handler.add(WidgetOption.NOT_REQUIRED_FOR_COMPLETION); + Assert.assertFalse(handler.contains(WidgetOption.REQUIRED_FOR_COMPLETION)); + Assert.assertTrue(handler.contains(WidgetOption.NOT_REQUIRED_FOR_COMPLETION)); + } + + @Test + public void testAdd_EDITABLE() { + WidgetOptionHandler handler = new WidgetOptionHandler(); + handler.add(WidgetOption.EDITABLE); + Assert.assertTrue(handler.contains(WidgetOption.EDITABLE)); + handler.add(WidgetOption.NOT_EDITABLE); + Assert.assertFalse(handler.contains(WidgetOption.EDITABLE)); + Assert.assertTrue(handler.contains(WidgetOption.NOT_EDITABLE)); + } + + @Test + public void testAdd_FILL() { + WidgetOptionHandler handler = new WidgetOptionHandler(); + handler.add(WidgetOption.FILL_HORIZONTALLY); + handler.add(WidgetOption.FILL_VERTICALLY); + Assert.assertTrue(handler.contains(WidgetOption.FILL_HORIZONTALLY)); + Assert.assertTrue(handler.contains(WidgetOption.FILL_VERTICALLY)); + handler.add(WidgetOption.FILL_NONE); + Assert.assertTrue(handler.contains(WidgetOption.FILL_NONE)); + Assert.assertFalse(handler.contains(WidgetOption.FILL_VERTICALLY)); + Assert.assertFalse(handler.contains(WidgetOption.FILL_HORIZONTALLY)); + } + + @Test + public void testSetWidgetOptionArray() { + WidgetOptionHandler handler = new WidgetOptionHandler(); + handler.add(Arrays.asList(WidgetOption.ADD_DEFAULT_VALUE, WidgetOption.FILL_HORIZONTALLY)); + Assert.assertTrue(handler.getXOptions().contains(WidgetOption.ADD_DEFAULT_VALUE)); + } + + @Test + public void testToString() { + WidgetOptionHandler handler = new WidgetOptionHandler(); + handler.add(Arrays.asList(WidgetOption.ADD_DEFAULT_VALUE, WidgetOption.FILL_HORIZONTALLY)); + String toString = handler.toString(); + Assert.assertTrue(toString.equals("[ADD_DEFAULT_VALUE, FILL_HORIZONTALLY]") || toString.equals( + "[FILL_HORIZONTALLY, ADD_DEFAULT_VALUE]")); + } + +} diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/WidgetOptionTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/WidgetOptionTest.java new file mode 100644 index 00000000000..81c68257949 --- /dev/null +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/WidgetOptionTest.java @@ -0,0 +1,37 @@ +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Boeing - initial API and implementation + **********************************************************************/ + +package org.eclipse.osee.ats.core.workdef; + +import org.eclipse.osee.ats.api.workdef.WidgetOption; +import org.junit.Assert; +import org.junit.Test; + +/** + * Test case for {@link WidgetOption} + * + * @author Donald G. Dunne + */ +public class WidgetOptionTest { + + @Test + public void testValues() { + Assert.assertEquals(35, WidgetOption.values().length); + } + + @Test + public void testValueOf() { + Assert.assertEquals(WidgetOption.ADD_DEFAULT_VALUE, WidgetOption.valueOf(WidgetOption.ADD_DEFAULT_VALUE.name())); + } + +} diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/WorkDefBuilderTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/WorkDefBuilderTest.java new file mode 100644 index 00000000000..7faa6e332d9 --- /dev/null +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/WorkDefBuilderTest.java @@ -0,0 +1,155 @@ +/******************************************************************************* + * Copyright (c) 2021 Boeing. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Boeing - initial API and implementation + *******************************************************************************/ +package org.eclipse.osee.ats.core.workdef; + +import org.eclipse.osee.ats.api.workdef.AtsWorkDefinitionToken; +import org.eclipse.osee.ats.api.workdef.IAtsStateDefinition; +import org.eclipse.osee.ats.api.workdef.StateToken; +import org.eclipse.osee.ats.api.workdef.StateType; +import org.eclipse.osee.ats.api.workdef.model.WorkDefinition; +import org.eclipse.osee.ats.core.workdef.builder.WorkDefBuilder; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +/** + * Test for WorkDefBuilder + * + * @author Donald G. Dunne + */ +public class WorkDefBuilderTest { + + public static AtsWorkDefinitionToken WorkDef_Team_Test = new AtsWorkDefinitionToken(4352354L, "WorkDef_Team_Test"); + private WorkDefBuilder bld; + + @Before + public void setup() { + bld = new WorkDefBuilder(WorkDef_Team_Test); + bld.andState(1, "Analyze", StateType.Working).isStartState() // + .andToStates(StateToken.Completed); + bld.andState(2, "Completed", StateType.Completed); + bld.andState(3, "Cancelled", StateType.Cancelled); + + } + + @Test + public void testGetWorkDefinition() { + WorkDefinition workDef = bld.getWorkDefinition(); + Assert.assertNotNull(workDef); + Assert.assertTrue(workDef.getResults().isSuccess()); + } + + @Test + public void testDuplicateStartStates() { + bld.andState(4, "Implement", StateType.Working).isStartState() // + .andToStates(StateToken.Completed); + + WorkDefinition workDef = bld.getWorkDefinition(); + Assert.assertTrue(workDef.getResults().isFailed()); + Assert.assertTrue(workDef.getResults().toString().contains("Duplicate Start States")); + } + + @Test + public void testDuplicateOrdinal() { + bld.andState(3, "Implement", StateType.Working) // + .andToStates(StateToken.Completed); + + WorkDefinition workDef = bld.getWorkDefinition(); + Assert.assertTrue(workDef.getResults().isFailed()); + Assert.assertTrue(workDef.getResults().toString().contains("Ordinal [3] already exists")); + } + + @Test + public void testDuplicateNames() { + bld.andState(4, "Completed", StateType.Working) // + .andToStates(StateToken.Analyze); + + WorkDefinition workDef = bld.getWorkDefinition(); + Assert.assertTrue(workDef.getResults().isFailed()); + Assert.assertTrue(workDef.getResults().toString().contains("State with name [Completed] already exists")); + } + + @Test + public void testToStatesCanNotHaveThisStateName() { + bld.andState(4, "Implement", StateType.Working) // + .andToStates(StateToken.Implement); + + WorkDefinition workDef = bld.getWorkDefinition(); + Assert.assertTrue(workDef.getResults().isFailed()); + Assert.assertTrue(workDef.getResults().toString().contains("toState [Implement] shouldn't match state name")); + } + + @Test + public void testToStatesDoesNotHaveDups() { + bld.andState(4, "Implement", StateType.Working) // + .andToStates(StateToken.Analyze, StateToken.Analyze); + + WorkDefinition workDef = bld.getWorkDefinition(); + Assert.assertTrue(workDef.getResults().isFailed()); + Assert.assertTrue(workDef.getResults().toString().contains("Should not have duplicate [Analyze] states")); + } + + @Test + public void testCompleteStateHasNoToStates() { + bld.andState(4, "Complete2", StateType.Completed) // + .andToStates(StateToken.Analyze); + + WorkDefinition workDef = bld.getWorkDefinition(); + Assert.assertTrue(workDef.getResults().isFailed()); + Assert.assertTrue( + workDef.getResults().toString().contains("Completed/Cancelled sate [Complete2] shouldn't have toStates")); + } + + @Test + public void testCancelledStateHasNoToStates() { + bld.andState(4, "Cancelled2", StateType.Cancelled) // + .andToStates(StateToken.Analyze); + + WorkDefinition workDef = bld.getWorkDefinition(); + Assert.assertTrue(workDef.getResults().isFailed()); + Assert.assertTrue( + workDef.getResults().toString().contains("Completed/Cancelled sate [Cancelled2] shouldn't have toStates")); + } + + @Test + public void testStateTokenAnyWithOthers() { + bld.andState(4, "Implement", StateType.Working) // + .andToStates(StateToken.ANY, StateToken.Analyze); + + WorkDefinition workDef = bld.getWorkDefinition(); + Assert.assertTrue(workDef.getResults().isFailed()); + Assert.assertTrue( + workDef.getResults().toString().contains("Should not use StateToken.ANY with other StateTokens")); + } + + @Test + public void testStateTokenAny() { + WorkDefBuilder anyBld = new WorkDefBuilder(WorkDef_Team_Test); + anyBld.andState(1, "Analyze", StateType.Working).isStartState() // + .andToStates(StateToken.ANY); + anyBld.andState(2, "Completed", StateType.Completed); + anyBld.andState(3, "Cancelled", StateType.Cancelled); + + WorkDefinition workDef = anyBld.getWorkDefinition(); + Assert.assertTrue(workDef.getResults().isSuccess()); + + IAtsStateDefinition state = workDef.getStateByName(StateToken.Analyze.getName()); + Assert.assertNotNull(state); + Assert.assertEquals(2, state.getToStates().size()); + IAtsStateDefinition completed = workDef.getStateByName(StateToken.Completed.getName()); + IAtsStateDefinition cancelled = workDef.getStateByName(StateToken.Cancelled.getName()); + Assert.assertTrue(state.getToStates().contains(completed)); + Assert.assertTrue(state.getToStates().contains(cancelled)); + } + +} diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/WorkDefinitionMatchTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/WorkDefinitionMatchTest.java deleted file mode 100644 index 1b59979a96f..00000000000 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/WorkDefinitionMatchTest.java +++ /dev/null @@ -1,83 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.ats.core.workdef; - -import org.eclipse.osee.ats.api.workdef.IAtsWorkDefinition; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.mockito.Mock; -import org.mockito.Mockito; -import org.mockito.MockitoAnnotations; - -/** - * Test case for {@link WorkDefinitionMatch} - * - * @author Donald G. Dunne - */ -public class WorkDefinitionMatchTest { - - // @formatter:off - @Mock private IAtsWorkDefinition workDef; - // @formatter:on - - @Before - public void setup() { - MockitoAnnotations.initMocks(this); - Mockito.when(workDef.getName()).thenReturn("mine"); - } - - @Test - public void testWorkDefinitionMatch() { - WorkDefinitionMatch match = new WorkDefinitionMatch(); - Assert.assertNull(match.getWorkDefinition()); - Assert.assertTrue(match.getTrace().isEmpty()); - } - - @Test - public void testWorkDefinitionMatchWorkDefinitionString() { - WorkDefinitionMatch match = new WorkDefinitionMatch(workDef.getName(), "trace"); - match.setWorkDefinition(workDef); - Assert.assertNotNull(match.getWorkDefinition()); - Assert.assertFalse(match.getTrace().isEmpty()); - } - - @Test - public void testAddTrace() { - WorkDefinitionMatch match = new WorkDefinitionMatch(); - Assert.assertTrue(match.getTrace().isEmpty()); - match.addTrace("trace 1"); - Assert.assertEquals("trace 1", match.getTrace().iterator().next()); - match.addTrace("trace 1"); - Assert.assertEquals(1, match.getTrace().size()); - Assert.assertEquals("trace 1", match.getTrace().iterator().next()); - match.addTrace("trace 2"); - Assert.assertEquals("trace 1", match.getTrace().iterator().next()); - Assert.assertEquals(2, match.getTrace().size()); - } - - @Test - public void testIsMatched() { - WorkDefinitionMatch match = new WorkDefinitionMatch(workDef.getName(), "trace"); - match.setWorkDefinition(workDef); - Assert.assertTrue(match.isMatched()); - match.setWorkDefinition(null); - Assert.assertFalse(match.isMatched()); - } - - @Test - public void testToString() { - WorkDefinitionMatch match = new WorkDefinitionMatch(workDef.getName(), "trace"); - match.setWorkDefinition(workDef); - Assert.assertEquals("mine", match.toString()); - } - -} diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/WorkDefinitionSheetTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/WorkDefinitionSheetTest.java deleted file mode 100644 index 37efd2d365a..00000000000 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/WorkDefinitionSheetTest.java +++ /dev/null @@ -1,29 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.ats.core.workdef; - -import java.io.File; -import org.junit.Assert; -import org.junit.Test; - -/** - * @author Donald G. Dunne - */ -public class WorkDefinitionSheetTest { - - @Test - public void testWorkDefinitionSheet() { - WorkDefinitionSheet sheet = new WorkDefinitionSheet("name", new File("\\file\\path")); - Assert.assertNotNull(sheet.getFile()); - Assert.assertEquals("name", sheet.getName()); - Assert.assertEquals("name - file[\\file\\path]", sheet.toString()); - } -} diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/AtsCore_Workflow_JT_Suite.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/AtsCore_Workflow_JT_Suite.java index 17268d7aafe..988a5c1d3fa 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/AtsCore_Workflow_JT_Suite.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/AtsCore_Workflow_JT_Suite.java @@ -1,13 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2004, 2007 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.workflow; import org.eclipse.osee.ats.core.workflow.state.AtsCore_Workflow_State_Suite; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/OneStates.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/OneStates.java index 8e21aff6c31..fac241c20e0 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/OneStates.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/OneStates.java @@ -1,18 +1,21 @@ -/******************************************************************************* - * Copyright (c) 2011 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2011 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.workflow; import java.util.List; import org.eclipse.osee.ats.api.workdef.StateType; -import org.eclipse.osee.ats.core.workflow.state.StateTypeAdapter; +import org.eclipse.osee.ats.api.workdef.StateTypeAdapter; /** * @author Donald G. Dunne diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/OrderedStates.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/OrderedStates.java index 24d432e1f81..c71827a1aed 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/OrderedStates.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/OrderedStates.java @@ -1,18 +1,21 @@ -/******************************************************************************* - * Copyright (c) 2011 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2011 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.workflow; import java.util.List; import org.eclipse.osee.ats.api.workdef.StateType; -import org.eclipse.osee.ats.core.workflow.state.StateTypeAdapter; +import org.eclipse.osee.ats.api.workdef.StateTypeAdapter; /** * @author Donald G. Dunne diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/StateTypeTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/StateTypeTest.java index 4cb9f3d3bd0..f895604408a 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/StateTypeTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/StateTypeTest.java @@ -1,13 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.workflow; import org.eclipse.osee.ats.api.workdef.StateType; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/TestState.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/TestState.java index eb844ed81a9..54cebb95e71 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/TestState.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/TestState.java @@ -1,17 +1,20 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.workflow; import org.eclipse.osee.ats.api.workdef.StateType; -import org.eclipse.osee.ats.core.workflow.state.StateTypeAdapter; +import org.eclipse.osee.ats.api.workdef.StateTypeAdapter; /** * @author Donald G. Dunne diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/TwoStates.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/TwoStates.java index 6959d2cb495..38aee1b8cd0 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/TwoStates.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/TwoStates.java @@ -1,18 +1,21 @@ -/******************************************************************************* - * Copyright (c) 2011 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2011 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.workflow; import java.util.List; import org.eclipse.osee.ats.api.workdef.StateType; -import org.eclipse.osee.ats.core.workflow.state.StateTypeAdapter; +import org.eclipse.osee.ats.api.workdef.StateTypeAdapter; /** * @author Donald G. Dunne diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/WorkflowManagerCoreTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/WorkflowManagerCoreTest.java index ca4de02af83..9bb7907b8c8 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/WorkflowManagerCoreTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/WorkflowManagerCoreTest.java @@ -1,21 +1,26 @@ -/******************************************************************************* - * Copyright (c) 2011 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2011 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.workflow; import static org.mockito.Mockito.when; import java.util.ArrayList; import java.util.List; +import org.eclipse.osee.ats.api.AtsApi; import org.eclipse.osee.ats.api.review.IAtsAbstractReview; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; -import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinitionService; +import org.eclipse.osee.ats.api.user.AtsUser; import org.eclipse.osee.ats.api.workdef.IAtsStateDefinition; import org.eclipse.osee.ats.api.workdef.model.RuleDefinitionOption; import org.eclipse.osee.ats.api.workflow.IAtsTask; @@ -37,9 +42,11 @@ public class WorkflowManagerCoreTest { @Mock private IAtsTeamDefinition teamDef; @Mock private IAtsStateDefinition analyzeState, implementState; @Mock private IAtsTask task; - @Mock private IAtsUser Joe, Mary; + @Mock private AtsUser Joe, Mary; + @Mock private AtsApi atsApi; + @Mock private IAtsTeamDefinitionService teamDefinitionService; // @formatter:on - List<IAtsUser> assignees = new ArrayList<>(); + List<AtsUser> assignees = new ArrayList<>(); @Before public void setup() { @@ -51,6 +58,8 @@ public class WorkflowManagerCoreTest { when(analyzeState.getName()).thenReturn("analyze"); when(implementState.getName()).thenReturn("implement"); when(teamWf.getAssignees()).thenReturn(assignees); + when(atsApi.getTeamDefinitionService()).thenReturn(teamDefinitionService); + when(teamDef.getAtsApi()).thenReturn(atsApi); } @Test @@ -62,7 +71,7 @@ public class WorkflowManagerCoreTest { Assert.assertFalse(wmc.teamDefHasRule(task, option)); Assert.assertFalse(wmc.teamDefHasRule(review, option)); - when(teamDef.hasRule(RuleDefinitionOption.AllowEditToAll.name())).thenReturn(true); + when(teamDefinitionService.hasRule(teamDef, RuleDefinitionOption.AllowEditToAll.name())).thenReturn(true); Assert.assertTrue(wmc.teamDefHasRule(teamWf, option)); Assert.assertTrue(wmc.teamDefHasRule(review, option)); @@ -77,42 +86,39 @@ public class WorkflowManagerCoreTest { WorkflowManagerCore wmc = new WorkflowManagerCore(); // current state equals state - Assert.assertFalse(wmc.isWorkItemEditable(teamWf, null, false, Mary, false)); - Assert.assertFalse(wmc.isWorkItemEditable(teamWf, analyzeState, false, Mary, false)); - Assert.assertTrue(wmc.isWorkItemEditable(teamWf, analyzeState, false, Mary, true)); - Assert.assertFalse(wmc.isWorkItemEditable(teamWf, implementState, false, Mary, true)); + Assert.assertFalse(wmc.isWorkItemEditable(teamWf, null, Mary, false)); + Assert.assertFalse(wmc.isWorkItemEditable(teamWf, analyzeState, Mary, false)); + Assert.assertTrue(wmc.isWorkItemEditable(teamWf, analyzeState, Mary, true)); + Assert.assertFalse(wmc.isWorkItemEditable(teamWf, implementState, Mary, true)); // assignee is current user assignees.add(Mary); - Assert.assertTrue(wmc.isWorkItemEditable(teamWf, analyzeState, false, Mary, false)); + Assert.assertTrue(wmc.isWorkItemEditable(teamWf, analyzeState, Mary, false)); assignees.add(Joe); - Assert.assertTrue(wmc.isWorkItemEditable(teamWf, analyzeState, false, Mary, false)); + Assert.assertTrue(wmc.isWorkItemEditable(teamWf, analyzeState, Mary, false)); assignees.remove(Mary); - Assert.assertFalse(wmc.isWorkItemEditable(teamWf, analyzeState, false, Mary, false)); + Assert.assertFalse(wmc.isWorkItemEditable(teamWf, analyzeState, Mary, false)); // isAtsAdmin assignees.clear(); - Assert.assertTrue(wmc.isWorkItemEditable(teamWf, analyzeState, false, Mary, true)); - - // privilegedEditEnabled - assignees.clear(); - Assert.assertTrue(wmc.isWorkItemEditable(teamWf, analyzeState, true, Mary, false)); + Assert.assertTrue(wmc.isWorkItemEditable(teamWf, analyzeState, Mary, true)); // state has rule + assignees.clear(); when(analyzeState.hasRule(RuleDefinitionOption.AllowEditToAll.name())).thenReturn(false); - Assert.assertFalse(wmc.isWorkItemEditable(teamWf, analyzeState, false, Mary, false)); + Assert.assertFalse(wmc.isWorkItemEditable(teamWf, analyzeState, Mary, false)); when(analyzeState.hasRule(RuleDefinitionOption.AllowEditToAll.name())).thenReturn(true); - Assert.assertTrue(wmc.isWorkItemEditable(teamWf, analyzeState, false, Mary, false)); + Assert.assertTrue(wmc.isWorkItemEditable(teamWf, analyzeState, Mary, false)); when(analyzeState.hasRule(RuleDefinitionOption.AllowEditToAll.name())).thenReturn(false); // teamDef has rule - when(teamDef.hasRule(RuleDefinitionOption.AllowEditToAll.name())).thenReturn(true); - Assert.assertTrue(wmc.isWorkItemEditable(teamWf, analyzeState, false, Mary, false)); - when(teamDef.hasRule(RuleDefinitionOption.AllowEditToAll.name())).thenReturn(false); - Assert.assertFalse(wmc.isWorkItemEditable(teamWf, analyzeState, false, Mary, false)); + when(teamDefinitionService.hasRule(teamDef, RuleDefinitionOption.AllowEditToAll.name())).thenReturn(true); + Assert.assertTrue(wmc.isWorkItemEditable(teamWf, analyzeState, Mary, false)); + when(teamDefinitionService.hasRule(teamDef, RuleDefinitionOption.AllowEditToAll.name())).thenReturn(false); + Assert.assertFalse(wmc.isWorkItemEditable(teamWf, analyzeState, Mary, false)); // statics assignees.add(Mary); - Assert.assertTrue(WorkflowManagerCore.isEditable(teamWf, analyzeState, false, Mary, false)); + Assert.assertTrue(WorkflowManagerCore.isEditable(teamWf, analyzeState, Mary, false)); } } diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/note/AtsCore_Workflow_Note_Suite.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/note/AtsCore_Workflow_Note_Suite.java index 4078e6bb305..390694235c6 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/note/AtsCore_Workflow_Note_Suite.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/note/AtsCore_Workflow_Note_Suite.java @@ -1,13 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2004, 2007 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.workflow.note; import org.junit.runner.RunWith; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/note/AtsNoteTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/note/AtsNoteTest.java index 0cfe65cf597..625448c0ee0 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/note/AtsNoteTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/note/AtsNoteTest.java @@ -1,26 +1,29 @@ -/******************************************************************************* - * Copyright (c) 2010 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2010 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.workflow.note; +import static org.eclipse.osee.ats.core.users.AbstractUserTest.joe; import static org.mockito.Mockito.when; import java.util.ArrayList; import java.util.Date; import java.util.List; -import org.eclipse.osee.ats.api.IAtsServices; -import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.AtsApi; +import org.eclipse.osee.ats.api.user.AtsUser; import org.eclipse.osee.ats.api.user.IAtsUserService; import org.eclipse.osee.ats.api.workflow.note.IAtsWorkItemNotes; import org.eclipse.osee.ats.api.workflow.note.NoteItem; import org.eclipse.osee.framework.core.util.Result; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.GUID; import org.junit.Assert; import org.junit.Before; @@ -35,32 +38,30 @@ public class AtsNoteTest { // @formatter:off @Mock private IAtsUserService userService; - @Mock private IAtsServices services; - @Mock private IAtsUser Joe; + @Mock private AtsApi atsApi; // @formatter:on - List<IAtsUser> assignees = new ArrayList<>(); + List<AtsUser> assignees = new ArrayList<>(); @Before public void setup() { MockitoAnnotations.initMocks(this); - when(services.getUserService()).thenReturn(userService); - when(userService.getUserById("333")).thenReturn(Joe); - when(Joe.getUserId()).thenReturn("333"); + when(atsApi.getUserService()).thenReturn(userService); + when(userService.getUserByUserId(joe.getUserId())).thenReturn(joe); } @Test - public void testToAndFromStore() throws OseeCoreException { + public void testToAndFromStore() { Date date = new Date(); SimpleNoteStore store = new SimpleNoteStore(); - IAtsWorkItemNotes log = new AtsWorkItemNotes(store, services); - NoteItem item = NoteItemTest.getTestNoteItem(date, Joe); + IAtsWorkItemNotes log = new AtsWorkItemNotes(store, atsApi); + NoteItem item = NoteItemTest.getTestNoteItem(date, joe); log.addNoteItem(item); - IAtsWorkItemNotes log2 = new AtsWorkItemNotes(store, services); + IAtsWorkItemNotes log2 = new AtsWorkItemNotes(store, atsApi); Assert.assertEquals(1, log2.getNoteItems().size()); NoteItem loadItem = log2.getNoteItems().iterator().next(); - NoteItemTest.validate(loadItem, date, Joe); + NoteItemTest.validate(loadItem, date, joe); } public class SimpleNoteStore implements INoteStorageProvider { diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/note/NoteItemTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/note/NoteItemTest.java index 0952b9c4428..f1852b18739 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/note/NoteItemTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/note/NoteItemTest.java @@ -1,26 +1,29 @@ -/******************************************************************************* - * Copyright (c) 2010 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2010 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.workflow.note; +import static org.eclipse.osee.ats.core.users.AbstractUserTest.joe; import static org.mockito.Mockito.when; import java.util.ArrayList; import java.util.Arrays; import java.util.Date; import java.util.List; -import org.eclipse.osee.ats.api.IAtsServices; -import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.AtsApi; +import org.eclipse.osee.ats.api.user.AtsUser; import org.eclipse.osee.ats.api.user.IAtsUserService; import org.eclipse.osee.ats.api.workflow.note.NoteItem; import org.eclipse.osee.ats.api.workflow.note.NoteType; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.DateUtil; import org.junit.Assert; import org.junit.Before; @@ -35,87 +38,84 @@ public class NoteItemTest { // @formatter:off @Mock private IAtsUserService userService; - @Mock private IAtsServices services; - @Mock private IAtsUser Joe; + @Mock private AtsApi atsApi; // @formatter:on - List<IAtsUser> assignees = new ArrayList<>(); + List<AtsUser> assignees = new ArrayList<>(); @Before public void setup() { MockitoAnnotations.initMocks(this); - when(services.getUserService()).thenReturn(userService); - when(userService.getUserById("333")).thenReturn(Joe); - when(Joe.getUserId()).thenReturn("333"); + when(atsApi.getUserService()).thenReturn(userService); + when(userService.getUserByUserId(joe.getUserId())).thenReturn(joe); } @Test - public void testNoteItemNoteTypeStringStringUserString() throws OseeCoreException { + public void testNoteItemNoteTypeStringStringUserString() { Date date = new Date(); - NoteItem item = new NoteItem(NoteType.Comment, "Implement", String.valueOf(date.getTime()), Joe, "my msg"); - validate(item, date, Joe); + NoteItem item = new NoteItem(NoteType.Comment, "Implement", String.valueOf(date.getTime()), joe, "my msg"); + validate(item, date, joe); } - public static void validate(NoteItem item, Date date, IAtsUser Joe) throws OseeCoreException { + public static void validate(NoteItem item, Date date, AtsUser joe) { Assert.assertEquals(NoteType.Comment, item.getType()); Assert.assertEquals("Implement", item.getState()); - Assert.assertEquals(Joe, item.getUser()); + Assert.assertEquals(joe, item.getUser()); Assert.assertEquals("my msg", item.getMsg()); } - public static NoteItem getTestNoteItem(Date date, IAtsUser user) throws OseeCoreException { + public static NoteItem getTestNoteItem(Date date, AtsUser user) { return new NoteItem(NoteType.Comment, "Implement", String.valueOf(date.getTime()), user, "my msg"); } @Test - public void testNoteItemStringStringStringUserString() throws OseeCoreException { + public void testNoteItemStringStringStringUserString() { Date date = new Date(); - NoteItem item = new NoteItem(NoteType.Comment.name(), "Implement", String.valueOf(date.getTime()), Joe, "my msg"); - validate(item, date, Joe); + NoteItem item = new NoteItem(NoteType.Comment.name(), "Implement", String.valueOf(date.getTime()), joe, "my msg"); + validate(item, date, joe); } @Test - public void testToString() throws OseeCoreException { + public void testToString() { Date date = new Date(); - NoteItem item = getTestNoteItem(date, Joe); + NoteItem item = getTestNoteItem(date, joe); Assert.assertEquals( - "Note: Comment from " + Joe.getName() + " for \"Implement\" on " + DateUtil.getMMDDYYHHMM(date) + " - my msg", + "Note: Comment from " + joe.getName() + " for \"Implement\" on " + DateUtil.getMMDDYYHHMM(date) + " - my msg", item.toString()); } @Test - public void testToXmlFromXml() throws OseeCoreException { + public void testToXmlFromXml() { Date date = new Date(); - NoteItem item = getTestNoteItem(date, Joe); + NoteItem item = getTestNoteItem(date, joe); NoteItem item2 = - new NoteItem(NoteType.Question.name(), "Analyze", String.valueOf(date.getTime()), Joe, "another message"); + new NoteItem(NoteType.Question.name(), "Analyze", String.valueOf(date.getTime()), joe, "another message"); - String xml = AtsWorkItemNotes.toXml(Arrays.asList(item, item2), services); + String xml = AtsWorkItemNotes.toXml(Arrays.asList(item, item2), atsApi); Assert.assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?><AtsNote>" + // - "<Item date=\"" + date.getTime() + "\" msg=\"my msg\" state=\"Implement\" type=\"Comment\" userId=\"" + Joe.getUserId() + "\"/>" + // - "<Item date=\"" + date.getTime() + "\" msg=\"another message\" state=\"Analyze\" type=\"Question\" userId=\"" + Joe.getUserId() + "\"/></AtsNote>", + "<Item date=\"" + date.getTime() + "\" msg=\"my msg\" state=\"Implement\" type=\"Comment\" userId=\"" + joe.getUserId() + "\"/>" + // + "<Item date=\"" + date.getTime() + "\" msg=\"another message\" state=\"Analyze\" type=\"Question\" userId=\"" + joe.getUserId() + "\"/></AtsNote>", xml); - List<NoteItem> items = AtsWorkItemNotes.fromXml(xml, "ASDF4", services); - validate(items.iterator().next(), date, Joe); + List<NoteItem> items = AtsWorkItemNotes.fromXml(xml, "ASDF4", atsApi); + validate(items.iterator().next(), date, joe); NoteItem fromXmlItem2 = items.get(1); Assert.assertEquals(NoteType.Question, fromXmlItem2.getType()); Assert.assertEquals("Analyze", fromXmlItem2.getState()); - Assert.assertEquals(Joe, fromXmlItem2.getUser()); + Assert.assertEquals(joe, fromXmlItem2.getUser()); Assert.assertEquals("another message", fromXmlItem2.getMsg()); } @Test - public void testToHTML() throws OseeCoreException { + public void testToHTML() { Date date = new Date(); - NoteItem item = getTestNoteItem(date, Joe); + NoteItem item = getTestNoteItem(date, joe); Assert.assertEquals( - "<b>Note:</b>Comment from " + Joe.getName() + " for \"Implement\" on " + DateUtil.getMMDDYYHHMM( + "<b>Note:</b>Comment from " + joe.getName() + " for \"Implement\" on " + DateUtil.getMMDDYYHHMM( date) + " - my msg", item.toHTML()); } - -} +}
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/state/AtsCore_Workflow_State_Suite.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/state/AtsCore_Workflow_State_Suite.java index 290a2f48300..a320551ccce 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/state/AtsCore_Workflow_State_Suite.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/state/AtsCore_Workflow_State_Suite.java @@ -1,13 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.workflow.state; import org.junit.runner.RunWith; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/state/SimpleTeamStateTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/state/SimpleTeamStateTest.java index eaac7a352dd..5646add7414 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/state/SimpleTeamStateTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/state/SimpleTeamStateTest.java @@ -1,13 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.workflow.state; import org.eclipse.osee.ats.api.workdef.StateType; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/state/StateManagerUtilityTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/state/StateManagerUtilityTest.java index 01d00acf8cb..44b8197e1db 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/state/StateManagerUtilityTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/state/StateManagerUtilityTest.java @@ -1,23 +1,26 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.workflow.state; import static org.mockito.Mockito.when; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.eclipse.osee.ats.api.IAtsServices; +import org.eclipse.osee.ats.api.AtsApi; import org.eclipse.osee.ats.api.IAtsWorkItem; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; -import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.user.AtsUser; import org.eclipse.osee.ats.api.user.IAtsUserService; import org.eclipse.osee.ats.api.util.IAtsChangeSet; import org.eclipse.osee.ats.api.workdef.IAtsStateDefinition; @@ -31,8 +34,8 @@ import org.eclipse.osee.ats.api.workflow.state.IAtsWorkStateFactory; import org.eclipse.osee.ats.core.internal.state.AtsWorkStateFactory; import org.eclipse.osee.ats.core.internal.state.StateManager; import org.eclipse.osee.ats.core.workflow.TestState; +import org.eclipse.osee.framework.core.enums.DemoUsers; import org.eclipse.osee.framework.core.util.Result; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -42,14 +45,13 @@ import org.mockito.MockitoAnnotations; /** * Test Case for {@link StateManagerUtility} - * + * * @author Donald G. Dunne */ public class StateManagerUtilityTest { // @formatter:off @Mock IAtsWorkItem workItem; - @Mock IAtsUser Joe, Kay; @Mock IAtsChangeSet changes; @Mock IAtsWorkDefinition workDef; @Mock IAtsStateDefinition analyzeState, completedState; @@ -58,11 +60,13 @@ public class StateManagerUtilityTest { @Mock IAtsWorkStateFactory workStateFactory; @Mock IAtsUserService userService; @Mock IAtsLogFactory logFactory; - @Mock IAtsServices services; + @Mock AtsApi atsApi; // @formatter:on + private static final AtsUser Joe = new AtsUser(DemoUsers.Joe_Smith); + private static final AtsUser Kay = new AtsUser(DemoUsers.Kay_Jones); @Before - public void setup() throws OseeCoreException { + public void setup() { MockitoAnnotations.initMocks(this); when(workItem.getWorkDefinition()).thenReturn(workDef); when(workItem.getStateMgr()).thenReturn(stateMgr); @@ -81,7 +85,7 @@ public class StateManagerUtilityTest { @Test public void testInitializeStateMachine() { - StateManager stateMgr = new StateManager(workItem, logFactory, services); + StateManager stateMgr = new StateManager(workItem, logFactory, atsApi); TestState state = new TestState("Analyze", StateType.Working); StateManagerUtility.initializeStateMachine(stateMgr, state, Arrays.asList(Joe, Kay), Joe, changes); Assert.assertEquals("Analyze", stateMgr.getCurrentStateName()); diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/state/StateTypeAdapterTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/state/StateTypeAdapterTest.java index a933bb695e0..32e9a540208 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/state/StateTypeAdapterTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/state/StateTypeAdapterTest.java @@ -1,16 +1,20 @@ -/******************************************************************************* - * Copyright (c) 2011 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2011 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.workflow.state; import org.eclipse.osee.ats.api.workdef.StateType; +import org.eclipse.osee.ats.api.workdef.StateTypeAdapter; import org.eclipse.osee.ats.core.workflow.OneStates; import org.eclipse.osee.ats.core.workflow.OrderedStates; import org.eclipse.osee.ats.core.workflow.TestState; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/state/TeamStateTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/state/TeamStateTest.java index 2cfbd144280..1ce92713be9 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/state/TeamStateTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/state/TeamStateTest.java @@ -1,13 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.workflow.state; import org.eclipse.osee.ats.api.workdef.StateType; @@ -16,7 +19,7 @@ import org.junit.Test; /** * Test Unit for {@link TeamState} - * + * * @author Donald G. Dunne */ public class TeamStateTest { @@ -44,7 +47,7 @@ public class TeamStateTest { @Test public void testValues() { - Assert.assertEquals(6, TeamState.values().size()); + Assert.assertEquals(7, TeamState.values().size()); } } diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/transition/AtsCore_Workflow_Transition_Suite.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/transition/AtsCore_Workflow_Transition_Suite.java index 1f60b81c02e..8167631ce7c 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/transition/AtsCore_Workflow_Transition_Suite.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/transition/AtsCore_Workflow_Transition_Suite.java @@ -1,13 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.workflow.transition; import org.junit.runner.RunWith; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/transition/TransitionHelperAdapterTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/transition/TransitionHelperAdapterTest.java index 9c9506c82f6..95a2a9a514e 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/transition/TransitionHelperAdapterTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/transition/TransitionHelperAdapterTest.java @@ -1,31 +1,33 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.workflow.transition; import static org.mockito.Mockito.when; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.eclipse.osee.ats.api.IAtsServices; +import org.eclipse.osee.ats.api.AtsApi; import org.eclipse.osee.ats.api.IAtsWorkItem; -import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.user.AtsCoreUsers; +import org.eclipse.osee.ats.api.user.AtsUser; import org.eclipse.osee.ats.api.user.IAtsUserService; import org.eclipse.osee.ats.api.util.IAtsChangeSet; import org.eclipse.osee.ats.api.workdef.IAttributeResolver; import org.eclipse.osee.ats.api.workflow.IAtsBranchService; +import org.eclipse.osee.ats.api.workflow.hooks.IAtsTransitionHook; import org.eclipse.osee.ats.api.workflow.state.IAtsStateManager; -import org.eclipse.osee.ats.api.workflow.transition.ITransitionListener; -import org.eclipse.osee.ats.core.users.AtsCoreUsers; -import org.eclipse.osee.framework.core.util.Result; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; +import org.eclipse.osee.ats.api.workflow.transition.TransitionData; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -34,7 +36,7 @@ import org.mockito.MockitoAnnotations; /** * Unit test for {@link TransitionHelperAdapter} - * + * * @author Donald G. Dunne */ public class TransitionHelperAdapterTest { @@ -42,7 +44,7 @@ public class TransitionHelperAdapterTest { // @formatter:off @Mock IAtsWorkItem workItem; @Mock IAtsStateManager stateMgr; - @Mock IAtsUser Joe, Kay; + @Mock AtsUser Joe, Kay; @Mock IAtsUserService userService; @Mock IAtsBranchService branchService; @Mock IAttributeResolver attrResolver; @@ -51,18 +53,13 @@ public class TransitionHelperAdapterTest { TestTransitionHelper helper = null; @Before - public void setup() throws OseeCoreException { + public void setup() { MockitoAnnotations.initMocks(this); helper = new TestTransitionHelper(); } @Test - public void testIsPrivilegedEditEnabled() { - Assert.assertFalse(helper.isPrivilegedEditEnabled()); - } - - @Test public void testIsOverrideTransitionValidityCheck() { Assert.assertFalse(helper.isOverrideTransitionValidityCheck()); } @@ -80,7 +77,7 @@ public class TransitionHelperAdapterTest { @Test public void testIsSystemUserAssignee() { when(workItem.getStateMgr()).thenReturn(stateMgr); - List<IAtsUser> assignees = new ArrayList<>(); + List<AtsUser> assignees = new ArrayList<>(); when(stateMgr.getAssignees()).thenReturn(assignees); Assert.assertFalse(helper.isSystemUserAssingee(workItem)); @@ -108,42 +105,47 @@ public class TransitionHelperAdapterTest { } @Override - public Collection<? extends IAtsWorkItem> getWorkItems() { + public Collection<IAtsWorkItem> getWorkItems() { return null; } @Override - public Result getCompleteOrCancellationReason() { + public TransitionData getCancellationReason(TransitionData transitionData) { return null; } @Override - public Result handleExtraHoursSpent(IAtsChangeSet changes) { + public Collection<? extends AtsUser> getToAssignees(IAtsWorkItem workItem) { return null; } @Override - public Collection<? extends IAtsUser> getToAssignees(IAtsWorkItem workItem) throws OseeCoreException { + public String getToStateName() { return null; } @Override - public String getToStateName() { + public IAtsChangeSet getChangeSet() { return null; } @Override - public IAtsChangeSet getChangeSet() { + public Collection<IAtsTransitionHook> getTransitionListeners() { + return null; + } + + @Override + public AtsApi getServices() { return null; } @Override - public Collection<ITransitionListener> getTransitionListeners() { + public String getCancellationReasonDetails() { return null; } @Override - public IAtsServices getServices() { + public String getCancellationReason() { return null; } diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/transition/TransitionHelperTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/transition/TransitionHelperTest.java index 47152d30635..588f9807050 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/transition/TransitionHelperTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/transition/TransitionHelperTest.java @@ -1,32 +1,34 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.workflow.transition; import static org.mockito.Mockito.when; import java.util.Arrays; import java.util.Collection; -import org.eclipse.osee.ats.api.IAtsServices; +import org.eclipse.osee.ats.api.AtsApi; import org.eclipse.osee.ats.api.IAtsWorkItem; -import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.user.AtsCoreUsers; +import org.eclipse.osee.ats.api.user.AtsUser; import org.eclipse.osee.ats.api.user.IAtsUserService; import org.eclipse.osee.ats.api.util.IAtsChangeSet; import org.eclipse.osee.ats.api.workdef.IAttributeResolver; import org.eclipse.osee.ats.api.workflow.IAtsBranchService; import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; import org.eclipse.osee.ats.api.workflow.IAtsWorkItemService; -import org.eclipse.osee.ats.api.workflow.transition.ITransitionListener; +import org.eclipse.osee.ats.api.workflow.hooks.IAtsTransitionHook; +import org.eclipse.osee.ats.api.workflow.transition.TransitionData; import org.eclipse.osee.ats.api.workflow.transition.TransitionOption; -import org.eclipse.osee.ats.core.users.AtsCoreUsers; -import org.eclipse.osee.framework.core.util.Result; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -35,7 +37,7 @@ import org.mockito.MockitoAnnotations; /** * Unit test for {@link TransitionHelper} - * + * * @author Donald G. Dunne */ public class TransitionHelperTest { @@ -43,39 +45,29 @@ public class TransitionHelperTest { // @formatter:off @Mock IAtsWorkItem workItem, workItem2; @Mock IAtsTeamWorkflow teamWf; - @Mock IAtsUser Joe, Kay; + @Mock AtsUser Joe, Kay; @Mock IAtsChangeSet changes; - @Mock ITransitionListener transListener1, transListener2; + @Mock IAtsTransitionHook transListener1, transListener2; @Mock IAtsWorkItemService workItemService; @Mock IAtsUserService userService; @Mock IAtsBranchService branchService; - @Mock IAtsServices services; + @Mock AtsApi atsApi; @Mock IAttributeResolver attrResolver; // @formatter:on TransitionHelper helper = null; @Before - public void setup() throws OseeCoreException { + public void setup() { MockitoAnnotations.initMocks(this); - when(services.getAttributeResolver()).thenReturn(attrResolver); - when(services.getBranchService()).thenReturn(branchService); - when(services.getUserService()).thenReturn(userService); - when(services.getWorkItemService()).thenReturn(workItemService); + when(atsApi.getAttributeResolver()).thenReturn(attrResolver); + when(atsApi.getBranchService()).thenReturn(branchService); + when(atsApi.getUserService()).thenReturn(userService); + when(atsApi.getWorkItemService()).thenReturn(workItemService); helper = new TransitionHelper("test", Arrays.asList(workItem, workItem2), "Completed", Arrays.asList(Joe, Kay), - "cancel reason", changes, services, TransitionOption.None); - } - - @Test - public void testIsPrivilegedEditEnabled() { - Assert.assertFalse(helper.isPrivilegedEditEnabled()); - - TransitionHelper helper = new TransitionHelper("test", Arrays.asList(workItem, workItem2), "Completed", - Arrays.asList(Joe, Kay), "cancel reason", changes, services, TransitionOption.PrivilegedEditEnabled); - - Assert.assertTrue(helper.isPrivilegedEditEnabled()); + "cancel reason", changes, atsApi, TransitionOption.None); } @Test @@ -83,7 +75,7 @@ public class TransitionHelperTest { Assert.assertFalse(helper.isOverrideTransitionValidityCheck()); TransitionHelper helper = new TransitionHelper("test", Arrays.asList(workItem, workItem2), "Completed", - Arrays.asList(Joe, Kay), "cancel reason", changes, services, TransitionOption.OverrideTransitionValidityCheck); + Arrays.asList(Joe, Kay), "cancel reason", changes, atsApi, TransitionOption.OverrideTransitionValidityCheck); Assert.assertTrue(helper.isOverrideTransitionValidityCheck()); } @@ -93,7 +85,7 @@ public class TransitionHelperTest { Assert.assertFalse(helper.isOverrideAssigneeCheck()); TransitionHelper helper = new TransitionHelper("test", Arrays.asList(workItem, workItem2), "Completed", - Arrays.asList(Joe, Kay), "cancel reason", changes, services, TransitionOption.OverrideAssigneeCheck); + Arrays.asList(Joe, Kay), "cancel reason", changes, atsApi, TransitionOption.OverrideAssigneeCheck); Assert.assertTrue(helper.isOverrideAssigneeCheck()); } @@ -116,16 +108,16 @@ public class TransitionHelperTest { @Test public void testGetCompleteOrCancellationReason() { - Result reason = helper.getCompleteOrCancellationReason(); - Assert.assertEquals("cancel reason", reason.getText()); - Assert.assertTrue(reason.isTrue()); + TransitionData transitionData = new TransitionData(); + transitionData.setCancellationReason("cancel reason"); + helper.getCancellationReason(transitionData); + Assert.assertEquals("cancel reason", transitionData.getCancellationReason()); - TransitionHelper helper2 = new TransitionHelper("test", Arrays.asList(workItem, workItem2), "Completed", - Arrays.asList(Joe, Kay), null, changes, services, TransitionOption.OverrideAssigneeCheck); + TransitionHelper transitionHelper = new TransitionHelper("test", Arrays.asList(workItem, workItem2), "Completed", + Arrays.asList(Joe, Kay), null, changes, atsApi, TransitionOption.OverrideAssigneeCheck); + transitionHelper.setCancellationReason("cancel reason"); - reason = helper2.getCompleteOrCancellationReason(); - Assert.assertEquals("", reason.getText()); - Assert.assertTrue(reason.isFalse()); + transitionHelper.getCancellationReason(transitionData); } @Test @@ -135,18 +127,13 @@ public class TransitionHelperTest { @Test public void testGetToAssignees() { - Collection<? extends IAtsUser> toAssignees = helper.getToAssignees(workItem); + Collection<? extends AtsUser> toAssignees = helper.getToAssignees(workItem); Assert.assertEquals(2, toAssignees.size()); Assert.assertTrue(toAssignees.contains(Kay)); Assert.assertTrue(toAssignees.contains(Joe)); } @Test - public void testHandleExtraHoursSpent() { - Assert.assertEquals(Result.TrueResult, helper.handleExtraHoursSpent(changes)); - } - - @Test public void testGetToStateName() { Assert.assertEquals("Completed", helper.getToStateName()); } @@ -183,7 +170,7 @@ public class TransitionHelperTest { @Test public void testGetTransitionListeners() { - when(workItemService.getTransitionListeners()).thenReturn(Arrays.asList(transListener1)); + when(workItemService.getTransitionHooks()).thenReturn(Arrays.asList(transListener1)); Assert.assertEquals(transListener1, helper.getTransitionListeners().iterator().next()); } diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/transition/TransitionStatusDataTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/transition/TransitionStatusDataTest.java index 989fb4f8d9e..f890b04419a 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/transition/TransitionStatusDataTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/transition/TransitionStatusDataTest.java @@ -1,37 +1,42 @@ -/******************************************************************************* - * Copyright (c) 2013 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************* + * Copyright (c) 2013 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boeing - initial API and implementation - *******************************************************************************/ + **********************************************************************/ + package org.eclipse.osee.ats.core.workflow.transition; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import org.eclipse.osee.ats.api.IAtsWorkItem; -import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.user.AtsUser; import org.eclipse.osee.ats.api.user.IAtsUserService; import org.eclipse.osee.ats.api.workflow.IAtsBranchService; import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; import org.eclipse.osee.framework.core.util.Result; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +/** + * @author Donald G. Dunne + */ public class TransitionStatusDataTest { // @formatter:off @Mock IAtsWorkItem workItem, workItem2; @Mock IAtsTeamWorkflow teamWf; - @Mock IAtsUser Joe, Kay; + @Mock AtsUser Joe, Kay; @Mock IAtsUserService userService; @Mock IAtsBranchService branchService; // @formatter:on @@ -39,7 +44,7 @@ public class TransitionStatusDataTest { TransitionStatusData data; @Before - public void setup() throws OseeCoreException { + public void setup() { MockitoAnnotations.initMocks(this); List<IAtsWorkItem> workItems = new ArrayList<>(); |