Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlgoubet2012-03-22 15:43:18 -0400
committerlgoubet2012-03-22 15:43:18 -0400
commitb90e0e0a998038fda35f61861693f890742b9358 (patch)
tree9b534a65e9ae1973022fe187dd2b692f66657c5e /plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse
parent951972eb357768f0a32e1c4172fbaa678972e083 (diff)
downloadorg.eclipse.emf.compare-b90e0e0a998038fda35f61861693f890742b9358.tar.gz
org.eclipse.emf.compare-b90e0e0a998038fda35f61861693f890742b9358.tar.xz
org.eclipse.emf.compare-b90e0e0a998038fda35f61861693f890742b9358.zip
First implementation of the diff engine : detects containment changes
and some of the possible reference changes.
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/MatchTest.java24
1 files changed, 12 insertions, 12 deletions
diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/MatchTest.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/MatchTest.java
index 49d75a729..d3d13d443 100644
--- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/MatchTest.java
+++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/MatchTest.java
@@ -26,7 +26,7 @@ public class MatchTest extends AbstractCompareTest {
*/
@Test
public void testSubMatches() {
- EStructuralFeature feature = org.eclipse.emf.compare.ComparePackage.eINSTANCE.getMatch_SubMatches();
+ EStructuralFeature feature = org.eclipse.emf.compare.ComparePackage.eINSTANCE.getMatch_Submatches();
Match match = CompareFactory.eINSTANCE.createMatch();
match.eAdapters().add(new MockEAdapter());
org.eclipse.emf.compare.Match subMatchesValue = org.eclipse.emf.compare.CompareFactory.eINSTANCE
@@ -35,30 +35,30 @@ public class MatchTest extends AbstractCompareTest {
listSubMatches.add(subMatchesValue);
assertFalse(match.eIsSet(feature));
- assertTrue(match.getSubMatches().isEmpty());
+ assertTrue(match.getSubmatches().isEmpty());
- match.getSubMatches().add(subMatchesValue);
+ match.getSubmatches().add(subMatchesValue);
assertTrue(notified);
notified = false;
- assertTrue(match.getSubMatches().contains(subMatchesValue));
- assertSame(match.getSubMatches(), match.eGet(feature));
- assertSame(match.getSubMatches(), match.eGet(feature, false));
+ assertTrue(match.getSubmatches().contains(subMatchesValue));
+ assertSame(match.getSubmatches(), match.eGet(feature));
+ assertSame(match.getSubmatches(), match.eGet(feature, false));
assertTrue(match.eIsSet(feature));
match.eUnset(feature);
assertTrue(notified);
notified = false;
- assertTrue(match.getSubMatches().isEmpty());
- assertSame(match.getSubMatches(), match.eGet(feature));
- assertSame(match.getSubMatches(), match.eGet(feature, false));
+ assertTrue(match.getSubmatches().isEmpty());
+ assertSame(match.getSubmatches(), match.eGet(feature));
+ assertSame(match.getSubmatches(), match.eGet(feature, false));
assertFalse(match.eIsSet(feature));
match.eSet(feature, listSubMatches);
assertTrue(notified);
notified = false;
- assertTrue(match.getSubMatches().contains(subMatchesValue));
- assertSame(match.getSubMatches(), match.eGet(feature));
- assertSame(match.getSubMatches(), match.eGet(feature, false));
+ assertTrue(match.getSubmatches().contains(subMatchesValue));
+ assertSame(match.getSubmatches(), match.eGet(feature));
+ assertSame(match.getSubmatches(), match.eGet(feature, false));
assertTrue(match.eIsSet(feature));
}

Back to the top