diff options
| author | Cedric Brun | 2011-06-15 14:58:40 +0000 |
|---|---|---|
| committer | lgoubet | 2011-08-02 13:05:36 +0000 |
| commit | 1278c3fcf068cada9f9844edbced74c1af8dae61 (patch) | |
| tree | c459840b7489546010bb8aaae0443aabbcca413d | |
| parent | e2b68d0a8b355e8197a56e81bfd6a34cb35a4cf4 (diff) | |
| download | org.eclipse.emf.compare-1278c3fcf068cada9f9844edbced74c1af8dae61.tar.gz org.eclipse.emf.compare-1278c3fcf068cada9f9844edbced74c1af8dae61.tar.xz org.eclipse.emf.compare-1278c3fcf068cada9f9844edbced74c1af8dae61.zip | |
making sure left/right is actually useful in the tests
| -rw-r--r-- | plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/MergeTestBase.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/MergeTestBase.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/MergeTestBase.java index af1c356f3..fd2df11f3 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/MergeTestBase.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/MergeTestBase.java @@ -83,8 +83,15 @@ public abstract class MergeTestBase extends TestCase { MergeService.merge(differences, isLeftToRight); postMergeHook(isLeftToRight); - String expected = ModelUtils.serialize(testLeftModel); - String actual = ModelUtils.serialize(testRightModel); + String leftModelString = ModelUtils.serialize(testLeftModel); + String rightModelString = ModelUtils.serialize(testRightModel); + String expected = leftModelString; + String actual = rightModelString; + if (!isLeftToRight) { + expected = rightModelString; + actual = leftModelString; + } + assertEquals(expected, actual); // boolean mergeOK = EcoreUtil.equals(expectedModel, rightModel); |