TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-09-14 07:17:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixed some windows build issues

Browse Source
This commit is contained in:
hneemann 2019-07-12 11:02:18 +02:00
parent 7d4c14d254
commit 84e1962641
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/test/java/de/neemann/digital/core/memory/DataFieldTest.java
View File

@ -62,7 +62,7 @@ public class DataFieldTest extends TestCase {
"7\n" + "7\n" +
"8\n" + "8\n" +
"9\n" + "9\n" +
"a\n", w.toString()); "a\n", w.toString().replace("\r",""));
} }
public void testSaveEmpty() throws IOException { public void testSaveEmpty() throws IOException {
@ -71,7 +71,7 @@ public class DataFieldTest extends TestCase {
StringWriter w = new StringWriter(); StringWriter w = new StringWriter();
data.saveTo(w); data.saveTo(w);
assertEquals("v2.0 raw\n", w.toString()); assertEquals("v2.0 raw\n", w.toString().replace("\r",""));
} }
public void testSaveRLE() throws IOException { public void testSaveRLE() throws IOException {
@ -97,7 +97,7 @@ public class DataFieldTest extends TestCase {
"7*6\n" + "7*6\n" +
"8*7\n" + "8*7\n" +
"9*8\n" + "9*8\n" +
"10*9\n", w.toString()); "10*9\n", w.toString().replace("\r",""));
DataField readData = new DataField(100); DataField readData = new DataField(100);
LogisimReader r = new LogisimReader(new StringReader(w.toString())); LogisimReader r = new LogisimReader(new StringReader(w.toString()));

1
src/test/java/de/neemann/digital/integration/Resources.java
View File

@ -6,6 +6,7 @@
package de.neemann.digital.integration; package de.neemann.digital.integration;
import java.io.File; import java.io.File;
import java.net.URISyntaxException;
/** /**
*/ */

4
src/test/java/de/neemann/digital/toolchain/ConfigurationTest.java
View File

@ -100,7 +100,7 @@ public class ConfigurationTest extends TestCase {
assertEquals(4, fileWriter.files.size()); assertEquals(4, fileWriter.files.size());
assertEquals("deal with {?=path?}", fileWriter.files.get("z/file1").toString()); 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()); assertEquals("test", fileWriter.files.get("z/test.z").toString());
} }
@ -112,7 +112,7 @@ public class ConfigurationTest extends TestCase {
@Override @Override
public OutputStream getOutputStream(File filename) { public OutputStream getOutputStream(File filename) {
final ByteArrayOutputStream baos = new ByteArrayOutputStream(); final ByteArrayOutputStream baos = new ByteArrayOutputStream();
files.put(filename.getPath(), baos); files.put(filename.getPath().replace('\\', '/'), baos);
return baos; return baos;
} }