Changeset 7109 in josm for trunk/test/unit/org/openstreetmap

Timestamp:

2014-05-12T00:40:09+02:00 (10 years ago)

Author:

Don-vip

Message:

see #8671 - some code refactoring done in an unsuccessful attempt to reproduce error, but worth keeping

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• TestUtils.java (modified) (2 diffs)
• gui/DefaultNameFormatterTest.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/TestUtils.java

@@ -5 +5 @@
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
+import java.util.Arrays;
+import java.util.Comparator;
 import java.util.Map;
 
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -65 +67 @@
     }
 
+    /**
+     * Checks that the given Comparator respects its contract on the given table.
+     * @param comparator The comparator to test
+     * @param array The array sorted for test purpose
+     */
+    public static <T> void checkComparableContract(Comparator<T> comparator, T[] array) {
+        System.out.println("Validating Comparable contract on array of "+array.length+" elements");
+        // Check each compare possibility
+        for (int i=0; i<array.length; i++) {
+            T r1 = array[i];
+            for (int j=i; j<array.length; j++) {
+                T r2 = array[j];
+                int a = comparator.compare(r1, r2);
+                int b = comparator.compare(r2, r1);
+                if (i==j || a==b) {
+                    if (a != 0 || b != 0) {
+                        fail(getFailMessage(r1, r2, a, b));
+                    }
+                } else {
+                    if (a != -b) {
+                        fail(getFailMessage(r1, r2, a, b));
+                    }
+                }
+                for (int k=j; k<array.length; k++) {
+                    T r3 = array[k];
+                    int c = comparator.compare(r1, r3);
+                    int d = comparator.compare(r2, r3);
+                    if (a > 0 && d > 0) {
+                        if (c <= 0) {
+                           fail(getFailMessage(r1, r2, r3, a, b, c, d));
+                        }
+                    } else if (a == 0 && d == 0) {
+                        if (c != 0) {
+                            fail(getFailMessage(r1, r2, r3, a, b, c, d));
+                        }
+                    } else if (a < 0 && d < 0) {
+                        if (c >= 0) {
+                            fail(getFailMessage(r1, r2, r3, a, b, c, d));
+                        }
+                    }
+                }
+            }
+        }
+        // Sort relation array
+        Arrays.sort(array, comparator);
+    }
+
+    private static <T> String getFailMessage(T o1, T o2, int a, int b) {
+        return new StringBuilder("Compared\no1: ").append(o1).append("\no2: ")
+        .append(o2).append("\ngave: ").append(a).append("/").append(b)
+        .toString();
+    }
+
+    private static <T> String getFailMessage(T o1, T o2, T o3, int a, int b, int c, int d) {
+        return new StringBuilder(getFailMessage(o1, o2, a, b))
+        .append("\nCompared\no1: ").append(o1).append("\no3: ").append(o3).append("\ngave: ").append(c)
+        .append("\nCompared\no2: ").append(o2).append("\no3: ").append(o3).append("\ngave: ").append(d)
+        .toString();
+    }
 }

trunk/test/unit/org/openstreetmap/josm/gui/DefaultNameFormatterTest.java

@@ -3 +3 @@
 
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 import java.io.FileInputStream;
@@ -9 +8 @@
 import java.io.InputStream;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Comparator;
 
@@ -75 +73 @@
             Relation[] relations = new ArrayList<>(ds.getRelations()).toArray(new Relation[0]);
 
-            // Check each compare possibility
-            for (int i=0; i<relations.length; i++) {
-                Relation r1 = relations[i];
-                for (int j=i; j<relations.length; j++) {
-                    Relation r2 = relations[j];
-                    int a = comparator.compare(r1, r2);
-                    int b = comparator.compare(r2, r1);
-                    if (i==j || a==b) {
-                        if (a != 0 || b != 0) {
-                            fail(getFailMessage(r1, r2, a, b));
-                        }
-                    } else {
-                        if (a != -b) {
-                            fail(getFailMessage(r1, r2, a, b));
-                        }
-                    }
-                    for (int k=j; k<relations.length; k++) {
-                        Relation r3 = relations[k];
-                        int c = comparator.compare(r1, r3);
-                        int d = comparator.compare(r2, r3);
-                        if (a > 0 && d > 0) {
-                            if (c <= 0) {
-                               fail(getFailMessage(r1, r2, r3, a, b, c, d));
-                            }
-                        } else if (a == 0 && d == 0) {
-                            if (c != 0) {
-                                fail(getFailMessage(r1, r2, r3, a, b, c, d));
-                            }
-                        } else if (a < 0 && d < 0) {
-                            if (c >= 0) {
-                                fail(getFailMessage(r1, r2, r3, a, b, c, d));
-                            }
-                        }
-                    }
-                }
-            }
-            // Sort relation array
-            Arrays.sort(relations, comparator);
+            TestUtils.checkComparableContract(comparator, relations);
         }
     }
-
-    private static String getFailMessage(Relation r1, Relation r2, int a, int b) {
-        return new StringBuilder("Compared\nr1: ").append(r1).append("\nr2: ")
-        .append(r2).append("\ngave: ").append(a).append("/").append(b)
-        .toString();
-    }
-
-    private static String getFailMessage(Relation r1, Relation r2, Relation r3, int a, int b, int c, int d) {
-        return new StringBuilder(getFailMessage(r1, r2, a, b))
-        .append("\nCompared\nr1: ").append(r1).append("\nr3: ").append(r3).append("\ngave: ").append(c)
-        .append("\nCompared\nr2: ").append(r2).append("\nr3: ").append(r3).append("\ngave: ").append(d)
-        .toString();
-    }
 }