Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormegumi.telles2015-09-30 12:59:57 -0400
committerRyan D. Brooks2015-09-30 12:59:57 -0400
commit165caac839e71bfdb37a886532f1e2e5de2edf39 (patch)
tree769be3d76224d454cdd8712b3e8055dcf399e22e /plugins/org.eclipse.osee.orcs.db.test
parent3b3ee8cf3dade0278f326984a96345dbe1212e17 (diff)
downloadorg.eclipse.osee-165caac839e71bfdb37a886532f1e2e5de2edf39.tar.gz
org.eclipse.osee-165caac839e71bfdb37a886532f1e2e5de2edf39.tar.xz
org.eclipse.osee-165caac839e71bfdb37a886532f1e2e5de2edf39.zip
bug[ats_ATS227491]: Allow deleted on dest arts with mods show in change report
- Added an change ignore type to change items - Compute net changes now checks and sets the ignore cases for change items - ChangeDataLoader and CommitBranchDatabaseCallable filter the change list based on allowable ignore cases - Artifact image shows a red 'x' when arts, attrs, relations are considered deleted on destination in the change report - Change provider displays Deleted on Destination on appropriate arts, attrs, rels in change report. Does not change the actual mod type only a UI representation - View word change report will pop-up an informational letting the user know this artifact has been deleted on the destination Change-Id: Iad075ec2799294be4f457b7be7c54b7b44ffb302
Diffstat (limited to 'plugins/org.eclipse.osee.orcs.db.test')
-rw-r--r--plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/change/ComputeNetChangeTest.java15
1 files changed, 11 insertions, 4 deletions
diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/change/ComputeNetChangeTest.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/change/ComputeNetChangeTest.java
index 6d8ccbcac9..1e764ae574 100644
--- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/change/ComputeNetChangeTest.java
+++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/change/ComputeNetChangeTest.java
@@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.Callable;
import org.eclipse.osee.framework.core.enums.ModificationType;
+import org.eclipse.osee.framework.core.model.change.ChangeIgnoreType;
import org.eclipse.osee.framework.core.model.change.ChangeItem;
import org.eclipse.osee.framework.core.model.change.ChangeVersion;
import org.eclipse.osee.framework.jdk.core.type.OseeStateException;
@@ -29,7 +30,7 @@ import org.junit.Test;
/**
* Test Case for {@link ComputeNetChangeCallable}
- *
+ *
* @author Roberto E. Escobar
*/
public class ComputeNetChangeTest {
@@ -39,8 +40,8 @@ public class ComputeNetChangeTest {
// New Or Introduced
data.add(createTest(1, entry(3L, NEW), entry(4L, NEW), entry(5L, MODIFIED), null, entry(5L, NEW), false));
- data.add(createTest(2, entry(3L, NEW), entry(6L, INTRODUCED), entry(7L, MODIFIED), null, entry(7L, INTRODUCED),
- false));
+ data.add(
+ createTest(2, entry(3L, NEW), entry(6L, INTRODUCED), entry(7L, MODIFIED), null, entry(7L, INTRODUCED), false));
data.add(createTest(3, entry(3L, NEW), null, entry(7693330L, INTRODUCED), entry(7693330L, NEW),
entry(7693330L, INTRODUCED), false));
@@ -110,7 +111,9 @@ public class ComputeNetChangeTest {
TestData testData = data.get(index);
String message = String.format("Test: %s", index + 1);
if (testData.isRemoved()) {
- Assert.assertFalse(message, items.contains(testData.getItem()));
+ if (testData.getIgnoreType().isNone()) {
+ Assert.assertFalse(message, items.contains(testData.getItem()));
+ }
} else {
Assert.assertTrue(message, items.contains(testData.getItem()));
ChangeTestUtility.checkChange(message, testData.getExpectedNet(), testData.getItem().getNetChange());
@@ -166,5 +169,9 @@ public class ComputeNetChangeTest {
public boolean isRemoved() {
return isRemoved;
}
+
+ public ChangeIgnoreType getIgnoreType() {
+ return item.getIgnoreType();
+ }
}
}

Back to the top