diff options
| author | lgoubet | 2012-05-04 14:18:21 +0000 |
|---|---|---|
| committer | lgoubet | 2012-05-10 14:56:06 +0000 |
| commit | a912ac031264101d6a6b28eac9abde3396d80086 (patch) | |
| tree | fc30df61d6f64bd5fa4a9691436c142fc3be0ea3 /plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison | |
| parent | 6934941481d0fa61cb2626f19b873f04ef2e615d (diff) | |
| download | org.eclipse.emf.compare-a912ac031264101d6a6b28eac9abde3396d80086.tar.gz org.eclipse.emf.compare-a912ac031264101d6a6b28eac9abde3396d80086.tar.xz org.eclipse.emf.compare-a912ac031264101d6a6b28eac9abde3396d80086.zip | |
We now detect changes for "identical deletions" on each side.
Conflicts are missing the notion of "pseudo conflicts" when the same difference has been made on both sides.
Diffstat (limited to 'plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison')
| -rw-r--r-- | plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/IdentifierComparisonTest.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/IdentifierComparisonTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/IdentifierComparisonTest.java index bbd93b660..d21d5f092 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/IdentifierComparisonTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/IdentifierComparisonTest.java @@ -157,6 +157,11 @@ public class IdentifierComparisonTest extends EMFCompareTestBase { */
assertChangedAttribute(differences, "extlibrary.AudioVisualItem.length", "name", "minutesLength",
"length", DifferenceSource.LEFT);
+ // These are actually pseudo-conflicts : same diff on both sides
+ assertRemoved(differences, "extlibrary.BookOnTape.reader", DifferenceSource.LEFT);
+ assertRemoved(differences, "extlibrary.BookOnTape.reader", DifferenceSource.RIGHT);
+ assertRemoved(differences, "extlibrary.Periodical.title", DifferenceSource.LEFT);
+ assertRemoved(differences, "extlibrary.Periodical.title", DifferenceSource.RIGHT);
/*
* These changes can only be detected with an origin : lastName has been removed in the left model
* and thus only the removal can be detected in two-way. Likewise, "minutesLength" has been
|