Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlgoubet2012-08-31 08:15:27 +0000
committerlgoubet2012-08-31 08:16:20 +0000
commit3cace00ab0304fec3c6cf78880f54601bf46e89d (patch)
tree066eb8f7d8bf1806be0c9624ab9958ee4d76bb40 /plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff
parentbd39fbaa720c37cc62d7fe18a275761220d87e1a (diff)
downloadorg.eclipse.emf.compare-3cace00ab0304fec3c6cf78880f54601bf46e89d.tar.gz
org.eclipse.emf.compare-3cace00ab0304fec3c6cf78880f54601bf46e89d.tar.xz
org.eclipse.emf.compare-3cace00ab0304fec3c6cf78880f54601bf46e89d.zip
Some more unit tests for the out-of-scope values merging.
Fixing the related bugs they highlighted.
Diffstat (limited to 'plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff')
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/DiffUtilTest.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/DiffUtilTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/DiffUtilTest.java
index a18267019..f1edebba2 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/DiffUtilTest.java
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/DiffUtilTest.java
@@ -54,8 +54,8 @@ public class DiffUtilTest {
final List<Character> lcs = DiffUtil.longestCommonSubsequence(emptyComparison, left, right);
/*
- * This is documented in {@link DefaultDiffEngine#longestCommonSubsequence(Comparison, List, List)}.
- * Ensure the documentation stays in sync.
+ * This is documented in {@link DiffUtil#longestCommonSubsequence(Comparison, List, List)}. Ensure the
+ * documentation stays in sync.
*/
assertEqualContents(Lists.charactersOf("cde"), lcs);
}

Back to the top