diff --git a/test/junit/org/luaj/vm2/compiler/AbstractUnitTests.java b/test/junit/org/luaj/vm2/compiler/AbstractUnitTests.java index 22f85c27..3219dcb4 100644 --- a/test/junit/org/luaj/vm2/compiler/AbstractUnitTests.java +++ b/test/junit/org/luaj/vm2/compiler/AbstractUnitTests.java @@ -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; } diff --git a/test/junit/org/luaj/vm2/vm1/Luajvm1CompatibilityTest.java b/test/junit/org/luaj/vm2/vm1/Luajvm1CompatibilityTest.java index 0430a4d3..84de6261 100644 --- a/test/junit/org/luaj/vm2/vm1/Luajvm1CompatibilityTest.java +++ b/test/junit/org/luaj/vm2/vm1/Luajvm1CompatibilityTest.java @@ -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);