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

Improve test file finding.

Browse Source
This commit is contained in:
James Roseborough
2010-07-20 16:28:25 +00:00
parent c537e5b124
commit b806a23bc3
2 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
test/junit/org/luaj/vm2/compiler/AbstractUnitTests.java
View File

@@ -2,9 +2,11 @@ package org.luaj.vm2.compiler;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintStream;
import java.net.MalformedURLException;
import java.net.URL;
import junit.framework.TestCase;
@@ -22,7 +24,19 @@ abstract public class AbstractUnitTests extends TestCase {
private LuaTable _G;
public AbstractUnitTests(String zipfile, String dir) {
URL zip = getClass().getResource(zipfile);
URL zip = null;
zip = getClass().getResource(zipfile);
if ( zip == null ) {
File file = new File("test/junit/org/luaj/vm2/compiler/"+zipfile);
try {
if ( file.exists() )
zip = file.toURI().toURL();
} catch (MalformedURLException e) {
e.printStackTrace();
}
}
if ( zip == null )
throw new RuntimeException("not found: "+zipfile);
this.jar = "jar:" + zip.toExternalForm()+ "!/";
this.dir = dir;
}

16
test/junit/org/luaj/vm2/vm1/Luajvm1CompatibilityTest.java
View File

@@ -27,6 +27,7 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintStream;
import java.net.MalformedURLException;
import java.net.URL;
import junit.framework.TestCase;
@@ -35,7 +36,6 @@ import org.luaj.vm2.LuaTable;
import org.luaj.vm2.LuaThread;
import org.luaj.vm2.LuaValue;
import org.luaj.vm2.ScriptDrivenTest;
import org.luaj.vm2.Varargs;
/**
* Test for compatiblity between luaj 1.0 and 2.0.
@@ -51,7 +51,19 @@ public class Luajvm1CompatibilityTest extends TestCase {
protected void runTest(String test) {
try {
URL zip = getClass().getResource(zipfile);
URL zip = null;
zip = getClass().getResource(zipfile);
if ( zip == null ) {
File file = new File("test/junit/org/luaj/vm2/vm1/"+zipfile);
try {
if ( file.exists() )
zip = file.toURI().toURL();
} catch (MalformedURLException e) {
e.printStackTrace();
}
}
if ( zip == null )
throw new RuntimeException("not found: "+zipfile);
jarpath = "jar:"+zip.toExternalForm()+"!/";
String lua = luaRun(test);
String luaj20 = luaj20Run(test);