diff options
| -rw-r--r-- | tests/test_utf8.lua | 1 | ||||
| -rw-r--r-- | tests/test_util_http.lua | 20 | ||||
| -rw-r--r-- | tests/test_util_multitable.lua | 2 | ||||
| -rw-r--r-- | tests/test_util_uuid.lua | 2 | ||||
| -rw-r--r-- | util/sql.lua | 4 |
5 files changed, 16 insertions, 13 deletions
diff --git a/tests/test_utf8.lua b/tests/test_utf8.lua index 481eff5d..db59a70f 100644 --- a/tests/test_utf8.lua +++ b/tests/test_utf8.lua @@ -11,7 +11,6 @@ function valid() if expect ~= "pass" and expect ~= "fail" then error("unknown expectation: "..line:match("^[^:]+")); end - local prefix, style = " ", valid_style; local valid = utf8.valid(data); assert_equal(valid, utf8.valid(data.." ")); assert_equal(valid, expect == "pass", line); diff --git a/tests/test_util_http.lua b/tests/test_util_http.lua index a195df6b..d9cc2779 100644 --- a/tests/test_util_http.lua +++ b/tests/test_util_http.lua @@ -25,13 +25,17 @@ function formencode(formencode) end function formdecode(formdecode) - local t = formdecode("one=1&two=2"); - assert_table(t[1]); - assert_equal(t[1].name, "one"); assert_equal(t[1].value, "1"); - assert_table(t[2]); - assert_equal(t[2].name, "two"); assert_equal(t[2].value, "2"); + do + local t = formdecode("one=1&two=2"); + assert_table(t[1]); + assert_equal(t[1].name, "one"); assert_equal(t[1].value, "1"); + assert_table(t[2]); + assert_equal(t[2].name, "two"); assert_equal(t[2].value, "2"); + end - local t = formdecode("one+two=1&two+one%26=2"); - assert_equal(t[1].name, "one two"); assert_equal(t[1].value, "1"); - assert_equal(t[2].name, "two one&"); assert_equal(t[2].value, "2"); + do + local t = formdecode("one+two=1&two+one%26=2"); + assert_equal(t[1].name, "one two"); assert_equal(t[1].value, "1"); + assert_equal(t[2].name, "two one&"); assert_equal(t[2].value, "2"); + end end diff --git a/tests/test_util_multitable.lua b/tests/test_util_multitable.lua index 4a8dd14c..45727bc3 100644 --- a/tests/test_util_multitable.lua +++ b/tests/test_util_multitable.lua @@ -27,7 +27,7 @@ function get(get, multitable) return true, "has-all"; end for n=1,select('#', ...) do should_have[select(n, ...)] = true; end - for n, item in ipairs(list) do + for _, item in ipairs(list) do if not should_have[item] then return false, "too-many"; end should_have[item] = nil; end diff --git a/tests/test_util_uuid.lua b/tests/test_util_uuid.lua index d3f72bb4..07d75025 100644 --- a/tests/test_util_uuid.lua +++ b/tests/test_util_uuid.lua @@ -13,7 +13,7 @@ local pattern = "^" .. table.concat({ }, "%-") .. "$"; function generate(generate) - for i = 1, 100 do + for _ = 1, 100 do assert_is(generate():match(pattern)); end end diff --git a/util/sql.lua b/util/sql.lua index 6fed1373..eb562eb2 100644 --- a/util/sql.lua +++ b/util/sql.lua @@ -49,7 +49,7 @@ end function table_mt:__tostring() local s = { 'name="'..self.__table__.name..'"' } - for i,col in ipairs(self.__table__) do + for _, col in ipairs(self.__table__) do s[#s+1] = tostring(col); end return 'Table{ '..t_concat(s, ", ")..' }' @@ -294,7 +294,7 @@ function engine:_create_table(table) end local success,err = self:execute(sql); if not success then return success,err; end - for i,v in ipairs(table.__table__) do + for _, v in ipairs(table.__table__) do if is_index(v) then self:_create_index(v); end |