Changeset 10962 in josm for trunk/test/unit/org/openstreetmap/josm/gui/dialogs
- Timestamp:
- 2016-09-05T01:10:07+02:00 (8 years ago)
- Location:
- trunk/test/unit/org/openstreetmap/josm/gui/dialogs
- Files:
-
- 24 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/gui/dialogs/ConflictDialogTest.java
r9669 r10962 8 8 import java.awt.image.BufferedImage; 9 9 10 import org.junit. BeforeClass;10 import org.junit.Rule; 11 11 import org.junit.Test; 12 import org.openstreetmap.josm.JOSMFixture;13 12 import org.openstreetmap.josm.Main; 14 13 import org.openstreetmap.josm.data.coor.LatLon; … … 18 17 import org.openstreetmap.josm.data.osm.Way; 19 18 import org.openstreetmap.josm.gui.dialogs.ConflictDialog.ConflictPainter; 19 import org.openstreetmap.josm.testutils.JOSMTestRules; 20 21 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; 20 22 21 23 /** … … 27 29 * Setup tests 28 30 */ 29 @BeforeClass 30 public static void setUpBeforeClass() { 31 JOSMFixture.createUnitTestFixture().init(true); 32 } 31 @Rule 32 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") 33 public JOSMTestRules test = new JOSMTestRules().platform().commands(); 33 34 34 35 /** -
trunk/test/unit/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialogTest.java
r10888 r10962 9 9 import javax.swing.JPanel; 10 10 11 import org.junit. BeforeClass;11 import org.junit.Rule; 12 12 import org.junit.Test; 13 import org.openstreetmap.josm.JOSMFixture;14 13 import org.openstreetmap.josm.Main; 15 14 import org.openstreetmap.josm.data.coor.LatLon; … … 18 17 import org.openstreetmap.josm.data.osm.User; 19 18 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 19 import org.openstreetmap.josm.testutils.JOSMTestRules; 20 21 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; 20 22 21 23 /** … … 27 29 * Setup tests 28 30 */ 29 @BeforeClass 30 public static void setUpBeforeClass() { 31 JOSMFixture.createUnitTestFixture().init(true); 32 } 31 @Rule 32 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") 33 public JOSMTestRules test = new JOSMTestRules().commands(); 33 34 34 35 /** -
trunk/test/unit/org/openstreetmap/josm/gui/dialogs/MapPaintDialogTest.java
r9996 r10962 2 2 package org.openstreetmap.josm.gui.dialogs; 3 3 4 import org.junit. BeforeClass;4 import org.junit.Rule; 5 5 import org.junit.Test; 6 import org.openstreetmap.josm.JOSMFixture;7 6 import org.openstreetmap.josm.Main; 7 import org.openstreetmap.josm.testutils.JOSMTestRules; 8 9 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; 8 10 9 11 /** … … 15 17 * Setup tests 16 18 */ 17 @BeforeClass 18 public static void setUpBeforeClass() { 19 JOSMFixture.createUnitTestFixture().init(true); 20 } 19 @Rule 20 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") 21 public JOSMTestRules test = new JOSMTestRules().commands(); 21 22 22 23 /** -
trunk/test/unit/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerTest.java
r9916 r10962 7 7 import java.util.List; 8 8 9 import org.junit. BeforeClass;9 import org.junit.Rule; 10 10 import org.junit.Test; 11 import org.openstreetmap.josm.JOSMFixture;12 11 import org.openstreetmap.josm.data.osm.Changeset; 13 12 import org.openstreetmap.josm.gui.dialogs.changeset.ChangesetCacheManager.CancelAction; … … 20 19 import org.openstreetmap.josm.gui.dialogs.changeset.ChangesetCacheManager.RemoveFromCacheAction; 21 20 import org.openstreetmap.josm.gui.dialogs.changeset.ChangesetCacheManager.ShowDetailAction; 21 import org.openstreetmap.josm.testutils.JOSMTestRules; 22 23 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; 22 24 23 25 /** … … 29 31 * Setup tests 30 32 */ 31 @BeforeClass 32 public static void setUpBeforeClass() { 33 JOSMFixture.createUnitTestFixture().init(); 34 } 33 @Rule 34 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") 35 public JOSMTestRules test = new JOSMTestRules().preferences(); 35 36 36 37 /** -
trunk/test/unit/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanelTest.java
r9669 r10962 4 4 import static org.junit.Assert.assertNotNull; 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 tests 17 19 */ 18 @BeforeClass 19 public static void setUpBeforeClass() { 20 JOSMFixture.createUnitTestFixture().init(); 21 } 20 @Rule 21 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") 22 public JOSMTestRules test = new JOSMTestRules().preferences(); 22 23 23 24 /** -
trunk/test/unit/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanelTest.java
r9669 r10962 4 4 import static org.junit.Assert.assertNotNull; 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 tests 17 19 */ 18 @BeforeClass 19 public static void setUpBeforeClass() { 20 JOSMFixture.createUnitTestFixture().init(); 21 } 20 @Rule 21 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") 22 public JOSMTestRules test = new JOSMTestRules().preferences(); 22 23 23 24 /** -
trunk/test/unit/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDiscussionPanelTest.java
r9669 r10962 4 4 import static org.junit.Assert.assertNotNull; 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 tests 17 19 */ 18 @BeforeClass 19 public static void setUpBeforeClass() { 20 JOSMFixture.createUnitTestFixture().init(); 21 } 20 @Rule 21 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") 22 public JOSMTestRules test = new JOSMTestRules().preferences(); 22 23 23 24 /** -
trunk/test/unit/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetTagsPanelTest.java
r9669 r10962 4 4 import static org.junit.Assert.assertNotNull; 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 tests 17 19 */ 18 @BeforeClass 19 public static void setUpBeforeClass() { 20 JOSMFixture.createUnitTestFixture().init(); 21 } 20 @Rule 21 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") 22 public JOSMTestRules test = new JOSMTestRules().preferences(); 22 23 23 24 /** -
trunk/test/unit/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanelTest.java
r9669 r10962 4 4 import static org.junit.Assert.assertNotNull; 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 setUpBeforeClass() { 20 JOSMFixture.createUnitTestFixture().init(); 21 } 20 @Rule 21 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") 22 public JOSMTestRules test = new JOSMTestRules().preferences(); 22 23 23 24 /** -
trunk/test/unit/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanelTest.java
r9669 r10962 4 4 import static org.junit.Assert.assertNotNull; 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 setUpBeforeClass() { 20 JOSMFixture.createUnitTestFixture().init(); 21 } 20 @Rule 21 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") 22 public JOSMTestRules test = new JOSMTestRules().preferences(); 22 23 23 24 /** -
trunk/test/unit/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanelTest.java
r9669 r10962 4 4 import static org.junit.Assert.assertNotNull; 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 setUpBeforeClass() { 20 JOSMFixture.createUnitTestFixture().init(); 21 } 20 @Rule 21 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") 22 public JOSMTestRules test = new JOSMTestRules().preferences(); 22 23 23 24 /** -
trunk/test/unit/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialogTest.java
r10127 r10962 8 8 import java.util.List; 9 9 10 import org.junit. BeforeClass;10 import org.junit.Rule; 11 11 import org.junit.Test; 12 import org.openstreetmap.josm.JOSMFixture;13 12 import org.openstreetmap.josm.data.coor.LatLon; 14 13 import org.openstreetmap.josm.data.osm.DataSet; … … 17 16 import org.openstreetmap.josm.data.osm.OsmPrimitiveComparator; 18 17 import org.openstreetmap.josm.data.osm.Way; 18 import org.openstreetmap.josm.testutils.JOSMTestRules; 19 20 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; 19 21 20 22 /** … … 26 28 * Setup tests 27 29 */ 28 @BeforeClass 29 public static void setUpBeforeClass() { 30 JOSMFixture.createUnitTestFixture().init(); 31 } 30 @Rule 31 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") 32 public JOSMTestRules test = new JOSMTestRules(); 32 33 33 34 private static String createSearchSetting(DataSet ds, boolean sameType) { -
trunk/test/unit/org/openstreetmap/josm/gui/dialogs/properties/RecentTagCollectionTest.java
r10758 r10962 9 9 import java.util.Collections; 10 10 11 import org.junit. BeforeClass;11 import org.junit.Rule; 12 12 import org.junit.Test; 13 import org.openstreetmap.josm.JOSMFixture;14 13 import org.openstreetmap.josm.actions.search.SearchAction; 15 14 import org.openstreetmap.josm.actions.search.SearchCompiler; 16 15 import org.openstreetmap.josm.data.osm.Tag; 17 16 import org.openstreetmap.josm.data.preferences.CollectionProperty; 17 import org.openstreetmap.josm.testutils.JOSMTestRules; 18 19 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; 18 20 19 21 /** … … 25 27 * Setup tests 26 28 */ 27 @BeforeClass 28 public static void setUpBeforeClass() { 29 JOSMFixture.createUnitTestFixture().init(); 30 } 29 @Rule 30 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") 31 public JOSMTestRules test = new JOSMTestRules().preferences(); 31 32 32 33 /** -
trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowserTest.java
r9775 r10962 4 4 import static org.junit.Assert.assertNotNull; 5 5 6 import org.junit. BeforeClass;6 import org.junit.Rule; 7 7 import org.junit.Test; 8 import org.openstreetmap.josm.JOSMFixture;9 8 import org.openstreetmap.josm.data.osm.DataSet; 10 9 import org.openstreetmap.josm.data.osm.Relation; 11 10 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 11 import org.openstreetmap.josm.testutils.JOSMTestRules; 12 13 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; 12 14 13 15 /** … … 19 21 * Setup test. 20 22 */ 21 @BeforeClass 22 public static void setUpBeforeClass() { 23 JOSMFixture.createUnitTestFixture().init(); 24 } 23 @Rule 24 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") 25 public JOSMTestRules test = new JOSMTestRules().preferences(); 25 26 26 27 /** -
trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditorTest.java
r10113 r10962 9 9 import javax.swing.JPanel; 10 10 11 import org.junit. BeforeClass;11 import org.junit.Rule; 12 12 import org.junit.Test; 13 import org.openstreetmap.josm.JOSMFixture;14 13 import org.openstreetmap.josm.data.osm.DataSet; 15 14 import org.openstreetmap.josm.data.osm.Node; … … 28 27 import org.openstreetmap.josm.gui.tagging.TagEditorPanel; 29 28 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField; 29 import org.openstreetmap.josm.testutils.JOSMTestRules; 30 31 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; 30 32 31 33 /** … … 37 39 * Setup test. 38 40 */ 39 @BeforeClass 40 public static void setUpBeforeClass() { 41 JOSMFixture.createUnitTestFixture().init(true); 42 } 41 @Rule 42 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") 43 public JOSMTestRules test = new JOSMTestRules().preferences().platform().commands(); 43 44 44 45 /** -
trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRendererTest.java
r9907 r10962 6 6 import javax.swing.JTable; 7 7 8 import org.junit. BeforeClass;8 import org.junit.Rule; 9 9 import org.junit.Test; 10 import org.openstreetmap.josm.JOSMFixture;11 10 import org.openstreetmap.josm.TestUtils; 12 11 import org.openstreetmap.josm.gui.dialogs.relation.sort.WayConnectionType; 12 import org.openstreetmap.josm.testutils.JOSMTestRules; 13 14 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; 13 15 14 16 /** … … 20 22 * Setup test. 21 23 */ 22 @BeforeClass 23 public static void setUpBeforeClass() { 24 JOSMFixture.createUnitTestFixture().init(); 25 } 24 @Rule 25 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") 26 public JOSMTestRules test = new JOSMTestRules().preferences(); 26 27 27 28 /** -
trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/MemberTableMemberCellRendererTest.java
r9907 r10962 6 6 import javax.swing.JTable; 7 7 8 import org.junit. BeforeClass;8 import org.junit.Rule; 9 9 import org.junit.Test; 10 import org.openstreetmap.josm.JOSMFixture;11 10 import org.openstreetmap.josm.data.osm.DataSet; 12 11 import org.openstreetmap.josm.data.osm.Node; 13 12 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 13 import org.openstreetmap.josm.testutils.JOSMTestRules; 14 15 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; 14 16 15 17 /** … … 21 23 * Setup test. 22 24 */ 23 @BeforeClass 24 public static void setUpBeforeClass() { 25 JOSMFixture.createUnitTestFixture().init(); 26 } 25 @Rule 26 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") 27 public JOSMTestRules test = new JOSMTestRules().preferences(); 27 28 28 29 /** -
trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModelTest.java
r9669 r10962 8 8 import java.util.List; 9 9 10 import org.junit. BeforeClass;10 import org.junit.Rule; 11 11 import org.junit.Test; 12 import org.openstreetmap.josm.JOSMFixture;13 12 import org.openstreetmap.josm.data.osm.Node; 14 13 import org.openstreetmap.josm.data.osm.OsmPrimitive; 15 14 import org.openstreetmap.josm.data.osm.Tag; 16 15 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetHandler; 16 import org.openstreetmap.josm.testutils.JOSMTestRules; 17 18 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; 17 19 18 20 /** … … 24 26 * Setup test. 25 27 */ 26 @BeforeClass 27 public static void setUpBeforeClass() { 28 JOSMFixture.createUnitTestFixture().init(); 29 } 28 @Rule 29 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") 30 public JOSMTestRules test = new JOSMTestRules(); 30 31 31 32 /** -
trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/MemberTableRoleCellRendererTest.java
r9907 r10962 6 6 import javax.swing.JTable; 7 7 8 import org.junit. BeforeClass;8 import org.junit.Rule; 9 9 import org.junit.Test; 10 import org.openstreetmap.josm.JOSMFixture;11 10 import org.openstreetmap.josm.data.osm.DataSet; 12 11 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 12 import org.openstreetmap.josm.testutils.JOSMTestRules; 13 14 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; 13 15 14 16 /** … … 20 22 * Setup test. 21 23 */ 22 @BeforeClass 23 public static void setUpBeforeClass() { 24 JOSMFixture.createUnitTestFixture().init(); 25 } 24 @Rule 25 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") 26 public JOSMTestRules test = new JOSMTestRules(); 26 27 27 28 /** -
trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowserTest.java
r9775 r10962 2 2 package org.openstreetmap.josm.gui.dialogs.relation; 3 3 4 import org.junit. BeforeClass;4 import org.junit.Rule; 5 5 import org.junit.Test; 6 import org.openstreetmap.josm.JOSMFixture;7 6 import org.openstreetmap.josm.data.osm.DataSet; 8 7 import org.openstreetmap.josm.data.osm.Relation; 9 8 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 9 import org.openstreetmap.josm.testutils.JOSMTestRules; 10 11 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; 10 12 11 13 /** … … 17 19 * Setup test. 18 20 */ 19 @BeforeClass 20 public static void setUpBeforeClass() { 21 JOSMFixture.createUnitTestFixture().init(); 22 } 21 @Rule 22 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") 23 public JOSMTestRules test = new JOSMTestRules().preferences(); 23 24 24 25 /** -
trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeCellRendererTest.java
r9907 r10962 6 6 import javax.swing.JTree; 7 7 8 import org.junit. BeforeClass;8 import org.junit.Rule; 9 9 import org.junit.Test; 10 import org.openstreetmap.josm.JOSMFixture;11 10 import org.openstreetmap.josm.data.osm.Relation; 11 import org.openstreetmap.josm.testutils.JOSMTestRules; 12 13 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; 12 14 13 15 /** … … 19 21 * Setup test. 20 22 */ 21 @BeforeClass 22 public static void setUpBeforeClass() { 23 JOSMFixture.createUnitTestFixture().init(); 24 } 23 @Rule 24 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") 25 public JOSMTestRules test = new JOSMTestRules().preferences(); 25 26 26 27 /** -
trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRendererTest.java
r10072 r10962 6 6 import javax.swing.JTable; 7 7 8 import org.junit. BeforeClass;8 import org.junit.Rule; 9 9 import org.junit.Test; 10 import org.openstreetmap.josm.JOSMFixture;11 10 import org.openstreetmap.josm.data.osm.Node; 11 import org.openstreetmap.josm.testutils.JOSMTestRules; 12 13 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; 12 14 13 15 /** … … 19 21 * Setup test. 20 22 */ 21 @BeforeClass 22 public static void setUpBeforeClass() { 23 JOSMFixture.createUnitTestFixture().init(); 24 } 23 @Rule 24 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") 25 public JOSMTestRules test = new JOSMTestRules().preferences(); 25 26 26 27 /** -
trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableTest.java
r10436 r10962 8 8 import java.awt.event.MouseListener; 9 9 10 import org.junit. BeforeClass;10 import org.junit.Rule; 11 11 import org.junit.Test; 12 import org.openstreetmap.josm.JOSMFixture;13 12 import org.openstreetmap.josm.Main; 14 13 import org.openstreetmap.josm.data.coor.LatLon; … … 19 18 import org.openstreetmap.josm.gui.dialogs.relation.SelectionTable.DoubleClickAdapter; 20 19 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 20 import org.openstreetmap.josm.testutils.JOSMTestRules; 21 22 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; 21 23 22 24 /** … … 28 30 * Setup test. 29 31 */ 30 @BeforeClass 31 public static void setUpBeforeClass() { 32 JOSMFixture.createUnitTestFixture().init(true); 33 } 32 @Rule 33 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") 34 public JOSMTestRules test = new JOSMTestRules(); 34 35 35 36 /** -
trunk/test/unit/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanelTest.java
r10880 r10962 12 12 import java.util.Set; 13 13 14 import org.junit. BeforeClass;14 import org.junit.Rule; 15 15 import org.junit.Test; 16 import org.openstreetmap.josm.JOSMFixture;17 16 import org.openstreetmap.josm.data.osm.Node; 18 17 import org.openstreetmap.josm.data.osm.OsmPrimitive; 19 18 import org.openstreetmap.josm.data.validation.Severity; 20 19 import org.openstreetmap.josm.data.validation.TestError; 20 import org.openstreetmap.josm.testutils.JOSMTestRules; 21 22 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; 21 23 22 24 /** … … 28 30 * Setup tests 29 31 */ 30 @BeforeClass 31 public static void setUpBeforeClass() { 32 JOSMFixture.createUnitTestFixture().init(true); 33 } 32 @Rule 33 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") 34 public JOSMTestRules test = new JOSMTestRules().preferences(); 34 35 35 36 /**
Note:
See TracChangeset
for help on using the changeset viewer.