create and use Asserts.testOperation to standardize testing operations

2 files changed, 5 insertions, 14 deletions

diff --git a/plugins/org.eclipse.osee.framework.branch.management.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.branch.management.test/META-INF/MANIFEST.MF
index 59fb5824ac8..e589ac4c8b6 100644
--- a/plugins/org.eclipse.osee.framework.branch.management.test/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.branch.management.test/META-INF/MANIFEST.MF
@@ -7,5 +7,6 @@ Bundle-Vendor: Eclipse Open System Engineering Environment
 Fragment-Host: org.eclipse.osee.framework.branch.management;bundle-version="0.4.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.junit4;bundle-version="4.5.0"
-Import-Package: org.eclipse.osee.framework.core.message.test.mocks
+Import-Package: org.eclipse.osee.framework.core.message.test.mocks,
+ org.eclipse.osee.framework.core.test.mocks
 Export-Package: org.eclipse.osee.framework.branch.management.test
diff --git a/plugins/org.eclipse.osee.framework.branch.management.test/src/org/eclipse/osee/framework/branch/management/test/change/ComputeNetChangeTest.java b/plugins/org.eclipse.osee.framework.branch.management.test/src/org/eclipse/osee/framework/branch/management/test/change/ComputeNetChangeTest.java
index 1cd8eee39e5..554aa005fc5 100644
--- a/plugins/org.eclipse.osee.framework.branch.management.test/src/org/eclipse/osee/framework/branch/management/test/change/ComputeNetChangeTest.java
+++ b/plugins/org.eclipse.osee.framework.branch.management.test/src/org/eclipse/osee/framework/branch/management/test/change/ComputeNetChangeTest.java
@@ -19,15 +19,13 @@ import static org.eclipse.osee.framework.core.enums.ModificationType.NEW;
 import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.osee.framework.branch.management.change.ComputeNetChangeOperation;
 import org.eclipse.osee.framework.core.enums.ModificationType;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.core.message.ChangeItem;
 import org.eclipse.osee.framework.core.message.ChangeVersion;
 import org.eclipse.osee.framework.core.message.test.mocks.ChangeTestUtility;
-import org.eclipse.osee.framework.core.operation.IOperation;
-import org.eclipse.osee.framework.core.operation.Operations;
+import org.eclipse.osee.framework.core.test.mocks.Asserts;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -103,7 +101,7 @@ public class ComputeNetChangeTest {
       for (TestData testData : data) {
          items.add(testData.getItem());
       }
-      computeNetChange(items, IStatus.OK);
+      Asserts.testOperation(new ComputeNetChangeOperation(items), IStatus.OK);
 
       for (int index = 0; index < data.size(); index++) {
          TestData testData = data.get(index);
@@ -124,15 +122,7 @@ public class ComputeNetChangeTest {
       // Source to Non-Parent commit
       items.add(ChangeTestUtility.createItem(3, entry(10L, MODIFIED), null, entry(11L, MODIFIED), null, null));
 
-      computeNetChange(items, IStatus.ERROR);
-   }
-
-   private void computeNetChange(List<ChangeItem> changes, int status) {
-      IOperation operation = new ComputeNetChangeOperation(changes);
-
-      Operations.executeWork(operation, new NullProgressMonitor(), 0);
-      String message = operation.getStatus().toString();
-      Assert.assertEquals(message, status, operation.getStatus().getSeverity());
+      Asserts.testOperation(new ComputeNetChangeOperation(items), IStatus.ERROR);
    }
 
    private static TestData createTest(int itemId, ChangeVersion base, ChangeVersion first, ChangeVersion current, ChangeVersion destination, ChangeVersion expected, boolean isRemoved) {