Changeset 9968 in josm for trunk/test


Ignore:
Timestamp:
2016-03-12T19:18:29+01:00 (4 years ago)
Author:
Don-vip
Message:

sonar - Add parentheses to make the operator precedence explicit + add unit tests

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

Legend:

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

    r9661 r9968  
    33
    44import static org.junit.Assert.assertEquals;
     5import static org.junit.Assert.assertNull;
    56import static org.junit.Assert.assertSame;
    67import static org.junit.Assert.assertTrue;
     
    102103    }
    103104
     105    /**
     106     * Unit test of {@link SplitWayAction#findVia}.
     107     */
     108    @Test
     109    public void testFindVia() {
     110        // empty relation
     111        assertNull(SplitWayAction.findVia(new Relation(), null));
     112        // restriction relation without via member
     113        Relation r = new Relation();
     114        r.addMember(new RelationMember("", new Node()));
     115        assertNull(SplitWayAction.findVia(r, "restriction"));
     116        // restriction relation with via member
     117        r = new Relation();
     118        OsmPrimitive via = new Node();
     119        r.addMember(new RelationMember("via", via));
     120        assertEquals(via, SplitWayAction.findVia(r, "restriction"));
     121        // destination_sign relation without sign nor intersection
     122        r = new Relation();
     123        r.addMember(new RelationMember("", new Node()));
     124        assertNull(SplitWayAction.findVia(r, "destination_sign"));
     125        // destination_sign with sign
     126        r = new Relation();
     127        via = new Node();
     128        r.addMember(new RelationMember("sign", via));
     129        assertEquals(via, SplitWayAction.findVia(r, "destination_sign"));
     130        // destination_sign with intersection
     131        r = new Relation();
     132        via = new Node();
     133        r.addMember(new RelationMember("intersection", via));
     134        assertEquals(via, SplitWayAction.findVia(r, "destination_sign"));
     135    }
     136
     137    /**
     138     * Unit tests of route relations.
     139     */
    104140    @Test
    105141    public void testRouteRelation() {
     
    143179        dataSet.setSelected(Arrays.asList(w2, n3, n4, n5));
    144180
    145 
    146181        final SplitWayAction.Strategy strategy = new SplitWayAction.Strategy() {
    147182
     
    174209        assertFirstLastNodeIs(((Way) route.getMemberPrimitivesList().get(5)), n6);
    175210        assertFirstLastNodeIs(((Way) route.getMemberPrimitivesList().get(5)), n7);
    176 
    177211    }
    178212
Note: See TracChangeset for help on using the changeset viewer.