Changeset 12754 in josm
- Timestamp:
- 2017-09-06T10:17:46+02:00 (7 years ago)
- Location:
- trunk/test/unit/org/openstreetmap/josm/plugins
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/plugins/PluginDownloadExceptionTest.java
r10050 r12754 4 4 import static org.junit.Assert.assertEquals; 5 5 6 import org.junit. BeforeClass;6 import org.junit.Rule; 7 7 import org.junit.Test; 8 import org.openstreetmap.josm.JOSMFixture; 8 import org.openstreetmap.josm.testutils.JOSMTestRules; 9 10 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; 9 11 10 12 /** … … 16 18 * Setup test. 17 19 */ 18 @BeforeClass 19 public static void setUp() { 20 JOSMFixture.createUnitTestFixture().init(); 21 } 20 @Rule 21 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") 22 public JOSMTestRules test = new JOSMTestRules(); 22 23 23 24 /** -
trunk/test/unit/org/openstreetmap/josm/plugins/PluginExceptionTest.java
r10050 r12754 4 4 import static org.junit.Assert.assertEquals; 5 5 6 import org.junit. BeforeClass;6 import org.junit.Rule; 7 7 import org.junit.Test; 8 import org.openstreetmap.josm.JOSMFixture; 8 import org.openstreetmap.josm.testutils.JOSMTestRules; 9 10 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; 9 11 10 12 /** … … 16 18 * Setup test. 17 19 */ 18 @BeforeClass 19 public static void setUp() { 20 JOSMFixture.createUnitTestFixture().init(); 21 } 20 @Rule 21 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") 22 public JOSMTestRules test = new JOSMTestRules(); 22 23 23 24 /** -
trunk/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTest.java
r11974 r12754 11 11 import java.util.List; 12 12 13 import org.junit. BeforeClass;13 import org.junit.Rule; 14 14 import org.junit.Test; 15 import org.openstreetmap.josm.JOSMFixture;16 15 import org.openstreetmap.josm.Main; 17 16 import org.openstreetmap.josm.gui.preferences.plugin.PluginPreferenceTest; 18 17 import org.openstreetmap.josm.plugins.PluginHandler.DeprecatedPlugin; 19 18 import org.openstreetmap.josm.plugins.PluginHandler.PluginInformationAction; 19 import org.openstreetmap.josm.testutils.JOSMTestRules; 20 20 import org.openstreetmap.josm.tools.Utils; 21 21 22 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; 22 23 import nl.jqno.equalsverifier.EqualsVerifier; 23 24 … … 30 31 * Setup test. 31 32 */ 32 @BeforeClass 33 public static void setUp() { 34 JOSMFixture.createUnitTestFixture().init(); 35 } 33 @Rule 34 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") 35 public JOSMTestRules test = new JOSMTestRules().platform(); 36 36 37 37 /** -
trunk/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTestIT.java
r12636 r12754 18 18 import org.apache.commons.collections.MapUtils; 19 19 import org.apache.commons.lang.exception.ExceptionUtils; 20 import org.junit.BeforeClass;21 20 import org.junit.Rule; 22 21 import org.junit.Test; 23 import org.junit.rules.Timeout;24 import org.openstreetmap.josm.JOSMFixture;25 22 import org.openstreetmap.josm.Main; 26 23 import org.openstreetmap.josm.data.gpx.GpxData; … … 31 28 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 32 29 import org.openstreetmap.josm.gui.progress.NullProgressMonitor; 30 import org.openstreetmap.josm.testutils.JOSMTestRules; 33 31 34 32 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; … … 40 38 41 39 /** 42 * Global timeout applied to all test methods.40 * Setup test. 43 41 */ 44 42 @Rule 45 43 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") 46 public Timeout globalTimeout = Timeout.seconds(10*60); 47 48 /** 49 * Setup test. 50 */ 51 @BeforeClass 52 public static void setUp() { 53 JOSMFixture.createUnitTestFixture().init(true); 54 } 44 public JOSMTestRules test = new JOSMTestRules().platform().main().projection().timeout(10*60*1000); 55 45 56 46 /** -
trunk/test/unit/org/openstreetmap/josm/plugins/PluginListParseExceptionTest.java
r10050 r12754 4 4 import static org.junit.Assert.assertEquals; 5 5 6 import org.junit. BeforeClass;6 import org.junit.Rule; 7 7 import org.junit.Test; 8 import org.openstreetmap.josm.JOSMFixture; 8 import org.openstreetmap.josm.testutils.JOSMTestRules; 9 10 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; 9 11 10 12 /** … … 16 18 * Setup test. 17 19 */ 18 @BeforeClass 19 public static void setUp() { 20 JOSMFixture.createUnitTestFixture().init(); 21 } 20 @Rule 21 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") 22 public JOSMTestRules test = new JOSMTestRules(); 22 23 23 24 /**
Note:
See TracChangeset
for help on using the changeset viewer.