diff options
| author | cbrun | 2012-10-12 07:48:14 +0000 |
|---|---|---|
| committer | cbrun | 2012-10-12 07:48:14 +0000 |
| commit | 6f1cb6f6c936350df789b38f20b5e55b4fabbf66 (patch) | |
| tree | d6670085e7265b8be5da8999f8e10b01addba7d3 /plugins | |
| parent | c573265c30a21c6927a533f3576c30ad279b8756 (diff) | |
| download | org.eclipse.emf.compare-6f1cb6f6c936350df789b38f20b5e55b4fabbf66.tar.gz org.eclipse.emf.compare-6f1cb6f6c936350df789b38f20b5e55b4fabbf66.tar.xz org.eclipse.emf.compare-6f1cb6f6c936350df789b38f20b5e55b4fabbf66.zip | |
Fix choco-commit
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/DistanceAxiomsTests.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/DistanceAxiomsTests.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/DistanceAxiomsTests.java index 176a91e79..d72fbf875 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/DistanceAxiomsTests.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/DistanceAxiomsTests.java @@ -56,8 +56,8 @@ public class DistanceAxiomsTests { @Theory public void symetry(EObject a, EObject b) { Assume.assumeTrue(a.eClass() == b.eClass()); - int aTob = meter.distance(a, b, MAX_DISTANCE); - int bToa = meter.distance(b, a, MAX_DISTANCE); + int aTob = meter.distance(a, b); + int bToa = meter.distance(b, a); assertEquals(aTob, bToa); } @@ -67,15 +67,15 @@ public class DistanceAxiomsTests { @Theory public void separation(EObject a) { - assertEquals(0, meter.distance(a, a, MAX_DISTANCE)); + assertEquals(0, meter.distance(a, a)); } @Theory public void triangularInequality(EObject x, EObject y, EObject z) { Assume.assumeTrue(x.eClass() == y.eClass() && x.eClass() == z.eClass()); - int xToz = meter.distance(x, z, MAX_DISTANCE); - int xToy = meter.distance(x, y, MAX_DISTANCE); - int yToz = meter.distance(y, z, MAX_DISTANCE); + int xToz = meter.distance(x, z); + int xToy = meter.distance(x, y); + int yToz = meter.distance(y, z); assertTrue("Triangular inequality (x-z <= x-y + y-z ) failed (" + xToz + "<=" + xToy + " + " + yToz + ")for \nx:" + x.toString() + "\n|y:" + y.toString() + "\n|z:" + z.toString(), xToz <= xToy + yToz); |