Index: trunk/test/data/regress/14199/emptytag.osm =================================================================== --- trunk/test/data/regress/14199/emptytag.osm (revision 11435) +++ trunk/test/data/regress/14199/emptytag.osm (revision 11435) @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + Index: trunk/test/unit/org/openstreetmap/josm/io/OsmReaderTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/io/OsmReaderTest.java (revision 11435) +++ trunk/test/unit/org/openstreetmap/josm/io/OsmReaderTest.java (revision 11435) @@ -0,0 +1,33 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.io; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +import java.io.InputStream; + +import org.junit.Test; +import org.openstreetmap.josm.TestUtils; +import org.openstreetmap.josm.data.osm.Way; +import org.openstreetmap.josm.gui.progress.NullProgressMonitor; + +/** + * Unit tests of {@link OsmReader} class. + */ +public class OsmReaderTest { + + /** + * Non-regression test for Bug #14199. + * @throws Exception if any error occurs + */ + @Test + public void testTicket14199() throws Exception { + try (InputStream in = TestUtils.getRegressionDataStream(14199, "emptytag.osm")) { + Way w = OsmReader.parseDataSet(in, NullProgressMonitor.INSTANCE).getWays().iterator().next(); + assertEquals(1, w.getKeys().size()); + assertNull(w.get(" ")); + assertTrue(w.isModified()); + } + } +} Index: trunk/test/unit/org/openstreetmap/josm/tools/UtilsTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/tools/UtilsTest.java (revision 11433) +++ trunk/test/unit/org/openstreetmap/josm/tools/UtilsTest.java (revision 11435) @@ -3,4 +3,7 @@ import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import java.io.IOException; @@ -10,5 +13,4 @@ import java.util.Locale; -import org.junit.Assert; import org.junit.Rule; import org.junit.Test; @@ -53,26 +55,42 @@ "\u3000"; // IDEOGRAPHIC SPACE // CHECKSTYLE.ON: SingleSpaceSeparator - Assert.assertNull(Utils.strip(null)); - Assert.assertEquals("", Utils.strip("")); - Assert.assertEquals("", Utils.strip(" ")); - Assert.assertEquals("", Utils.strip(" ")); - Assert.assertEquals("", Utils.strip(" ")); - Assert.assertEquals("", Utils.strip(someWhite)); - Assert.assertEquals("a", Utils.strip("a")); - Assert.assertEquals("ab", Utils.strip("ab")); - Assert.assertEquals("abc", Utils.strip("abc")); - Assert.assertEquals("a", Utils.strip(" a")); - Assert.assertEquals("ab", Utils.strip(" ab")); - Assert.assertEquals("abc", Utils.strip(" abc")); - Assert.assertEquals("a", Utils.strip("a ")); - Assert.assertEquals("ab", Utils.strip("ab ")); - Assert.assertEquals("abc", Utils.strip("abc ")); - Assert.assertEquals("a", Utils.strip(someWhite+"a"+someWhite)); - Assert.assertEquals("ab", Utils.strip(someWhite+"ab"+someWhite)); - Assert.assertEquals("abc", Utils.strip(someWhite+"abc"+someWhite)); + assertNull(Utils.strip(null)); + assertEquals("", Utils.strip("")); + assertEquals("", Utils.strip(" ")); + assertEquals("", Utils.strip(" ")); + assertEquals("", Utils.strip(" ")); + assertEquals("", Utils.strip(someWhite)); + assertEquals("a", Utils.strip("a")); + assertEquals("ab", Utils.strip("ab")); + assertEquals("abc", Utils.strip("abc")); + assertEquals("a", Utils.strip(" a")); + assertEquals("ab", Utils.strip(" ab")); + assertEquals("abc", Utils.strip(" abc")); + assertEquals("a", Utils.strip("a ")); + assertEquals("ab", Utils.strip("ab ")); + assertEquals("abc", Utils.strip("abc ")); + assertEquals("a", Utils.strip(someWhite+"a"+someWhite)); + assertEquals("ab", Utils.strip(someWhite+"ab"+someWhite)); + assertEquals("abc", Utils.strip(someWhite+"abc"+someWhite)); // extended skip - Assert.assertEquals("a", Utils.strip("a", "b")); - Assert.assertEquals("b", Utils.strip("acbcac", "ac")); + assertEquals("a", Utils.strip("a", "b")); + assertEquals("b", Utils.strip("acbcac", "ac")); + } + + /** + * Test of {@link Utils#isStripEmpty} method. + */ + @Test + public void testIsStripEmpty() { + assertTrue(Utils.isStripEmpty(null)); + assertTrue(Utils.isStripEmpty("")); + assertTrue(Utils.isStripEmpty(" ")); + assertTrue(Utils.isStripEmpty(" ")); + assertFalse(Utils.isStripEmpty("a")); + assertFalse(Utils.isStripEmpty("foo")); + assertFalse(Utils.isStripEmpty(" foo")); + assertFalse(Utils.isStripEmpty("foo ")); + assertFalse(Utils.isStripEmpty(" foo ")); } @@ -82,11 +100,11 @@ @Test public void testToHexString() { - Assert.assertEquals("", Utils.toHexString(null)); - Assert.assertEquals("", Utils.toHexString(new byte[0])); - Assert.assertEquals("01", Utils.toHexString(new byte[]{0x1})); - Assert.assertEquals("0102", Utils.toHexString(new byte[]{0x1, 0x2})); - Assert.assertEquals("12", Utils.toHexString(new byte[]{0x12})); - Assert.assertEquals("127f", Utils.toHexString(new byte[]{0x12, 0x7f})); - Assert.assertEquals("fedc", Utils.toHexString(new byte[]{(byte) 0xfe, (byte) 0xdc})); + assertEquals("", Utils.toHexString(null)); + assertEquals("", Utils.toHexString(new byte[0])); + assertEquals("01", Utils.toHexString(new byte[]{0x1})); + assertEquals("0102", Utils.toHexString(new byte[]{0x1, 0x2})); + assertEquals("12", Utils.toHexString(new byte[]{0x12})); + assertEquals("127f", Utils.toHexString(new byte[]{0x12, 0x7f})); + assertEquals("fedc", Utils.toHexString(new byte[]{(byte) 0xfe, (byte) 0xdc})); }