summaryrefslogtreecommitdiff
path: root/gtest/script
diff options
context:
space:
mode:
author“pengxuanzheng” <[email protected]>2022-06-24 09:01:28 +0000
committer“pengxuanzheng” <[email protected]>2022-06-24 09:07:56 +0000
commit626ea0318e338660c8e6dd5753f3a1a0c865be41 (patch)
tree7f4fe5a5d947cb374255accf3a112c687cccdbba /gtest/script
parentd229dcfa923d4ff7013c825fc4d2f2c4dbdb850a (diff)
✨ feat(TSG-11082): 运行脚本增加新的返回类型nilv1.1.0
Diffstat (limited to 'gtest/script')
-rw-r--r--gtest/script/handle_qqnum.lua10
-rw-r--r--gtest/script/handle_weixinnum.lua10
-rw-r--r--gtest/script/return_boolean_normal.lua4
-rw-r--r--gtest/script/return_boolean_normal.luajitbin109 -> 101 bytes
-rw-r--r--gtest/script/return_integer_normal.lua4
-rw-r--r--gtest/script/return_integer_normal.luajitbin109 -> 97 bytes
-rw-r--r--gtest/script/return_type_invaild.lua2
7 files changed, 15 insertions, 15 deletions
diff --git a/gtest/script/handle_qqnum.lua b/gtest/script/handle_qqnum.lua
index fc0d1a4..4994536 100644
--- a/gtest/script/handle_qqnum.lua
+++ b/gtest/script/handle_qqnum.lua
@@ -27,28 +27,28 @@ end
-- 命中特征"\0\0\0\0"
local _, _end = string.find(data, "\0\0\0\0")
if not _end then
- return 1, false
+ return false
end
-- 获取qqnum长度
local qqnum_len = string.byte(data, _end + 1)
if not qqnum_len then
- return 1,false
+ return false
end
locate = _end + 1
qqnum_len = qqnum_len - 4
-- 判断qqnum长度的合法性
if qqnum_len > 12 or qqnum_len > (data_len - locate) then
- return 1, false
+ return false
end
locate = locate + 1
-- 获取qqnum
local qqnum = string.sub(data, locate, locate + qqnum_len - 1)
if not qqnum then
- return 1, false
+ return false
end
-- 验证qqnum由全数字组成
if not tonumber(qqnum) then
- return 1, false
+ return false
end
return qqnum_len, qqnum
diff --git a/gtest/script/handle_weixinnum.lua b/gtest/script/handle_weixinnum.lua
index 1b8b448..e1b6db5 100644
--- a/gtest/script/handle_weixinnum.lua
+++ b/gtest/script/handle_weixinnum.lua
@@ -18,23 +18,23 @@ local locate = 0 -- 字符串中当前正在处理的位置
-- 查找字符串weixinnum位置
local _start, _end = string.find(data, feature)
if not _end then
- return 1, false
+ return false
end
-- 获取weixinnum数值字符串长度
-- weixinnum数值字符串长度不超过12,所以前三位必须为0
if ((string.byte(data, _end + 1) ~= 0) or (string.byte(data, _end + 2) ~=0 ) or (string.byte(data, _end + 3) ~= 0)) then
- return 1, false
+ return false
end
local weixinnum_len = string.byte(data, _end + offset)
if not weixinnum_len then
- return 1, false
+ return false
end
locate = _end + offset
-- 判断weixinnum数值字符串长度的合法性
if weixinnum_len > data_len - _end - offset or weixinnum_len > max_weixinnum_len then
- return 1, false
+ return false
end
-- 获取weixinnum数值字符串
@@ -43,5 +43,5 @@ local weixinnum = string.sub(data, locate + 1, locate + weixinnum_len)
if tonumber(weixinnum) then
return weixinnum_len, weixinnum
else
- return 1, false
+ return false
end
diff --git a/gtest/script/return_boolean_normal.lua b/gtest/script/return_boolean_normal.lua
index fbf1fbf..5856cc4 100644
--- a/gtest/script/return_boolean_normal.lua
+++ b/gtest/script/return_boolean_normal.lua
@@ -1,6 +1,6 @@
local str = TSG.data
local s_index, e_index = string.find(str, 'hello')
if s_index then
- return 1, true
-else return 1, false
+ return true
+else return false
end
diff --git a/gtest/script/return_boolean_normal.luajit b/gtest/script/return_boolean_normal.luajit
index 9bbbfbb..215e3f9 100644
--- a/gtest/script/return_boolean_normal.luajit
+++ b/gtest/script/return_boolean_normal.luajit
Binary files differ
diff --git a/gtest/script/return_integer_normal.lua b/gtest/script/return_integer_normal.lua
index ccb38fe..9c64643 100644
--- a/gtest/script/return_integer_normal.lua
+++ b/gtest/script/return_integer_normal.lua
@@ -1,7 +1,7 @@
local str = TSG.data
local s_index, e_index = string.find(str, 'world')
if s_index then
- return 8, s_index
+ return s_index
else
- return 1, false
+ return false
end
diff --git a/gtest/script/return_integer_normal.luajit b/gtest/script/return_integer_normal.luajit
index 3abd850..6dac219 100644
--- a/gtest/script/return_integer_normal.luajit
+++ b/gtest/script/return_integer_normal.luajit
Binary files differ
diff --git a/gtest/script/return_type_invaild.lua b/gtest/script/return_type_invaild.lua
index 2d4e33e..89fcb65 100644
--- a/gtest/script/return_type_invaild.lua
+++ b/gtest/script/return_type_invaild.lua
@@ -1,2 +1,2 @@
local str = "hello"
-return string.len(str), nil
+return string.len(str), nil