From bb51e9d6e41efe08f6f053599bf31245ab116b77 Mon Sep 17 00:00:00 2001
From: Benoit Giannangeli <giann008@gmail.com>
Date: Tue, 11 Apr 2017 08:22:22 +0200
Subject: Use lua-tests fork

---
 tests/lua-tests  |   2 +-
 tests/lua.js     |  10 +-
 tests/single.lua | 374 -------------------------------------------------------
 3 files changed, 6 insertions(+), 380 deletions(-)
 delete mode 100644 tests/single.lua

(limited to 'tests')

diff --git a/tests/lua-tests b/tests/lua-tests
index 26eebb4..01eded4 160000
--- a/tests/lua-tests
+++ b/tests/lua-tests
@@ -1 +1 @@
-Subproject commit 26eebb47b6442996d89e298b99404cbf53468c4c
+Subproject commit 01eded4b34159a77f61b56c5567c74f169d3b1ea
diff --git a/tests/lua.js b/tests/lua.js
index 04b8250..43e82bc 100644
--- a/tests/lua.js
+++ b/tests/lua.js
@@ -7,12 +7,12 @@ const lauxlib  = require("../src/lauxlib.js");
 const lua      = require('../src/lua.js');
 const linit    = require('../src/linit.js');
 
-test('string.lua', function (t) {
+test('strings.lua', function (t) {
     let luaCode = `
-        return dofile("tests/single.lua")
+        return dofile("tests/lua-tests/strings.lua")
     `, L;
     
-    t.plan(1);
+    t.plan(2);
 
     t.doesNotThrow(function () {
 
@@ -24,10 +24,10 @@ test('string.lua', function (t) {
 
     }, "Lua program loaded without error");
 
-    // t.doesNotThrow(function () {
+    t.doesNotThrow(function () {
 
         lapi.lua_call(L, 0, -1);
 
-    // }, "Lua program ran without error");
+    }, "Lua program ran without error");
 
 });
diff --git a/tests/single.lua b/tests/single.lua
deleted file mode 100644
index fd06c3a..0000000
--- a/tests/single.lua
+++ /dev/null
@@ -1,374 +0,0 @@
--- $Id: strings.lua,v 1.86 2016/11/07 13:11:28 roberto Exp roberto $
--- See Copyright Notice in file all.lua
-
-print('testing strings and string library')
-
-local maxi, mini = math.maxinteger, math.mininteger
-
-
-local function checkerror (msg, f, ...)
-  local s, err = pcall(f, ...)
-  assert(not s and string.find(err, msg))
-end
-
-
--- testing string comparisons
-assert('alo' < 'alo1')
-assert('' < 'a')
-assert('alo\0alo' < 'alo\0b')
-assert('alo\0alo\0\0' > 'alo\0alo\0')
-assert('alo' < 'alo\0')
-assert('alo\0' > 'alo')
-assert('\0' < '\1')
-assert('\0\0' < '\0\1')
-assert('\1\0a\0a' <= '\1\0a\0a')
-assert(not ('\1\0a\0b' <= '\1\0a\0a'))
-assert('\0\0\0' < '\0\0\0\0')
-assert(not('\0\0\0\0' < '\0\0\0'))
-assert('\0\0\0' <= '\0\0\0\0')
-assert(not('\0\0\0\0' <= '\0\0\0'))
-assert('\0\0\0' <= '\0\0\0')
-assert('\0\0\0' >= '\0\0\0')
-assert(not ('\0\0b' < '\0\0a\0'))
-
--- testing string.sub
-assert(string.sub("123456789",2,4) == "234")
-assert(string.sub("123456789",7) == "789")
-assert(string.sub("123456789",7,6) == "")
-assert(string.sub("123456789",7,7) == "7")
-assert(string.sub("123456789",0,0) == "")
-assert(string.sub("123456789",-10,10) == "123456789")
-assert(string.sub("123456789",1,9) == "123456789")
-assert(string.sub("123456789",-10,-20) == "")
-assert(string.sub("123456789",-1) == "9")
-assert(string.sub("123456789",-4) == "6789")
-assert(string.sub("123456789",-6, -4) == "456")
-assert(string.sub("123456789", mini, -4) == "123456")
-assert(string.sub("123456789", mini, maxi) == "123456789")
-assert(string.sub("123456789", mini, mini) == "")
-assert(string.sub("\000123456789",3,5) == "234")
-assert(("\000123456789"):sub(8) == "789")
-
--- testing string.find
-assert(string.find("123456789", "345") == 3)
-a,b = string.find("123456789", "345")
-assert(string.sub("123456789", a, b) == "345")
-assert(string.find("1234567890123456789", "345", 3) == 3)
-assert(string.find("1234567890123456789", "345", 4) == 13)
-assert(string.find("1234567890123456789", "346", 4) == nil)
-assert(string.find("1234567890123456789", ".45", -9) == 13)
-assert(string.find("abcdefg", "\0", 5, 1) == nil)
-assert(string.find("", "") == 1)
-assert(string.find("", "", 1) == 1)
-assert(not string.find("", "", 2))
-assert(string.find('', 'aaa', 1) == nil)
-assert(('alo(.)alo'):find('(.)', 1, 1) == 4)
-
-assert(string.len("") == 0)
-assert(string.len("\0\0\0") == 3)
-assert(string.len("1234567890") == 10)
-
-assert(#"" == 0)
-assert(#"\0\0\0" == 3)
-assert(#"1234567890" == 10)
-
--- testing string.byte/string.char
-assert(string.byte("a") == 97)
-assert(string.byte("\xe4") > 127)
-assert(string.byte(string.char(255)) == 255)
-assert(string.byte(string.char(0)) == 0)
-assert(string.byte("\0") == 0)
-assert(string.byte("\0\0alo\0x", -1) == string.byte('x'))
-assert(string.byte("ba", 2) == 97)
-assert(string.byte("\n\n", 2, -1) == 10)
-assert(string.byte("\n\n", 2, 2) == 10)
-assert(string.byte("") == nil)
-assert(string.byte("hi", -3) == nil)
-assert(string.byte("hi", 3) == nil)
-assert(string.byte("hi", 9, 10) == nil)
-assert(string.byte("hi", 2, 1) == nil)
-assert(string.char() == "")
-assert(string.char(0, 255, 0) == "\0\255\0")
-assert(string.char(0, string.byte("\xe4"), 0) == "\0\xe4\0")
-assert(string.char(string.byte("\xe4l\0óu", 1, -1)) == "\xe4l\0óu")
-assert(string.char(string.byte("\xe4l\0óu", 1, 0)) == "")
-assert(string.char(string.byte("\xe4l\0óu", -10, 100)) == "\xe4l\0óu")
-
-assert(string.upper("ab\0c") == "AB\0C")
-assert(string.lower("\0ABCc%$") == "\0abcc%$")
-assert(string.rep('teste', 0) == '')
-assert(string.rep('tés\00tê', 2) == 'tés\0têtés\000tê')
-assert(string.rep('', 10) == '')
-
-if string.packsize("i") == 4 then
-  -- result length would be 2^31 (int overflow)
-  checkerror("too large", string.rep, 'aa', (1 << 30))
-  checkerror("too large", string.rep, 'a', (1 << 30), ',')
-end
-
--- repetitions with separator
-assert(string.rep('teste', 0, 'xuxu') == '')
-assert(string.rep('teste', 1, 'xuxu') == 'teste')
-assert(string.rep('\1\0\1', 2, '\0\0') == '\1\0\1\0\0\1\0\1')
-assert(string.rep('', 10, '.') == string.rep('.', 9))
-assert(not pcall(string.rep, "aa", maxi // 2 + 10))
-assert(not pcall(string.rep, "", maxi // 2 + 10, "aa"))
-
-assert(string.reverse"" == "")
-assert(string.reverse"\0\1\2\3" == "\3\2\1\0")
-assert(string.reverse"\0001234" == "4321\0")
-
-for i=0,30 do assert(string.len(string.rep('a', i)) == i) end
-
-assert(type(tostring(nil)) == 'string')
-assert(type(tostring(12)) == 'string')
-assert(string.find(tostring{}, 'table:'))
-assert(string.find(tostring(print), 'function:'))
-assert(#tostring('\0') == 1)
-assert(tostring(true) == "true")
-assert(tostring(false) == "false")
-assert(tostring(-1203) == "-1203")
-assert(tostring(1203.125) == "1203.125")
-assert(tostring(-0.5) == "-0.5")
-assert(tostring(-32767) == "-32767")
-if math.tointeger(2147483647) then   -- no overflow? (32 bits)
-  assert(tostring(-2147483647) == "-2147483647")
-end
-if math.tointeger(4611686018427387904) then   -- no overflow? (64 bits)
-  assert(tostring(4611686018427387904) == "4611686018427387904")
-  assert(tostring(-4611686018427387904) == "-4611686018427387904")
-end
-
-if tostring(0.0) == "0.0" then   -- "standard" coercion float->string
-  assert('' .. 12 == '12' and 12.0 .. '' == '12.0')
-  assert(tostring(-1203 + 0.0) == "-1203.0")
-else   -- compatible coercion
-  assert(tostring(0.0) == "0")
-  assert('' .. 12 == '12' and 12.0 .. '' == '12')
-  assert(tostring(-1203 + 0.0) == "-1203")
-end
-
-x = '"ílo"\n\\'
-assert(string.format('%q%s', x, x) == '"\\"ílo\\"\\\n\\\\""ílo"\n\\')
-assert(string.format('%q', "\0") == [["\0"]])
-assert(load(string.format('return %q', x))() == x)
-x = "\0\1\0023\5\0009"
-assert(load(string.format('return %q', x))() == x)
-assert(string.format("\0%c\0%c%x\0", string.byte("\xe4"), string.byte("b"), 140) ==
-              "\0\xe4\0b8c\0")
-assert(string.format('') == "")
-assert(string.format("%c",34)..string.format("%c",48)..string.format("%c",90)..string.format("%c",100) ==
-       string.format("%c%c%c%c", 34, 48, 90, 100))
-assert(string.format("%s\0 is not \0%s", 'not be', 'be') == 'not be\0 is not \0be')
-assert(string.format("%%%d %010d", 10, 23) == "%10 0000000023")
-assert(tonumber(string.format("%f", 10.3)) == 10.3)
-x = string.format('"%-50s"', 'a')
-assert(#x == 52)
-assert(string.sub(x, 1, 4) == '"a  ')
-
-assert(string.format("-%.20s.20s", string.rep("%", 2000)) ==
-                     "-"..string.rep("%", 20)..".20s")
-assert(string.format('"-%20s.20s"', string.rep("%", 2000)) ==
-       string.format("%q", "-"..string.rep("%", 2000)..".20s"))
-
-do
-  local function checkQ (v)
-    local s = string.format("%q", v)
-    local nv = load("return " .. s)()
-    assert(v == nv and math.type(v) == math.type(nv))
-  end
-  checkQ("\0\0\1\255\u{234}")
-  checkQ(math.maxinteger)
-  checkQ(math.mininteger)
-  checkQ(math.pi)
-  checkQ(0.1)
-  checkQ(true)
-  checkQ(nil)
-  checkQ(false)
-  checkerror("no literal", string.format, "%q", {})
-end
-
-assert(string.format("\0%s\0", "\0\0\1") == "\0\0\0\1\0")
-checkerror("contains zeros", string.format, "%10s", "\0")
-
--- format x tostring
-assert(string.format("%s %s", nil, true) == "nil true")
-assert(string.format("%s %.4s", false, true) == "false true")
-assert(string.format("%.3s %.3s", false, true) == "fal tru")
-local m = setmetatable({}, {__tostring = function () return "hello" end,
-                            __name = "hi"})
-assert(string.format("%s %.10s", m, m) == "hello hello")
-getmetatable(m).__tostring = nil   -- will use '__name' from now on
-assert(string.format("%.4s", m) == "hi: ")
-
-getmetatable(m).__tostring = function () return {} end
-checkerror("'__tostring' must return a string", tostring, m)
-
-assert(string.format("%x", 0.0) == "0")
-assert(string.format("%02x", 0.0) == "00")
-assert(string.format("%08X", 0xFFFFFFFF) == "FFFFFFFF")
-assert(string.format("%+08d", 31501) == "+0031501")
-assert(string.format("%+08d", -30927) == "-0030927")
-
-
--- TODO: when figured out number limit stuff
-
--- do    -- longest number that can be formatted
---   local i = 1
---   local j = 10000
---   while i + 1 < j do   -- binary search for maximum finite float
---     local m = (i + j) // 2
---     if 10^m < math.huge then i = m else j = m end
---   end
---   assert(10^i < math.huge and 10^j == math.huge)
---   local s = string.format('%.99f', -(10^i))
---   assert(string.len(s) >= i + 101)
---   assert(tonumber(s) == -(10^i))
--- end
-
-
--- -- testing large numbers for format
--- do   -- assume at least 32 bits
---   local max, min = 0x7fffffff, -0x80000000    -- "large" for 32 bits
---   assert(string.sub(string.format("%8x", -1), -8) == "ffffffff")
---   assert(string.format("%x", max) == "7fffffff")
---   assert(string.sub(string.format("%x", min), -8) == "80000000")
---   assert(string.format("%d", max) ==  "2147483647")
---   assert(string.format("%d", min) == "-2147483648")
---   assert(string.format("%u", 0xffffffff) == "4294967295")
---   assert(string.format("%o", 0xABCD) == "125715")
-
---   max, min = 0x7fffffffffffffff, -0x8000000000000000
---   if max > 2.0^53 then  -- only for 64 bits
---     assert(string.format("%x", (2^52 | 0) - 1) == "fffffffffffff")
---     assert(string.format("0x%8X", 0x8f000003) == "0x8F000003")
---     assert(string.format("%d", 2^53) == "9007199254740992")
---     assert(string.format("%i", -2^53) == "-9007199254740992")
---     assert(string.format("%x", max) == "7fffffffffffffff")
---     assert(string.format("%x", min) == "8000000000000000")
---     assert(string.format("%d", max) ==  "9223372036854775807")
---     assert(string.format("%d", min) == "-9223372036854775808")
---     assert(string.format("%u", ~(-1 << 64)) == "18446744073709551615")
---     assert(tostring(1234567890123) == '1234567890123')
---   end
--- end
-
-do print("testing 'format %a %A'")
-  local function matchhexa (n)
-    local s = string.format("%a", n)
-    -- result matches ISO C requirements
-    assert(string.find(s, "^%-?0x[1-9a-f]%.?[0-9a-f]*p[-+]?%d+$"))
-    assert(tonumber(s) == n)  -- and has full precision
-    s = string.format("%A", n)
-    assert(string.find(s, "^%-?0X[1-9A-F]%.?[0-9A-F]*P[-+]?%d+$"))
-    assert(tonumber(s) == n)
-  end
-  for _, n in ipairs{0.1, -0.1, 1/3, -1/3, 1e30, -1e30,
-                     -45/247, 1, -1, 2, -2, 3e-20, -3e-20} do
-    matchhexa(n)
-  end
-
-  assert(string.find(string.format("%A", 0.0), "^0X0%.?0?P%+?0$"))
-  assert(string.find(string.format("%a", -0.0), "^%-0x0%.?0?p%+?0$"))
-
-  if not _port then   -- test inf, -inf, NaN, and -0.0
-    assert(string.find(string.format("%a", 1/0), "^inf"))
-    assert(string.find(string.format("%A", -1/0), "^%-INF"))
-    assert(string.find(string.format("%a", 0/0), "^%-?nan"))
-    assert(string.find(string.format("%a", -0.0), "^%-0x0"))
-  end
-  
-  if not pcall(string.format, "%.3a", 0) then
-    (Message or print)("\n >>> modifiers for format '%a' not available <<<\n")
-  else
-    assert(string.find(string.format("%+.2A", 12), "^%+0X%x%.%x0P%+?%d$"))
-    assert(string.find(string.format("%.4A", -12), "^%-0X%x%.%x000P%+?%d$"))
-  end
-end
-
--- errors in format
-
-local function check (fmt, msg)
-  checkerror(msg, string.format, fmt, 10)
-end
-
-local aux = string.rep('0', 600)
-check("%100.3d", "too long")
-check("%1"..aux..".3d", "too long")
-check("%1.100d", "too long")
-check("%10.1"..aux.."004d", "too long")
-check("%t", "invalid option")
-check("%"..aux.."d", "repeated flags")
-check("%d %d", "no value")
-
-assert(load("return 1\n--comment without ending EOL")() == 1)
-
-checkerror("table expected", table.concat, 3)
-assert(table.concat{} == "")
-assert(table.concat({}, 'x') == "")
-assert(table.concat({'\0', '\0\1', '\0\1\2'}, '.\0.') == "\0.\0.\0\1.\0.\0\1\2")
-local a = {}; for i=1,300 do a[i] = "xuxu" end
-assert(table.concat(a, "123").."123" == string.rep("xuxu123", 300))
-assert(table.concat(a, "b", 20, 20) == "xuxu")
-assert(table.concat(a, "", 20, 21) == "xuxuxuxu")
-assert(table.concat(a, "x", 22, 21) == "")
-assert(table.concat(a, "3", 299) == "xuxu3xuxu")
-assert(table.concat({}, "x", maxi, maxi - 1) == "")
-assert(table.concat({}, "x", mini + 1, mini) == "")
-assert(table.concat({}, "x", maxi, mini) == "")
-assert(table.concat({[maxi] = "alo"}, "x", maxi, maxi) == "alo")
-assert(table.concat({[maxi] = "alo", [maxi - 1] = "y"}, "-", maxi - 1, maxi) == "y-alo")
-
-assert(not pcall(table.concat, {"a", "b", {}}))
-
-a = {"a","b","c"}
-assert(table.concat(a, ",", 1, 0) == "")
-assert(table.concat(a, ",", 1, 1) == "a")
-assert(table.concat(a, ",", 1, 2) == "a,b")
-assert(table.concat(a, ",", 2) == "b,c")
-assert(table.concat(a, ",", 3) == "c")
-assert(table.concat(a, ",", 4) == "")
-
--- TODO: when os.setlocale is implemented
-if false and not _port then
-
-  local locales = { "ptb", "pt_BR.iso88591", "ISO-8859-1" }
-  local function trylocale (w)
-    for i = 1, #locales do
-      if os.setlocale(locales[i], w) then
-        print(string.format("'%s' locale set to '%s'", w, locales[i]))
-        return locales[i]
-      end
-    end
-    print(string.format("'%s' locale not found", w))
-    return false
-  end
-
-  if trylocale("collate")  then
-    assert("alo" < "álo" and "álo" < "amo")
-  end
-
-  if trylocale("ctype") then
-    assert(string.gsub("áéíóú", "%a", "x") == "xxxxx")
-    assert(string.gsub("áÁéÉ", "%l", "x") == "xÁxÉ")
-    assert(string.gsub("áÁéÉ", "%u", "x") == "áxéx")
-    assert(string.upper"áÁé{xuxu}ção" == "ÁÁÉ{XUXU}ÇÃO")
-  end
-
-  os.setlocale("C")
-  assert(os.setlocale() == 'C')
-  assert(os.setlocale(nil, "numeric") == 'C')
-
-end
-
-
--- bug in Lua 5.3.2
--- 'gmatch' iterator does not work across coroutines
-do
-  local f = string.gmatch("1 2 3 4 5", "%d+")
-  assert(f() == "1")
-  co = coroutine.wrap(f)
-  assert(co() == "2")
-end
-
-print('OK')
-- 
cgit v1.2.3-54-g00ecf