Index: trunk/test/unit/org/openstreetmap/josm/actions/OrthogonalizeActionTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/actions/OrthogonalizeActionTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/actions/OrthogonalizeActionTest.java (revision 10378) @@ -96,5 +96,5 @@ void verifyRectangleClockwise(final Way way) { for (int i = 1; i < way.getNodesCount() - 1; i++) { - assertEquals(-Math.PI / 2, Geometry.getCornerAngle( + assertEquals(-Math.PI / 2, Geometry.getCornerAngle( way.getNode(i - 1).getEastNorth(), way.getNode(i).getEastNorth(), way.getNode(i + 1).getEastNorth()), 1e-6); } Index: trunk/test/unit/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJobTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJobTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJobTest.java (revision 10378) @@ -79,5 +79,5 @@ */ @Test - public void testStatusCodes() throws IOException, InterruptedException { + public void testStatusCodes() throws IOException, InterruptedException { doTestStatusCode(200); // can't test for 3xx, as httpstat.us redirects finally to 200 page Index: trunk/test/unit/org/openstreetmap/josm/data/coor/LatLonTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/coor/LatLonTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/data/coor/LatLonTest.java (revision 10378) @@ -33,10 +33,12 @@ @SuppressFBWarnings(value = "MS_PKGPROTECT") public static final double[] SAMPLE_VALUES = new double[]{ + // CHECKSTYLE.OFF: SingleSpaceSeparator -180.0, -179.9, -179.6, -179.5, -179.4, -179.1, -179.0, -100.0, -99.9, -10.0, -9.9, -1.0, -0.1, - 180.0, 179.9, 179.6, 179.5, 179.4, 179.1, 179.0, 100.0, 99.9, 10.0, 9.9, 1.0, 0.1, + 180.0, 179.9, 179.6, 179.5, 179.4, 179.1, 179.0, 100.0, 99.9, 10.0, 9.9, 1.0, 0.1, 0.12, 0.123, 0.1234, 0.12345, 0.123456, 0.1234567, 1.12, 1.123, 1.1234, 1.12345, 1.123456, 1.1234567, 10.12, 10.123, 10.1234, 10.12345, 10.123456, 10.1234567, 100.12, 100.123, 100.1234, 100.12345, 100.123456, 100.1234567 + // CHECKSTYLE.ON: SingleSpaceSeparator }; @@ -54,4 +56,5 @@ assertEquals(LatLon.roundToOsmPrecision(-0.0), 0.0, 0); + // CHECKSTYLE.OFF: SingleSpaceSeparator assertEquals(LatLon.roundToOsmPrecision(0.12345678), 0.1234568, 0); assertEquals(LatLon.roundToOsmPrecision(0.123456789), 0.1234568, 0); @@ -65,34 +68,35 @@ assertEquals(LatLon.roundToOsmPrecision(100.12345678), 100.1234568, 0); assertEquals(LatLon.roundToOsmPrecision(100.123456789), 100.1234568, 0); + // CHECKSTYLE.ON: SingleSpaceSeparator - assertEquals(LatLon.roundToOsmPrecision(100.00000001), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(100.000000001), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(100.0000000001), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(100.00000000001), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(100.000000000001), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(100.0000000000001), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(100.00000000000001), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(100.000000000000001), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(100.0000000000000001), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(100.00000000000000001), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(100.000000000000000001), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(100.0000000000000000001), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(100.00000000000000000001), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(100.00000001), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(100.000000001), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(100.0000000001), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(100.00000000001), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(100.000000000001), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(100.0000000000001), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(100.00000000000001), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(100.000000000000001), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(100.0000000000000001), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(100.00000000000000001), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(100.000000000000000001), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(100.0000000000000000001), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(100.00000000000000000001), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(99.999999999999999999999), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(99.99999999999999999999), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(99.9999999999999999999), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(99.999999999999999999), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(99.99999999999999999), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(99.9999999999999999), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(99.999999999999999), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(99.99999999999999), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(99.9999999999999), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(99.999999999999), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(99.99999999999), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(99.9999999999), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(99.999999999), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(99.99999999), 100.0000000, 0); - assertEquals(LatLon.roundToOsmPrecision(99.9999999), 99.9999999, 0); + assertEquals(LatLon.roundToOsmPrecision(99.999999999999999999999), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(99.99999999999999999999), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(99.9999999999999999999), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(99.999999999999999999), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(99.99999999999999999), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(99.9999999999999999), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(99.999999999999999), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(99.99999999999999), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(99.9999999999999), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(99.999999999999), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(99.99999999999), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(99.9999999999), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(99.999999999), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(99.99999999), 100.0000000, 0); + assertEquals(LatLon.roundToOsmPrecision(99.9999999), 99.9999999, 0); } Index: trunk/test/unit/org/openstreetmap/josm/data/imagery/ImageryInfoTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/imagery/ImageryInfoTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/data/imagery/ImageryInfoTest.java (revision 10378) @@ -36,5 +36,5 @@ @Test public void testGetExtendedUrl() { - ImageryInfo testImageryTMS = new ImageryInfo("test imagery", "http://localhost", "tms", null, null); + ImageryInfo testImageryTMS = new ImageryInfo("test imagery", "http://localhost", "tms", null, null); testImageryTMS.setDefaultMinZoom(16); testImageryTMS.setDefaultMaxZoom(23); Index: trunk/test/unit/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSourceTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSourceTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSourceTest.java (revision 10378) @@ -23,6 +23,6 @@ public class TemplatedWMSTileSourceTest { - private ImageryInfo testImageryWMS = new ImageryInfo("test imagery", "http://localhost", "wms", null, null); - private ImageryInfo testImageryTMS = new ImageryInfo("test imagery", "http://localhost", "tms", null, null); + private ImageryInfo testImageryWMS = new ImageryInfo("test imagery", "http://localhost", "wms", null, null); + private ImageryInfo testImageryTMS = new ImageryInfo("test imagery", "http://localhost", "tms", null, null); /** @@ -190,5 +190,5 @@ private static boolean isWithin(EastNorth point, EastNorth topLeft, EastNorth bottomRight) { return Math.min(topLeft.east(), bottomRight.east()) <= point.east() && - point.east() <= Math.max(topLeft.east(), bottomRight.east()) && + point.east() <= Math.max(topLeft.east(), bottomRight.east()) && Math.min(topLeft.north(), bottomRight.north()) <= point.north() && point.north() <= Math.max(topLeft.north(), bottomRight.north()); Index: trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java (revision 10378) @@ -25,5 +25,5 @@ public class WMTSTileSourceTest { - private ImageryInfo testImageryTMS = new ImageryInfo("test imagery", "http://localhost", "tms", null, null); + private ImageryInfo testImageryTMS = new ImageryInfo("test imagery", "http://localhost", "tms", null, null); private ImageryInfo testImageryPSEUDO_MERCATOR = getImagery(TestUtils.getTestDataRoot() + "wmts/getcapabilities-pseudo-mercator.xml"); private ImageryInfo testImageryTOPO_PL = getImagery(TestUtils.getTestDataRoot() + "wmts/getcapabilities-TOPO.xml"); @@ -192,5 +192,5 @@ + "VERSION=1.0.0&LAYER=MAPA TOPOGRAFICZNA&STYLE=default&FORMAT=image/jpeg&tileMatrixSet=EPSG:4326&" + "tileMatrix=EPSG:4326:0&tileRow=1&tileCol=1", - testSource.getTileUrl(0, 1, 1)); + testSource.getTileUrl(0, 1, 1)); } @@ -221,5 +221,5 @@ assertEquals( "http://www.ngi.be/cartoweb/1.0.0/topo/default/3857/7/1/1.png", - testSource.getTileUrl(0, 1, 1)); + testSource.getTileUrl(0, 1, 1)); } @@ -232,5 +232,4 @@ verifyTile(new LatLon(45.4105023, -75.7153702), testSource, 303751, 375502, 12); verifyTile(new LatLon(45.4601306, -75.7617187), testSource, 1186, 1466, 4); - } Index: trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java (revision 10378) @@ -8,4 +8,5 @@ import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.io.StringWriter; @@ -53,7 +54,7 @@ } - private void runConsistencyTests(DataSet ds) throws Exception { + private void runConsistencyTests(DataSet ds) { StringWriter writer = new StringWriter(); - DatasetConsistencyTest test = new DatasetConsistencyTest(ds, writer); + DatasetConsistencyTest test = new DatasetConsistencyTest(ds, writer); test.checkReferrers(); test.checkCompleteWaysWithIncompleteNodes(); @@ -63,10 +64,10 @@ test.checkZeroNodesWays(); String result = writer.toString(); - if (result.length() > 0) - throw new RuntimeException(result); + if (!result.isEmpty()) + fail(result); } @After - public void checkDatasets() throws Exception { + public void checkDatasets() { runConsistencyTests(my); runConsistencyTests(their); Index: trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryRelationTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryRelationTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryRelationTest.java (revision 10378) @@ -80,4 +80,5 @@ rel2.addMember(new RelationMemberData(null, OsmPrimitiveType.NODE, 2)); + // CHECKSTYLE.OFF: SingleSpaceSeparator assertEquals("relation (1, 0 members)", rel0.getDisplayName(hnf)); assertEquals("relation (1, 1 member)", rel1.getDisplayName(hnf)); @@ -94,4 +95,5 @@ assertEquals("relation (\"RelName\", 1 member)", rel1.getDisplayName(hnf)); assertEquals("relation (\"RelName\", 2 members)", rel2.getDisplayName(hnf)); + // CHECKSTYLE.ON: SingleSpaceSeparator } } Index: trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java (revision 10378) @@ -122,4 +122,5 @@ way2.addNode(2); + // CHECKSTYLE.OFF: SingleSpaceSeparator assertEquals("1 (0 nodes)", way0.getDisplayName(hnf)); assertEquals("1 (1 node)", way1.getDisplayName(hnf)); @@ -136,4 +137,5 @@ assertEquals("WayName (1 node)", way1.getDisplayName(hnf)); assertEquals("WayName (2 nodes)", way2.getDisplayName(hnf)); + // CHECKSTYLE.ON: SingleSpaceSeparator } } Index: trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java (revision 10378) @@ -169,5 +169,5 @@ r1.addMember(new RelationMember("node-20", n20)); Way w30 = new Way(30, 1); - Node n21 = new Node(21); + Node n21 = new Node(21); w30.addNode(n21); Node n22 = new Node(22); Index: trunk/test/unit/org/openstreetmap/josm/data/projection/SwissGridTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/projection/SwissGridTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/data/projection/SwissGridTest.java (revision 10378) @@ -25,4 +25,5 @@ // CHECKSTYLE.OFF: LineLength + // CHECKSTYLE.OFF: SingleSpaceSeparator /** @@ -30,10 +31,11 @@ */ ProjData[] data = { - new ProjData("Zimmerwald", d(7, 27, 54.983506), d(46, 52, 37.540562), 947.149, 602030.680, 191775.030, 897.915), - new ProjData("Chrischona", d(7, 40, 6.983077), d(47, 34, 1.385301), 504.935, 617306.300, 268507.300, 456.064), - new ProjData("Pfaender", d(9, 47, 3.697723), d(47, 30, 55.172797), 1089.372, 776668.105, 265372.681, 1042.624), - new ProjData("La Givrine", d(6, 6, 7.326361), d(46, 27, 14.690021), 1258.274, 497313.292, 145625.438, 1207.434), - new ProjData("Monte Generoso", d(9, 1, 16.389053), d(45, 55, 45.438020), 1685.027, 722758.810, 87649.670, 1636.600) }; - + new ProjData("Zimmerwald", d(7, 27, 54.983506), d(46, 52, 37.540562), 947.149, 602030.680, 191775.030, 897.915), + new ProjData("Chrischona", d(7, 40, 6.983077), d(47, 34, 1.385301), 504.935, 617306.300, 268507.300, 456.064), + new ProjData("Pfaender", d(9, 47, 3.697723), d(47, 30, 55.172797), 1089.372, 776668.105, 265372.681, 1042.624), + new ProjData("La Givrine", d(6, 6, 7.326361), d(46, 27, 14.690021), 1258.274, 497313.292, 145625.438, 1207.434), + new ProjData("Monte Generoso", d(9, 1, 16.389053), d(45, 55, 45.438020), 1685.027, 722758.810, 87649.670, 1636.600) }; + + // CHECKSTYLE.ON: SingleSpaceSeparator // CHECKSTYLE.ON: LineLength Index: trunk/test/unit/org/openstreetmap/josm/data/validation/routines/EmailValidatorTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/validation/routines/EmailValidatorTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/data/validation/routines/EmailValidatorTest.java (revision 10378) @@ -58,5 +58,5 @@ */ @Test - public void testEmail() { + public void testEmail() { assertTrue(validator.isValid("jsmith@apache.org")); assertFalse(validator.isValid(null)); @@ -67,5 +67,5 @@ */ @Test - public void testEmailWithNumericAddress() { + public void testEmailWithNumericAddress() { assertTrue(validator.isValid("someone@[216.109.118.76]")); assertTrue(validator.isValid("someone@yahoo.com")); @@ -76,5 +76,5 @@ */ @Test - public void testEmailExtension() { + public void testEmailExtension() { assertTrue(validator.isValid("jsmith@apache.org")); @@ -99,5 +99,5 @@ */ @Test - public void testEmailWithDash() { + public void testEmailWithDash() { assertTrue(validator.isValid("andy.noble@data-workshop.com")); @@ -114,5 +114,5 @@ */ @Test - public void testEmailWithDotEnd() { + public void testEmailWithDotEnd() { assertFalse(validator.isValid("andy.noble@data-workshop.com.")); } @@ -123,5 +123,5 @@ */ @Test - public void testEmailWithBogusCharacter() { + public void testEmailWithBogusCharacter() { assertFalse(validator.isValid("andy.noble@\u008fdata-workshop.com")); @@ -184,5 +184,5 @@ */ @Test - public void testEmailWithCommas() { + public void testEmailWithCommas() { assertFalse(validator.isValid("joeblow@apa,che.org")); @@ -196,5 +196,5 @@ */ @Test - public void testEmailWithSpaces() { + public void testEmailWithSpaces() { assertFalse(validator.isValid("joeblow @apache.org")); // TODO - this should be valid? @@ -215,5 +215,5 @@ */ @Test - public void testEmailWithControlChars() { + public void testEmailWithControlChars() { for (char c = 0; c < 32; c++) { assertFalse("Test control char " + ((int) c), validator.isValid("foo" + c + "bar@domain.com")); @@ -278,5 +278,5 @@ */ @Test - public void testEmailUserName() { + public void testEmailUserName() { assertTrue(validator.isValid("joe1blow@apache.org")); @@ -492,5 +492,5 @@ @Ignore("This test fails so disable it for 1.1.4 release. The real solution is to fix the email parsing") @Test - public void testEmailFromPerl() { + public void testEmailFromPerl() { for (int index = 0; index < testEmailFromPerl.length; index++) { String item = testEmailFromPerl[index].item; Index: trunk/test/unit/org/openstreetmap/josm/data/validation/routines/InetAddressValidatorTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/validation/routines/InetAddressValidatorTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/data/validation/routines/InetAddressValidatorTest.java (revision 10378) @@ -47,8 +47,10 @@ @Test public void testInetAddressesFromTheWild() { - assertTrue("www.apache.org IP should be valid", validator.isValid("140.211.11.130")); - assertTrue("www.l.google.com IP should be valid", validator.isValid("72.14.253.103")); - assertTrue("fsf.org IP should be valid", validator.isValid("199.232.41.5")); - assertTrue("appscs.ign.com IP should be valid", validator.isValid("216.35.123.87")); + // CHECKSTYLE.OFF: SingleSpaceSeparator + assertTrue("www.apache.org IP should be valid", validator.isValid("140.211.11.130")); + assertTrue("www.l.google.com IP should be valid", validator.isValid("72.14.253.103")); + assertTrue("fsf.org IP should be valid", validator.isValid("199.232.41.5")); + assertTrue("appscs.ign.com IP should be valid", validator.isValid("216.35.123.87")); + // CHECKSTYLE.ON: SingleSpaceSeparator } @@ -67,18 +69,20 @@ @Test public void testInetAddressesByClass() { - assertTrue("class A IP should be valid", validator.isValid("24.25.231.12")); - assertFalse("illegal class A IP should be invalid", validator.isValid("2.41.32.324")); - - assertTrue("class B IP should be valid", validator.isValid("135.14.44.12")); - assertFalse("illegal class B IP should be invalid", validator.isValid("154.123.441.123")); - - assertTrue("class C IP should be valid", validator.isValid("213.25.224.32")); - assertFalse("illegal class C IP should be invalid", validator.isValid("201.543.23.11")); - - assertTrue("class D IP should be valid", validator.isValid("229.35.159.6")); - assertFalse("illegal class D IP should be invalid", validator.isValid("231.54.11.987")); - - assertTrue("class E IP should be valid", validator.isValid("248.85.24.92")); - assertFalse("illegal class E IP should be invalid", validator.isValid("250.21.323.48")); + // CHECKSTYLE.OFF: SingleSpaceSeparator + assertTrue("class A IP should be valid", validator.isValid("24.25.231.12")); + assertFalse("illegal class A IP should be invalid", validator.isValid("2.41.32.324")); + + assertTrue("class B IP should be valid", validator.isValid("135.14.44.12")); + assertFalse("illegal class B IP should be invalid", validator.isValid("154.123.441.123")); + + assertTrue("class C IP should be valid", validator.isValid("213.25.224.32")); + assertFalse("illegal class C IP should be invalid", validator.isValid("201.543.23.11")); + + assertTrue("class D IP should be valid", validator.isValid("229.35.159.6")); + assertFalse("illegal class D IP should be invalid", validator.isValid("231.54.11.987")); + + assertTrue("class E IP should be valid", validator.isValid("248.85.24.92")); + assertFalse("illegal class E IP should be invalid", validator.isValid("250.21.323.48")); + // CHECKSTYLE.ON: SingleSpaceSeparator } @@ -88,6 +92,6 @@ @Test public void testReservedInetAddresses() { - assertTrue("localhost IP should be valid", validator.isValid("127.0.0.1")); - assertTrue("broadcast IP should be valid", validator.isValid("255.255.255.255")); + assertTrue("localhost IP should be valid", validator.isValid("127.0.0.1")); + assertTrue("broadcast IP should be valid", validator.isValid("255.255.255.255")); } @@ -97,8 +101,10 @@ @Test public void testBrokenInetAddresses() { + // CHECKSTYLE.OFF: SingleSpaceSeparator assertFalse("IP with characters should be invalid", validator.isValid("124.14.32.abc")); assertFalse("IP with leading zeroes should be invalid", validator.isValid("124.14.32.01")); assertFalse("IP with three groups should be invalid", validator.isValid("23.64.12")); assertFalse("IP with five groups should be invalid", validator.isValid("26.34.23.77.234")); + // CHECKSTYLE.ON: SingleSpaceSeparator } Index: trunk/test/unit/org/openstreetmap/josm/data/validation/routines/RegexValidatorTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/validation/routines/RegexValidatorTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/data/validation/routines/RegexValidatorTest.java (revision 10378) @@ -37,15 +37,17 @@ public class RegexValidatorTest { - private static final String REGEX = "^([abc]*)(?:\\-)([DEF]*)(?:\\-)([123]*)$"; + private static final String REGEX = "^([abc]*)(?:\\-)([DEF]*)(?:\\-)([123]*)$"; private static final String COMPONENT_1 = "([abc]{3})"; private static final String COMPONENT_2 = "([DEF]{3})"; private static final String COMPONENT_3 = "([123]{3})"; - private static final String SEPARATOR_1 = "(?:\\-)"; - private static final String SEPARATOR_2 = "(?:\\s)"; + private static final String SEPARATOR_1 = "(?:\\-)"; + private static final String SEPARATOR_2 = "(?:\\s)"; private static final String REGEX_1 = "^" + COMPONENT_1 + SEPARATOR_1 + COMPONENT_2 + SEPARATOR_1 + COMPONENT_3 + "$"; private static final String REGEX_2 = "^" + COMPONENT_1 + SEPARATOR_2 + COMPONENT_2 + SEPARATOR_2 + COMPONENT_3 + "$"; private static final String REGEX_3 = "^" + COMPONENT_1 + COMPONENT_2 + COMPONENT_3 + "$"; private static final String[] MULTIPLE_REGEX = new String[] {REGEX_1, REGEX_2, REGEX_3}; + + // CHECKSTYLE.OFF: SingleSpaceSeparator /** @@ -85,8 +87,8 @@ // ------------ Set up Sensitive Validators - RegexValidator multiple = new RegexValidator(MULTIPLE_REGEX); - RegexValidator single1 = new RegexValidator(REGEX_1); - RegexValidator single2 = new RegexValidator(REGEX_2); - RegexValidator single3 = new RegexValidator(REGEX_3); + RegexValidator multiple = new RegexValidator(MULTIPLE_REGEX); + RegexValidator single1 = new RegexValidator(REGEX_1); + RegexValidator single2 = new RegexValidator(REGEX_2); + RegexValidator single3 = new RegexValidator(REGEX_3); // ------------ Set up test values @@ -128,7 +130,7 @@ // ------------ Set up In-sensitive Validators RegexValidator multiple = new RegexValidator(MULTIPLE_REGEX, false); - RegexValidator single1 = new RegexValidator(REGEX_1, false); - RegexValidator single2 = new RegexValidator(REGEX_2, false); - RegexValidator single3 = new RegexValidator(REGEX_3, false); + RegexValidator single1 = new RegexValidator(REGEX_1, false); + RegexValidator single2 = new RegexValidator(REGEX_2, false); + RegexValidator single3 = new RegexValidator(REGEX_3, false); // ------------ Set up test values @@ -172,4 +174,6 @@ assertNull("Instance match()", validator.match(null)); } + + // CHECKSTYLE.ON: SingleSpaceSeparator /** Index: trunk/test/unit/org/openstreetmap/josm/data/validation/routines/UrlValidatorTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/validation/routines/UrlValidatorTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/data/validation/routines/UrlValidatorTest.java (revision 10378) @@ -99,5 +99,5 @@ int statusPerLine = 60; int printed = 0; - if (printIndex) { + if (printIndex) { statusPerLine = 6; } Index: trunk/test/unit/org/openstreetmap/josm/gui/DefaultNameFormatterTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/DefaultNameFormatterTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/gui/DefaultNameFormatterTest.java (revision 10378) @@ -70,4 +70,5 @@ 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 @@ -77,4 +78,5 @@ 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]); Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/LayerManagerTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/layer/LayerManagerTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/gui/layer/LayerManagerTest.java (revision 10378) @@ -128,5 +128,5 @@ */ @Before - public void setUp() { + public void setUp() { layerManager = new LayerManager(); } Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayerTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayerTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayerTest.java (revision 10378) @@ -37,5 +37,5 @@ */ @Test - public void testMarkerLayer() { + public void testMarkerLayer() { assertEquals(Color.magenta, MarkerLayer.getGenericColor()); MarkerLayer layer = new MarkerLayer(new GpxData(), "foo", null, null); Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreferenceTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreferenceTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreferenceTest.java (revision 10378) @@ -26,5 +26,5 @@ */ @Test - public void testAdvancedPreference() { + public void testAdvancedPreference() { assertNotNull(new AdvancedPreference.Factory().createPreferenceSetting()); } Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/ExportProfileActionTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/ExportProfileActionTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/ExportProfileActionTest.java (revision 10378) @@ -24,5 +24,5 @@ */ @Test - public void testAction() { + public void testAction() { new ExportProfileAction(Main.pref, "foo", "bar").actionPerformed(null); new ExportProfileAction(Main.pref, "expert", "expert").actionPerformed(null); Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/ListEditorTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/ListEditorTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/ListEditorTest.java (revision 10378) @@ -30,5 +30,5 @@ */ @Test - public void testListSettingTableModel() { + public void testListSettingTableModel() { ListSettingTableModel model = new ListSettingTableModel(null); assertNotNull(model.getData()); Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/PrefEntryTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/PrefEntryTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/PrefEntryTest.java (revision 10378) @@ -30,5 +30,5 @@ */ @Test - public void testPrefEntry() { + public void testPrefEntry() { String key = "key"; StringSetting val = new StringSetting("value"); Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTableTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTableTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTableTest.java (revision 10378) @@ -42,5 +42,5 @@ */ @Test - public void testPreferencesTable() { + public void testPreferencesTable() { PreferencesTable t = newTable(); t.fireDataChanged(); @@ -55,5 +55,5 @@ */ @Test - public void testAllSettingsTableModel() { + public void testAllSettingsTableModel() { AllSettingsTableModel model = (AllSettingsTableModel) newTable().getModel(); assertEquals(1, model.getRowCount()); Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/audio/AudioPreferenceTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/preferences/audio/AudioPreferenceTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/audio/AudioPreferenceTest.java (revision 10378) @@ -27,5 +27,5 @@ */ @Test - public void testAudioPreference() { + public void testAudioPreference() { assertNotNull(new AudioPreference.Factory().createPreferenceSetting()); } Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/ColorPreferenceTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/ColorPreferenceTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/ColorPreferenceTest.java (revision 10378) @@ -26,5 +26,5 @@ */ @Test - public void testColorPreference() { + public void testColorPreference() { assertNotNull(new ColorPreference.Factory().createPreferenceSetting()); } Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/DisplayPreferenceTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/DisplayPreferenceTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/DisplayPreferenceTest.java (revision 10378) @@ -26,5 +26,5 @@ */ @Test - public void testDisplayPreference() { + public void testDisplayPreference() { assertNotNull(new DisplayPreference.Factory().createPreferenceSetting()); } Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/DrawingPreferenceTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/DrawingPreferenceTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/DrawingPreferenceTest.java (revision 10378) @@ -26,5 +26,5 @@ */ @Test - public void testDrawingPreference() { + public void testDrawingPreference() { assertNotNull(new DrawingPreference.Factory().createPreferenceSetting()); } Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/LafPreferenceTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/LafPreferenceTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/LafPreferenceTest.java (revision 10378) @@ -26,5 +26,5 @@ */ @Test - public void testLafPreference() { + public void testLafPreference() { assertNotNull(new LafPreference.Factory().createPreferenceSetting()); } Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/LanguagePreferenceTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/LanguagePreferenceTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/display/LanguagePreferenceTest.java (revision 10378) @@ -26,5 +26,5 @@ */ @Test - public void testLanguagePreference() { + public void testLanguagePreference() { assertNotNull(new LanguagePreference.Factory().createPreferenceSetting()); } Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTest.java (revision 10378) @@ -26,5 +26,5 @@ */ @Test - public void testImageryPreference() { + public void testImageryPreference() { assertNotNull(new ImageryPreference.Factory().createPreferenceSetting()); } Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/BackupPreferenceTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/BackupPreferenceTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/BackupPreferenceTest.java (revision 10378) @@ -26,5 +26,5 @@ */ @Test - public void testBackupPreference() { + public void testBackupPreference() { assertNotNull(new BackupPreference.Factory().createPreferenceSetting()); } Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/MapPaintPreferenceTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/MapPaintPreferenceTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/MapPaintPreferenceTest.java (revision 10378) @@ -26,5 +26,5 @@ */ @Test - public void testMapPaintPreference() { + public void testMapPaintPreference() { assertNotNull(new MapPaintPreference.Factory().createPreferenceSetting()); } Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/MapPreferenceTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/MapPreferenceTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/MapPreferenceTest.java (revision 10378) @@ -26,5 +26,5 @@ */ @Test - public void testMapPreference() { + public void testMapPreference() { assertNotNull(new MapPreference.Factory().createPreferenceSetting()); } Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreferenceTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreferenceTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreferenceTest.java (revision 10378) @@ -26,5 +26,5 @@ */ @Test - public void testTaggingPresetPreference() { + public void testTaggingPresetPreference() { assertNotNull(new TaggingPresetPreference.Factory().createPreferenceSetting()); } Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferenceTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferenceTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferenceTest.java (revision 10378) @@ -36,5 +36,5 @@ */ @Test - public void testPluginPreference() { + public void testPluginPreference() { assertNotNull(new PluginPreference.Factory().createPreferenceSetting()); } @@ -45,5 +45,5 @@ */ @Test - public void testBuildDownloadSummary() throws Exception { + public void testBuildDownloadSummary() throws Exception { final PluginInformation dummy = new PluginInformation( new File(TestUtils.getTestDataRoot() + "plugin/dummy_plugin.jar"), "dummy_plugin"); Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreferenceTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreferenceTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreferenceTest.java (revision 10378) @@ -27,5 +27,5 @@ */ @Test - public void testProjectionPreference() { + public void testProjectionPreference() { assertNotNull(new ProjectionPreference.Factory().createPreferenceSetting()); } Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/remotecontrol/RemoteControlPreferenceTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/preferences/remotecontrol/RemoteControlPreferenceTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/remotecontrol/RemoteControlPreferenceTest.java (revision 10378) @@ -26,5 +26,5 @@ */ @Test - public void testRemoteControlPreference() { + public void testRemoteControlPreference() { assertNotNull(new RemoteControlPreference.Factory().createPreferenceSetting()); } Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferenceTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferenceTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferenceTest.java (revision 10378) @@ -26,5 +26,5 @@ */ @Test - public void testAuthenticationPreference() { + public void testAuthenticationPreference() { assertNotNull(new AuthenticationPreference.Factory().createPreferenceSetting()); } Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/server/OverpassServerPreferenceTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/preferences/server/OverpassServerPreferenceTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/server/OverpassServerPreferenceTest.java (revision 10378) @@ -26,5 +26,5 @@ */ @Test - public void testOverpassServerPreference() { + public void testOverpassServerPreference() { assertNotNull(new OverpassServerPreference.Factory().createPreferenceSetting()); } Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/server/ProxyPreferenceTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/preferences/server/ProxyPreferenceTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/server/ProxyPreferenceTest.java (revision 10378) @@ -26,5 +26,5 @@ */ @Test - public void testProxyPreference() { + public void testProxyPreference() { assertNotNull(new ProxyPreference.Factory().createPreferenceSetting()); } Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/server/ServerAccessPreferenceTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/preferences/server/ServerAccessPreferenceTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/server/ServerAccessPreferenceTest.java (revision 10378) @@ -26,5 +26,5 @@ */ @Test - public void testServerAccessPreference() { + public void testServerAccessPreference() { assertNotNull(new ServerAccessPreference.Factory().createPreferenceSetting()); } Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/shortcut/ShortcutPreferenceTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/preferences/shortcut/ShortcutPreferenceTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/shortcut/ShortcutPreferenceTest.java (revision 10378) @@ -26,5 +26,5 @@ */ @Test - public void testShortcutPreference() { + public void testShortcutPreference() { assertNotNull(new ShortcutPreference.Factory().createPreferenceSetting()); } Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/validator/ValidatorPreferenceTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/preferences/validator/ValidatorPreferenceTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/validator/ValidatorPreferenceTest.java (revision 10378) @@ -26,5 +26,5 @@ */ @Test - public void testValidatorPreference() { + public void testValidatorPreference() { assertNotNull(new ValidatorPreference.Factory().createPreferenceSetting()); } Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/validator/ValidatorTestsPreferenceTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/preferences/validator/ValidatorTestsPreferenceTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/validator/ValidatorTestsPreferenceTest.java (revision 10378) @@ -26,5 +26,5 @@ */ @Test - public void testValidatorTestsPreference() { + public void testValidatorTestsPreference() { assertNotNull(new ValidatorTestsPreference.Factory().createPreferenceSetting()); } Index: trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReaderTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReaderTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReaderTest.java (revision 10378) @@ -58,5 +58,5 @@ final Collection presets = TaggingPresetReader.readAll(TestUtils.getTestDataRoot() + "preset_chunk.xml", true); assertThat(presets, hasSize(1)); - final TaggingPreset abc = presets.iterator().next(); + final TaggingPreset abc = presets.iterator().next(); final List keys = Utils.transform(abc.data, new Utils.Function() { @Override Index: trunk/test/unit/org/openstreetmap/josm/tools/PlatformHookOsxTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/tools/PlatformHookOsxTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/tools/PlatformHookOsxTest.java (revision 10378) @@ -36,5 +36,5 @@ */ @Test - public void testStartupHook() { + public void testStartupHook() { hook.startupHook(); } Index: trunk/test/unit/org/openstreetmap/josm/tools/PlatformHookWindowsTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/tools/PlatformHookWindowsTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/tools/PlatformHookWindowsTest.java (revision 10378) @@ -43,5 +43,5 @@ */ @Test - public void testStartupHook() { + public void testStartupHook() { hook.startupHook(); } Index: trunk/test/unit/org/openstreetmap/josm/tools/TextTagParserTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/tools/TextTagParserTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/tools/TextTagParserTest.java (revision 10378) @@ -30,14 +30,18 @@ public void testUnescape() { String s, s1; - s = "\"2 3 4\""; s1 = "2 3 4"; + s = "\"2 3 4\""; + s1 = "2 3 4"; Assert.assertEquals(s1, TextTagParser.unescape(s)); - s = "\"2 \\\"3\\\" 4\""; s1 = "2 \"3\" 4"; + s = "\"2 \\\"3\\\" 4\""; + s1 = "2 \"3\" 4"; Assert.assertEquals(s1, TextTagParser.unescape(s)); - s = "\"2 3 ===4===\""; s1 = "2 3 ===4==="; + s = "\"2 3 ===4===\""; + s1 = "2 3 ===4==="; Assert.assertEquals(s1, TextTagParser.unescape(s)); - s = "\"2 3 \\\\\\\\===4===\""; s1 = "2 3 \\\\===4==="; + s = "\"2 3 \\\\\\\\===4===\""; + s1 = "2 3 \\\\===4==="; Assert.assertEquals(s1, TextTagParser.unescape(s)); } Index: trunk/test/unit/org/openstreetmap/josm/tools/UtilsTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/tools/UtilsTest.java (revision 10375) +++ trunk/test/unit/org/openstreetmap/josm/tools/UtilsTest.java (revision 10378) @@ -24,4 +24,5 @@ @Test public void testStrip() { + // CHECKSTYLE.OFF: SingleSpaceSeparator final String someWhite = "\u00A0"+ // SPACE_SEPARATOR @@ -42,4 +43,5 @@ "\uFEFF"+ // ZERO WIDTH NO-BREAK SPACE "\u3000"; // IDEOGRAPHIC SPACE + // CHECKSTYLE.ON: SingleSpaceSeparator Assert.assertNull(Utils.strip(null)); Assert.assertEquals("", Utils.strip(""));