diff options
author | donald.g.dunne | 2013-09-03 19:00:14 +0000 |
---|---|---|
committer | donald.g.dunne | 2013-09-03 19:01:04 +0000 |
commit | 3a3a3fe7db847c6133c330f14020ffdbf77d5d21 (patch) | |
tree | 2ad4673a8a80432a422aaa8c80f6416078526668 /plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse | |
parent | 29776a90082d311386f7626910516c5087a80532 (diff) | |
download | org.eclipse.osee-3a3a3fe7db847c6133c330f14020ffdbf77d5d21.tar.gz org.eclipse.osee-3a3a3fe7db847c6133c330f14020ffdbf77d5d21.tar.xz org.eclipse.osee-3a3a3fe7db847c6133c330f14020ffdbf77d5d21.zip |
feature[ats_N5JZT]: Make new Task creation default to un-related to state
Change-Id: I06eaed251b8db4252c50d5a43cd4c8b2cd27d91f
Diffstat (limited to 'plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse')
4 files changed, 55 insertions, 51 deletions
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/transition/TransitionManagerTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/transition/TransitionManagerTest.java index a877b7355d1..f8edbea4c87 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/transition/TransitionManagerTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/transition/TransitionManagerTest.java @@ -114,8 +114,8 @@ public class TransitionManagerTest { TransitionHelper helper = new TransitionHelper(getClass().getSimpleName(), Arrays.asList(teamArt), - AtsTestUtil.getImplementStateDef().getName(), Arrays.asList(AtsClientService.get().getUserAdmin().getCurrentUser()), null, - TransitionOption.None); + AtsTestUtil.getImplementStateDef().getName(), + Arrays.asList(AtsClientService.get().getUserAdmin().getCurrentUser()), null, TransitionOption.None); TransitionManager transMgr = new TransitionManager(helper); TransitionResults results = new TransitionResults(); @@ -169,8 +169,8 @@ public class TransitionManagerTest { TeamWorkFlowArtifact teamArt = AtsTestUtil.getTeamWf(); MockTransitionHelper helper = new MockTransitionHelper(getClass().getSimpleName(), Arrays.asList(teamArt), - AtsTestUtil.getImplementStateDef().getName(), Arrays.asList(AtsClientService.get().getUserAdmin().getCurrentUser()), null, - TransitionOption.None); + AtsTestUtil.getImplementStateDef().getName(), + Arrays.asList(AtsClientService.get().getUserAdmin().getCurrentUser()), null, TransitionOption.None); TransitionManager transMgr = new TransitionManager(helper); TransitionResults results = new TransitionResults(); @@ -207,8 +207,8 @@ public class TransitionManagerTest { TeamWorkFlowArtifact teamArt = AtsTestUtil.getTeamWf(); MockTransitionHelper helper = new MockTransitionHelper(getClass().getSimpleName(), Arrays.asList(teamArt), - AtsTestUtil.getImplementStateDef().getName(), Arrays.asList(AtsClientService.get().getUserAdmin().getCurrentUser()), null, - TransitionOption.None); + AtsTestUtil.getImplementStateDef().getName(), + Arrays.asList(AtsClientService.get().getUserAdmin().getCurrentUser()), null, TransitionOption.None); TransitionManager transMgr = new TransitionManager(helper); TransitionResults results = new TransitionResults(); @@ -233,8 +233,8 @@ public class TransitionManagerTest { TeamWorkFlowArtifact teamArt = AtsTestUtil.getTeamWf(); MockTransitionHelper helper = new MockTransitionHelper(getClass().getSimpleName(), Arrays.asList(teamArt), - AtsTestUtil.getImplementStateDef().getName(), Arrays.asList(AtsClientService.get().getUserAdmin().getCurrentUser()), null, - TransitionOption.None); + AtsTestUtil.getImplementStateDef().getName(), + Arrays.asList(AtsClientService.get().getUserAdmin().getCurrentUser()), null, TransitionOption.None); IAtsStateDefinition fromStateDef = AtsTestUtil.getAnalyzeStateDef(); fromStateDef.getLayoutItems().clear(); TransitionManager transMgr = new TransitionManager(helper); @@ -273,8 +273,8 @@ public class TransitionManagerTest { TeamWorkFlowArtifact teamArt = AtsTestUtil.getTeamWf(); MockTransitionHelper helper = new MockTransitionHelper(getClass().getSimpleName(), Arrays.asList(teamArt), - AtsTestUtil.getImplementStateDef().getName(), Arrays.asList(AtsClientService.get().getUserAdmin().getCurrentUser()), null, - TransitionOption.None); + AtsTestUtil.getImplementStateDef().getName(), + Arrays.asList(AtsClientService.get().getUserAdmin().getCurrentUser()), null, TransitionOption.None); IAtsStateDefinition fromStateDef = AtsTestUtil.getAnalyzeStateDef(); fromStateDef.getLayoutItems().clear(); TransitionManager transMgr = new TransitionManager(helper); @@ -328,8 +328,8 @@ public class TransitionManagerTest { TeamWorkFlowArtifact teamArt = AtsTestUtil.getTeamWf(); MockTransitionHelper helper = new MockTransitionHelper(getClass().getSimpleName(), Arrays.asList(teamArt), - AtsTestUtil.getImplementStateDef().getName(), Arrays.asList(AtsClientService.get().getUserAdmin().getCurrentUser()), null, - TransitionOption.None); + AtsTestUtil.getImplementStateDef().getName(), + Arrays.asList(AtsClientService.get().getUserAdmin().getCurrentUser()), null, TransitionOption.None); TransitionManager transMgr = new TransitionManager(helper); TransitionResults results = new TransitionResults(); @@ -338,7 +338,9 @@ public class TransitionManagerTest { Assert.assertTrue(results.isEmpty()); // validate that can't transition with InWork task - TaskArtifact taskArt = teamArt.createNewTask("New Tasks", new Date(), AtsClientService.get().getUserAdmin().getCurrentUser()); + TaskArtifact taskArt = + teamArt.createNewTask("New Tasks", new Date(), AtsClientService.get().getUserAdmin().getCurrentUser(), + teamArt.getCurrentStateName()); results.clear(); transMgr.handleTransitionValidation(results); Assert.assertTrue(results.contains(teamArt, TransitionResult.TASKS_NOT_COMPLETED)); @@ -359,8 +361,8 @@ public class TransitionManagerTest { // attempt to transition parent to cancelled, should not be able to transition with un-completed/cancelled tasks helper = new MockTransitionHelper(getClass().getSimpleName(), Arrays.asList(teamArt), - AtsTestUtil.getCancelledStateDef().getName(), Arrays.asList(AtsClientService.get().getUserAdmin().getCurrentUser()), null, - TransitionOption.None); + AtsTestUtil.getCancelledStateDef().getName(), + Arrays.asList(AtsClientService.get().getUserAdmin().getCurrentUser()), null, TransitionOption.None); transMgr = new TransitionManager(helper); results.clear(); transMgr.handleTransitionValidation(results); @@ -387,8 +389,8 @@ public class TransitionManagerTest { TeamWorkFlowArtifact teamArt = AtsTestUtil.getTeamWf(); MockTransitionHelper helper = new MockTransitionHelper(getClass().getSimpleName(), Arrays.asList(teamArt), - AtsTestUtil.getImplementStateDef().getName(), Arrays.asList(AtsClientService.get().getUserAdmin().getCurrentUser()), null, - TransitionOption.None); + AtsTestUtil.getImplementStateDef().getName(), + Arrays.asList(AtsClientService.get().getUserAdmin().getCurrentUser()), null, TransitionOption.None); TransitionManager transMgr = new TransitionManager(helper); TransitionResults results = new TransitionResults(); @@ -415,8 +417,8 @@ public class TransitionManagerTest { TeamWorkFlowArtifact teamArt = AtsTestUtil.getTeamWf(); MockTransitionHelper helper = new MockTransitionHelper(getClass().getSimpleName(), Arrays.asList(teamArt), - AtsTestUtil.getImplementStateDef().getName(), Arrays.asList(AtsClientService.get().getUserAdmin().getCurrentUser()), null, - TransitionOption.None); + AtsTestUtil.getImplementStateDef().getName(), + Arrays.asList(AtsClientService.get().getUserAdmin().getCurrentUser()), null, TransitionOption.None); TransitionManager transMgr = new TransitionManager(helper); TransitionResults results = new TransitionResults(); @@ -444,8 +446,8 @@ public class TransitionManagerTest { TeamWorkFlowArtifact teamArt = AtsTestUtil.getTeamWf(); MockTransitionHelper helper = new MockTransitionHelper(getClass().getSimpleName(), Arrays.asList(teamArt), - AtsTestUtil.getImplementStateDef().getName(), Arrays.asList(AtsClientService.get().getUserAdmin().getCurrentUser()), null, - TransitionOption.None); + AtsTestUtil.getImplementStateDef().getName(), + Arrays.asList(AtsClientService.get().getUserAdmin().getCurrentUser()), null, TransitionOption.None); TransitionManager transMgr = new TransitionManager(helper); TransitionResults results = new TransitionResults(); @@ -478,8 +480,8 @@ public class TransitionManagerTest { results.clear(); SkynetTransaction transaction = TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(), getClass().getSimpleName()); - DecisionReviewManager.transitionTo(decArt, DecisionReviewState.Completed, AtsClientService.get().getUserAdmin().getCurrentUser(), false, - transaction); + DecisionReviewManager.transitionTo(decArt, DecisionReviewState.Completed, + AtsClientService.get().getUserAdmin().getCurrentUser(), false, transaction); transaction.execute(); transMgr.handleTransitionValidation(results); Assert.assertTrue(results.isEmpty()); @@ -492,8 +494,8 @@ public class TransitionManagerTest { TeamWorkFlowArtifact teamArt = AtsTestUtil.getTeamWf(); MockTransitionHelper helper = new MockTransitionHelper(getClass().getSimpleName(), Arrays.asList(teamArt), - AtsTestUtil.getImplementStateDef().getName(), Arrays.asList(AtsClientService.get().getUserAdmin().getCurrentUser()), null, - TransitionOption.None); + AtsTestUtil.getImplementStateDef().getName(), + Arrays.asList(AtsClientService.get().getUserAdmin().getCurrentUser()), null, TransitionOption.None); TransitionManager transMgr = new TransitionManager(helper); TransitionResults results = new TransitionResults(); @@ -569,8 +571,8 @@ public class TransitionManagerTest { //1. Initially transition workflows to Implement MockTransitionHelper helper = new MockTransitionHelper(getClass().getSimpleName(), Arrays.asList(teamArt01, teamArt02), - AtsTestUtil.getImplementStateDef().getName(), Arrays.asList(AtsClientService.get().getUserAdmin().getCurrentUser()), null, - TransitionOption.None); + AtsTestUtil.getImplementStateDef().getName(), + Arrays.asList(AtsClientService.get().getUserAdmin().getCurrentUser()), null, TransitionOption.None); TransitionManager transMgr = new TransitionManager(helper); TransitionResults results = new TransitionResults(); transMgr.handleTransitionValidation(results); @@ -579,8 +581,8 @@ public class TransitionManagerTest { //2. redundant transition workflows to Implement MockTransitionHelper helper01 = new MockTransitionHelper(getClass().getSimpleName(), Arrays.asList(teamArt01, teamArt02), - AtsTestUtil.getImplementStateDef().getName(), Arrays.asList(AtsClientService.get().getUserAdmin().getCurrentUser()), null, - TransitionOption.None); + AtsTestUtil.getImplementStateDef().getName(), + Arrays.asList(AtsClientService.get().getUserAdmin().getCurrentUser()), null, TransitionOption.None); TransitionManager transMgr01 = new TransitionManager(helper01); TransitionResults results01 = new TransitionResults(); transMgr01.handleTransitionValidation(results01); @@ -589,8 +591,8 @@ public class TransitionManagerTest { //3. Transition one TeamWf to Complete MockTransitionHelper helper02 = new MockTransitionHelper(getClass().getSimpleName(), Arrays.asList(teamArt01), - AtsTestUtil.getCompletedStateDef().getName(), Arrays.asList(AtsClientService.get().getUserAdmin().getCurrentUser()), null, - TransitionOption.None); + AtsTestUtil.getCompletedStateDef().getName(), + Arrays.asList(AtsClientService.get().getUserAdmin().getCurrentUser()), null, TransitionOption.None); TransitionManager transMgr02 = new TransitionManager(helper02); TransitionResults results02 = new TransitionResults(); transMgr02.handleTransitionValidation(results02); @@ -599,8 +601,8 @@ public class TransitionManagerTest { //4. redundant transition workflows to Implement MockTransitionHelper helper03 = new MockTransitionHelper(getClass().getSimpleName(), Arrays.asList(teamArt01, teamArt02), - AtsTestUtil.getCompletedStateDef().getName(), Arrays.asList(AtsClientService.get().getUserAdmin().getCurrentUser()), null, - TransitionOption.None); + AtsTestUtil.getCompletedStateDef().getName(), + Arrays.asList(AtsClientService.get().getUserAdmin().getCurrentUser()), null, TransitionOption.None); TransitionManager transMgr03 = new TransitionManager(helper03); TransitionResults results03 = new TransitionResults(); transMgr03.handleTransitionValidation(results03); @@ -659,8 +661,8 @@ public class TransitionManagerTest { // Setup - Transition to Implement SkynetTransaction transaction = TransactionManager.createTransaction(AtsUtilCore.getAtsBranchToken(), "create"); Result result = - AtsTestUtil.transitionTo(AtsTestUtilState.Implement, AtsClientService.get().getUserAdmin().getCurrentUser(), transaction, - TransitionOption.OverrideAssigneeCheck); + AtsTestUtil.transitionTo(AtsTestUtilState.Implement, AtsClientService.get().getUserAdmin().getCurrentUser(), + transaction, TransitionOption.OverrideAssigneeCheck); transaction.execute(); Assert.assertTrue("Transition Error: " + result.getText(), result.isTrue()); Assert.assertEquals("Implement", teamArt.getCurrentStateName()); @@ -669,8 +671,8 @@ public class TransitionManagerTest { // Transition to completed should set percent to 100 MockTransitionHelper helper = new MockTransitionHelper(getClass().getSimpleName(), Arrays.asList(teamArt), - AtsTestUtil.getCompletedStateDef().getName(), Arrays.asList(AtsClientService.get().getUserAdmin().getCurrentUser()), null, - TransitionOption.None); + AtsTestUtil.getCompletedStateDef().getName(), + Arrays.asList(AtsClientService.get().getUserAdmin().getCurrentUser()), null, TransitionOption.None); TransitionManager transMgr = new TransitionManager(helper); TransitionResults results = new TransitionResults(); transMgr.handleTransition(results); @@ -682,8 +684,8 @@ public class TransitionManagerTest { // Transition to Implement should set percent to 0 helper = new MockTransitionHelper(getClass().getSimpleName(), Arrays.asList(teamArt), - AtsTestUtil.getImplementStateDef().getName(), Arrays.asList(AtsClientService.get().getUserAdmin().getCurrentUser()), null, - TransitionOption.None); + AtsTestUtil.getImplementStateDef().getName(), + Arrays.asList(AtsClientService.get().getUserAdmin().getCurrentUser()), null, TransitionOption.None); transMgr = new TransitionManager(helper); results = new TransitionResults(); transMgr.handleTransition(results); @@ -696,8 +698,8 @@ public class TransitionManagerTest { // Transition to Cancelled should set percent to 0 helper = new MockTransitionHelper(getClass().getSimpleName(), Arrays.asList(teamArt), - AtsTestUtil.getCancelledStateDef().getName(), Arrays.asList(AtsClientService.get().getUserAdmin().getCurrentUser()), null, - TransitionOption.None); + AtsTestUtil.getCancelledStateDef().getName(), + Arrays.asList(AtsClientService.get().getUserAdmin().getCurrentUser()), null, TransitionOption.None); transMgr = new TransitionManager(helper); results = new TransitionResults(); transMgr.handleTransition(results); diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/AtsDeleteManagerTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/AtsDeleteManagerTest.java index 781181655f5..9afdbcf4e5a 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/AtsDeleteManagerTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/AtsDeleteManagerTest.java @@ -215,8 +215,8 @@ public class AtsDeleteManagerTest { } } - teamArt.createTasks(Arrays.asList(testName.name() + " Task 1", testName.name() + " Task 2"), null, createdDate, - createdBy, transaction); + teamArt.createTasks(Arrays.asList(testName.name() + " Task 1", testName.name() + " Task 2"), + (List<IAtsUser>) null, createdDate, createdBy, transaction); DecisionReviewArtifact decRev = DecisionReviewManager.createNewDecisionReview(teamArt, ReviewBlockType.None, testName.name(), diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/workflow/SMAPromptChangeStatusTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/workflow/SMAPromptChangeStatusTest.java index 854315d98b2..7a5d60fcafe 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/workflow/SMAPromptChangeStatusTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/workflow/SMAPromptChangeStatusTest.java @@ -83,7 +83,8 @@ public class SMAPromptChangeStatusTest { SkynetTransaction transaction = TransactionManager.createTransaction(AtsUtil.getAtsBranch(), "Prompt Change Status Test"); Collection<TaskArtifact> tasks = - DemoTestUtil.createSimpleTasks(teamArt, getClass().getSimpleName() + "_NoRes", 4, transaction); + DemoTestUtil.createSimpleTasks(teamArt, getClass().getSimpleName() + "_NoRes", 4, + teamArt.getCurrentStateName(), transaction); transaction.execute(); assertTrue(tasks.size() == 4); @@ -117,7 +118,7 @@ public class SMAPromptChangeStatusTest { SkynetTransaction transaction = TransactionManager.createTransaction(AtsUtil.getAtsBranch(), "Prompt Change Status Test"); Collection<TaskArtifact> tasks = - DemoTestUtil.createSimpleTasks(teamArt, getClass().getSimpleName() + "_Cancel", 2, transaction); + DemoTestUtil.createSimpleTasks(teamArt, getClass().getSimpleName() + "_Cancel", 2, null, transaction); transaction.execute(); assertTrue(tasks.size() == 2); @@ -144,7 +145,8 @@ public class SMAPromptChangeStatusTest { SkynetTransaction transaction = TransactionManager.createTransaction(AtsUtil.getAtsBranch(), "Prompt Change Status Test"); Collection<TaskArtifact> tasks = - DemoTestUtil.createSimpleTasks(teamArt, getClass().getSimpleName() + "_RelState", 2, transaction); + DemoTestUtil.createSimpleTasks(teamArt, getClass().getSimpleName() + "_RelState", 2, + teamArt.getCurrentStateName(), transaction); transaction.execute(); assertTrue(tasks.size() == 2); diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/util/DemoTestUtil.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/util/DemoTestUtil.java index e96c9bb63e9..e942f274c31 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/util/DemoTestUtil.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/util/DemoTestUtil.java @@ -35,7 +35,6 @@ import org.eclipse.osee.ats.client.integration.tests.AtsClientService; import org.eclipse.osee.ats.core.client.action.ActionManager; import org.eclipse.osee.ats.core.client.task.TaskArtifact; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; - import org.eclipse.osee.ats.core.client.workflow.ChangeType; import org.eclipse.osee.ats.core.config.ActionableItems; import org.eclipse.osee.ats.core.config.TeamDefinitions; @@ -126,7 +125,8 @@ public class DemoTestUtil { Collection<IAtsTeamDefinition> teamDefs = TeamDefinitions.getImpactedTeamDefs(actionableItems); ActionManager.createTeamWorkflow(actionArt, teamDefs.iterator().next(), actionableItems, - Arrays.asList(AtsClientService.get().getUserAdmin().getCurrentUser()), transaction, new Date(), AtsClientService.get().getUserAdmin().getCurrentUser(), null); + Arrays.asList(AtsClientService.get().getUserAdmin().getCurrentUser()), transaction, new Date(), + AtsClientService.get().getUserAdmin().getCurrentUser(), null); TeamWorkFlowArtifact teamArt = null; for (TeamWorkFlowArtifact team : ActionManager.getTeams(actionArt)) { @@ -140,13 +140,13 @@ public class DemoTestUtil { /** * Create tasks named title + <num> */ - public static Collection<TaskArtifact> createSimpleTasks(TeamWorkFlowArtifact teamArt, String title, int numTasks, SkynetTransaction transaction) throws Exception { + public static Collection<TaskArtifact> createSimpleTasks(TeamWorkFlowArtifact teamArt, String title, int numTasks, String relatedToState, SkynetTransaction transaction) throws Exception { List<String> names = new ArrayList<String>(); for (int x = 1; x < numTasks + 1; x++) { names.add(title + " " + x); } - return teamArt.createTasks(names, Arrays.asList(AtsClientService.get().getUserAdmin().getCurrentUser()), new Date(), AtsClientService.get().getUserAdmin().getCurrentUser(), - transaction); + return teamArt.createTasks(names, Arrays.asList(AtsClientService.get().getUserAdmin().getCurrentUser()), + new Date(), AtsClientService.get().getUserAdmin().getCurrentUser(), relatedToState, transaction); } public static TeamWorkFlowArtifact getToolsTeamWorkflow() throws OseeCoreException { |