Changeset 7082 in josm for trunk/test/unit/org/openstreetmap

Timestamp:

2014-05-09T05:32:37+02:00 (11 years ago)

Author:

Don-vip

Message:

see #8465 - replace Utils.UTF_8 by StandardCharsets.UTF_8, new in Java 7

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• data/projection/ProjectionRefTest.java (modified) (3 diffs)
• data/projection/ProjectionRegressionTest.java (modified) (4 diffs)
• io/remotecontrol/RemoteControlTest.java (modified) (3 diffs)
• tools/BugReportExceptionHandlerTest.java (modified) (2 diffs)

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

@@ -7 +7 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.HashMap;
@@ -17 +18 @@
 import org.openstreetmap.josm.gui.preferences.projection.ProjectionChoice;
 import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
-import org.openstreetmap.josm.tools.Utils;
 
 /**
  * Test projections using reference data. (Currently provided by proj.4)
- * 
+ *
  * The data file data_nodist/projection-reference-data.csv can be created like this:
  *      Fist run this file's main method to collect epsg codes and bounds data.
@@ -46 +46 @@
         }
     }
- 
+
     @Test
     public void test() throws IOException, FileNotFoundException {
         try (BufferedReader in = new BufferedReader(new InputStreamReader(
-                new FileInputStream("data_nodist/projection-reference-data.csv"), Utils.UTF_8))) {
+                new FileInputStream("data_nodist/projection-reference-data.csv"), StandardCharsets.UTF_8))) {
             StringBuilder fail = new StringBuilder();
             String line;

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

@@ -11 +11 @@
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -30 +31 @@
 import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
 import org.openstreetmap.josm.tools.Pair;
-import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -89 +89 @@
 
         Random rand = new Random();
-        try (BufferedWriter out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(PROJECTION_DATA_FILE), Utils.UTF_8))) {
+        try (BufferedWriter out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(PROJECTION_DATA_FILE), StandardCharsets.UTF_8))) {
             out.write("# Data for test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java\n");
             out.write("# Format: 1. Projection code; 2. lat/lon; 3. lat/lon projected -> east/north; 4. east/north (3.) inverse projected\n");
@@ -112 +112 @@
 
     private static List<TestData> readData() throws IOException, FileNotFoundException {
-        try (BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(PROJECTION_DATA_FILE), Utils.UTF_8))) {
+        try (BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(PROJECTION_DATA_FILE), StandardCharsets.UTF_8))) {
             List<TestData> result = new ArrayList<>();
             String line;

trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/RemoteControlTest.java

@@ -12 +12 @@
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.security.GeneralSecurityException;
 import java.security.SecureRandom;
@@ -28 +29 @@
 import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -125 +125 @@
             // TODO this code should be refactored somewhere in Utils as it is used in several JOSM classes
             StringBuilder responseBody = new StringBuilder();
-            try (BufferedReader in = new BufferedReader(new InputStreamReader(is, Utils.UTF_8))) {
+            try (BufferedReader in = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) {
                 String s;
                 while((s = in.readLine()) != null) {

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

@@ -7 +7 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.zip.GZIPInputStream;
 
@@ -49 +50 @@
             StringBuilder sb = new StringBuilder();
             for (int n = is.read(buff); n > 0; n = is.read(buff)) {
-                sb.append(new String(buff, 0, n, Utils.UTF_8));
+                sb.append(new String(buff, 0, n, StandardCharsets.UTF_8));
             }
             assertEquals(report, sb.toString());