Change platform packages.

This commit is contained in:
James Roseborough
2010-07-30 18:09:31 +00:00
parent 6ca90b180a
commit 51e64c87cb
24 changed files with 50 additions and 36 deletions

View File

@@ -30,7 +30,7 @@ import org.luaj.vm2.LuaValue;
import org.luaj.vm2.Print;
import org.luaj.vm2.Prototype;
import org.luaj.vm2.compiler.LuaC;
import org.luaj.vm2.lib.JsePlatform;
import org.luaj.vm2.lib.jse.JsePlatform;
/** Test the plain old bytecode interpreter */
public class TestLuaJ {

View File

@@ -30,7 +30,7 @@ import java.util.Hashtable;
import org.luaj.vm2.LuaTable;
import org.luaj.vm2.LuaValue;
import org.luaj.vm2.Varargs;
import org.luaj.vm2.lib.JsePlatform;
import org.luaj.vm2.lib.jse.JsePlatform;
import org.luaj.vm2.luajc.LuaJC;
public class TestLuaJC {

View File

@@ -71,7 +71,7 @@ public class FragmentsTest extends TestSuite {
public void runFragment( Varargs expected, String script ) {
try {
String name = getName();
LuaTable _G = org.luaj.vm2.lib.JsePlatform.standardGlobals();
LuaTable _G = org.luaj.vm2.lib.jse.JsePlatform.standardGlobals();
InputStream is = new ByteArrayInputStream(script.getBytes("UTF-8"));
LuaValue chunk ;
switch ( TEST_TYPE ) {

View File

@@ -179,7 +179,7 @@ public class LuaOperationsTest extends TestCase {
public Prototype createPrototype( String script, String name ) {
try {
LuaTable _G = org.luaj.vm2.lib.JsePlatform.standardGlobals();
LuaTable _G = org.luaj.vm2.lib.jse.JsePlatform.standardGlobals();
InputStream is = new ByteArrayInputStream(script.getBytes("UTF-8"));
return LuaC.instance.compile(is, name);
} catch (Exception e) {
@@ -195,7 +195,7 @@ public class LuaOperationsTest extends TestCase {
// set up suitable environments for execution
LuaValue aaa = LuaValue.valueOf("aaa");
LuaValue eee = LuaValue.valueOf("eee");
LuaTable _G = org.luaj.vm2.lib.JsePlatform.standardGlobals();
LuaTable _G = org.luaj.vm2.lib.jse.JsePlatform.standardGlobals();
LuaTable newenv = LuaValue.tableOf( new LuaValue[] {
LuaValue.valueOf("a"), LuaValue.valueOf("aaa"),
LuaValue.valueOf("b"), LuaValue.valueOf("bbb"), } );

View File

@@ -2,9 +2,9 @@ package org.luaj.vm2;
import junit.framework.TestCase;
import org.luaj.vm2.lib.JsePlatform;
import org.luaj.vm2.lib.MathLib;
import org.luaj.vm2.lib.jse.JseMathLib;
import org.luaj.vm2.lib.jse.JsePlatform;
public class MathLibTest extends TestCase {

View File

@@ -2,7 +2,7 @@ package org.luaj.vm2;
import junit.framework.TestCase;
import org.luaj.vm2.lib.JsePlatform;
import org.luaj.vm2.lib.jse.JsePlatform;
import org.luaj.vm2.require.RequireSampleClassCastExcep;
import org.luaj.vm2.require.RequireSampleLoadLuaError;
import org.luaj.vm2.require.RequireSampleLoadRuntimeExcep;

View File

@@ -58,10 +58,10 @@ public class ScriptDrivenTest extends TestCase {
case JSE:
case LUAJIT:
case LUA2JAVA:
_G = org.luaj.vm2.lib.JsePlatform.debugGlobals();
_G = org.luaj.vm2.lib.jse.JsePlatform.debugGlobals();
break;
case JME:
_G = org.luaj.vm2.lib.JmePlatform.debugGlobals();
_G = org.luaj.vm2.lib.jme.JmePlatform.debugGlobals();
break;
}
}

View File

@@ -6,7 +6,7 @@ import java.io.UnsupportedEncodingException;
import junit.framework.TestCase;
import org.luaj.vm2.lib.JsePlatform;
import org.luaj.vm2.lib.jse.JsePlatform;
public class StringTest extends TestCase {

View File

@@ -15,7 +15,7 @@ import org.luaj.vm2.LoadState;
import org.luaj.vm2.LuaTable;
import org.luaj.vm2.Print;
import org.luaj.vm2.Prototype;
import org.luaj.vm2.lib.JsePlatform;
import org.luaj.vm2.lib.jse.JsePlatform;
abstract public class AbstractUnitTests extends TestCase {

View File

@@ -15,7 +15,7 @@ import org.luaj.vm2.LuaFunction;
import org.luaj.vm2.LuaTable;
import org.luaj.vm2.LuaValue;
import org.luaj.vm2.Prototype;
import org.luaj.vm2.lib.JsePlatform;
import org.luaj.vm2.lib.jse.JsePlatform;
public class DumpLoadEndianIntTest extends TestCase {

View File

@@ -10,7 +10,7 @@ import org.luaj.vm2.LuaFunction;
import org.luaj.vm2.LuaInteger;
import org.luaj.vm2.LuaTable;
import org.luaj.vm2.LuaValue;
import org.luaj.vm2.lib.JsePlatform;
import org.luaj.vm2.lib.jse.JsePlatform;
public class SimpleTests extends TestCase {

View File

@@ -10,7 +10,6 @@ import org.luaj.vm2.LuaUserdata;
import org.luaj.vm2.LuaValue;
import org.luaj.vm2.Varargs;
import org.luaj.vm2.compiler.LuaC;
import org.luaj.vm2.lib.JsePlatform;
public class LuaJavaCoercionTest extends TestCase {

View File

@@ -129,7 +129,7 @@ public class Luajvm1CompatibilityTest extends TestCase {
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
PrintStream printStream = new PrintStream( outputStream );
try {
org.luaj.vm2.LuaTable _G = org.luaj.vm2.lib.JsePlatform.debugGlobals();
org.luaj.vm2.LuaTable _G = org.luaj.vm2.lib.jse.JsePlatform.debugGlobals();
LuaThread.getRunning().setfenv(_G);
LuaValue loader = new org.luaj.vm2.lib.OneArgFunction(_G) {
public LuaValue call(LuaValue arg) {