Ignore:
Timestamp:
2016-12-15T08:13:49+01:00 (7 years ago)
Author:
Don-vip
Message:

replace groovy validator unit tests by java ones

File:
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/test/unit/org/openstreetmap/josm/data/validation/tests/LanesTest.java

    r11390 r11403  
    1 package org.openstreetmap.josm.data.validation.tests
     1// License: GPL. For details, see LICENSE file.
     2package org.openstreetmap.josm.data.validation.tests;
    23
    3 import org.openstreetmap.josm.JOSMFixture
    4 import org.openstreetmap.josm.data.osm.OsmUtils
     4import static org.junit.Assert.assertEquals;
     5import static org.junit.Assert.assertTrue;
    56
    6 class LanesTest extends GroovyTestCase {
     7import org.junit.Before;
     8import org.junit.Test;
     9import org.openstreetmap.josm.JOSMFixture;
     10import org.openstreetmap.josm.data.osm.OsmUtils;
    711
    8     Lanes lanes = new Lanes()
     12/**
     13 * Unit tests of {@link Lanes}.
     14 */
     15public class LanesTest {
    916
    10     @Override
    11     void setUp() {
    12         JOSMFixture.createUnitTestFixture().init()
    13         lanes.initialize()
    14         lanes.startTest(null)
     17    private final Lanes lanes = new Lanes();
     18
     19    /**
     20     * Setup test.
     21     * @throws Exception if an error occurs
     22     */
     23    @Before
     24    public void setUp() throws Exception {
     25        JOSMFixture.createUnitTestFixture().init();
     26        lanes.initialize();
     27        lanes.startTest(null);
    1528    }
    1629
    17     void testLanesCount() {
    18         assert lanes.getLanesCount("") == 0
    19         assert lanes.getLanesCount("left") == 1
    20         assert lanes.getLanesCount("left|right") == 2
    21         assert lanes.getLanesCount("yes|no|yes") == 3
    22         assert lanes.getLanesCount("yes||") == 3
     30    /**
     31     * Unit test of {@link Lanes#getLanesCount}.
     32     */
     33    @Test
     34    public void testLanesCount() {
     35        assertEquals(0, Lanes.getLanesCount(""));
     36        assertEquals(1, Lanes.getLanesCount("left"));
     37        assertEquals(2, Lanes.getLanesCount("left|right"));
     38        assertEquals(3, Lanes.getLanesCount("yes|no|yes"));
     39        assertEquals(3, Lanes.getLanesCount("yes||"));
    2340    }
    2441
    25     void test1() {
    26         lanes.check(OsmUtils.createPrimitive("way turn:lanes=left|right change:lanes=only_left|not_right|yes"))
    27         assert lanes.errors.get(0).getMessage() == "Number of lane dependent values inconsistent"
     42    @Test
     43    public void test1() {
     44        lanes.check(OsmUtils.createPrimitive("way turn:lanes=left|right change:lanes=only_left|not_right|yes"));
     45        assertEquals("Number of lane dependent values inconsistent", lanes.getErrors().get(0).getMessage());
    2846    }
    2947
    30     void test2() {
    31         lanes.check(OsmUtils.createPrimitive("way width:lanes:forward=1|2|3 psv:lanes:forward=no|designated"))
    32         assert lanes.errors.get(0).getMessage() == "Number of lane dependent values inconsistent in forward direction"
     48    @Test
     49    public void test2() {
     50        lanes.check(OsmUtils.createPrimitive("way width:lanes:forward=1|2|3 psv:lanes:forward=no|designated"));
     51        assertEquals("Number of lane dependent values inconsistent in forward direction", lanes.getErrors().get(0).getMessage());
    3352    }
    3453
    35     void test3() {
    36         lanes.check(OsmUtils.createPrimitive("way change:lanes:forward=yes|no turn:lanes:backward=left|right|left"))
    37         assert lanes.errors.isEmpty()
     54    @Test
     55    public void test3() {
     56        lanes.check(OsmUtils.createPrimitive("way change:lanes:forward=yes|no turn:lanes:backward=left|right|left"));
     57        assertTrue(lanes.getErrors().isEmpty());
    3858    }
    3959
    40     void test4() {
    41         lanes.check(OsmUtils.createPrimitive("way turn:lanes:forward=left|right change:lanes:forward=yes|no|yes width:backward=1|2|3"))
    42         assert lanes.errors.get(0).getMessage() == "Number of lane dependent values inconsistent in forward direction"
     60    @Test
     61    public void test4() {
     62        lanes.check(OsmUtils.createPrimitive("way turn:lanes:forward=left|right change:lanes:forward=yes|no|yes width:backward=1|2|3"));
     63        assertEquals("Number of lane dependent values inconsistent in forward direction", lanes.getErrors().get(0).getMessage());
    4364    }
    4465
    45     void test5() {
    46         lanes.check(OsmUtils.createPrimitive("way lanes:forward=5 turn:lanes:forward=left|right"))
    47         assert lanes.errors.get(0).getMessage() == "Number of lanes:forward greater than *:lanes:forward"
     66    @Test
     67    public void test5() {
     68        lanes.check(OsmUtils.createPrimitive("way lanes:forward=5 turn:lanes:forward=left|right"));
     69        assertEquals("Number of lanes:forward greater than *:lanes:forward", lanes.getErrors().get(0).getMessage());
    4870    }
    4971
    50     void test6() {
    51         lanes.check(OsmUtils.createPrimitive("way lanes:forward=foo|bar turn:lanes:forward=foo+bar"))
    52         assert lanes.errors.isEmpty()
     72    @Test
     73    public void test6() {
     74        lanes.check(OsmUtils.createPrimitive("way lanes:forward=foo|bar turn:lanes:forward=foo+bar"));
     75        assertTrue(lanes.getErrors().isEmpty());
    5376    }
    5477
    55     void test7() {
    56         lanes.check(OsmUtils.createPrimitive("way lanes=3 lanes:forward=3 lanes:backward=7"))
    57         assert lanes.errors.get(0).getMessage() == "Number of lanes:forward+lanes:backward greater than lanes"
     78    @Test
     79    public void test7() {
     80        lanes.check(OsmUtils.createPrimitive("way lanes=3 lanes:forward=3 lanes:backward=7"));
     81        assertEquals("Number of lanes:forward+lanes:backward greater than lanes", lanes.getErrors().get(0).getMessage());
    5882    }
    5983
    60     void test8() {
    61         lanes.check(OsmUtils.createPrimitive("way destination:country:lanes=X|Y;Z|none destination:ref:lanes=xyz|| destination:sign:lanes=none|airport|none"))
    62         assert lanes.errors.isEmpty()
     84    @Test
     85    public void test8() {
     86        lanes.check(OsmUtils.createPrimitive(
     87                "way destination:country:lanes=X|Y;Z|none destination:ref:lanes=xyz|| destination:sign:lanes=none|airport|none"));
     88        assertTrue(lanes.getErrors().isEmpty());
    6389    }
    6490
    65     void test9() {
    66         lanes.check(OsmUtils.createPrimitive("way highway=secondary lanes=2 source:lanes=survey"))
    67         assert lanes.errors.isEmpty()
     91    @Test
     92    public void test9() {
     93        lanes.check(OsmUtils.createPrimitive("way highway=secondary lanes=2 source:lanes=survey"));
     94        assertTrue(lanes.getErrors().isEmpty());
    6895    }
    6996}
Note: See TracChangeset for help on using the changeset viewer.