Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Goubet2014-01-30 05:18:27 -0500
committerLaurent Goubet2014-01-30 10:43:15 -0500
commit578f5e206473a3a4286246648b969282bf0a1029 (patch)
treec42e21f7d395e3b90c56264e234424ad19c26d20 /plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff
parentf6f92566be706f641c0afade7e3ab3dd752927cd (diff)
downloadorg.eclipse.emf.compare-578f5e206473a3a4286246648b969282bf0a1029.tar.gz
org.eclipse.emf.compare-578f5e206473a3a4286246648b969282bf0a1029.tar.xz
org.eclipse.emf.compare-578f5e206473a3a4286246648b969282bf0a1029.zip
Cleanup for version bumping
- Bump versions to reflect minimal BREE change - Fix as many warnings as possible - Make sure our @since reflect the correct versions Change-Id: Ifb30b655f17ef2420ea5ca69c528910bd51e7649
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/LCSPerformanceTest.java6
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/URIDistanceTest.java17
2 files changed, 13 insertions, 10 deletions
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/LCSPerformanceTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/LCSPerformanceTest.java
index 19feebab1..ca7cbc688 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/LCSPerformanceTest.java
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/LCSPerformanceTest.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2013 Obeo.
+ * Copyright (c) 2013, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -10,8 +10,8 @@
*/
package org.eclipse.emf.compare.tests.diff;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import com.google.common.collect.Lists;
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/URIDistanceTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/URIDistanceTest.java
index a1947ce21..b172370df 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/URIDistanceTest.java
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/URIDistanceTest.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2012 Obeo.
+ * Copyright (c) 2012, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -24,6 +24,7 @@ import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EcorePackage;
import org.junit.Test;
+@SuppressWarnings("nls")
public class URIDistanceTest {
private URIDistance meter = new URIDistance();
@@ -141,14 +142,16 @@ public class URIDistanceTest {
} else {
CharMatcher slash = CharMatcher.is('/');
Splitter splitter = Splitter.on('/');
- if (slash.indexIn(aPath) == 0) {
- aPath = aPath.substring(1);
+ String actualAPath = aPath;
+ String actualBPath = bPath;
+ if (slash.indexIn(actualAPath) == 0) {
+ actualAPath = aPath.substring(1);
}
- if (slash.indexIn(bPath) == 0) {
- bPath = bPath.substring(1);
+ if (slash.indexIn(actualBPath) == 0) {
+ actualBPath = bPath.substring(1);
}
- Iterable<String> aString = splitter.split(slash.trimTrailingFrom(aPath));
- Iterable<String> bString = splitter.split(slash.trimTrailingFrom(bPath));
+ Iterable<String> aString = splitter.split(slash.trimTrailingFrom(actualAPath));
+ Iterable<String> bString = splitter.split(slash.trimTrailingFrom(actualBPath));
return meter.proximity(ImmutableList.copyOf(aString), ImmutableList.copyOf(bString));
}
}

Back to the top