Changeset 16643 in josm for trunk/test/unit

Timestamp:

2020-06-14T20:19:59+02:00 (4 years ago)

Author:

simon04

Message:

see #19334 - ​https://errorprone.info/bugpattern/StringSplitter

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• TestUtils.java (modified) (1 diff)
• data/osm/TagCollectionTest.java (modified) (1 diff)
• data/projection/ProjectionRefTest.java (modified) (4 diffs)
• data/projection/ProjectionRegressionTest.java (modified) (1 diff)
• data/validation/tests/ValidatorTestUtils.java (modified) (1 diff)
• gui/mappaint/RenderingCLIAreaTest.java (modified) (1 diff)
• gui/preferences/imagery/ImageryPreferenceTestIT.java (modified) (2 diffs)
• tools/KeyboardUtilsTest.java (modified) (1 diff)

trunk/test/unit/org/openstreetmap/josm/TestUtils.java

@@ -598 +598 @@
     public static List<String> getIgnoredErrorMessages(Class<?> integrationTest) throws IOException {
         return Arrays.stream(new WikiReader()
-                .read("https://josm.openstreetmap.de/wiki/IntegrationTestIgnores?format=txt")
-                .split("\\n"))
+                .read("https://josm.openstreetmap.de/wiki/IntegrationTestIgnores?format=txt").split("\\n", -1))
                 .filter(s -> s.startsWith("|| " + integrationTest.getSimpleName() + " ||"))
                 .map(s -> s.substring(s.indexOf("{{{") + 3, s.indexOf("}}}")))

trunk/test/unit/org/openstreetmap/josm/data/osm/TagCollectionTest.java

@@ -689 +689 @@
         TagCollection g = new TagCollection(Arrays.asList(new Tag("k", "b"), new Tag("k", "a"), new Tag("k", "b"),
                 new Tag("k", "c"), new Tag("k", "d")));
-        assertEquals("a;b;c;d", Stream.of(g.getJoinedValues("k").split(";")).sorted().collect(Collectors.joining(";")));
+        assertEquals("a;b;c;d", Stream.of(g.getJoinedValues("k").split(";", -1)).sorted().collect(Collectors.joining(";")));
     }
 

trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java

@@ -99 +99 @@
             debug = "debug".equals(args[0]);
             if (args[args.length - 1].startsWith("EPSG:")) {
-                forcedCodes = Arrays.asList(args[args.length - 1].split(","));
+                forcedCodes = Arrays.asList(args[args.length - 1].split(",", -1));
             }
         }
@@ -137 +137 @@
                     result.add(curEntry);
                 } else if (curEntry != null) {
-                    String[] f = line.trim().split(",");
+                    String[] f = line.trim().split(",", -1);
                     double lon = Double.parseDouble(f[0]);
                     double lat = Double.parseDouble(f[1]);
@@ -277 +277 @@
         List<String> args = new ArrayList<>();
         args.add(CS2CS_EXE);
-        args.addAll(Arrays.asList("-f %.9f +proj=longlat +datum=WGS84 +to".split(" ")));
+        args.addAll(Arrays.asList("-f %.9f +proj=longlat +datum=WGS84 +to".split(" ", -1)));
         // proj.4 cannot read our ntf_r93_b.gsb file
         // possibly because it is big endian. Use equivalent
@@ -286 +286 @@
             def = def.replace("'", "\\'").replace("\"", "\\\"");
         }
-        args.addAll(Arrays.asList(def.split(" ")));
+        args.addAll(Arrays.asList(def.split(" ", -1)));
         ProcessBuilder pb = new ProcessBuilder(args);
         pb.environment().put("PROJ_LIB", new File(PROJ_LIB_DIR).getAbsolutePath());

trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java

@@ -125 +125 @@
 
     private static Pair<Double, Double> readLine(String expectedName, String input) {
-        String[] fields = input.trim().split("[ ]+");
+        String[] fields = input.trim().split("[ ]+", -1);
         if (fields.length != 3) throw new AssertionError();
         if (!fields[0].equals(expectedName)) throw new AssertionError();

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

@@ -51 +51 @@
                     Set<Integer> expectedCodes = new TreeSet<>();
                     if (!"none".equals(codes)) {
-                        for (String code : codes.split(",")) {
+                        for (String code : codes.split(",", -1)) {
                             expectedCodes.add(Integer.parseInt(code));
                         }

trunk/test/unit/org/openstreetmap/josm/gui/mappaint/RenderingCLIAreaTest.java

@@ -154 +154 @@
 
     public RenderingCLIAreaTest(String args, Matcher<Double> scaleMatcher, Matcher<Bounds> boundsMatcher) {
-        this.args = args.split("\\s+");
+        this.args = args.split("\\s+", -1);
         this.scaleMatcher = scaleMatcher;
         this.boundsMatcher = boundsMatcher;

trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTestIT.java

@@ -248 +248 @@
         // Check if we have received an error message
         String error = helper.detectErrorMessage(new String(data, StandardCharsets.UTF_8));
-        String errorMsg = url + zoomMarker(zoom) + (error != null ? error.split("\\n")[0] : defaultMessage);
+        String errorMsg = url + zoomMarker(zoom) + (error != null ? error.split("\\n", -1)[0] : defaultMessage);
         addError(info, errorMsg);
         return errorMsg;
@@ -344 +344 @@
 
     private static boolean isZoomError(String error) {
-        String[] parts = error.split(ERROR_SEP);
+        String[] parts = error.split(ERROR_SEP, -1);
         String lastPart = parts.length > 0 ? parts[parts.length - 1].toLowerCase(Locale.ENGLISH) : "";
         return lastPart.contains("bbox")

trunk/test/unit/org/openstreetmap/josm/tools/KeyboardUtilsTest.java

@@ -108 +108 @@
     private static void testgetCharactersForKeyE00(String locale, Character... expected) {
         if (locale.contains("_")) {
-            String[] l = locale.split("_");
+            String[] l = locale.split("_", -1);
             testgetCharactersForKeyE00(new Locale(l[0], l[1]), expected);
         } else {