Improve error tests

src/core/org/luaj/vm2/lib/BaseLib.java

@@ -200,7 +200,7 @@ public class BaseLib extends OneArgFunction implements ResourceFinder {
 			switch ( opcode ) {
 			case 0: // "assert", // ( v [,message] ) -> v, message | ERR
 				if ( !args.arg1().toboolean() ) 
-					error( args.narg()>1? args.checkjstring(2): "assertion failed!" );
+					error( args.narg()>1? args.optjstring(2,"assertion failed!"): "assertion failed!" );
 				return args;
 			case 1: // "dofile", // ( filename ) -> result1, ...
 			{

test/junit/org/luaj/vm2/ErrorsTest.java

@@ -21,6 +21,7 @@
  ******************************************************************************/
 package org.luaj.vm2;
 
+import org.luaj.vm2.lib.PackageLib;
 import org.luaj.vm2.compiler.LuaC;
 
 
@@ -33,7 +34,7 @@ import org.luaj.vm2.compiler.LuaC;
 public class ErrorsTest extends ScriptDrivenTest {
 
 	private static final String dir = "test/lua/errors";
-	
+
 	public ErrorsTest() {
 		super(ScriptDrivenTest.PlatformType.JSE, dir);
 	}

test/lua/errors/args.lua

@@ -75,7 +75,7 @@ local pretty = {
 
 local function values(list)
 	local t = {}
-	for i=1,#list do
+	for i=1,(list.n or #list) do
 		local ai = list[i]
 		local fi = pretty[type(ai)]
 		t[i] = fi and fi(ai) or tostring(ai)
@@ -85,7 +85,7 @@ end
 
 local function types(list)
 	local t = {}
-	for i=1,#list do
+	for i=1,(list.n or #list) do
 		local ai = list[i]
 		t[i] = type(ai)
 	end
@@ -98,7 +98,7 @@ end
 
 local function dup(t)
 	local s = {}
-	for i=1,#t do
+	for i=1,(t.n or #t) do
 		s[i] = t[i]
 	end
 	return s
@@ -106,7 +106,7 @@ end
 
 local function split(t)
 	local s = {}
-	local n = #t
+	local n = (t.n or #t)
 	for i=1,n-1 do
 		s[i] = t[i]
 	end
@@ -116,13 +116,13 @@ end
 local function expand(argsets, typesets, ...)	
 	local n = typesets and #typesets or 0
 	if n <= 0 then
-		table.insert(argsets,{...})
+		table.insert(argsets,arg)
 		return argsets
 	end
 
 	local s,v = split(typesets)
-	for i=1,#v do
+	for i=1,(v.n or #v) do
-		expand(argsets, s, v[i], ...)
+		expand(argsets, s, v[i], unpack(arg,1,arg.n))
 	end
 	return argsets
 end
@@ -140,12 +140,7 @@ end
 local function invoke( name, arglist )
 	local s,c = pcall(lookup, name)
 	if not s then return s,c end
-	local f = function(...)
+	return pcall(c, unpack(arglist,1,arglist.n or #arglist))
-		local u = unpack
-		local t = { c(...) }
-		return u(t)
-	end
-	return pcall(f, unpack(arglist))
 end
 
 -- messages, banners

test/lua/errors/baselibargs.lua

@@ -1,4 +1,4 @@
-package.path = "?.lua;src/test/errors/?.lua"
+package.path = "?.lua;test/lua/errors/?.lua"
 require 'args'
 
 -- arg types for basic library functions
@@ -6,8 +6,8 @@ require 'args'
 -- assert
 banner('assert')
 checkallpass('assert',{{true,123},anylua})
-checkallerrors('assert',{{nil,false},{nil}},'assertion failed')
+checkallerrors('assert',{{nil,false,n=2},{nil,n=1}},'assertion failed')
-checkallerrors('assert',{{nil,false},{'message'}},'message')
+checkallerrors('assert',{{nil,false,n=2},{'message'}},'message')
 
 -- collectgarbage
 banner('collectgarbage')
@@ -17,7 +17,7 @@ checkallerrors('collectgarbage',{notanil},'bad argument #1')
 -- dofile
 banner('dofile')
 checkallpass('dofile', {})
-checkallpass('dofile', {{'src/test/errors/args.lua'}})
+checkallpass('dofile', {{'test/lua/errors/args.lua'}})
 checkallerrors('dofile', {{'args.lua'}}, 'cannot open args.lua')
 checkallerrors('dofile', {nonstring}, 'bad argument #1')
 
@@ -51,7 +51,7 @@ checkallerrors('load', {somefunction,{afunction,atable}}, 'bad argument #2')
 banner('loadfile')
 checkallpass('loadfile', {})
 checkallpass('loadfile', {{'bogus'}})
-checkallpass('loadfile', {{'src/test/errors/args.lua'}})
+checkallpass('loadfile', {{'test/lua/errors/args.lua'}})
 checkallpass('loadfile', {{'args.lua'}})
 checkallerrors('loadfile', {nonstring}, 'bad argument #1')
 

test/lua/errors/coroutinelibargs.lua

@@ -1,4 +1,4 @@
-package.path = "?.lua;src/test/errors/?.lua"
+package.path = "?.lua;test/lua/errors/?.lua"
 require 'args'
 
 -- arg type tests for coroutine library functions

test/lua/errors/iolibargs.lua

@@ -1,4 +1,4 @@
-package.path = "?.lua;src/test/errors/?.lua"
+package.path = "?.lua;test/lua/errors/?.lua"
 require 'args'
 
 -- arg type tests for io library functions

test/lua/errors/mathlibargs.lua

@@ -1,4 +1,4 @@
-package.path = "?.lua;src/test/errors/?.lua"
+package.path = "?.lua;test/lua/errors/?.lua"
 require 'args'
 
 -- arg type tests for math library functions

test/lua/errors/modulelibargs.lua

@@ -1,4 +1,4 @@
-package.path = "?.lua;src/test/errors/?.lua"
+package.path = "?.lua;test/lua/errors/?.lua"
 require 'args'
 
 -- arg type tests for module library functions

test/lua/errors/operators.lua

@@ -1,4 +1,4 @@
-package.path = "?.lua;src/test/errors/?.lua"
+package.path = "?.lua;test/lua/errors/?.lua"
 require 'args'
 
 -- arg types for language operator

test/lua/errors/stringlibargs.lua

@@ -1,4 +1,4 @@
-package.path = "?.lua;src/test/errors/?.lua"
+package.path = "?.lua;test/lua/errors/?.lua"
 require 'args'
 
 -- arg type tests for string library functions

test/lua/errors/tablelibargs.lua

@@ -1,4 +1,4 @@
-package.path = "?.lua;src/test/errors/?.lua"
+package.path = "?.lua;test/lua/errors/?.lua"
 require 'args'
 
 -- arg type tests for table library functions