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

Timestamp:

2014-04-23T02:30:39+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #9906 - fix reliance on default encoding

Location:

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

Files:

• ProjectionRefTest.java (modified) (3 diffs)
• ProjectionRegressionTest.java (modified) (4 diffs)

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

@@ -3 +3 @@
 
 import java.io.BufferedReader;
+import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import java.io.FileReader;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.util.Collection;
 import java.util.HashMap;
@@ -48 +49 @@
     @Test
     public void test() throws IOException, FileNotFoundException {
-        BufferedReader in = new BufferedReader(new FileReader("data_nodist/projection-reference-data.csv"));
+        BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream("data_nodist/projection-reference-data.csv"), Utils.UTF_8));
         StringBuilder fail = new StringBuilder();
         String line;
@@ -92 +93 @@
             throw new AssertionError(fail.toString());
         }
-
     }
 }

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

@@ -5 +5 @@
 import java.io.BufferedWriter;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -29 +31 @@
 import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
 import org.openstreetmap.josm.tools.Pair;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -87 +90 @@
 
         Random rand = new Random();
-        BufferedWriter out = new BufferedWriter(new FileWriter(PROJECTION_DATA_FILE));
+        BufferedWriter out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(PROJECTION_DATA_FILE), Utils.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 +115 @@
 
     private static List<TestData> readData() throws IOException, FileNotFoundException {
-        BufferedReader in = new BufferedReader(new FileReader(PROJECTION_DATA_FILE));
+        BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(PROJECTION_DATA_FILE), Utils.UTF_8));
         List<TestData> result = new ArrayList<TestData>();
         String line;