Index: /trunk/test/unit/org/openstreetmap/josm/actions/CreateCircleActionTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/actions/CreateCircleActionTest.java (revision 8449) +++ /trunk/test/unit/org/openstreetmap/josm/actions/CreateCircleActionTest.java (revision 8450) @@ -2,4 +2,5 @@ package org.openstreetmap.josm.actions; +import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; @@ -98,7 +99,6 @@ // Expected result: Dataset contain one closed way, clockwise Collection resultingWays = dataSet.getWays(); - assertTrue(String.format("Expect one way after perform action. %d found", - resultingWays.size()), - resultingWays.size() == 1); + assertSame(String.format("Expect one way after perform action. %d found", resultingWays.size()), + resultingWays.size(), 1); Way resultingWay = resultingWays.iterator().next(); assertTrue("Resulting way is not closed", @@ -174,7 +174,6 @@ // Expected result: Dataset contain one closed way, clockwise Collection resultingWays = dataSet.getWays(); - assertTrue(String.format("Expect one way after perform action. %d found", - resultingWays.size()), - resultingWays.size() == 1); + assertSame(String.format("Expect one way after perform action. %d found", resultingWays.size()), + resultingWays.size(), 1); Way resultingWay = resultingWays.iterator().next(); assertTrue("Resulting way is not closed", Index: /trunk/test/unit/org/openstreetmap/josm/actions/SplitWayActionTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/actions/SplitWayActionTest.java (revision 8449) +++ /trunk/test/unit/org/openstreetmap/josm/actions/SplitWayActionTest.java (revision 8450) @@ -2,4 +2,5 @@ package org.openstreetmap.josm.actions; +import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; @@ -80,16 +81,15 @@ // Ensures 3 ways. - assertTrue(String.format("Found %d ways after split action instead of 3.", - dataSet.getWays().size()), - dataSet.getWays().size() == 3); + assertSame(String.format("Found %d ways after split action instead of 3.", dataSet.getWays().size()), + dataSet.getWays().size(), 3); // Ensures way w1 is unchanged. assertTrue("Unselected ways disappear during split action.", dataSet.getWays().contains(w1)); - assertTrue("Unselected way seems to have change during split action.", - w1.getNodesCount() == 3); + assertSame("Unselected way seems to have change during split action.", + w1.getNodesCount(), 3); for(int i = 0; i < 3; i++) { - assertTrue("Node change in unselected way during split action.", - w1.getNode(i) == w1NodesArray[i]); + assertSame("Node change in unselected way during split action.", + w1.getNode(i), w1NodesArray[i]); } } Index: /trunk/test/unit/org/openstreetmap/josm/actions/UnJoinNodeWayActionTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/actions/UnJoinNodeWayActionTest.java (revision 8449) +++ /trunk/test/unit/org/openstreetmap/josm/actions/UnJoinNodeWayActionTest.java (revision 8450) @@ -2,5 +2,5 @@ package org.openstreetmap.josm.actions; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertFalse; import java.util.Arrays; @@ -32,5 +32,5 @@ public void notify(String msg, int messageType) { return; - }; + } } @@ -82,6 +82,5 @@ // Ensures node n2 remove from w - assertTrue("Node n2 wasn't removed from way w.", - !w.containsNode(n2)); + assertFalse("Node n2 wasn't removed from way w.", w.containsNode(n2)); } } Index: /trunk/test/unit/org/openstreetmap/josm/actions/mapmode/SelectActionTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/actions/mapmode/SelectActionTest.java (revision 8449) +++ /trunk/test/unit/org/openstreetmap/josm/actions/mapmode/SelectActionTest.java (revision 8450) @@ -2,5 +2,8 @@ package org.openstreetmap.josm.actions.mapmode; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.awt.Cursor; @@ -43,15 +46,22 @@ this.currentDataSet = dataSet; }; + @Override public EastNorth getEastNorth(int x, int y) { return new EastNorth(x, y); } + @Override public void addMouseListener(MouseListener ml) {} + @Override public void removeMouseListener(MouseListener ml) {} public void addMouseMotionListener(MouseListener ml) {} public void removeMouseMotionListener(MouseListener ml) {} public void mvRepaint() {} + @Override public void setVirtualNodesEnabled(boolean enabled) {} + @Override public void setNewCursor(Cursor cursor, Object reference) {} + @Override public void setNewCursor(int cursor, Object reference) {} + @Override public boolean isActiveLayerVisible() { return true; @@ -64,12 +74,17 @@ } }; + @Override public void requestClearRect() {} + @Override public Point2D getPoint2D(EastNorth p) { return new Point2D.Double(p.getX(), p.getY()); } + @Override public void setActiveLayer(Layer layer) {} + @Override public Layer getActiveLayer() { return layer; } + @Override protected DataSet getCurrentDataSet() { return currentDataSet; @@ -81,4 +96,5 @@ */ class PreferencesMock extends Preferences { + @Override public synchronized int getInteger(String key, int def) { if (key == "edit.initial-move-delay") { @@ -101,12 +117,12 @@ } catch (Exception e) { e.printStackTrace(); - assertTrue("Can't setup testing environnement", false); + fail("Can't setup testing environnement"); } } + @Override public void mergeNodes(OsmDataLayer layer, Collection nodes, Node targetLocationNode) { - assertTrue(String.format("Should merge two nodes, %d found", - nodes.size()), - nodes.size() == 2); + assertSame(String.format("Should merge two nodes, %d found", nodes.size()), + nodes.size(), 2); nodesMerged = true; } @@ -182,13 +198,10 @@ // As result of test, we must find a 2 nodes way, from EN(0, 0) to EN(100, 0) assertTrue("Nodes are not merged", nodesMerged); - assertTrue(String.format("Expect exactly one way, found %d\n", - dataSet.getWays().size()), - dataSet.getWays().size() == 1); + assertSame(String.format("Expect exactly one way, found %d\n", dataSet.getWays().size()), + dataSet.getWays().size(), 1); Way rw = dataSet.getWays().iterator().next(); - assertTrue("Way shouldn't be deleted\n", - !rw.isDeleted()); - assertTrue(String.format("Way shouldn't have 2 nodes, %d found\n", - w.getNodesCount()), - rw.getNodesCount() == 2); + assertFalse("Way shouldn't be deleted\n", rw.isDeleted()); + assertSame(String.format("Way shouldn't have 2 nodes, %d found\n", w.getNodesCount()), + rw.getNodesCount(), 2); Node r1 = rw.firstNode(); Node r2 = rw.lastNode(); @@ -198,10 +211,8 @@ r2 = tmp; } - assertTrue(String.format("East should be 0, found %f\n", - r1.getEastNorth().east()), - Double.compare(r1.getEastNorth().east(), 0) == 0); - assertTrue(String.format("East should be 100, found %f\n", - r2.getEastNorth().east()), - Double.compare(r2.getEastNorth().east(), 100) == 0); + assertSame(String.format("East should be 0, found %f\n", r1.getEastNorth().east()), + Double.compare(r1.getEastNorth().east(), 0), 0); + assertSame(String.format("East should be 100, found %f\n", r2.getEastNorth().east()), + Double.compare(r2.getEastNorth().east(), 100), 0); } } Index: /trunk/test/unit/org/openstreetmap/josm/data/BoundsTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/BoundsTest.java (revision 8449) +++ /trunk/test/unit/org/openstreetmap/josm/data/BoundsTest.java (revision 8450) @@ -1,8 +1,10 @@ package org.openstreetmap.josm.data; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import org.junit.Test; import org.openstreetmap.josm.data.coor.LatLon; - -import static org.junit.Assert.assertTrue; public class BoundsTest { @@ -12,16 +14,16 @@ Bounds b1 = new Bounds(0, 170, 50, -170); assertTrue(b1.crosses180thMeridian()); - assertTrue(!b1.contains(new LatLon(-10, -180))); + assertFalse(b1.contains(new LatLon(-10, -180))); assertTrue(b1.contains(new LatLon(0, -180))); assertTrue(b1.contains(new LatLon(50, -180))); - assertTrue(!b1.contains(new LatLon(60, -180))); - assertTrue(!b1.contains(new LatLon(-10, 180))); + assertFalse(b1.contains(new LatLon(60, -180))); + assertFalse(b1.contains(new LatLon(-10, 180))); assertTrue(b1.contains(new LatLon(0, 180))); assertTrue(b1.contains(new LatLon(50, 180))); - assertTrue(!b1.contains(new LatLon(60, 180))); + assertFalse(b1.contains(new LatLon(60, 180))); Bounds b2 = new Bounds(60, 170, 90, -170); - assertTrue(!b1.intersects(b2)); - assertTrue(!b2.intersects(b1)); + assertFalse(b1.intersects(b2)); + assertFalse(b2.intersects(b1)); Bounds b3 = new Bounds(25, 170, 90, -170); @@ -30,14 +32,14 @@ assertTrue(b2.intersects(b3)); assertTrue(b3.intersects(b2)); - + b3.extend(b1); - assertTrue(b3.equals(new Bounds(0, 170, 90, -170))); + assertEquals(b3, new Bounds(0, 170, 90, -170)); assertTrue(b1.intersects(b3)); assertTrue(b3.intersects(b1)); assertTrue(b2.intersects(b3)); assertTrue(b3.intersects(b2)); - + b3.extend(new LatLon(0, 0)); - assertTrue(b3.equals(new Bounds(0, 0, 90, -170))); + assertEquals(b3, new Bounds(0, 0, 90, -170)); } } Index: /trunk/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java (revision 8449) +++ /trunk/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java (revision 8450) @@ -3,4 +3,5 @@ import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -139,6 +140,6 @@ assertEquals(3, toAdd.size()); - assertEquals(true, toAdd.indexOf(r2) < toAdd.indexOf(r1)); - assertEquals(true, toAdd.indexOf(r3) < toAdd.indexOf(r1)); + assertTrue(toAdd.indexOf(r2) < toAdd.indexOf(r1)); + assertTrue(toAdd.indexOf(r3) < toAdd.indexOf(r1)); } @@ -186,6 +187,6 @@ assertEquals(4, toDelete.size()); - assertEquals(true, toDelete.indexOf(r2) < toDelete.indexOf(r1)); - assertEquals(true, toDelete.indexOf(r3) < toDelete.indexOf(r1)); + assertTrue(toDelete.indexOf(r2) < toDelete.indexOf(r1)); + assertTrue(toDelete.indexOf(r3) < toDelete.indexOf(r1)); } @@ -226,7 +227,7 @@ assertEquals(4, toDelete.size()); - assertEquals(true, toDelete.indexOf(way) < toDelete.indexOf(n1)); - assertEquals(true, toDelete.indexOf(way) < toDelete.indexOf(n2)); - assertEquals(true, toDelete.indexOf(r1) < toDelete.indexOf(way)); + assertTrue(toDelete.indexOf(way) < toDelete.indexOf(n1)); + assertTrue(toDelete.indexOf(way) < toDelete.indexOf(n2)); + assertTrue(toDelete.indexOf(r1) < toDelete.indexOf(way)); } Index: /trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java (revision 8449) +++ /trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java (revision 8450) @@ -5,4 +5,6 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; @@ -91,12 +93,12 @@ Node n2 = (Node)my.getPrimitiveById(1, OsmPrimitiveType.NODE); assertTrue(visitor.getConflicts().isEmpty()); - assertTrue(n1 != n2); // make sure we have a clone + assertNotSame(n1, n2); // make sure we have a clone assertEquals(1, n2.getId()); assertEquals(1, n2.getVersion()); - assertEquals(false, n2.isModified()); + assertFalse(n2.isModified()); assertEquals("value1", n2.get("key1")); // merge target not modified after merging - assertTrue(!n2.isModified()); + assertFalse(n2.isModified()); } @@ -127,14 +129,14 @@ Node n2 = (Node)my.getPrimitiveById(1, OsmPrimitiveType.NODE); assertTrue(visitor.getConflicts().isEmpty()); - assertTrue(n == n2); // make sure the merged node is still the original node - assertTrue(n2.getDataSet() == my); + assertSame(n, n2); // make sure the merged node is still the original node + assertSame(n2.getDataSet(), my); assertEquals(1, n2.getId()); assertEquals(2, n2.getVersion()); - assertEquals(false, n2.isModified()); + assertFalse(n2.isModified()); assertEquals("value1-new", n2.get("key1")); assertEquals("value2", n2.get("key2")); // the merge target should not be modified - assertTrue(!n2.isModified()); + assertFalse(n2.isModified()); } @@ -168,7 +170,7 @@ Node n2 = (Node)my.getPrimitiveById(1, OsmPrimitiveType.NODE); assertEquals(1,visitor.getConflicts().size()); - assertTrue(n == n2); - assertTrue(n1 != n2); - assertTrue(n1.getDataSet() == their); + assertSame(n, n2); + assertNotSame(n1, n2); + assertSame(n1.getDataSet(), their); } @@ -201,7 +203,7 @@ Node n2 = (Node)my.getPrimitiveById(1, OsmPrimitiveType.NODE); assertEquals(1,visitor.getConflicts().size()); - assertTrue(n == n2); - assertTrue(n1 != n2); - assertTrue(n1.getDataSet() == their); + assertSame(n, n2); + assertNotSame(n1, n2); + assertSame(n1.getDataSet(), their); } @@ -228,8 +230,8 @@ Node n2 = (Node)my.getPrimitiveById(1, OsmPrimitiveType.NODE); assertEquals(0,visitor.getConflicts().size()); - assertEquals(true, n2.isVisible()); - assertTrue(n == n2); - assertTrue(n.getDataSet() == my); - assertTrue(n1.getDataSet() == their); + assertTrue(n2.isVisible()); + assertSame(n, n2); + assertSame(n.getDataSet(), my); + assertSame(n1.getDataSet(), their); } @@ -253,6 +255,6 @@ assertEquals(0, visitor.getConflicts().size()); - assertTrue(n.getDataSet() == my); - assertTrue(n1.getDataSet() == their); + assertSame(n.getDataSet(), my); + assertSame(n1.getDataSet(), their); } @@ -279,5 +281,5 @@ assertEquals(0,visitor.getConflicts().size()); Node n2 = (Node)my.getNodes().toArray()[0]; - assertTrue(n2 == n); + assertSame(n2, n); assertTrue(n2.isDeleted()); } @@ -322,9 +324,9 @@ assertEquals(0,visitor.getConflicts().size()); assertEquals("value1",n2.get("key1")); - assertEquals(true, n1.getTimestamp().equals(n2.getTimestamp())); + assertTrue(n1.getTimestamp().equals(n2.getTimestamp())); assertEquals(theirUser,n2.getUser()); - assertTrue(n2 == n); - assertTrue(n2 != n1); - assertTrue(n2.getDataSet() == my); + assertSame(n2, n); + assertNotSame(n2, n1); + assertSame(n2.getDataSet(), my); } @@ -356,7 +358,7 @@ assertEquals(0,visitor.getConflicts().size()); assertEquals("value1",n2.get("key1")); - assertEquals(true, n1.getTimestamp().equals(n2.getTimestamp())); - assertEquals(false, n2.isIncomplete()); - assertTrue(n2 == n); + assertTrue(n1.getTimestamp().equals(n2.getTimestamp())); + assertFalse(n2.isIncomplete()); + assertSame(n2, n); } @@ -423,13 +425,13 @@ assertEquals(1,merged.getNode(0).getId()); assertEquals(2,merged.getNode(1).getId()); - assertTrue(merged == myWay); - assertTrue(merged.getDataSet() == my); + assertSame(merged, myWay); + assertSame(merged.getDataSet(), my); Node mergedNode = (Node)my.getPrimitiveById(1, OsmPrimitiveType.NODE); - assertTrue(mergedNode == n1); + assertSame(mergedNode, n1); mergedNode = (Node)my.getPrimitiveById(2, OsmPrimitiveType.NODE); - assertTrue(mergedNode == n2); - - assertTrue(!merged.isModified()); + assertSame(mergedNode, n2); + + assertFalse(merged.isModified()); } @@ -498,10 +500,9 @@ assertEquals("value1",merged.getNode(2).get("key1")); - assertTrue(merged.getNode(0) == n1); - assertTrue(merged.getNode(1) != n5); // must be clone of the original node in their - assertTrue(merged.getNode(2) == n2); - - assertTrue(!merged.isModified()); // the target wasn't modified before merging, it - // mustn't be after merging + assertSame(merged.getNode(0), n1); + assertNotSame(merged.getNode(1), n5); // must be clone of the original node in their + assertSame(merged.getNode(2), n2); + + assertFalse(merged.isModified()); // the target wasn't modified before merging, it mustn't be after merging } @@ -613,6 +614,6 @@ Way merged = (Way)my.getPrimitiveById(3, OsmPrimitiveType.WAY); assertEquals(1,visitor.getConflicts().size()); - assertEquals(true, visitor.getConflicts().hasConflictForMy(myWay)); - assertEquals(true, visitor.getConflicts().hasConflictForTheir(theirWay)); + assertTrue(visitor.getConflicts().hasConflictForMy(myWay)); + assertTrue(visitor.getConflicts().hasConflictForTheir(theirWay)); assertEquals(myWay,merged); } @@ -669,9 +670,9 @@ assertEquals(1111, merged.getUser().getId()); assertEquals(theirWay.getTimestamp(), merged.getTimestamp()); - assertTrue(merged == myWay); - assertTrue(merged.getNode(0) == n1); - assertTrue(merged.getNode(1) == n2); - - assertTrue(!merged.isModified()); + assertSame(merged, myWay); + assertSame(merged.getNode(0), n1); + assertSame(merged.getNode(1), n2); + + assertFalse(merged.isModified()); } @@ -723,9 +724,9 @@ assertEquals(1111, merged.getUser().getId()); assertEquals(theirWay.getTimestamp(), merged.getTimestamp()); - assertTrue(merged == myWay); - assertTrue(merged.getNode(0) == n1); - assertTrue(merged.getNode(1) == n2); - - assertTrue(!merged.isModified()); + assertSame(merged, myWay); + assertSame(merged.getNode(0), n1); + assertSame(merged.getNode(1), n2); + + assertFalse(merged.isModified()); } @@ -830,5 +831,5 @@ Node n = (Node)my.getPrimitiveById(1,OsmPrimitiveType.NODE); - assertTrue(n != null); + assertNotNull(n); assertEquals(1, visitor.getConflicts().size()); @@ -926,18 +927,18 @@ OsmPrimitive p= my.getPrimitiveById(1, OsmPrimitiveType.NODE); assertNotNull(p); - assertTrue(!p.isIncomplete()); + assertFalse(p.isIncomplete()); p= my.getPrimitiveById(2, OsmPrimitiveType.NODE); assertNotNull(p); - assertTrue(!p.isIncomplete()); + assertFalse(p.isIncomplete()); p= my.getPrimitiveById(3,OsmPrimitiveType.WAY); assertNotNull(p); - assertTrue(!p.isIncomplete()); + assertFalse(p.isIncomplete()); Way w = (Way)my.getPrimitiveById(3,OsmPrimitiveType.WAY); assertNotNull(w); - assertTrue(!p.isIncomplete()); + assertFalse(p.isIncomplete()); assertEquals(2, w.getNodesCount()); - assertTrue(!w.getNode(0).isIncomplete()); - assertTrue(!w.getNode(1).isIncomplete()); + assertFalse(w.getNode(0).isIncomplete()); + assertFalse(w.getNode(1).isIncomplete()); } Index: /trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java (revision 8449) +++ /trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java (revision 8450) @@ -2,4 +2,5 @@ package org.openstreetmap.josm.data.osm; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -58,5 +59,5 @@ assertTrue(n2.isDisabledAndHidden()); - assertTrue(!n1.isDisabled()); + assertFalse(n1.isDisabled()); } Index: /trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveKeyHandlingTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveKeyHandlingTest.java (revision 8449) +++ /trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveKeyHandlingTest.java (revision 8450) @@ -2,4 +2,7 @@ package org.openstreetmap.josm.data.osm; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; @@ -27,7 +30,7 @@ public void emptyNode() { Node n = new Node(); - assertTrue(n.getKeys().size() == 0); - assertTrue(!n.hasKeys()); - assertTrue(!n.hasKey("nosuchkey")); + assertSame(n.getKeys().size(), 0); + assertFalse(n.hasKeys()); + assertFalse(n.hasKey("nosuchkey")); assertTrue(n.keySet().isEmpty()); @@ -43,7 +46,7 @@ n.put("akey", "avalue"); assertTrue(n.get("akey").equals("avalue")); - assertTrue(n.getKeys().size() == 1); + assertSame(n.getKeys().size(), 1); - assertTrue(n.keySet().size() == 1); + assertSame(n.keySet().size(), 1); assertTrue(n.keySet().contains("akey")); } @@ -59,9 +62,9 @@ assertTrue(n.get("key.1").equals("value.1")); assertTrue(n.get("key.2").equals("value.2")); - assertTrue(n.getKeys().size() == 2); + assertSame(n.getKeys().size(), 2); assertTrue(n.hasKeys()); assertTrue(n.hasKey("key.1")); assertTrue(n.hasKey("key.2")); - assertTrue(!n.hasKey("nosuchkey")); + assertFalse(n.hasKey("nosuchkey")); } @@ -75,20 +78,20 @@ n.put("key.2", "value.2"); - n.remove("nosuchkey"); // should work - assertTrue(n.getKeys().size() == 2); // still 2 tags ? + n.remove("nosuchkey"); // should work + assertSame(n.getKeys().size(), 2); // still 2 tags ? n.remove("key.1"); - assertTrue(n.getKeys().size() == 1); - assertTrue(!n.hasKey("key.1")); - assertTrue(n.get("key.1") == null); + assertSame(n.getKeys().size(), 1); + assertFalse(n.hasKey("key.1")); + assertNull(n.get("key.1")); assertTrue(n.hasKey("key.2")); assertTrue(n.get("key.2").equals("value.2")); n.remove("key.2"); - assertTrue(n.getKeys().size() == 0); - assertTrue(!n.hasKey("key.1")); - assertTrue(n.get("key.1") == null); - assertTrue(!n.hasKey("key.2")); - assertTrue(n.get("key.2") == null); + assertSame(n.getKeys().size(), 0); + assertFalse(n.hasKey("key.1")); + assertNull(n.get("key.1")); + assertFalse(n.hasKey("key.2")); + assertNull(n.get("key.2")); } @@ -104,5 +107,5 @@ n.removeAll(); - assertTrue(n.getKeys().size() == 0); + assertSame(n.getKeys().size(), 0); } @@ -141,5 +144,5 @@ n2.put("key.2", "value.4"); - assertTrue(!n1.hasEqualSemanticAttributes(n2)); + assertFalse(n1.hasEqualSemanticAttributes(n2)); } } Index: /trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryNodeTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryNodeTest.java (revision 8449) +++ /trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryNodeTest.java (revision 8450) @@ -3,4 +3,5 @@ import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import java.util.Date; @@ -28,5 +29,5 @@ assertEquals(1, node.getId()); assertEquals(2, node.getVersion()); - assertEquals(true, node.isVisible()); + assertTrue(node.isVisible()); assertEquals("testuser", node.getUser().getName()); assertEquals(3, node.getUser().getId()); Index: /trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java (revision 8449) +++ /trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java (revision 8450) @@ -3,4 +3,5 @@ import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -28,5 +29,5 @@ assertEquals(1, way.getId()); assertEquals(2, way.getVersion()); - assertEquals(true, way.isVisible()); + assertTrue(way.isVisible()); assertEquals("testuser", way.getUser().getName()); assertEquals(3, way.getUser().getId()); Index: /trunk/test/unit/org/openstreetmap/josm/data/projection/SwissGridTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/projection/SwissGridTest.java (revision 8449) +++ /trunk/test/unit/org/openstreetmap/josm/data/projection/SwissGridTest.java (revision 8450) @@ -2,4 +2,5 @@ package org.openstreetmap.josm.data.projection; +import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; @@ -60,5 +61,5 @@ } } - assertTrue(errs.toString(), errs.length() == 0); + assertSame(errs.toString(), errs.length(), 0); } Index: /trunk/test/unit/org/openstreetmap/josm/gui/DefaultNameFormatterTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/gui/DefaultNameFormatterTest.java (revision 8449) +++ /trunk/test/unit/org/openstreetmap/josm/gui/DefaultNameFormatterTest.java (revision 8450) @@ -3,6 +3,6 @@ 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,11 +67,11 @@ 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]); Index: /trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java (revision 8449) +++ /trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java (revision 8450) @@ -5,4 +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,5 +698,5 @@ model.setFrozen(false); - assertTrue(!model.isFrozen()); + assertFalse(model.isFrozen()); } Index: /trunk/test/unit/org/openstreetmap/josm/gui/tagging/PresetClassificationsTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/gui/tagging/PresetClassificationsTest.java (revision 8449) +++ /trunk/test/unit/org/openstreetmap/josm/gui/tagging/PresetClassificationsTest.java (revision 8450) @@ -2,4 +2,5 @@ package org.openstreetmap.josm.gui.tagging; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -54,5 +55,5 @@ 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,5 +65,5 @@ 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")); } } Index: /trunk/test/unit/org/openstreetmap/josm/io/session/SessionReaderTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/io/session/SessionReaderTest.java (revision 8449) +++ /trunk/test/unit/org/openstreetmap/josm/io/session/SessionReaderTest.java (revision 8450) @@ -3,4 +3,6 @@ import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; @@ -64,5 +66,5 @@ for (String file : new String[]{"osm.jos", "osm.joz"}) { List layers = testRead(file); - assertTrue(layers.size() == 1); + assertSame(layers.size(), 1); assertTrue(layers.get(0) instanceof OsmDataLayer); OsmDataLayer osm = (OsmDataLayer) layers.get(0); @@ -80,5 +82,5 @@ for (String file : new String[]{"gpx.jos", "gpx.joz", "nmea.jos"}) { List layers = testRead(file); - assertTrue(layers.size() == 1); + assertSame(layers.size(), 1); assertTrue(layers.get(0) instanceof GpxLayer); GpxLayer gpx = (GpxLayer) layers.get(0); @@ -95,5 +97,5 @@ public void testReadGpxAndMarker() throws IOException, IllegalDataException { List layers = testRead("gpx_markers.joz"); - assertTrue(layers.size() == 2); + assertSame(layers.size(), 2); GpxLayer gpx = null; MarkerLayer marker = null; @@ -105,6 +107,6 @@ } } - assertTrue(gpx != null); - assertTrue(marker != null); + assertNotNull(gpx); + assertNotNull(marker); assertEquals(gpx.getName(), "GPX layer name"); assertEquals(marker.getName(), "Marker layer name");