ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-07 05:28:51 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #257 from dicej/windows

Browse Source 
Windows fixes
This commit is contained in:
Joshua Warner 2014-05-09 16:56:42 -06:00
commit 758909e15a
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
classpath/java/io/PrintStream.java
View File

@ -24,6 +24,17 @@ public class PrintStream extends OutputStream {
this.autoFlush = autoFlush;
}
public PrintStream(OutputStream out, boolean autoFlush, String encoding)
throws UnsupportedEncodingException
{
this.out = out;
this.autoFlush = autoFlush;
if (! (encoding.equals("UTF-8") || encoding.equals("ISO-8859-1"))) {
throw new UnsupportedEncodingException(encoding);
}
}
public PrintStream(OutputStream out) {
this(out, false);
}

2
makefile
View File

@ -1431,7 +1431,7 @@ class-name = $(patsubst $(1)/%.class,%,$(2))
class-names = $(foreach x,$(2),$(call class-name,$(1),$(x)))
test-flags = -Djava.library.path=$(build) \
-cp $(build)/test$(target-path-separator)$(build)/extra-dir
-cp '$(build)/test$(target-path-separator)$(build)/extra-dir'
test-args = $(test-flags) $(input)

9
test/Strings.java
View File

@ -199,7 +199,7 @@ public class Strings {
.equals("I enjoy grape nuts. do you? you do?"));
{ java.io.ByteArrayOutputStream bout = new java.io.ByteArrayOutputStream();
java.io.PrintStream pout = new java.io.PrintStream(bout);
java.io.PrintStream pout = new java.io.PrintStream(bout, true, "UTF-8");
String s = "I ♥ grape nuts";
System.out.println(s);
pout.println(s);
@ -207,17 +207,14 @@ public class Strings {
expect
(arraysEqual
(bout.toByteArray(),
(s + System.getProperty("line.separator")).getBytes()));
(s + System.getProperty("line.separator")).getBytes("UTF-8")));
// note that this effectively asserts that the VM's default
// charset is UTF-8. If we want to make this test more
// portable, we should specify the charset explicitly.
expect
(arraysEqual
(bout.toByteArray(), append
(new byte[] { 73, 32, -30, -103, -91, 32, 103, 114, 97, 112, 101,
32, 110, 117, 116, 115 },
System.getProperty("line.separator").getBytes())));
System.getProperty("line.separator").getBytes("UTF-8"))));
}
expect("abc".lastIndexOf('b', 100) == 1);