Content Based Match

Fix and tweak ratios (dumb constant leading to very high sensibility)
Externalize a class responsible for providing weights for each feature.
Make sure we are always using the same list of valid features while
computing max distance and actualy comparing the EObjects

1 files changed, 9 insertions, 9 deletions

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 f21309c49..4b29dc7ed 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
@@ -21,11 +21,11 @@ public class URIDistanceTest {
 

 	@Test

 	public void sameNumberOfFragments() throws Exception {

-		assertEquals(3, meter.proximity("/root/a/b", "/root/a/b/c"));

-		assertEquals(3, meter.proximity("/root/a/b/", "/root/a/b/c/"));

+		assertEquals(10, meter.proximity("/root/a/b", "/root/a/b/c"));

+		assertEquals(10, meter.proximity("/root/a/b/", "/root/a/b/c/"));

 		assertEquals(0, meter.proximity("/root/a/b", "/root/a/b"));

-		assertEquals(8, meter.proximity("/root/a/a2/a3", "/root/b/b2/a3"));

-		assertEquals(8, meter.proximity("/root/a/a2/a3", "/root/b/b2/b3"));

+		assertEquals(10, meter.proximity("/root/a/a2/a3", "/root/b/b2/a3"));

+		assertEquals(10, meter.proximity("/root/a/a2/a3", "/root/b/b2/b3"));

 	}

 

 	@Test

@@ -61,15 +61,15 @@ public class URIDistanceTest {
 	@Test

 	public void idLikeURIs() throws Exception {

 		assertEquals(10, meter.proximity("#131233", "#azeazezae"));

-		assertEquals(3, meter.proximity("/c/d/e/f", "/c/d/e/f?#azeaze"));

+		assertEquals(10, meter.proximity("/c/d/e/f", "/c/d/e/f?#azeaze"));

 	}

 

 	@Test

 	public void traillingSlashes() throws Exception {

-		assertEquals(3, meter.proximity("/root/a/b/", "/root/a/b/c/"));

-		assertEquals(3, meter.proximity("root/a/b/", "/root/a/b/c/"));

-		assertEquals(3, meter.proximity("/root/a/b/", "/root/a/b/c"));

-		assertEquals(3, meter.proximity("///root/a/b/", "/root/a/b/c"));

+		assertEquals(10, meter.proximity("/root/a/b/", "/root/a/b/c/"));

+		assertEquals(10, meter.proximity("root/a/b/", "/root/a/b/c/"));

+		assertEquals(10, meter.proximity("/root/a/b/", "/root/a/b/c"));

+		assertEquals(10, meter.proximity("///root/a/b/", "/root/a/b/c"));

 	}

 

 }