diff options
2 files changed, 14 insertions, 1 deletions
diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/change/ChangeItemUtilTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/change/ChangeItemUtilTest.java index efae56e5d15..21956ec0211 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/change/ChangeItemUtilTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/change/ChangeItemUtilTest.java @@ -328,6 +328,19 @@ public class ChangeItemUtilTest { } + @Test + public void testIsRessurectedOnNewItem() throws OseeCoreException { + ChangeVersion base = ChangeTestUtility.createChange(null, null); + ChangeVersion first = ChangeTestUtility.createChange(null, null); + ChangeVersion current = ChangeTestUtility.createChange(3333L, ModificationType.NEW); + ChangeVersion destination = ChangeTestUtility.createChange(3333L, ModificationType.DELETED); + ChangeVersion net = ChangeTestUtility.createChange(null, null); + + ChangeItem item = ChangeTestUtility.createItem(500, base, first, current, destination, net); + + Assert.assertFalse(ChangeItemUtil.isResurrected(item)); + } + private Triplet<ChangeVersion, ChangeVersion, Boolean> createTriplet(Long long1, ModificationType mod1, Long long2, ModificationType mod2, boolean expected) { return new Triplet<ChangeVersion, ChangeVersion, Boolean>(// ChangeTestUtility.createChange(long1, mod1), // diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/change/ChangeItemUtil.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/change/ChangeItemUtil.java index 74d090087b9..dc3b938e61a 100644 --- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/change/ChangeItemUtil.java +++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/change/ChangeItemUtil.java @@ -137,7 +137,7 @@ public final class ChangeItemUtil { public static boolean isResurrected(ChangeItem changeItem) { // There's a change corresponding to a Deleted Item, item MUST have been resurrected - return changeItem.getBaselineVersion().getModType().isDeleted(); + return changeItem.getBaselineVersion().isValid() && isDeleted(changeItem.getBaselineVersion()); } } |