From 84e1962641e0ec98e320a0faeac9fea764aadc8e Mon Sep 17 00:00:00 2001
From: hneemann <helmut.neemann@arcor.de>
Date: Fri, 12 Jul 2019 11:02:18 +0200
Subject: [PATCH] fixed some windows build issues

---
 .../java/de/neemann/digital/core/memory/DataFieldTest.java  | 6 +++---
 src/test/java/de/neemann/digital/integration/Resources.java | 1 +
 .../de/neemann/digital/toolchain/ConfigurationTest.java     | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/test/java/de/neemann/digital/core/memory/DataFieldTest.java b/src/test/java/de/neemann/digital/core/memory/DataFieldTest.java
index f5607cb27..07bdab840 100644
--- a/src/test/java/de/neemann/digital/core/memory/DataFieldTest.java
+++ b/src/test/java/de/neemann/digital/core/memory/DataFieldTest.java
@@ -62,7 +62,7 @@ public class DataFieldTest extends TestCase {
                 "7\n" +
                 "8\n" +
                 "9\n" +
-                "a\n", w.toString());
+                "a\n", w.toString().replace("\r",""));
     }
 
     public void testSaveEmpty() throws IOException {
@@ -71,7 +71,7 @@ public class DataFieldTest extends TestCase {
         StringWriter w = new StringWriter();
         data.saveTo(w);
 
-        assertEquals("v2.0 raw\n", w.toString());
+        assertEquals("v2.0 raw\n", w.toString().replace("\r",""));
     }
 
     public void testSaveRLE() throws IOException {
@@ -97,7 +97,7 @@ public class DataFieldTest extends TestCase {
                 "7*6\n" +
                 "8*7\n" +
                 "9*8\n" +
-                "10*9\n", w.toString());
+                "10*9\n", w.toString().replace("\r",""));
 
         DataField readData = new DataField(100);
         LogisimReader r = new LogisimReader(new StringReader(w.toString()));
diff --git a/src/test/java/de/neemann/digital/integration/Resources.java b/src/test/java/de/neemann/digital/integration/Resources.java
index c71c9b61d..46ed5d6c4 100644
--- a/src/test/java/de/neemann/digital/integration/Resources.java
+++ b/src/test/java/de/neemann/digital/integration/Resources.java
@@ -6,6 +6,7 @@
 package de.neemann.digital.integration;
 
 import java.io.File;
+import java.net.URISyntaxException;
 
 /**
  */
diff --git a/src/test/java/de/neemann/digital/toolchain/ConfigurationTest.java b/src/test/java/de/neemann/digital/toolchain/ConfigurationTest.java
index 2ff0cea62..7d52cad52 100644
--- a/src/test/java/de/neemann/digital/toolchain/ConfigurationTest.java
+++ b/src/test/java/de/neemann/digital/toolchain/ConfigurationTest.java
@@ -100,7 +100,7 @@ public class ConfigurationTest extends TestCase {
 
         assertEquals(4, fileWriter.files.size());
         assertEquals("deal with {?=path?}", fileWriter.files.get("z/file1").toString());
-        assertEquals("deal with z/test.dig, Bits: 1 (A)", fileWriter.files.get("z/file2").toString());
+        assertEquals("deal with z/test.dig, Bits: 1 (A)", fileWriter.files.get("z/file2").toString().replace('\\', '/'));
         assertEquals("test", fileWriter.files.get("z/test.z").toString());
     }
 
@@ -112,7 +112,7 @@ public class ConfigurationTest extends TestCase {
         @Override
         public OutputStream getOutputStream(File filename) {
             final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            files.put(filename.getPath(), baos);
+            files.put(filename.getPath().replace('\\', '/'), baos);
             return baos;
         }