Changeset 6995 in josm for trunk/test

Timestamp:

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

Author:

Don-vip

Message:

fix #9906 - fix reliance on default encoding

Location:

trunk/test

Files:

• functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified) (3 diffs)
• functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (modified) (3 diffs)
• unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java (modified) (3 diffs)
• unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java (modified) (4 diffs)

trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java

@@ -10 +10 @@
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.text.MessageFormat;
@@ -36 +37 @@
 import org.openstreetmap.josm.gui.io.UploadStrategySpecification;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
+import org.openstreetmap.josm.tools.Utils;
 
 public class MultiFetchServerObjectReaderTest {
@@ -211 +213 @@
         try {
             PrintWriter pw = new PrintWriter(
-                    new FileWriter(dataSetCacheOutputFile)
+                    new OutputStreamWriter(new FileOutputStream(dataSetCacheOutputFile), Utils.UTF_8)
             );
             logger.info(MessageFormat.format("caching test data set in ''{0}'' ...", dataSetCacheOutputFile.toString()));

trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java

@@ -8 +8 @@
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.text.MessageFormat;
@@ -37 +38 @@
 import org.openstreetmap.josm.gui.io.UploadStrategySpecification;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
+import org.openstreetmap.josm.tools.Utils;
 
 public class OsmServerBackreferenceReaderTest {
@@ -218 +220 @@
         try {
             PrintWriter pw = new PrintWriter(
-                    new FileWriter(dataSetCacheOutputFile)
+                    new OutputStreamWriter(new FileOutputStream(dataSetCacheOutputFile), Utils.UTF_8)
             );
             logger.info(MessageFormat.format("caching test data set in ''{0}'' ...", dataSetCacheOutputFile.toString()));

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;