Changeset 12562 in josm for trunk/test/unit/org/openstreetmap/josm/actions/AlignInLineActionTest.java

Timestamp:

2017-08-03T19:57:36+02:00 (7 years ago)

Author:

Don-vip

Message:

speedup unit tests

File:

• trunk/test/unit/org/openstreetmap/josm/actions/AlignInLineActionTest.java (modified) (10 diffs)

trunk/test/unit/org/openstreetmap/josm/actions/AlignInLineActionTest.java

@@ -6 +6 @@
 
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.AlignInLineAction.InvalidSelection;
@@ -17 +17 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -23 +26 @@
 public final class AlignInLineActionTest {
 
+    /**
+     * Setup test.
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().mainMenu().projection();
+
     /** Class under test. */
     private static AlignInLineAction action;
@@ -31 +41 @@
     @Before
     public void setUp() {
-        JOSMFixture.createUnitTestFixture().init(true);
-
         // Enable "Align in line" feature.
         action = Main.main.menu.alignInLine;
@@ -43 +51 @@
      * https://josm.openstreetmap.de/ticket/9605#comment:3. Note that in this test, after alignment, way is overlapping
      * itself.
-     */
-    @Test
-    public void testNodesOpenWay() {
+     * @throws InvalidSelection never
+     */
+    @Test
+    public void testNodesOpenWay() throws InvalidSelection {
         DataSet dataSet = new DataSet();
         OsmDataLayer layer = new OsmDataLayer(dataSet, OsmDataLayer.createNewName(), null);
@@ -67 +76 @@
             dataSet.addSelected(point1, point2, point3);
 
-            action.actionPerformed(null);
+            action.buildCommand().executeCommand();
         } finally {
             // Ensure we clean the place before leaving, even if test fails.
@@ -82 +91 @@
      * Test case: only nodes selected, part of a closed way: align these nodes on the line passing through the most
      * distant nodes.
-     */
-    @Test
-    public void testNodesClosedWay() {
+     * @throws InvalidSelection never
+     */
+    @Test
+    public void testNodesClosedWay() throws InvalidSelection {
         DataSet dataSet = new DataSet();
         OsmDataLayer layer = new OsmDataLayer(dataSet, OsmDataLayer.createNewName(), null);
@@ -106 +116 @@
             dataSet.addSelected(point4, point1, point2);
 
-            action.actionPerformed(null);
+            action.buildCommand().executeCommand();
         } finally {
             // Ensure we clean the place before leaving, even if test fails.
@@ -122 +132 @@
      * Test case: only nodes selected, part of multiple ways: align these nodes on the line passing through the most
      * distant nodes.
-     */
-    @Test
-    public void testNodesOpenWays() {
+     * @throws InvalidSelection never
+     */
+    @Test
+    public void testNodesOpenWays() throws InvalidSelection {
         DataSet dataSet = new DataSet();
         OsmDataLayer layer = new OsmDataLayer(dataSet, OsmDataLayer.createNewName(), null);
@@ -149 +160 @@
 
             // Points must align between points 1 and 4.
-            action.actionPerformed(null);
+            action.buildCommand().executeCommand();
         } finally {
             // Ensure we clean the place before leaving, even if test fails.