Autoflush and encode written bytes in script contexts (fixes issue #20)

This commit is contained in:
James Roseborough
2014-03-09 17:59:25 +00:00
parent 736218d1f2
commit e9ee95fd58
2 changed files with 35 additions and 2 deletions

View File

@@ -106,7 +106,7 @@ public class LuajContext extends SimpleScriptContext implements ScriptContext {
@Override
public void setWriter(Writer writer) {
globals.STDOUT = writer != null?
new PrintStream(new WriterOutputStream(writer)):
new PrintStream(new WriterOutputStream(writer), true):
stdout;
}
@@ -116,7 +116,19 @@ public class LuajContext extends SimpleScriptContext implements ScriptContext {
this.w = w;
}
public void write(int b) throws IOException {
w.write(b);
w.write(new String(new byte[] {(byte)b}));
}
public void write(byte[] b, int o, int l) throws IOException {
w.write(new String(b, o, l));
}
public void write(byte[] b) throws IOException {
w.write(new String(b));
}
public void close() throws IOException {
w.close();
}
public void flush() throws IOException {
w.flush();
}
}

View File

@@ -51,6 +51,7 @@ public class ScriptEngineTests extends TestSuite {
suite.addTest( new TestSuite( DefaultBindingsTest.class, "Default Bindings" ) );
suite.addTest( new TestSuite( LuaJCBindingsTest.class, "LuaJC Bindings" ) );
suite.addTest( new TestSuite( UserContextTest.class, "User Context" ) );
suite.addTest( new TestSuite( WriterTest.class, "Writer" ) );
return suite;
}
@@ -282,4 +283,24 @@ public class ScriptEngineTests extends TestSuite {
assertEquals(5, b.get("z"));
}
}
public static class WriterTest extends TestCase {
protected ScriptEngine e;
protected Bindings b;
public void setUp() {
this.e = new ScriptEngineManager().getEngineByName("luaj");
this.b = e.getBindings(ScriptContext.ENGINE_SCOPE);
}
public void testWriter() throws ScriptException {
CharArrayWriter output = new CharArrayWriter();
CharArrayWriter errors = new CharArrayWriter();
e.getContext().setWriter(output);
e.getContext().setErrorWriter(errors);
e.eval("io.write( [[line]] )");
assertEquals("line", output.toString());
e.eval("io.write( [[ one\nline two\n]] )");
assertEquals("line one\nline two\n", output.toString());
output.reset();
}
}
}