Changeset 7081 in josm for trunk/test/unit/org/openstreetmap/josm/data/validation/tests/OpeningHourTestTest.java

Timestamp:

2014-05-09T04:49:54+02:00 (10 years ago)

Author:

Don-vip

Message:

fixes for unit tests

File:

• trunk/test/unit/org/openstreetmap/josm/data/validation/tests/OpeningHourTestTest.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/OpeningHourTestTest.java

@@ -16 +16 @@
 import org.junit.Before;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.data.validation.Severity;
@@ -37 +37 @@
     @Before
     public void setUp() throws Exception {
-        Main.initApplicationPreferences();
+        JOSMFixture.createUnitTestFixture().init();
         OPENING_HOUR_TEST.initialize();
     }
@@ -135 +135 @@
         final String key = "opening_hours";
         assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "Mo,Tu 04-17").get(0).getSeverity(), is(Severity.WARNING));
-        assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "Mo,Tu 04-17").get(0).getMessage(), 
+        assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "Mo,Tu 04-17").get(0).getMessage(),
                 is(key + " - Mo,Tu 04-17 <--- (Time range without minutes specified. Not very explicit! Please use this syntax instead e.g. \"12:00-14:00\".)"));
         assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "Mo,Tu 04-17").get(0).getPrettifiedValue(), is("Mo,Tu 04:00-17:00"));