Changeset 10219 in josm for trunk/test/unit/org

Timestamp:

2016-05-15T18:48:35+02:00 (8 years ago)

Author:

Don-vip

Message:

findbugs - reliance on default encoding

Location:

trunk/test/unit/org/openstreetmap/josm/data

Files:

• cache/JCSCachedTileLoaderJobTest.java (modified) (2 diffs)
• projection/ProjectionRefTest.java (modified) (1 diff)
• validation/routines/DomainValidatorTestIT.java (modified) (5 diffs)

trunk/test/unit/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJobTest.java

@@ -7 +7 @@
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 
 import org.apache.commons.jcs.access.behavior.ICacheAccess;
@@ -46 +47 @@
         @Override
         protected CacheEntry createCacheEntry(byte[] content) {
-            return new CacheEntry("dummy".getBytes());
+            return new CacheEntry("dummy".getBytes(StandardCharsets.UTF_8));
         }
     }

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

@@ -222 +222 @@
             Process process = pb.start();
             OutputStream stdin = process.getOutputStream();
-            final BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(stdin));
+            final BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(stdin, StandardCharsets.UTF_8));
             InputStream stdout = process.getInputStream();
-            final BufferedReader reader = new BufferedReader(new InputStreamReader(stdout));
+            final BufferedReader reader = new BufferedReader(new InputStreamReader(stdout, StandardCharsets.UTF_8));
             String input = String.format("%.9f %.9f\n", ll.lon(), ll.lat());
             writer.write(input);

trunk/test/unit/org/openstreetmap/josm/data/validation/routines/DomainValidatorTestIT.java

@@ -23 +23 @@
 import java.io.Closeable;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
@@ -32 +33 @@
 import java.net.IDN;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -80 +82 @@
         download(htmlFile, "http://www.iana.org/domains/root/db", timestamp);
 
-        BufferedReader br = new BufferedReader(new FileReader(txtFile));
+        BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(txtFile), StandardCharsets.UTF_8));
         String line;
         final String header;
@@ -184 +186 @@
         final Pattern comment = Pattern.compile("\\s+<td>([^<]+)</td>");
 
-        final BufferedReader br = new BufferedReader(new FileReader(f));
+        final BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(f), StandardCharsets.UTF_8));
         String line;
         while ((line = br.readLine()) != null) {
@@ -288 +290 @@
             File rootCheck = new File(System.getProperty("java.io.tmpdir"), "tld_" + domain + ".html");
             download(rootCheck, tldurl, 0L);
-            in = new BufferedReader(new FileReader(rootCheck));
+            in = new BufferedReader(new InputStreamReader(new FileInputStream(rootCheck), StandardCharsets.UTF_8));
             String inputLine;
             while ((inputLine = in.readLine()) != null) {