diff options
| author | OpportunityLiu <[email protected]> | 2019-07-17 12:59:26 +0800 |
|---|---|---|
| committer | OpportunityLiu <[email protected]> | 2019-07-17 12:59:26 +0800 |
| commit | 09f10b74034b040a6cb56640cd2c2f1027051b50 (patch) | |
| tree | 732500a47d61a02cf333c3fa043e07ff1eeb989d | |
| parent | aaa64a03788b8403c4e7b223ae3682d8d048280e (diff) | |
add tests
| -rw-r--r-- | core/src/xmake/string/trim.c | 10 | ||||
| -rw-r--r-- | tests/modules/string/test.lua | 15 |
2 files changed, 20 insertions, 5 deletions
diff --git a/core/src/xmake/string/trim.c b/core/src/xmake/string/trim.c index b2e1fa4f5..1c03e999a 100644 --- a/core/src/xmake/string/trim.c +++ b/core/src/xmake/string/trim.c @@ -22,8 +22,8 @@ /* ////////////////////////////////////////////////////////////////////////////////////// * trace */ -#define TB_TRACE_MODULE_NAME "trim" -#define TB_TRACE_MODULE_DEBUG (0) +#define TB_TRACE_MODULE_NAME "trim" +#define TB_TRACE_MODULE_DEBUG (0) /* ////////////////////////////////////////////////////////////////////////////////////// * includes @@ -34,7 +34,7 @@ * privates */ -static tb_void_t xm_string_trim_space(tb_char_t const** psstr, tb_char_t const** pestr, tb_int64_t mode) +static tb_void_t xm_string_trim_space(tb_char_t const** psstr, tb_char_t const** pestr, tb_int_t mode) { // check tb_assert(psstr && pestr && *psstr && *pestr); @@ -111,7 +111,7 @@ tb_int_t xm_string_trim(lua_State* lua) tb_char_t const* sstr = luaL_checklstring(lua, 1, &lstr); tb_char_t const* estr = sstr + lstr; tb_char_t const* trimchars = luaL_optlstring(lua, 2, "", <rim); - tb_int64_t const trimtype = (tb_int64_t)luaL_optinteger(lua, 3, 0); + tb_int_t const trimtype = (tb_int_t)luaL_optinteger(lua, 3, 0); do { tb_assert_and_check_break(sstr && trimchars); @@ -136,7 +136,7 @@ tb_int_t xm_string_trim(lua_State* lua) lua_pushlstring(lua, sstr, estr - sstr); return 1; - } while (tb_false); + } while (0); // return orignal value lua_settop(lua, 1); diff --git a/tests/modules/string/test.lua b/tests/modules/string/test.lua index fbbadde08..538dfd893 100644 --- a/tests/modules/string/test.lua +++ b/tests/modules/string/test.lua @@ -14,27 +14,42 @@ function test_startswith(t) end function test_trim(t) + t:are_equal((""):trim(), "") + t:are_equal((" "):trim(), "") + t:are_equal((""):trim(""), "") + t:are_equal((" "):trim(""), "") t:are_equal((" aaa ccc "):trim(), "aaa ccc") t:are_equal(("aaa ccc "):trim(), "aaa ccc") t:are_equal((" aaa ccc"):trim(), "aaa ccc") t:are_equal(("aaa ccc"):trim(), "aaa ccc") t:are_equal(("\t\naaa ccc\r\n"):trim(), "aaa ccc") + t:are_equal(("aba"):trim("a"), "b") end function test_ltrim(t) + t:are_equal((""):ltrim(), "") + t:are_equal((" "):ltrim(), "") + t:are_equal((""):ltrim(""), "") + t:are_equal((" "):ltrim(""), "") t:are_equal((" aaa ccc "):ltrim(), "aaa ccc ") t:are_equal(("aaa ccc "):ltrim(), "aaa ccc ") t:are_equal((" aaa ccc"):ltrim(), "aaa ccc") t:are_equal(("aaa ccc"):ltrim(), "aaa ccc") t:are_equal(("\t\naaa ccc\r\n"):ltrim(), "aaa ccc\r\n") + t:are_equal(("aba"):ltrim("a"), "ba") end function test_rtrim(t) + t:are_equal((""):rtrim(), "") + t:are_equal((" "):rtrim(), "") + t:are_equal((""):rtrim(""), "") + t:are_equal((" "):rtrim(""), "") t:are_equal((" aaa ccc "):rtrim(), " aaa ccc") t:are_equal(("aaa ccc "):rtrim(), "aaa ccc") t:are_equal((" aaa ccc"):rtrim(), " aaa ccc") t:are_equal(("aaa ccc"):rtrim(), "aaa ccc") t:are_equal(("\t\naaa ccc\r\n"):rtrim(), "\t\naaa ccc") + t:are_equal(("aba"):rtrim("a"), "ab") end function test_split(t) |