Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlgoubet2012-05-11 04:50:30 -0400
committerlgoubet2012-05-11 04:50:30 -0400
commit9c8f1e57d3e3e30f4d705032c6650187dd1bf35e (patch)
tree237d3cad2d8783af67c3d40f0cbca9df7017c02b /plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse
parente414cbf03f2d3dec86c1891446f6f58c14c37190 (diff)
downloadorg.eclipse.emf.compare-9c8f1e57d3e3e30f4d705032c6650187dd1bf35e.tar.gz
org.eclipse.emf.compare-9c8f1e57d3e3e30f4d705032c6650187dd1bf35e.tar.xz
org.eclipse.emf.compare-9c8f1e57d3e3e30f4d705032c6650187dd1bf35e.zip
Fixing detection of some yet undetected diffs.
Adding tests for a number of conflict use cases. Fixing the detection of the problematic use cases.
Diffstat (limited to 'plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse')
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/AttributeChangeTest.java45
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/DiffTest.java45
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/EquivalenceTest.java6
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/ReferenceChangeTest.java45
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/ResourceAttachmentChangeTest.java50
5 files changed, 91 insertions, 100 deletions
diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/AttributeChangeTest.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/AttributeChangeTest.java
index f1346290a..f8da47e86 100644
--- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/AttributeChangeTest.java
+++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/AttributeChangeTest.java
@@ -273,60 +273,59 @@ public class AttributeChangeTest extends AbstractCompareTest {
* @generated
*/
@Test
- public void testEquivalentDiffs() {
- EStructuralFeature feature = org.eclipse.emf.compare.ComparePackage.eINSTANCE
- .getDiff_EquivalentDiffs();
+ public void testEquivalence() {
+ EStructuralFeature feature = org.eclipse.emf.compare.ComparePackage.eINSTANCE.getDiff_Equivalence();
AttributeChange attributeChange = CompareFactory.eINSTANCE.createAttributeChange();
attributeChange.eAdapters().add(new MockEAdapter());
org.eclipse.emf.compare.Equivalence equivalentDiffsValue = org.eclipse.emf.compare.CompareFactory.eINSTANCE
.createEquivalence();
assertFalse(attributeChange.eIsSet(feature));
- assertNull(attributeChange.getEquivalentDiffs());
+ assertNull(attributeChange.getEquivalence());
- attributeChange.setEquivalentDiffs(equivalentDiffsValue);
+ attributeChange.setEquivalence(equivalentDiffsValue);
assertTrue(notified);
notified = false;
- assertSame(equivalentDiffsValue, attributeChange.getEquivalentDiffs());
- assertSame(attributeChange.getEquivalentDiffs(), attributeChange.eGet(feature));
- assertSame(attributeChange.getEquivalentDiffs(), attributeChange.eGet(feature, false));
+ assertSame(equivalentDiffsValue, attributeChange.getEquivalence());
+ assertSame(attributeChange.getEquivalence(), attributeChange.eGet(feature));
+ assertSame(attributeChange.getEquivalence(), attributeChange.eGet(feature, false));
assertTrue(attributeChange.eIsSet(feature));
assertTrue(equivalentDiffsValue.getDifferences().contains(attributeChange));
attributeChange.eUnset(feature);
assertTrue(notified);
notified = false;
- assertNull(attributeChange.getEquivalentDiffs());
- assertSame(attributeChange.getEquivalentDiffs(), attributeChange.eGet(feature));
- assertSame(attributeChange.getEquivalentDiffs(), attributeChange.eGet(feature, false));
+ assertNull(attributeChange.getEquivalence());
+ assertSame(attributeChange.getEquivalence(), attributeChange.eGet(feature));
+ assertSame(attributeChange.getEquivalence(), attributeChange.eGet(feature, false));
assertFalse(attributeChange.eIsSet(feature));
assertFalse(equivalentDiffsValue.getDifferences().contains(attributeChange));
- attributeChange.setEquivalentDiffs(equivalentDiffsValue);
+ attributeChange.setEquivalence(equivalentDiffsValue);
assertTrue(notified);
notified = false;
- assertSame(equivalentDiffsValue, attributeChange.getEquivalentDiffs());
- assertSame(attributeChange.getEquivalentDiffs(), attributeChange.eGet(feature));
- assertSame(attributeChange.getEquivalentDiffs(), attributeChange.eGet(feature, false));
+ assertSame(equivalentDiffsValue, attributeChange.getEquivalence());
+ assertSame(attributeChange.getEquivalence(), attributeChange.eGet(feature));
+ assertSame(attributeChange.getEquivalence(), attributeChange.eGet(feature, false));
assertTrue(attributeChange.eIsSet(feature));
assertTrue(equivalentDiffsValue.getDifferences().contains(attributeChange));
attributeChange.eSet(feature, equivalentDiffsValue);
assertTrue(notified);
notified = false;
- assertSame(equivalentDiffsValue, attributeChange.getEquivalentDiffs());
- assertSame(attributeChange.getEquivalentDiffs(), attributeChange.eGet(feature));
- assertSame(attributeChange.getEquivalentDiffs(), attributeChange.eGet(feature, false));
+ assertSame(equivalentDiffsValue, attributeChange.getEquivalence());
+ assertSame(attributeChange.getEquivalence(), attributeChange.eGet(feature));
+ assertSame(attributeChange.getEquivalence(), attributeChange.eGet(feature, false));
assertTrue(attributeChange.eIsSet(feature));
assertTrue(equivalentDiffsValue.getDifferences().contains(attributeChange));
- attributeChange.setEquivalentDiffs(null);
+ attributeChange.setEquivalence(null);
assertTrue(notified);
notified = false;
- assertNull(attributeChange.getEquivalentDiffs());
- assertSame(feature.getDefaultValue(), attributeChange.getEquivalentDiffs());
- assertSame(attributeChange.getEquivalentDiffs(), attributeChange.eGet(feature));
- assertSame(attributeChange.getEquivalentDiffs(), attributeChange.eGet(feature, false));
+ assertNull(attributeChange.getEquivalence());
+ assertSame(feature.getDefaultValue(), attributeChange.getEquivalence());
+ assertSame(attributeChange.getEquivalence(), attributeChange.eGet(feature));
+ assertSame(attributeChange.getEquivalence(), attributeChange.eGet(feature, false));
assertFalse(attributeChange.eIsSet(feature));
assertFalse(equivalentDiffsValue.getDifferences().contains(attributeChange));
}
diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/DiffTest.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/DiffTest.java
index 1ae6e6ae5..bc6689132 100644
--- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/DiffTest.java
+++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/DiffTest.java
@@ -273,60 +273,59 @@ public class DiffTest extends AbstractCompareTest {
* @generated
*/
@Test
- public void testEquivalentDiffs() {
- EStructuralFeature feature = org.eclipse.emf.compare.ComparePackage.eINSTANCE
- .getDiff_EquivalentDiffs();
+ public void testEquivalence() {
+ EStructuralFeature feature = org.eclipse.emf.compare.ComparePackage.eINSTANCE.getDiff_Equivalence();
Diff diff = CompareFactory.eINSTANCE.createDiff();
diff.eAdapters().add(new MockEAdapter());
org.eclipse.emf.compare.Equivalence equivalentDiffsValue = org.eclipse.emf.compare.CompareFactory.eINSTANCE
.createEquivalence();
assertFalse(diff.eIsSet(feature));
- assertNull(diff.getEquivalentDiffs());
+ assertNull(diff.getEquivalence());
- diff.setEquivalentDiffs(equivalentDiffsValue);
+ diff.setEquivalence(equivalentDiffsValue);
assertTrue(notified);
notified = false;
- assertSame(equivalentDiffsValue, diff.getEquivalentDiffs());
- assertSame(diff.getEquivalentDiffs(), diff.eGet(feature));
- assertSame(diff.getEquivalentDiffs(), diff.eGet(feature, false));
+ assertSame(equivalentDiffsValue, diff.getEquivalence());
+ assertSame(diff.getEquivalence(), diff.eGet(feature));
+ assertSame(diff.getEquivalence(), diff.eGet(feature, false));
assertTrue(diff.eIsSet(feature));
assertTrue(equivalentDiffsValue.getDifferences().contains(diff));
diff.eUnset(feature);
assertTrue(notified);
notified = false;
- assertNull(diff.getEquivalentDiffs());
- assertSame(diff.getEquivalentDiffs(), diff.eGet(feature));
- assertSame(diff.getEquivalentDiffs(), diff.eGet(feature, false));
+ assertNull(diff.getEquivalence());
+ assertSame(diff.getEquivalence(), diff.eGet(feature));
+ assertSame(diff.getEquivalence(), diff.eGet(feature, false));
assertFalse(diff.eIsSet(feature));
assertFalse(equivalentDiffsValue.getDifferences().contains(diff));
- diff.setEquivalentDiffs(equivalentDiffsValue);
+ diff.setEquivalence(equivalentDiffsValue);
assertTrue(notified);
notified = false;
- assertSame(equivalentDiffsValue, diff.getEquivalentDiffs());
- assertSame(diff.getEquivalentDiffs(), diff.eGet(feature));
- assertSame(diff.getEquivalentDiffs(), diff.eGet(feature, false));
+ assertSame(equivalentDiffsValue, diff.getEquivalence());
+ assertSame(diff.getEquivalence(), diff.eGet(feature));
+ assertSame(diff.getEquivalence(), diff.eGet(feature, false));
assertTrue(diff.eIsSet(feature));
assertTrue(equivalentDiffsValue.getDifferences().contains(diff));
diff.eSet(feature, equivalentDiffsValue);
assertTrue(notified);
notified = false;
- assertSame(equivalentDiffsValue, diff.getEquivalentDiffs());
- assertSame(diff.getEquivalentDiffs(), diff.eGet(feature));
- assertSame(diff.getEquivalentDiffs(), diff.eGet(feature, false));
+ assertSame(equivalentDiffsValue, diff.getEquivalence());
+ assertSame(diff.getEquivalence(), diff.eGet(feature));
+ assertSame(diff.getEquivalence(), diff.eGet(feature, false));
assertTrue(diff.eIsSet(feature));
assertTrue(equivalentDiffsValue.getDifferences().contains(diff));
- diff.setEquivalentDiffs(null);
+ diff.setEquivalence(null);
assertTrue(notified);
notified = false;
- assertNull(diff.getEquivalentDiffs());
- assertSame(feature.getDefaultValue(), diff.getEquivalentDiffs());
- assertSame(diff.getEquivalentDiffs(), diff.eGet(feature));
- assertSame(diff.getEquivalentDiffs(), diff.eGet(feature, false));
+ assertNull(diff.getEquivalence());
+ assertSame(feature.getDefaultValue(), diff.getEquivalence());
+ assertSame(diff.getEquivalence(), diff.eGet(feature));
+ assertSame(diff.getEquivalence(), diff.eGet(feature, false));
assertFalse(diff.eIsSet(feature));
assertFalse(equivalentDiffsValue.getDifferences().contains(diff));
}
diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/EquivalenceTest.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/EquivalenceTest.java
index aeae30b2d..a822c6025 100644
--- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/EquivalenceTest.java
+++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/EquivalenceTest.java
@@ -44,7 +44,7 @@ public class EquivalenceTest extends AbstractCompareTest {
assertSame(equivalence.getDifferences(), equivalence.eGet(feature));
assertSame(equivalence.getDifferences(), equivalence.eGet(feature, false));
assertTrue(equivalence.eIsSet(feature));
- assertTrue(differencesValue.getEquivalentDiffs() == equivalence);
+ assertTrue(differencesValue.getEquivalence() == equivalence);
equivalence.eUnset(feature);
assertTrue(notified);
@@ -53,7 +53,7 @@ public class EquivalenceTest extends AbstractCompareTest {
assertSame(equivalence.getDifferences(), equivalence.eGet(feature));
assertSame(equivalence.getDifferences(), equivalence.eGet(feature, false));
assertFalse(equivalence.eIsSet(feature));
- assertFalse(differencesValue.getEquivalentDiffs() == equivalence);
+ assertFalse(differencesValue.getEquivalence() == equivalence);
equivalence.eSet(feature, listDifferences);
assertTrue(notified);
@@ -62,7 +62,7 @@ public class EquivalenceTest extends AbstractCompareTest {
assertSame(equivalence.getDifferences(), equivalence.eGet(feature));
assertSame(equivalence.getDifferences(), equivalence.eGet(feature, false));
assertTrue(equivalence.eIsSet(feature));
- assertTrue(differencesValue.getEquivalentDiffs() == equivalence);
+ assertTrue(differencesValue.getEquivalence() == equivalence);
}
}
diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/ReferenceChangeTest.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/ReferenceChangeTest.java
index cf5c20c03..44bf303a0 100644
--- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/ReferenceChangeTest.java
+++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/ReferenceChangeTest.java
@@ -273,60 +273,59 @@ public class ReferenceChangeTest extends AbstractCompareTest {
* @generated
*/
@Test
- public void testEquivalentDiffs() {
- EStructuralFeature feature = org.eclipse.emf.compare.ComparePackage.eINSTANCE
- .getDiff_EquivalentDiffs();
+ public void testEquivalence() {
+ EStructuralFeature feature = org.eclipse.emf.compare.ComparePackage.eINSTANCE.getDiff_Equivalence();
ReferenceChange referenceChange = CompareFactory.eINSTANCE.createReferenceChange();
referenceChange.eAdapters().add(new MockEAdapter());
org.eclipse.emf.compare.Equivalence equivalentDiffsValue = org.eclipse.emf.compare.CompareFactory.eINSTANCE
.createEquivalence();
assertFalse(referenceChange.eIsSet(feature));
- assertNull(referenceChange.getEquivalentDiffs());
+ assertNull(referenceChange.getEquivalence());
- referenceChange.setEquivalentDiffs(equivalentDiffsValue);
+ referenceChange.setEquivalence(equivalentDiffsValue);
assertTrue(notified);
notified = false;
- assertSame(equivalentDiffsValue, referenceChange.getEquivalentDiffs());
- assertSame(referenceChange.getEquivalentDiffs(), referenceChange.eGet(feature));
- assertSame(referenceChange.getEquivalentDiffs(), referenceChange.eGet(feature, false));
+ assertSame(equivalentDiffsValue, referenceChange.getEquivalence());
+ assertSame(referenceChange.getEquivalence(), referenceChange.eGet(feature));
+ assertSame(referenceChange.getEquivalence(), referenceChange.eGet(feature, false));
assertTrue(referenceChange.eIsSet(feature));
assertTrue(equivalentDiffsValue.getDifferences().contains(referenceChange));
referenceChange.eUnset(feature);
assertTrue(notified);
notified = false;
- assertNull(referenceChange.getEquivalentDiffs());
- assertSame(referenceChange.getEquivalentDiffs(), referenceChange.eGet(feature));
- assertSame(referenceChange.getEquivalentDiffs(), referenceChange.eGet(feature, false));
+ assertNull(referenceChange.getEquivalence());
+ assertSame(referenceChange.getEquivalence(), referenceChange.eGet(feature));
+ assertSame(referenceChange.getEquivalence(), referenceChange.eGet(feature, false));
assertFalse(referenceChange.eIsSet(feature));
assertFalse(equivalentDiffsValue.getDifferences().contains(referenceChange));
- referenceChange.setEquivalentDiffs(equivalentDiffsValue);
+ referenceChange.setEquivalence(equivalentDiffsValue);
assertTrue(notified);
notified = false;
- assertSame(equivalentDiffsValue, referenceChange.getEquivalentDiffs());
- assertSame(referenceChange.getEquivalentDiffs(), referenceChange.eGet(feature));
- assertSame(referenceChange.getEquivalentDiffs(), referenceChange.eGet(feature, false));
+ assertSame(equivalentDiffsValue, referenceChange.getEquivalence());
+ assertSame(referenceChange.getEquivalence(), referenceChange.eGet(feature));
+ assertSame(referenceChange.getEquivalence(), referenceChange.eGet(feature, false));
assertTrue(referenceChange.eIsSet(feature));
assertTrue(equivalentDiffsValue.getDifferences().contains(referenceChange));
referenceChange.eSet(feature, equivalentDiffsValue);
assertTrue(notified);
notified = false;
- assertSame(equivalentDiffsValue, referenceChange.getEquivalentDiffs());
- assertSame(referenceChange.getEquivalentDiffs(), referenceChange.eGet(feature));
- assertSame(referenceChange.getEquivalentDiffs(), referenceChange.eGet(feature, false));
+ assertSame(equivalentDiffsValue, referenceChange.getEquivalence());
+ assertSame(referenceChange.getEquivalence(), referenceChange.eGet(feature));
+ assertSame(referenceChange.getEquivalence(), referenceChange.eGet(feature, false));
assertTrue(referenceChange.eIsSet(feature));
assertTrue(equivalentDiffsValue.getDifferences().contains(referenceChange));
- referenceChange.setEquivalentDiffs(null);
+ referenceChange.setEquivalence(null);
assertTrue(notified);
notified = false;
- assertNull(referenceChange.getEquivalentDiffs());
- assertSame(feature.getDefaultValue(), referenceChange.getEquivalentDiffs());
- assertSame(referenceChange.getEquivalentDiffs(), referenceChange.eGet(feature));
- assertSame(referenceChange.getEquivalentDiffs(), referenceChange.eGet(feature, false));
+ assertNull(referenceChange.getEquivalence());
+ assertSame(feature.getDefaultValue(), referenceChange.getEquivalence());
+ assertSame(referenceChange.getEquivalence(), referenceChange.eGet(feature));
+ assertSame(referenceChange.getEquivalence(), referenceChange.eGet(feature, false));
assertFalse(referenceChange.eIsSet(feature));
assertFalse(equivalentDiffsValue.getDifferences().contains(referenceChange));
}
diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/ResourceAttachmentChangeTest.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/ResourceAttachmentChangeTest.java
index 311d669d6..14fd6f8bf 100644
--- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/ResourceAttachmentChangeTest.java
+++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/ResourceAttachmentChangeTest.java
@@ -278,9 +278,8 @@ public class ResourceAttachmentChangeTest extends AbstractCompareTest {
* @generated
*/
@Test
- public void testEquivalentDiffs() {
- EStructuralFeature feature = org.eclipse.emf.compare.ComparePackage.eINSTANCE
- .getDiff_EquivalentDiffs();
+ public void testEquivalence() {
+ EStructuralFeature feature = org.eclipse.emf.compare.ComparePackage.eINSTANCE.getDiff_Equivalence();
ResourceAttachmentChange resourceAttachmentChange = CompareFactory.eINSTANCE
.createResourceAttachmentChange();
resourceAttachmentChange.eAdapters().add(new MockEAdapter());
@@ -288,56 +287,51 @@ public class ResourceAttachmentChangeTest extends AbstractCompareTest {
.createEquivalence();
assertFalse(resourceAttachmentChange.eIsSet(feature));
- assertNull(resourceAttachmentChange.getEquivalentDiffs());
+ assertNull(resourceAttachmentChange.getEquivalence());
- resourceAttachmentChange.setEquivalentDiffs(equivalentDiffsValue);
+ resourceAttachmentChange.setEquivalence(equivalentDiffsValue);
assertTrue(notified);
notified = false;
- assertSame(equivalentDiffsValue, resourceAttachmentChange.getEquivalentDiffs());
- assertSame(resourceAttachmentChange.getEquivalentDiffs(), resourceAttachmentChange.eGet(feature));
- assertSame(resourceAttachmentChange.getEquivalentDiffs(), resourceAttachmentChange.eGet(feature,
- false));
+ assertSame(equivalentDiffsValue, resourceAttachmentChange.getEquivalence());
+ assertSame(resourceAttachmentChange.getEquivalence(), resourceAttachmentChange.eGet(feature));
+ assertSame(resourceAttachmentChange.getEquivalence(), resourceAttachmentChange.eGet(feature, false));
assertTrue(resourceAttachmentChange.eIsSet(feature));
assertTrue(equivalentDiffsValue.getDifferences().contains(resourceAttachmentChange));
resourceAttachmentChange.eUnset(feature);
assertTrue(notified);
notified = false;
- assertNull(resourceAttachmentChange.getEquivalentDiffs());
- assertSame(resourceAttachmentChange.getEquivalentDiffs(), resourceAttachmentChange.eGet(feature));
- assertSame(resourceAttachmentChange.getEquivalentDiffs(), resourceAttachmentChange.eGet(feature,
- false));
+ assertNull(resourceAttachmentChange.getEquivalence());
+ assertSame(resourceAttachmentChange.getEquivalence(), resourceAttachmentChange.eGet(feature));
+ assertSame(resourceAttachmentChange.getEquivalence(), resourceAttachmentChange.eGet(feature, false));
assertFalse(resourceAttachmentChange.eIsSet(feature));
assertFalse(equivalentDiffsValue.getDifferences().contains(resourceAttachmentChange));
- resourceAttachmentChange.setEquivalentDiffs(equivalentDiffsValue);
+ resourceAttachmentChange.setEquivalence(equivalentDiffsValue);
assertTrue(notified);
notified = false;
- assertSame(equivalentDiffsValue, resourceAttachmentChange.getEquivalentDiffs());
- assertSame(resourceAttachmentChange.getEquivalentDiffs(), resourceAttachmentChange.eGet(feature));
- assertSame(resourceAttachmentChange.getEquivalentDiffs(), resourceAttachmentChange.eGet(feature,
- false));
+ assertSame(equivalentDiffsValue, resourceAttachmentChange.getEquivalence());
+ assertSame(resourceAttachmentChange.getEquivalence(), resourceAttachmentChange.eGet(feature));
+ assertSame(resourceAttachmentChange.getEquivalence(), resourceAttachmentChange.eGet(feature, false));
assertTrue(resourceAttachmentChange.eIsSet(feature));
assertTrue(equivalentDiffsValue.getDifferences().contains(resourceAttachmentChange));
resourceAttachmentChange.eSet(feature, equivalentDiffsValue);
assertTrue(notified);
notified = false;
- assertSame(equivalentDiffsValue, resourceAttachmentChange.getEquivalentDiffs());
- assertSame(resourceAttachmentChange.getEquivalentDiffs(), resourceAttachmentChange.eGet(feature));
- assertSame(resourceAttachmentChange.getEquivalentDiffs(), resourceAttachmentChange.eGet(feature,
- false));
+ assertSame(equivalentDiffsValue, resourceAttachmentChange.getEquivalence());
+ assertSame(resourceAttachmentChange.getEquivalence(), resourceAttachmentChange.eGet(feature));
+ assertSame(resourceAttachmentChange.getEquivalence(), resourceAttachmentChange.eGet(feature, false));
assertTrue(resourceAttachmentChange.eIsSet(feature));
assertTrue(equivalentDiffsValue.getDifferences().contains(resourceAttachmentChange));
- resourceAttachmentChange.setEquivalentDiffs(null);
+ resourceAttachmentChange.setEquivalence(null);
assertTrue(notified);
notified = false;
- assertNull(resourceAttachmentChange.getEquivalentDiffs());
- assertSame(feature.getDefaultValue(), resourceAttachmentChange.getEquivalentDiffs());
- assertSame(resourceAttachmentChange.getEquivalentDiffs(), resourceAttachmentChange.eGet(feature));
- assertSame(resourceAttachmentChange.getEquivalentDiffs(), resourceAttachmentChange.eGet(feature,
- false));
+ assertNull(resourceAttachmentChange.getEquivalence());
+ assertSame(feature.getDefaultValue(), resourceAttachmentChange.getEquivalence());
+ assertSame(resourceAttachmentChange.getEquivalence(), resourceAttachmentChange.eGet(feature));
+ assertSame(resourceAttachmentChange.getEquivalence(), resourceAttachmentChange.eGet(feature, false));
assertFalse(resourceAttachmentChange.eIsSet(feature));
assertFalse(equivalentDiffsValue.getDifferences().contains(resourceAttachmentChange));
}

Back to the top