Changeset 8450 in josm for trunk/test/unit/org/openstreetmap/josm/gui

Timestamp:

2015-06-03T01:27:41+02:00 (10 years ago)

Author:

Don-vip

Message:

unit tests - simplify assertions

Location:

trunk/test/unit/org/openstreetmap/josm/gui

Files:

• DefaultNameFormatterTest.java (modified) (2 diffs)
• conflict/nodes/NodeListMergeModelTest.java (modified) (2 diffs)
• tagging/PresetClassificationsTest.java (modified) (3 diffs)

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

@@ -3 +3 @@
 
 import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
 
 import java.io.FileInputStream;
@@ -67 +67 @@
             System.out.println("p3: "+DefaultNameFormatter.getInstance().format(p3)+" - "+p3); // route(lcn Sal  Salier-Radweg(412 members)
 
-            assertTrue(comparator.compare(p1, p2) == -1); // p1 < p2
-            assertTrue(comparator.compare(p2, p1) ==  1); // p2 > p1
+            assertSame(comparator.compare(p1, p2), -1); // p1 < p2
+            assertSame(comparator.compare(p2, p1),  1); // p2 > p1
 
-            assertTrue(comparator.compare(p1, p3) == -1); // p1 < p3
-            assertTrue(comparator.compare(p3, p1) ==  1); // p3 > p1
-            assertTrue(comparator.compare(p2, p3) ==  1); // p2 > p3
-            assertTrue(comparator.compare(p3, p2) == -1); // p3 < p2
+            assertSame(comparator.compare(p1, p3), -1); // p1 < p3
+            assertSame(comparator.compare(p3, p1),  1); // p3 > p1
+            assertSame(comparator.compare(p2, p3),  1); // p2 > p3
+            assertSame(comparator.compare(p3, p2), -1); // p3 < p2
 
             Relation[] relations = new ArrayList<>(ds.getRelations()).toArray(new Relation[0]);

trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java

@@ -5 +5 @@
 import static org.fest.reflect.core.Reflection.method;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -697 +698 @@
 
         model.setFrozen(false);
-        assertTrue(!model.isFrozen());
+        assertFalse(model.isFrozen());
     }
 

trunk/test/unit/org/openstreetmap/josm/gui/tagging/PresetClassificationsTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.tagging;
 
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
@@ -54 +55 @@
         w.addNode(new Node());
         w.addNode(new Node());
-        assertTrue("unclosed way should not match building preset", !getMatchingPresetNames("building", w).contains("Building"));
+        assertFalse("unclosed way should not match building preset", getMatchingPresetNames("building", w).contains("Building"));
         w.addNode(n1);
         assertTrue("closed way should match building preset", getMatchingPresetNames("building", w).contains("Building"));
@@ -64 +65 @@
         assertTrue("railway=tram should match 'Railway Route' for relation creation", getMatchingPresetNames("route", tram).contains("Railway Route"));
         assertTrue("railway=tram should match 'Public Transport Route' for relation creation", getMatchingPresetNames("route", tram).contains("Public Transport Route"));
-        assertTrue("railway=tram should not match 'Bus route'", !getMatchingPresetNames("route", tram).contains("Bus route"));
+        assertFalse("railway=tram should not match 'Bus route'", getMatchingPresetNames("route", tram).contains("Bus route"));
     }
 }