xxx

ligurio · ligurio · commit 9188875a6eea · 2025-05-30T13:48:50.000+03:00
diff --git a/tests/lapi/lib.lua b/tests/lapi/lib.lua
@@ -51,6 +51,8 @@ local MIN_INT64 = math.mininteger or -0x8000000000000000
 local MAX_INT =  0x7fffffff
 local MIN_INT = -0x80000000
 
+local MAX_STR_LEN = 4096
+
 local function bitwise_op(op_name)
     return function(...)
         local n = select("#", ...)
@@ -100,6 +102,7 @@ return {
     MIN_INT64 = MIN_INT64,
     MAX_INT = MAX_INT,
     MIN_INT = MIN_INT,
+    MAX_STR_LEN = MAX_STR_LEN,
 
     -- FDP.
     random_locale = random_locale,
diff --git a/tests/lapi/string_byte_test.lua b/tests/lapi/string_byte_test.lua
@@ -17,10 +17,10 @@ local test_lib = require("lib")
 local function TestOneInput(buf, _size)
     local fdp = luzer.FuzzedDataProvider(buf)
     os.setlocale(test_lib.random_locale(fdp), "all")
-    local max_len = fdp:consume_integer(0, test_lib.MAX_INT)
-    local str = fdp:consume_string(max_len)
+    local str = fdp:consume_string(test_lib.MAX_STR_LEN)
     local i = fdp:consume_integer(0, test_lib.MAX_INT)
     local j = fdp:consume_integer(0, test_lib.MAX_INT)
+    -- `string.byte()` is the same as `str:byte()`.
     assert(string.byte(str, i, j) == str:byte(i, j))
     local char_code = string.byte(str, i, j)
     if char_code then
diff --git a/tests/lapi/string_dump_test.lua b/tests/lapi/string_dump_test.lua
@@ -20,8 +20,7 @@ local test_lib = require("lib")
 local function TestOneInput(buf, _size)
     local fdp = luzer.FuzzedDataProvider(buf)
     os.setlocale(test_lib.random_locale(fdp), "all")
-    local max_len = fdp:consume_string(1, test_lib.MAX_INT)
-    local str = fdp:consume_string(1, max_len)
+    local str = fdp:consume_string(test_lib.MAX_STR_LEN)
     local strip = fdp:consume_boolean()
     local ok, func = pcall(loadstring, str)
     if not ok or func == nil then
diff --git a/tests/lapi/string_find_test.lua b/tests/lapi/string_find_test.lua
@@ -23,9 +23,8 @@ local test_lib = require("lib")
 local function TestOneInput(buf, _size)
     local fdp = luzer.FuzzedDataProvider(buf)
     os.setlocale(test_lib.random_locale(fdp), "all")
-    local max_len = fdp:consume_integer(0, test_lib.MAX_INT)
-    local str = fdp:consume_string(max_len)
-    local pattern = fdp:consume_string(max_len)
+    local str = fdp:consume_string(test_lib.MAX_STR_LEN)
+    local pattern = fdp:consume_string(test_lib.MAX_STR_LEN)
     local init = fdp:consume_integer(0, test_lib.MAX_INT)
     local plain = fdp:consume_boolean()
     -- Avoid errors like "malformed pattern (missing ']')".
diff --git a/tests/lapi/string_format_test.lua b/tests/lapi/string_format_test.lua
@@ -67,8 +67,7 @@ local function TestOneInput(buf, _size)
     local fdp = luzer.FuzzedDataProvider(buf)
     local spec = fdp:oneof(specifiers)
     local format_string = ("%%%s"):format(spec)
-    local max_len = fdp:consume_integer(1, 10000)
-    local str = fdp:consume_string(1, max_len)
+    local str = fdp:consume_string(test_lib.MAX_STR_LEN)
 
     os.setlocale(test_lib.random_locale(fdp), "all")
     local ok, res = pcall(string.format, format_string, str)
diff --git a/tests/lapi/string_gmatch_test.lua b/tests/lapi/string_gmatch_test.lua
@@ -21,9 +21,8 @@ local test_lib = require("lib")
 local function TestOneInput(buf, _size)
     local fdp = luzer.FuzzedDataProvider(buf)
     os.setlocale(test_lib.random_locale(fdp), "all")
-    local len = fdp:consume_integer(0, test_lib.MAX_INT)
-    local s = fdp:consume_string(len)
-    local pattern = fdp:consume_string(len)
+    local s = fdp:consume_string(test_lib.MAX_STR_LEN)
+    local pattern = fdp:consume_string(test_lib.MAX_STR_LEN)
     local init = fdp:consume_integer(0, test_lib.MAX_INT)
     string.gmatch(s, pattern, init)
 end
diff --git a/tests/lapi/string_gsub_test.lua b/tests/lapi/string_gsub_test.lua
@@ -23,10 +23,9 @@ local test_lib = require("lib")
 
 local function TestOneInput(buf, _size)
     local fdp = luzer.FuzzedDataProvider(buf)
-    local max_len = fdp:consume_string(0, test_lib.MAX_INT)
-    local str = fdp:consume_string(0, max_len)
-    local pattern = fdp:consume_string(0, max_len)
-    local repl = fdp:consume_string(0, max_len)
+    local str = fdp:consume_string(test_lib.MAX_STR_LEN)
+    local pattern = fdp:consume_string(test_lib.MAX_STR_LEN)
+    local repl = fdp:consume_string(test_lib.MAX_STR_LEN)
     local n = fdp:consume_integer(0, test_lib.MAX_INT)
 
     os.setlocale(test_lib.random_locale(fdp), "all")
diff --git a/tests/lapi/string_len_test.lua b/tests/lapi/string_len_test.lua
@@ -14,8 +14,7 @@ local test_lib = require("lib")
 local function TestOneInput(buf, _size)
     local fdp = luzer.FuzzedDataProvider(buf)
     os.setlocale(test_lib.random_locale(fdp), "all")
-    local str_len = fdp:consume_integer(0, test_lib.MAX_INT)
-    local str = fdp:consume_string(str_len)
+    local str = fdp:consume_string(test_lib.MAX_STR_LEN)
     assert(string.len(str) == #str)
 end
 
diff --git a/tests/lapi/string_lower_test.lua b/tests/lapi/string_lower_test.lua
@@ -14,9 +14,16 @@ local test_lib = require("lib")
 local function TestOneInput(buf, _)
     local fdp = luzer.FuzzedDataProvider(buf)
     os.setlocale(test_lib.random_locale(fdp), "all")
-    local ch_uppercase = string.char(fdp:consume_integer(65, 65 + 25))
+    local lower_bound = string.byte("A")
+    local upper_bound = string.byte("A") + 25
+    local ch_code = fdp:consume_integer(lower_bound, upper_bound)
+    local ch_uppercase = string.char(ch_code)
     local ch = string.upper(string.lower(ch_uppercase))
     assert(ch == ch_uppercase)
+
+    local str = fdp:consume_string(1, test_lib.MAX_STR_LEN)
+    local str_lowercase = str:lower()
+    assert(str_lowercase == str_lowercase:upper():lower())
 end
 
 local args = {
diff --git a/tests/lapi/string_match_test.lua b/tests/lapi/string_match_test.lua
@@ -14,9 +14,8 @@ local test_lib = require("lib")
 local function TestOneInput(buf, _size)
     local fdp = luzer.FuzzedDataProvider(buf)
     os.setlocale(test_lib.random_locale(fdp), "all")
-    local max_len = fdp:consume_integer(0, test_lib.MAX_INT)
-    local str = fdp:consume_string(max_len)
-    local pattern = fdp:consume_string(max_len)
+    local str = fdp:consume_string(test_lib.MAX_STR_LEN)
+    local pattern = fdp:consume_string(test_lib.MAX_STR_LEN)
     local init = fdp:consume_integer(0, test_lib.MAX_INT)
     -- Avoid errors like "malformed pattern (ends with '%')".
     local ok, res = pcall(string.match, str, pattern, init)
diff --git a/tests/lapi/string_pack_test.lua b/tests/lapi/string_pack_test.lua
@@ -11,8 +11,10 @@ Synopsis: string.pack(fmt, v1, v2, ...)
 local luzer = require("luzer")
 local test_lib = require("lib")
 
--- PUC Rio Lua only.
-if test_lib.lua_version() == "LuaJIT" then
+-- The function `string.pack()` is available since Lua 5.3.
+local _, version_major, version_minor = test_lib.lua_version()
+if version_major <= 5 and version_minor < 3 then
+    print("Unsupported version.")
     os.exit(0)
 end
 
@@ -24,7 +26,7 @@ local function TestOneInput(buf, _size)
         return -1
     end
     local n = fdp:consume_integer(1, test_lib.MAX_INT)
-    local values = fdp:consume_strings(test_lib.MAX_INT,  n)
+    local values = fdp:consume_strings(test_lib.MAX_STR_LEN,  n)
     string.pack(fmt_str, table.unpack(values))
 end
 
diff --git a/tests/lapi/string_packsize_test.lua b/tests/lapi/string_packsize_test.lua
@@ -11,16 +11,17 @@ Synopsis: string.packsize(fmt)
 local luzer = require("luzer")
 local test_lib = require("lib")
 
--- PUC Rio Lua only.
-if test_lib.lua_version() == "LuaJIT" then
+-- The function `string.packsize()` is available since Lua 5.3.
+local _, version_major, version_minor = test_lib.lua_version()
+if version_major <= 5 and version_minor < 3 then
+    print("Unsupported version.")
     os.exit(0)
 end
 
 local function TestOneInput(buf, _size)
     local fdp = luzer.FuzzedDataProvider(buf)
     os.setlocale(test_lib.random_locale(fdp), "all")
-    local max_len = fdp:consume_integer(0, test_lib.MAX_INT)
-    local fmt_str = fdp:consume_string(max_len)
+    local fmt_str = fdp:consume_string(test_lib.MAX_STR_LEN)
     -- Avoid errors like "invalid format option 'R'".
     local ok, _ = pcall(string.packsize, fmt_str)
     if not ok then
diff --git a/tests/lapi/string_rep_test.lua b/tests/lapi/string_rep_test.lua
@@ -17,11 +17,10 @@ local test_lib = require("lib")
 local function TestOneInput(buf, _size)
     local fdp = luzer.FuzzedDataProvider(buf)
     os.setlocale(test_lib.random_locale(fdp), "all")
-    local max_len = fdp:consume_integer(0, test_lib.MAX_INT)
     -- Huge length leads to slow units.
-    local n = fdp:consume_integer(0, 32768)
-    local s = fdp:consume_string(0, max_len)
-    local sep = fdp:consume_string(0, max_len)
+    local n = fdp:consume_integer(0, test_lib.MAX_STR_LEN)
+    local s = fdp:consume_string(test_lib.MAX_STR_LEN)
+    local sep = fdp:consume_string(test_lib.MAX_STR_LEN)
     local len = string.len(string.rep(s, n, sep))
     assert(len == #s * n + #sep * (n - 1))
 end
diff --git a/tests/lapi/string_reverse_test.lua b/tests/lapi/string_reverse_test.lua
@@ -17,8 +17,7 @@ local test_lib = require("lib")
 local function TestOneInput(buf, _size)
     local fdp = luzer.FuzzedDataProvider(buf)
     os.setlocale(test_lib.random_locale(fdp), "all")
-    local max_len = fdp:consume_integer(1, test_lib.MAX_INT)
-    local str = fdp:consume_string(max_len)
+    local str = fdp:consume_string(test_lib.MAX_STR_LEN)
     assert(string.reverse(string.reverse(str)) == str)
 end
 
diff --git a/tests/lapi/string_sub_test.lua b/tests/lapi/string_sub_test.lua
@@ -14,13 +14,12 @@ local test_lib = require("lib")
 local function TestOneInput(buf, _size)
     local fdp = luzer.FuzzedDataProvider(buf)
     os.setlocale(test_lib.random_locale(fdp), "all")
-    local str_len = fdp:consume_integer(0, test_lib.MAX_INT)
-    local str = fdp:consume_string(str_len)
-    string.find(str, str_len)
-    -- FIXME
-    -- local pattern_len = fdp:consume_number(1, math.huge)
-    -- local pattern = fdp:consume_string(pattern_len)
-    -- string.sub(str, string.find(str, pattern))
+    local str_len = test_lib.MAX_STR_LEN
+    local middle_str = fdp:consume_string(str_len)
+    local left_str = fdp:consume_string(str_len)
+    local right_str = fdp:consume_string(str_len)
+    local str = left_str .. middle_str .. right_str
+    assert(middle_str == string.sub(str, #left_str + 1, #left_str + #middle_str))
 end
 
 local args = {
diff --git a/tests/lapi/string_unpack_test.lua b/tests/lapi/string_unpack_test.lua
@@ -11,17 +11,19 @@ Synopsis: string.unpack(fmt, s [, pos])
 local luzer = require("luzer")
 local test_lib = require("lib")
 
--- PUC Rio Lua only.
-if test_lib.lua_version() == "LuaJIT" then
+-- The function `string.unpack()` is available since Lua 5.3.
+local _, version_major, version_minor = test_lib.lua_version()
+if version_major <= 5 and version_minor < 3 then
+    print("Unsupported version.")
     os.exit(0)
 end
 
 local function TestOneInput(buf, _size)
     local fdp = luzer.FuzzedDataProvider(buf)
     os.setlocale(test_lib.random_locale(fdp), "all")
-    local str = fdp:consume_string(1, test_lib.MAX_INT)
-    local fmt_str = fdp:consume_string(1, test_lib.MAX_INT)
-    local pos = fdp:consume_integer(1, test_lib.MAX_INT)
+    local str = fdp:consume_string(1, test_lib.MAX_STR_LEN)
+    local fmt_str = fdp:consume_string(1, test_lib.MAX_STR_LEN)
+    local pos = fdp:consume_integer(0, test_lib.MAX_INT)
 
     local ok, _ = pcall(string.unpack, fmt_str, str, pos)
     if not ok then
diff --git a/tests/lapi/string_upper_test.lua b/tests/lapi/string_upper_test.lua
@@ -14,9 +14,25 @@ local test_lib = require("lib")
 local function TestOneInput(buf, _size)
     local fdp = luzer.FuzzedDataProvider(buf)
     os.setlocale(test_lib.random_locale(fdp), "all")
-    local str = fdp:consume_string(1, test_lib.MAX_INT)
-    local str_lowercase = str:lower()
-    assert(str_lowercase == str_lowercase:upper():lower())
+    local A_code = string.byte("A")
+    local a_code = string.byte("a")
+    local str = fdp:consume_string(1, test_lib.MAX_STR_LEN)
+    local letter_indices = {}
+    for i = 1, #str do
+        local code = string.byte(string.sub(str, i, i))
+        if code >= A_code and
+           code >= a_code and
+           code <= a_code + 25 and
+           code <= A_code + 25 then
+            table.insert(letter_indices, i)
+        end
+    end
+
+    local str_uppercase = str:upper()
+    for _, i in ipairs(letter_indices) do
+        local code = string.byte(string.sub(str_uppercase, i, i))
+        assert(code >= A_code and code <= A_code + 25)
+    end
 end
 
 local args = {
