Index: trunk/test/unit/org/openstreetmap/josm/data/osm/ChangesetTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/ChangesetTest.java (revision 12659)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/ChangesetTest.java (revision 12663)
@@ -20,5 +20,4 @@
import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.osm.visitor.Visitor;
-import org.openstreetmap.josm.gui.DefaultNameFormatter;
import org.openstreetmap.josm.testutils.JOSMTestRules;
import org.openstreetmap.josm.tools.Logging;
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/DefaultNameFormatterTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/DefaultNameFormatterTest.java (revision 12663)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/DefaultNameFormatterTest.java (revision 12663)
@@ -0,0 +1,155 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.osm;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetReader;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
+import org.openstreetmap.josm.io.IllegalDataException;
+import org.openstreetmap.josm.io.OsmReader;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.xml.sax.SAXException;
+
+import com.github.tomakehurst.wiremock.junit.WireMockRule;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests of {@link DefaultNameFormatter} class.
+ */
+public class DefaultNameFormatterTest {
+
+ /**
+ * Setup test.
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules().platform();
+
+ /**
+ * HTTP mock.
+ */
+ @Rule
+ public WireMockRule wireMockRule = new WireMockRule(options().dynamicPort().usingFilesUnderDirectory(TestUtils.getTestDataRoot()));
+
+ /**
+ * Non-regression test for ticket #9632.
+ * @throws IllegalDataException if an error was found while parsing the data from the source
+ * @throws IOException if any I/O error occurs
+ * @throws SAXException if any XML error occurs
+ */
+ @Test
+ @SuppressFBWarnings(value = "ITA_INEFFICIENT_TO_ARRAY")
+ public void testTicket9632() throws IllegalDataException, IOException, SAXException {
+ String source = "presets/Presets_BicycleJunction-preset.xml";
+ wireMockRule.stubFor(get(urlEqualTo("/" + source))
+ .willReturn(aResponse()
+ .withStatus(200)
+ .withHeader("Content-Type", "text/xml")
+ .withBodyFile(source)));
+ TaggingPresets.addTaggingPresets(TaggingPresetReader.readAll("http://localhost:" + wireMockRule.port() + "/" + source, true));
+
+ Comparator comparator = DefaultNameFormatter.getInstance().getRelationComparator();
+
+ try (InputStream is = TestUtils.getRegressionDataStream(9632, "data.osm.zip")) {
+ DataSet ds = OsmReader.parseDataSet(is, null);
+
+ // Test with 3 known primitives causing the problem. Correct order is p1, p3, p2 with this preset
+ Relation p1 = (Relation) ds.getPrimitiveById(2983382, OsmPrimitiveType.RELATION);
+ Relation p2 = (Relation) ds.getPrimitiveById(550315, OsmPrimitiveType.RELATION);
+ Relation p3 = (Relation) ds.getPrimitiveById(167042, OsmPrimitiveType.RELATION);
+
+ // route_master ("Bus 453", 6 members)
+ System.out.println("p1: "+DefaultNameFormatter.getInstance().format(p1)+" - "+p1);
+ // TMC ("A 6 Kaiserslautern - Mannheim [negative]", 123 members)
+ System.out.println("p2: "+DefaultNameFormatter.getInstance().format(p2)+" - "+p2);
+ // route(lcn Sal Salier-Radweg(412 members)
+ System.out.println("p3: "+DefaultNameFormatter.getInstance().format(p3)+" - "+p3);
+
+ // CHECKSTYLE.OFF: SingleSpaceSeparator
+ assertEquals(comparator.compare(p1, p2), -1); // p1 < p2
+ assertEquals(comparator.compare(p2, p1), 1); // p2 > p1
+
+ assertEquals(comparator.compare(p1, p3), -1); // p1 < p3
+ assertEquals(comparator.compare(p3, p1), 1); // p3 > p1
+ assertEquals(comparator.compare(p2, p3), 1); // p2 > p3
+ assertEquals(comparator.compare(p3, p2), -1); // p3 < p2
+ // CHECKSTYLE.ON: SingleSpaceSeparator
+
+ Relation[] relations = new ArrayList<>(ds.getRelations()).toArray(new Relation[0]);
+
+ TestUtils.checkComparableContract(comparator, relations);
+ }
+ }
+
+ /**
+ * Tests formatting of relation names.
+ */
+ @Test
+ public void testRelationName() {
+ assertEquals("relation (0, 0 members)",
+ getFormattedRelationName("X=Y"));
+ assertEquals("relation (\"Foo\", 0 members)",
+ getFormattedRelationName("name=Foo"));
+ assertEquals("route (\"123\", 0 members)",
+ getFormattedRelationName("type=route route=tram ref=123"));
+ assertEquals("multipolygon (\"building\", 0 members)",
+ getFormattedRelationName("type=multipolygon building=yes"));
+ assertEquals("multipolygon (\"123\", 0 members)",
+ getFormattedRelationName("type=multipolygon building=yes ref=123"));
+ assertEquals("multipolygon (\"building\", 0 members)",
+ getFormattedRelationName("type=multipolygon building=yes addr:housenumber=123"));
+ assertEquals("multipolygon (\"residential\", 0 members)",
+ getFormattedRelationName("type=multipolygon building=residential addr:housenumber=123"));
+ }
+
+ /**
+ * Tests formatting of way names.
+ */
+ @Test
+ public void testWayName() {
+ assertEquals("building (0 nodes)", getFormattedWayName("building=yes"));
+ assertEquals("House number 123 (0 nodes)", getFormattedWayName("building=yes addr:housenumber=123"));
+ assertEquals("House number 123 at FooStreet (0 nodes)", getFormattedWayName("building=yes addr:housenumber=123 addr:street=FooStreet"));
+ assertEquals("House FooName (0 nodes)", getFormattedWayName("building=yes addr:housenumber=123 addr:housename=FooName"));
+ }
+
+ static String getFormattedRelationName(String tagsString) {
+ return DefaultNameFormatter.getInstance().format((Relation) OsmUtils.createPrimitive("relation " + tagsString))
+ .replace("\u200E", "").replace("\u200F", "");
+ }
+
+ static String getFormattedWayName(String tagsString) {
+ return DefaultNameFormatter.getInstance().format((Way) OsmUtils.createPrimitive("way " + tagsString))
+ .replace("\u200E", "").replace("\u200F", "");
+ }
+
+ /**
+ * Test of {@link DefaultNameFormatter#formatAsHtmlUnorderedList} methods.
+ */
+ @Test
+ public void testFormatAsHtmlUnorderedList() {
+ assertEquals("",
+ DefaultNameFormatter.getInstance().formatAsHtmlUnorderedList(new Node(1)));
+
+ List nodes = new ArrayList<>(10);
+ for (int i = 1; i <= 10; i++) {
+ nodes.add(new Node(i, 1));
+ }
+ assertEquals("",
+ DefaultNameFormatter.getInstance().formatAsHtmlUnorderedList(nodes, 5));
+ }
+}
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryNodeTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryNodeTest.java (revision 12659)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryNodeTest.java (revision 12663)
@@ -12,8 +12,8 @@
import org.junit.Test;
import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
import org.openstreetmap.josm.data.osm.User;
-import org.openstreetmap.josm.gui.DefaultNameFormatter;
import org.openstreetmap.josm.testutils.JOSMTestRules;
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryRelationTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryRelationTest.java (revision 12659)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryRelationTest.java (revision 12663)
@@ -11,8 +11,8 @@
import org.junit.Rule;
import org.junit.Test;
+import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
import org.openstreetmap.josm.data.osm.RelationMemberData;
import org.openstreetmap.josm.data.osm.User;
-import org.openstreetmap.josm.gui.DefaultNameFormatter;
import org.openstreetmap.josm.testutils.JOSMTestRules;
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java (revision 12659)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java (revision 12663)
@@ -13,7 +13,7 @@
import org.junit.Rule;
import org.junit.Test;
+import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
import org.openstreetmap.josm.data.osm.User;
-import org.openstreetmap.josm.gui.DefaultNameFormatter;
import org.openstreetmap.josm.testutils.JOSMTestRules;
import org.openstreetmap.josm.tools.Logging;
Index: trunk/test/unit/org/openstreetmap/josm/data/validation/tests/ValidatorTestUtils.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/validation/tests/ValidatorTestUtils.java (revision 12659)
+++ trunk/test/unit/org/openstreetmap/josm/data/validation/tests/ValidatorTestUtils.java (revision 12663)
@@ -17,8 +17,8 @@
import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.validation.Test;
import org.openstreetmap.josm.data.validation.TestError;
-import org.openstreetmap.josm.gui.DefaultNameFormatter;
import org.openstreetmap.josm.io.OsmReader;
Index: trunk/test/unit/org/openstreetmap/josm/gui/DefaultNameFormatterTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/DefaultNameFormatterTest.java (revision 12659)
+++ (revision )
@@ -1,161 +1,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui;
-
-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.get;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
-import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.openstreetmap.josm.TestUtils;
-import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
-import org.openstreetmap.josm.data.osm.OsmUtils;
-import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetReader;
-import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
-import org.openstreetmap.josm.io.IllegalDataException;
-import org.openstreetmap.josm.io.OsmReader;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
-import org.xml.sax.SAXException;
-
-import com.github.tomakehurst.wiremock.junit.WireMockRule;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
-/**
- * Unit tests of {@link DefaultNameFormatter} class.
- */
-public class DefaultNameFormatterTest {
-
- /**
- * Setup test.
- */
- @Rule
- @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
- public JOSMTestRules test = new JOSMTestRules().platform();
-
- /**
- * HTTP mock.
- */
- @Rule
- public WireMockRule wireMockRule = new WireMockRule(options().dynamicPort().usingFilesUnderDirectory(TestUtils.getTestDataRoot()));
-
- /**
- * Non-regression test for ticket #9632.
- * @throws IllegalDataException if an error was found while parsing the data from the source
- * @throws IOException if any I/O error occurs
- * @throws SAXException if any XML error occurs
- */
- @Test
- @SuppressFBWarnings(value = "ITA_INEFFICIENT_TO_ARRAY")
- public void testTicket9632() throws IllegalDataException, IOException, SAXException {
- String source = "presets/Presets_BicycleJunction-preset.xml";
- wireMockRule.stubFor(get(urlEqualTo("/" + source))
- .willReturn(aResponse()
- .withStatus(200)
- .withHeader("Content-Type", "text/xml")
- .withBodyFile(source)));
- TaggingPresets.addTaggingPresets(TaggingPresetReader.readAll("http://localhost:" + wireMockRule.port() + "/" + source, true));
-
- Comparator comparator = DefaultNameFormatter.getInstance().getRelationComparator();
-
- try (InputStream is = TestUtils.getRegressionDataStream(9632, "data.osm.zip")) {
- DataSet ds = OsmReader.parseDataSet(is, null);
-
- // Test with 3 known primitives causing the problem. Correct order is p1, p3, p2 with this preset
- Relation p1 = (Relation) ds.getPrimitiveById(2983382, OsmPrimitiveType.RELATION);
- Relation p2 = (Relation) ds.getPrimitiveById(550315, OsmPrimitiveType.RELATION);
- Relation p3 = (Relation) ds.getPrimitiveById(167042, OsmPrimitiveType.RELATION);
-
- // route_master ("Bus 453", 6 members)
- System.out.println("p1: "+DefaultNameFormatter.getInstance().format(p1)+" - "+p1);
- // TMC ("A 6 Kaiserslautern - Mannheim [negative]", 123 members)
- System.out.println("p2: "+DefaultNameFormatter.getInstance().format(p2)+" - "+p2);
- // route(lcn Sal Salier-Radweg(412 members)
- System.out.println("p3: "+DefaultNameFormatter.getInstance().format(p3)+" - "+p3);
-
- // CHECKSTYLE.OFF: SingleSpaceSeparator
- assertEquals(comparator.compare(p1, p2), -1); // p1 < p2
- assertEquals(comparator.compare(p2, p1), 1); // p2 > p1
-
- assertEquals(comparator.compare(p1, p3), -1); // p1 < p3
- assertEquals(comparator.compare(p3, p1), 1); // p3 > p1
- assertEquals(comparator.compare(p2, p3), 1); // p2 > p3
- assertEquals(comparator.compare(p3, p2), -1); // p3 < p2
- // CHECKSTYLE.ON: SingleSpaceSeparator
-
- Relation[] relations = new ArrayList<>(ds.getRelations()).toArray(new Relation[0]);
-
- TestUtils.checkComparableContract(comparator, relations);
- }
- }
-
- /**
- * Tests formatting of relation names.
- */
- @Test
- public void testRelationName() {
- assertEquals("relation (0, 0 members)",
- getFormattedRelationName("X=Y"));
- assertEquals("relation (\"Foo\", 0 members)",
- getFormattedRelationName("name=Foo"));
- assertEquals("route (\"123\", 0 members)",
- getFormattedRelationName("type=route route=tram ref=123"));
- assertEquals("multipolygon (\"building\", 0 members)",
- getFormattedRelationName("type=multipolygon building=yes"));
- assertEquals("multipolygon (\"123\", 0 members)",
- getFormattedRelationName("type=multipolygon building=yes ref=123"));
- assertEquals("multipolygon (\"building\", 0 members)",
- getFormattedRelationName("type=multipolygon building=yes addr:housenumber=123"));
- assertEquals("multipolygon (\"residential\", 0 members)",
- getFormattedRelationName("type=multipolygon building=residential addr:housenumber=123"));
- }
-
- /**
- * Tests formatting of way names.
- */
- @Test
- public void testWayName() {
- assertEquals("building (0 nodes)", getFormattedWayName("building=yes"));
- assertEquals("House number 123 (0 nodes)", getFormattedWayName("building=yes addr:housenumber=123"));
- assertEquals("House number 123 at FooStreet (0 nodes)", getFormattedWayName("building=yes addr:housenumber=123 addr:street=FooStreet"));
- assertEquals("House FooName (0 nodes)", getFormattedWayName("building=yes addr:housenumber=123 addr:housename=FooName"));
- }
-
- static String getFormattedRelationName(String tagsString) {
- return DefaultNameFormatter.getInstance().format((Relation) OsmUtils.createPrimitive("relation " + tagsString))
- .replace("\u200E", "").replace("\u200F", "");
- }
-
- static String getFormattedWayName(String tagsString) {
- return DefaultNameFormatter.getInstance().format((Way) OsmUtils.createPrimitive("way " + tagsString))
- .replace("\u200E", "").replace("\u200F", "");
- }
-
- /**
- * Test of {@link DefaultNameFormatter#formatAsHtmlUnorderedList} methods.
- */
- @Test
- public void testFormatAsHtmlUnorderedList() {
- assertEquals("",
- DefaultNameFormatter.getInstance().formatAsHtmlUnorderedList(new Node(1)));
-
- List nodes = new ArrayList<>(10);
- for (int i = 1; i <= 10; i++) {
- nodes.add(new Node(i, 1));
- }
- assertEquals("",
- DefaultNameFormatter.getInstance().formatAsHtmlUnorderedList(nodes, 5));
- }
-}