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/ConditionalKeysTest.java

    r11390 r11403  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.data.validation.tests
     2package org.openstreetmap.josm.data.validation.tests;
    33
    4 import org.openstreetmap.josm.JOSMFixture
     4import static org.junit.Assert.assertFalse;
     5import static org.junit.Assert.assertTrue;
     6
     7import org.junit.Before;
     8import org.junit.Test;
     9import org.openstreetmap.josm.JOSMFixture;
    510import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
    611
    7 class ConditionalKeysTest extends GroovyTestCase {
     12/**
     13 * Unit test of {@link ConditionalKeys}.
     14 */
     15public class ConditionalKeysTest {
    816
    9     ConditionalKeys test = new ConditionalKeys()
     17    private final ConditionalKeys test = new ConditionalKeys();
    1018
    11     @Override
    12     void setUp() {
     19    /**
     20     * Setup test
     21     * @throws Exception if an error occurs
     22     */
     23    @Before
     24    public void setUp() throws Exception {
    1325        JOSMFixture.createUnitTestFixture().init();
    14         TaggingPresets.readFromPreferences()
    15         test.initialize()
     26        TaggingPresets.readFromPreferences();
     27        test.initialize();
    1628    }
    1729
    18     void testKeyValid() {
    19         assert test.isKeyValid("maxspeed:conditional")
    20         assert test.isKeyValid("motor_vehicle:conditional")
    21         assert test.isKeyValid("bicycle:conditional")
    22         assert test.isKeyValid("overtaking:hgv:conditional")
    23         assert test.isKeyValid("maxspeed:hgv:backward:conditional")
    24         assert test.isKeyValid("oneway:backward:conditional")
    25         assert test.isKeyValid("fee:conditional")
    26         assert !test.isKeyValid("maxspeed:hgv:conditional:backward")
     30    /**
     31     * Unit test of {@link ConditionalKeys#isKeyValid}.
     32     */
     33    @Test
     34    public void testKeyValid() {
     35        assertTrue(test.isKeyValid("maxspeed:conditional"));
     36        assertTrue(test.isKeyValid("motor_vehicle:conditional"));
     37        assertTrue(test.isKeyValid("bicycle:conditional"));
     38        assertTrue(test.isKeyValid("overtaking:hgv:conditional"));
     39        assertTrue(test.isKeyValid("maxspeed:hgv:backward:conditional"));
     40        assertTrue(test.isKeyValid("oneway:backward:conditional"));
     41        assertTrue(test.isKeyValid("fee:conditional"));
     42        assertFalse(test.isKeyValid("maxspeed:hgv:conditional:backward"));
    2743    }
    2844
    29     void testValueValid() {
    30         assert test.isValueValid("maxspeed:conditional", "120 @ (06:00-19:00)")
    31         assert !test.isValueValid("maxspeed:conditional", " @ (06:00-19:00)")
    32         assert !test.isValueValid("maxspeed:conditional", "120 (06:00-19:00)")
    33         assert !test.isValueValid("maxspeed:conditional", "120 @ ()")
    34         assert !test.isValueValid("maxspeed:conditional", "120 @ ")
    35         assert !test.isValueValid("maxspeed:conditional", "120 @ (06:00/19:00)")
    36         assert test.isValueValid("maxspeed:conditional", "120 @ (06:00-20:00); 100 @ (22:00-06:00)")
    37         assert test.isValueValid("motor_vehicle:conditional", "delivery @ (Mo-Fr 06:00-11:00,17:00-19:00;Sa 03:30-19:00)")
    38         assert test.isValueValid("motor_vehicle:conditional", "no @ (10:00-18:00 AND length>5)")
    39         assert !test.isValueValid("motor_vehicle:conditional", "foo @ (10:00-18:00 AND length>5)")
    40         assert !test.isValueValid("motor_vehicle:conditional", "no @ (10:00until18:00 AND length>5)")
    41         assert test.isValueValid("maxspeed:hgv:conditional", "60 @ (weight>7.5)")
     45    /**
     46     * Unit test of {@link ConditionalKeys#isValueValid}.
     47     */
     48    @Test
     49    public void testValueValid() {
     50        assertTrue(test.isValueValid("maxspeed:conditional", "120 @ (06:00-19:00)"));
     51        assertFalse(test.isValueValid("maxspeed:conditional", " @ (06:00-19:00)"));
     52        assertFalse(test.isValueValid("maxspeed:conditional", "120 (06:00-19:00)"));
     53        assertFalse(test.isValueValid("maxspeed:conditional", "120 @ ()"));
     54        assertFalse(test.isValueValid("maxspeed:conditional", "120 @ "));
     55        assertFalse(test.isValueValid("maxspeed:conditional", "120 @ (06:00/19:00)"));
     56        assertTrue(test.isValueValid("maxspeed:conditional", "120 @ (06:00-20:00); 100 @ (22:00-06:00)"));
     57        assertTrue(test.isValueValid("motor_vehicle:conditional", "delivery @ (Mo-Fr 06:00-11:00,17:00-19:00;Sa 03:30-19:00)"));
     58        assertTrue(test.isValueValid("motor_vehicle:conditional", "no @ (10:00-18:00 AND length>5)"));
     59        assertFalse(test.isValueValid("motor_vehicle:conditional", "foo @ (10:00-18:00 AND length>5)"));
     60        assertFalse(test.isValueValid("motor_vehicle:conditional", "no @ (10:00until18:00 AND length>5)"));
     61        assertTrue(test.isValueValid("maxspeed:hgv:conditional", "60 @ (weight>7.5)"));
    4262    }
    4363}
Note: See TracChangeset for help on using the changeset viewer.