Changeset 15455 in josm

Timestamp:

2019-10-12T22:12:57+02:00 (5 years ago)

Author:

Don-vip

Message:

see #18219, see #18216 - update unit tests

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/AbstractMergeAction.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/actions/MergeLayerActionTest.java (modified) (4 diffs)
• test/unit/org/openstreetmap/josm/data/validation/tests/RelationCheckerTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/AbstractMergeAction.java

@@ -124 +124 @@
      * @param targetLayers list of candidate target layers.
      * @return the chosen layer
-     * @deprecated
+     * @deprecated to be removed
      */
     @Deprecated
@@ -137 +137 @@
      * @param checkboxDefault whether the checkbox is ticked by default
      * @return The {@link TargetLayerDialogResult} containing the chosen target layer and the state of the checkbox
-     * @deprecated
+     * @deprecated to be removed
      */
     @Deprecated

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.actions;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.ExtendedDialog;
@@ -17 +18 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.widgets.JosmComboBox;
-import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 import org.openstreetmap.josm.testutils.mockers.ExtendedDialogMocker;
@@ -36 +36 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().main();
+    public JOSMTestRules test = new JOSMTestRules().main().projection();
 
     /**
@@ -108 +108 @@
         TestUtils.assumeWorkingJMockit();
         final MergeLayerExtendedDialogMocker edMocker = new MergeLayerExtendedDialogMocker();
-        edMocker.getMockResultMap().put("Please select the target layer.", "Merge");
+        edMocker.getMockResultMap().put("Please select the target layer.", "Merge layer");
 
         OsmDataLayer layer1 = new OsmDataLayer(new DataSet(), "1", null);

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

@@ -137 +137 @@
 
         List<TestError> errors = testRelation(r);
-        assertEquals(1, errors.size());
-        assertEquals("Role of relation member does not match template expression 'power' in preset Power Route", errors.get(0).getDescription());
+        assertEquals(2, errors.size());
+        assertEquals("Role 'line' missing", errors.get(0).getDescription());
+        assertEquals("Empty role found when expecting one of 'line/substation'", errors.get(1).getDescription());
     }