Merge pull request #86 from privat/test-force-utf8

Tests: force utf8

src/rars/api/Program.java

@@ -8,6 +8,7 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 
 /**
@@ -203,14 +204,22 @@ public Simulator.Reason simulate() throws SimulationException {
      * @return converts the bytes sent to stdout into a string (resets to "" when setup is called)
      */
     public String getSTDOUT(){
-        return stdout.toString();
+        try {
+            return stdout.toString("UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     /**
      * @return converts the bytes sent to stderr into a string (resets to "" when setup is called)
      */
     public String getSTDERR(){
-        return stderr.toString();
+        try {
+            return stderr.toString("UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     /**

test/RarsTest.java

@@ -101,7 +101,7 @@ public static String run(String path, Program p){
         // This is just a temporary solution that should work for the tests I want to write
         p.getOptions().selfModifyingCode = false;
         try {
-            BufferedReader br = new BufferedReader(new FileReader(path));
+            BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(path), "UTF-8"));
             String line = br.readLine();
             while(line != null){
                 if (line.startsWith("#error on lines:")) {