open-autonomous-connection/luaj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Allow expected test results to be read from zipfile.

Browse Source
This commit is contained in:
James Roseborough
2012-09-06 15:00:33 +00:00
parent d5ac153dca
commit 244a964af5
1 changed files with 60 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
test/junit/org/luaj/vm2/ScriptDrivenTest.java
View File

@@ -28,6 +28,8 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.io.PrintStream; import java.io.PrintStream;
import java.net.MalformedURLException;
import java.net.URL;
import junit.framework.TestCase; import junit.framework.TestCase;
@@ -138,6 +140,17 @@ public class ScriptDrivenTest extends TestCase {
private String getExpectedOutput(final String name) throws IOException, private String getExpectedOutput(final String name) throws IOException,
InterruptedException { InterruptedException {
String expectedOutput = loadFromFile(name);
if (expectedOutput == null)
expectedOutput = loadFromZipfile(name);
if (expectedOutput == null)
expectedOutput = executeLuaProcess(name);
if (expectedOutput == null)
throw new IOException("Failed to get comparison output for "+name);
return expectedOutput;
}
private String loadFromFile(String name) throws IOException {
String expectedOutputName = basedir+"/"+name+"-expected.out"; String expectedOutputName = basedir+"/"+name+"-expected.out";
File file = new File( expectedOutputName ); File file = new File( expectedOutputName );
if ( file.exists() ) { if ( file.exists() ) {
@@ -147,24 +160,57 @@ public class ScriptDrivenTest extends TestCase {
} finally { } finally {
is.close(); is.close();
} }
} else { }
file = new File(basedir+"/"+name+".lua"); return null;
if ( !file.exists() ) }
fail("Could not load script for test case: " + name);
InputStream script = new FileInputStream(file); private String loadFromZipfile(String name) throws IOException {
// } String zipfile = "luaj3.0-tests.zip";
try { try {
String luaCommand = System.getProperty("LUA_COMMAND"); URL zip = null;
if ( luaCommand == null ) zip = getClass().getResource(zipfile);
luaCommand = "lua"; if ( zip == null ) {
String[] args = new String[] { luaCommand, "-", platform.toString() }; File file = new File(basedir+"/"+zipfile);
return collectProcessOutput(args, script); try {
} finally { if ( file.exists() )
script.close(); zip = file.toURI().toURL();
} catch (MalformedURLException e) {
e.printStackTrace();
}
} }
if ( zip == null )
return null;
String jar = "jar:" + zip.toExternalForm()+ "!/";
String path = jar + name + ".out";
URL url = new URL(path);
InputStream is = url.openStream();
try {
return readString(is);
} finally {
is.close();
}
} catch (Exception e) {
return null;
} }
} }
private String executeLuaProcess(String name) throws IOException, InterruptedException {
File sourcefile = new File(basedir+"/"+name+".lua");
if ( !sourcefile.exists() )
throw new IOException("Failed to find source file "+sourcefile);
InputStream script = new FileInputStream(sourcefile);
try {
String luaCommand = System.getProperty("LUA_COMMAND");
if ( luaCommand == null )
luaCommand = "lua";
String[] args = new String[] { luaCommand, "-", platform.toString() };
return collectProcessOutput(args, script);
} finally {
script.close();
}
}
public static String collectProcessOutput(String[] cmd, final InputStream input) public static String collectProcessOutput(String[] cmd, final InputStream input)
throws IOException, InterruptedException { throws IOException, InterruptedException {
Runtime r = Runtime.getRuntime(); Runtime r = Runtime.getRuntime();