diff options
Diffstat (limited to 'plugins/org.eclipse.osee.ats.client.integration.tests/src/org')
4 files changed, 25 insertions, 7 deletions
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/PopulateDemoActionsTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/PopulateDemoActionsTest.java index 4ce54c95957..0df892a5652 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/PopulateDemoActionsTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/PopulateDemoActionsTest.java @@ -19,6 +19,7 @@ import java.util.List; 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.util.IAtsChangeSet; import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.client.demo.DemoUtil; import org.eclipse.osee.ats.client.demo.PopulateDemoActions; @@ -40,8 +41,12 @@ import org.eclipse.osee.ats.core.workflow.state.TeamState; import org.eclipse.osee.ats.demo.api.DemoArtifactTypes; import org.eclipse.osee.ats.demo.api.DemoTeam; import org.eclipse.osee.framework.core.data.IArtifactType; +import org.eclipse.osee.framework.core.enums.DeletionFlag; +import org.eclipse.osee.framework.core.enums.QueryOption; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; +import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; +import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; @@ -52,11 +57,22 @@ import org.junit.BeforeClass; * @author Donald G. Dunne */ public class PopulateDemoActionsTest { + @BeforeClass public static void validateDbInit() throws OseeCoreException { DemoUtil.checkDbInitAndPopulateSuccess(); } + @AfterClass + public static void cleanup() throws OseeCoreException { + IAtsChangeSet changes = AtsClientService.get().createAtsChangeSet("Cleanup PopulateDemoActionsTest"); + for (Artifact art : ArtifactQuery.getArtifactListFromName("Auto-created", AtsUtilCore.getAtsBranch(), + DeletionFlag.EXCLUDE_DELETED, QueryOption.CONTAINS_MATCH_OPTIONS)) { + changes.deleteArtifact(art); + } + changes.execute(); + } + @Before public void setup() throws OseeCoreException { AtsBulkLoad.reloadConfig(true); @@ -489,7 +505,7 @@ public class PopulateDemoActionsTest { Assert.assertNotNull(peerArt); Assert.assertNotNull(decArt); testReviewContents(peerArt, - "Auto-created Decision Review from ruleId atsAddPeerToPeerReview.test.addPeerToPeerReview.Authorize.None.TransitionTo", + "Auto-created Peer Review from ruleId atsAddPeerToPeerReview.test.addPeerToPeerReview.Authorize.None.TransitionTo", PeerToPeerReviewState.Prepare.getName(), "UnAssigned"); testReviewContents(decArt, "Auto-created Decision Review from ruleId: atsAddDecisionReview.test.addDecisionReview.Analyze.None.TransitionTo", diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/workflow/CreateTaskRuleTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/workflow/CreateTaskRuleTest.java index 3f59bf49e37..eab11ee71de 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/workflow/CreateTaskRuleTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/workflow/CreateTaskRuleTest.java @@ -72,6 +72,8 @@ public class CreateTaskRuleTest { AtsTestUtil.cleanupSimpleTest(CREATE_TASK_ACTION_FROM_TEAM_DEF_TITLE); AtsTestUtil.cleanupSimpleTest(CREATE_TASK_ACTION_FROM_AI_TITLE); AtsTestUtil.cleanupSimpleTest(getClass().getSimpleName()); + + AtsClientService.get().getWorkDefinitionAdmin().clearRuleDefinitionsCache(); } @Test diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/world/search/AtsQueryImplTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/world/search/AtsQueryImplTest.java index d11412c01c8..2ddd7af479f 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/world/search/AtsQueryImplTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/world/search/AtsQueryImplTest.java @@ -116,12 +116,12 @@ public class AtsQueryImplTest { query = queryService.createQuery(WorkItemType.WorkItem); query.isOfType(WorkItemType.PeerReview); query.andState("Prepare"); - assertEquals(4, query.getResults().size()); + assertEquals(1, query.getResults().size()); // by state type query = queryService.createQuery(WorkItemType.WorkItem); query.andStateType(StateType.Working); - assertEquals(48, query.getResults().size()); + assertEquals(42, query.getResults().size()); query = queryService.createQuery(WorkItemType.TeamWorkflow); query.andStateType(StateType.Working); diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/world/search/ShowOpenWorkflowsByArtifactTypeTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/world/search/ShowOpenWorkflowsByArtifactTypeTest.java index 1c588b64b47..f6de2789103 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/world/search/ShowOpenWorkflowsByArtifactTypeTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/world/search/ShowOpenWorkflowsByArtifactTypeTest.java @@ -21,7 +21,7 @@ public class ShowOpenWorkflowsByArtifactTypeTest { new ShowOpenWorkflowsByReviewType("Show Open " + WorkItemType.DecisionReview.name() + "s", WorkItemType.DecisionReview, false, false, AtsImage.DECISION_REVIEW); Collection<Artifact> results = search.performSearchGetResults(); - checkResults(5, AtsArtifactTypes.DecisionReview, results); + checkResults(2, AtsArtifactTypes.DecisionReview, results); } @org.junit.Test @@ -30,7 +30,7 @@ public class ShowOpenWorkflowsByArtifactTypeTest { new ShowOpenWorkflowsByReviewType("Show Workflows Waiting " + WorkItemType.DecisionReview.name() + "s", WorkItemType.DecisionReview, false, true, AtsImage.DECISION_REVIEW); Collection<Artifact> results = search.performSearchGetResults(); - checkResults(5, AtsArtifactTypes.TeamWorkflow, results); + checkResults(2, AtsArtifactTypes.TeamWorkflow, results); } @org.junit.Test @@ -39,7 +39,7 @@ public class ShowOpenWorkflowsByArtifactTypeTest { new ShowOpenWorkflowsByReviewType("Show Open " + WorkItemType.PeerReview.name() + "s", WorkItemType.PeerReview, false, false, AtsImage.PEER_REVIEW); Collection<Artifact> results = search.performSearchGetResults(); - checkResults(5, AtsArtifactTypes.PeerToPeerReview, results); + checkResults(2, AtsArtifactTypes.PeerToPeerReview, results); } @org.junit.Test @@ -48,7 +48,7 @@ public class ShowOpenWorkflowsByArtifactTypeTest { new ShowOpenWorkflowsByReviewType("Show Workflows Waiting " + WorkItemType.PeerReview.name() + "s", WorkItemType.PeerReview, false, true, AtsImage.PEER_REVIEW); Collection<Artifact> results = search.performSearchGetResults(); - checkResults(4, AtsArtifactTypes.TeamWorkflow, results); + checkResults(1, AtsArtifactTypes.TeamWorkflow, results); } private void checkResults(int expectedCount, IArtifactType ofType, Collection<Artifact> results) { |