Ignore:
Timestamp:
2015-06-03T01:27:41+02:00 (11 years ago)
Author:
Don-vip
Message:

unit tests - simplify assertions

Location:
trunk/test/unit/org/openstreetmap/josm/actions
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/test/unit/org/openstreetmap/josm/actions/CreateCircleActionTest.java

    r8303 r8450  
    22package org.openstreetmap.josm.actions;
    33
     4import static org.junit.Assert.assertSame;
    45import static org.junit.Assert.assertTrue;
    56
    … …  
    9899        // Expected result: Dataset contain one closed way, clockwise
    99100        Collection<Way> resultingWays = dataSet.getWays();
    100         assertTrue(String.format("Expect one way after perform action. %d found",
    101                                  resultingWays.size()),
    102                    resultingWays.size() == 1);
     101        assertSame(String.format("Expect one way after perform action. %d found", resultingWays.size()),
     102                   resultingWays.size(), 1);
    103103        Way resultingWay = resultingWays.iterator().next();
    104104        assertTrue("Resulting way is not closed",
    … …  
    174174        // Expected result: Dataset contain one closed way, clockwise
    175175        Collection<Way> resultingWays = dataSet.getWays();
    176         assertTrue(String.format("Expect one way after perform action. %d found",
    177                                  resultingWays.size()),
    178                    resultingWays.size() == 1);
     176        assertSame(String.format("Expect one way after perform action. %d found", resultingWays.size()),
     177                   resultingWays.size(), 1);
    179178        Way resultingWay = resultingWays.iterator().next();
    180179        assertTrue("Resulting way is not closed",

  • trunk/test/unit/org/openstreetmap/josm/actions/SplitWayActionTest.java

    r8276 r8450  
    22package org.openstreetmap.josm.actions;
    33
     4import static org.junit.Assert.assertSame;
    45import static org.junit.Assert.assertTrue;
    56
    … …  
    8081
    8182        // Ensures 3 ways.
    82         assertTrue(String.format("Found %d ways after split action instead of 3.",
    83                                  dataSet.getWays().size()),
    84                    dataSet.getWays().size() == 3);
     83        assertSame(String.format("Found %d ways after split action instead of 3.", dataSet.getWays().size()),
     84                   dataSet.getWays().size(), 3);
    8585
    8686        // Ensures way w1 is unchanged.
    8787        assertTrue("Unselected ways disappear during split action.",
    8888                   dataSet.getWays().contains(w1));
    89         assertTrue("Unselected way seems to have change during split action.",
    90                    w1.getNodesCount() == 3);
     89        assertSame("Unselected way seems to have change during split action.",
     90                   w1.getNodesCount(), 3);
    9191        for(int i = 0; i < 3; i++) {
    92             assertTrue("Node change in unselected way during split action.",
    93                        w1.getNode(i) == w1NodesArray[i]);
     92            assertSame("Node change in unselected way during split action.",
     93                       w1.getNode(i), w1NodesArray[i]);
    9494        }
    9595    }

  • trunk/test/unit/org/openstreetmap/josm/actions/UnJoinNodeWayActionTest.java

    r8294 r8450  
    22package org.openstreetmap.josm.actions;
    33
    4 import static org.junit.Assert.assertTrue;
     4import static org.junit.Assert.assertFalse;
    55
    66import java.util.Arrays;
    … …  
    3232        public void notify(String msg, int messageType) {
    3333            return;
    34         };
     34        }
    3535    }
    3636
    … …  
    8282
    8383        // Ensures node n2 remove from w
    84         assertTrue("Node n2 wasn't removed from way w.",
    85                    !w.containsNode(n2));
     84        assertFalse("Node n2 wasn't removed from way w.", w.containsNode(n2));
    8685    }
    8786}

  • trunk/test/unit/org/openstreetmap/josm/actions/mapmode/SelectActionTest.java

    r8343 r8450  
    22package org.openstreetmap.josm.actions.mapmode;
    33
     4import static org.junit.Assert.assertFalse;
     5import static org.junit.Assert.assertSame;
    46import static org.junit.Assert.assertTrue;
     7import static org.junit.Assert.fail;
    58
    69import java.awt.Cursor;
    … …  
    4346            this.currentDataSet = dataSet;
    4447        };
     48        @Override
    4549        public EastNorth getEastNorth(int x, int y) {
    4650            return new EastNorth(x, y);
    4751        }
     52        @Override
    4853        public void addMouseListener(MouseListener ml) {}
     54        @Override
    4955        public void removeMouseListener(MouseListener ml) {}
    5056        public void addMouseMotionListener(MouseListener ml) {}
    5157        public void removeMouseMotionListener(MouseListener ml) {}
    5258        public void mvRepaint() {}
     59        @Override
    5360        public void setVirtualNodesEnabled(boolean enabled) {}
     61        @Override
    5462        public void setNewCursor(Cursor cursor, Object reference) {}
     63        @Override
    5564        public void setNewCursor(int cursor, Object reference) {}
     65        @Override
    5666        public boolean isActiveLayerVisible() {
    5767            return true;
    … …  
    6474                }
    6575            };
     76        @Override
    6677        public void requestClearRect() {}
     78        @Override
    6779        public Point2D getPoint2D(EastNorth p) {
    6880            return new Point2D.Double(p.getX(), p.getY());
    6981        }
     82        @Override
    7083        public void setActiveLayer(Layer layer) {}
     84        @Override
    7185        public Layer getActiveLayer() {
    7286            return layer;
    7387        }
     88        @Override
    7489        protected DataSet getCurrentDataSet() {
    7590            return currentDataSet;
    … …  
    8196     */
    8297    class PreferencesMock extends Preferences {
     98        @Override
    8399        public synchronized int getInteger(String key, int def) {
    84100            if (key == "edit.initial-move-delay") {
    … …  
    101117            } catch (Exception e) {
    102118                e.printStackTrace();
    103                 assertTrue("Can't setup testing environnement", false);
     119                fail("Can't setup testing environnement");
    104120            }
    105121        }
     122        @Override
    106123        public void mergeNodes(OsmDataLayer layer, Collection<Node> nodes,
    107124                               Node targetLocationNode) {
    108             assertTrue(String.format("Should merge two nodes, %d found",
    109                                      nodes.size()),
    110                        nodes.size() == 2);
     125            assertSame(String.format("Should merge two nodes, %d found", nodes.size()),
     126                       nodes.size(), 2);
    111127            nodesMerged = true;
    112128        }
    … …  
    182198        // As result of test, we must find a 2 nodes way, from EN(0, 0) to EN(100, 0)
    183199        assertTrue("Nodes are not merged", nodesMerged);
    184         assertTrue(String.format("Expect exactly one way, found %d\n",
    185                                  dataSet.getWays().size()),
    186                    dataSet.getWays().size() == 1);
     200        assertSame(String.format("Expect exactly one way, found %d\n", dataSet.getWays().size()),
     201                   dataSet.getWays().size(), 1);
    187202        Way rw = dataSet.getWays().iterator().next();
    188         assertTrue("Way shouldn't be deleted\n",
    189                    !rw.isDeleted());
    190         assertTrue(String.format("Way shouldn't have 2 nodes, %d found\n",
    191                                  w.getNodesCount()),
    192                    rw.getNodesCount() == 2);
     203        assertFalse("Way shouldn't be deleted\n", rw.isDeleted());
     204        assertSame(String.format("Way shouldn't have 2 nodes, %d found\n", w.getNodesCount()),
     205                   rw.getNodesCount(), 2);
    193206        Node r1 = rw.firstNode();
    194207        Node r2 = rw.lastNode();
    … …  
    198211            r2 = tmp;
    199212        }
    200         assertTrue(String.format("East should be 0, found %f\n",
    201                                  r1.getEastNorth().east()),
    202                    Double.compare(r1.getEastNorth().east(), 0) == 0);
    203         assertTrue(String.format("East should be 100, found %f\n",
    204                                  r2.getEastNorth().east()),
    205                    Double.compare(r2.getEastNorth().east(), 100) == 0);
     213        assertSame(String.format("East should be 0, found %f\n", r1.getEastNorth().east()),
     214                   Double.compare(r1.getEastNorth().east(), 0), 0);
     215        assertSame(String.format("East should be 100, found %f\n", r2.getEastNorth().east()),
     216                   Double.compare(r2.getEastNorth().east(), 100), 0);
    206217    }
    207218}
Note: See TracChangeset for help on using the changeset viewer.