feature[ats_605B4]: Fix Create Search Work Package Blam Test

Change-Id: I0df87992c1c73d4bc6d3c04f7f59e8a5fe891c64

2 files changed, 11 insertions, 9 deletions

diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/ev/EarnedValueReportOperationTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/ev/EarnedValueReportOperationTest.java
index 700cf34a569..6d4f1e593fd 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/ev/EarnedValueReportOperationTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/ev/EarnedValueReportOperationTest.java
@@ -28,6 +28,7 @@ import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.util.AtsUtil;
 import org.eclipse.osee.framework.core.enums.Active;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.operation.Operations;
 import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
 import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
 import org.junit.Test;
@@ -47,14 +48,14 @@ public class EarnedValueReportOperationTest {
       teamDefs.add(teamDef);
       SearchWorkPackageOperation srch =
          new SearchWorkPackageOperation("srch", teamDefs, true, new ArrayList<IAtsActionableItem>(), false, Active.Both);
-      srch.run(null);
+      Operations.executeWorkAndCheckStatus(srch);
       Set<IAtsWorkPackage> workPackages = srch.getResults();
       Assert.assertEquals(3, workPackages.size());
 
       // Confirm that report is empty for Work Packages
-      EarnedValueReportOperation operation = new EarnedValueReportOperation("report", workPackages);
-      operation.run(null);
-      Assert.assertEquals(0, operation.getResults().size());
+      EarnedValueReportOperation earnedValueoperation = new EarnedValueReportOperation("report", workPackages);
+      Operations.executeWorkAndCheckStatus(earnedValueoperation);
+      Assert.assertEquals(0, earnedValueoperation.getResults().size());
 
       // Setup TeamWfs to have selected Work Pacakges
       SkynetTransaction transaction =
@@ -76,11 +77,11 @@ public class EarnedValueReportOperationTest {
       transaction.execute();
 
       // Run report and validate results
-      operation = new EarnedValueReportOperation("report2", workPackages);
-      operation.run(null);
-      Assert.assertEquals(3, operation.getResults().size());
+      EarnedValueReportOperation earnedValueOperation2 = new EarnedValueReportOperation("report2", workPackages);
+      Operations.executeWorkAndCheckStatus(earnedValueOperation2);
+      Assert.assertEquals(3, earnedValueOperation2.getResults().size());
       int num01 = 0, num03 = 0;
-      for (EarnedValueReportResult result : operation.getResults()) {
+      for (EarnedValueReportResult result : earnedValueOperation2.getResults()) {
          String id = result.getValue(EarnedValueReportOperation.Work_Package_Id);
          if (id.endsWith("01")) {
             num01++;
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/ev/SearchWorkPackageOperationTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/ev/SearchWorkPackageOperationTest.java
index edfc5611b35..d58d274097a 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/ev/SearchWorkPackageOperationTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/ev/SearchWorkPackageOperationTest.java
@@ -23,6 +23,7 @@ import org.eclipse.osee.ats.client.integration.tests.AtsClientService;
 import org.eclipse.osee.ats.core.client.ev.SearchWorkPackageOperation;
 import org.eclipse.osee.framework.core.enums.Active;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.operation.Operations;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.skynet.core.utility.Artifacts;
 import org.junit.Test;
@@ -113,7 +114,7 @@ public class SearchWorkPackageOperationTest {
       SearchWorkPackageOperation operation =
          new SearchWorkPackageOperation("test", teamDefs, includeChildrenTeamDefs, ais, includeChildrenAIs,
             activeOption);
-      operation.run(null);
+      Operations.executeWorkAndCheckStatus(operation);
       Set<Artifact> resultArtifacts = operation.getResultArtifacts();
       Collection<String> resultArtifactGuids = Artifacts.toGuids(resultArtifacts);
       Assert.assertEquals(resultSize, expectedWpGuids.size(), resultArtifacts.size());