From: Sergey Bronnikov via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: Sergey Kaplun <skaplun@tarantool.org> Cc: Sergey Bronnikov <estetus@gmail.com>, max.kokryashkin@gmail.com, tarantool-patches@dev.tarantool.org Subject: Re: [Tarantool-patches] [PATCH luajit 1/2] test: introduce asserts assert_str{_not}_equal Date: Wed, 15 Nov 2023 12:32:36 +0300 [thread overview] Message-ID: <a6d3ed67-620a-4de3-a168-5bf107f272dd@tarantool.org> (raw) In-Reply-To: <ZVM17huLKyMS8SSe@root> Hello, Sergey On 11/14/23 11:55, Sergey Kaplun wrote: <snipped> > I'll proceed with the review here with the diff below: > >> index 462534be..8fad6407 100644 >> --- a/test/tarantool-c-tests/README.md >> +++ b/test/tarantool-c-tests/README.md >> @@ -35,6 +35,8 @@ glibc `assert()`: >> equal to the `b`. >> * `assert_double{_not}_equal(a, b)` -- check that two doubles are {not} >> **exactly** equal. >> +* `assert_str{_not}_equal(a, b)` -- check that `char *` variable `a` is {not} >> + equal to the `b`. >> >> ## Directives >> >> diff --git a/test/tarantool-c-tests/test.h b/test/tarantool-c-tests/test.h >> index 8b14c705..2f2d9ea2 100644 >> --- a/test/tarantool-c-tests/test.h >> +++ b/test/tarantool-c-tests/test.h >> @@ -13,8 +13,6 @@ >> * * Helpers assert macros: >> * - assert_uint_equal if needed >> * - assert_uint_not_equal if needed >> - * - assert_str_equal if needed >> - * - assert_str_not_equal if needed >> * - assert_memory_equal if needed >> * - assert_memory_not_equal if needed >> * * Pragmas. >> @@ -214,4 +212,18 @@ static inline int todo(const char *reason) >> ); \ >> } while (0) >> >> +#define assert_str_equal(got, expected, n) do { \ >> + assert_general(strncmp(got, expected, n) == 0, \ > Maybe it is better to just use `strcmp(got, expected)` instead? > We don't really care about the number of characters to check. > > Or we can use `strncmp(got, expected, strlen(expected))`, as the most > common case. > > This removes an additional argument, and the description in the > <README.md> and declaration here become the same. > >> + ASSERT_EQUAL_FMT(str, "%s"), \ >> + __FILE__, __LINE__, (got), (expected) \ >> + ); \ >> +} while (0) >> + >> +#define assert_str_not_equal(got, unexpected, n) do { \ >> + assert_general(strncmp(got, expected, n) != 0, \ > Ditto. Fixed by patch below: diff --git a/test/tarantool-c-tests/lj-881-fix-lua-concat.test.c b/test/tarantool-c-tests/lj-881-fix-lua-concat.test.c index 1835d273..f028c457 100644 --- a/test/tarantool-c-tests/lj-881-fix-lua-concat.test.c +++ b/test/tarantool-c-tests/lj-881-fix-lua-concat.test.c @@ -77,7 +77,7 @@ static int lua_concat_testcase(void *test_state) const char *str = lua_tostring(L, -1); assert_int_equal(lua_gettop(L), top - 2 + 1); const char expected_str[] = CONCAT("A + ", TEST_VALUE); - assert_str_equal(str, expected_str, strlen(expected_str)); + assert_str_equal(str, expected_str); /* Teardown. */ lua_settop(L, 0); diff --git a/test/tarantool-c-tests/test.h b/test/tarantool-c-tests/test.h index 2f2d9ea2..5e5c96b2 100644 --- a/test/tarantool-c-tests/test.h +++ b/test/tarantool-c-tests/test.h @@ -212,15 +212,15 @@ static inline int todo(const char *reason) ); \ } while (0) -#define assert_str_equal(got, expected, n) do { \ - assert_general(strncmp(got, expected, n) == 0, \ +#define assert_str_equal(got, expected) do { \ + assert_general(strncmp(got, expected, strlen(expected)) == 0, \ ASSERT_EQUAL_FMT(str, "%s"), \ __FILE__, __LINE__, (got), (expected) \ ); \ } while (0) -#define assert_str_not_equal(got, unexpected, n) do { \ - assert_general(strncmp(got, expected, n) != 0, \ +#define assert_str_not_equal(got, unexpected) do { \ + assert_general(strncmp(got, expected, strlen(expected)) != 0, \ ASSERT_NOT_EQUAL_FMT(str, "%s"), \ __FILE__, __LINE__, (got), (unexpected) \ ); \ > >> + ASSERT_NOT_EQUAL_FMT(str, "%s"), \ >> + __FILE__, __LINE__, (got), (unexpected) \ >> + ); \ >> +} while (0) >> + >> #endif /* TARANTOOL_LUAJIT_TEST_H */
next prev parent reply other threads:[~2023-11-15 9:32 UTC|newest] Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <cover.1698775628.git.sergeyb@tarantool.org> 2023-09-26 6:56 ` [Tarantool-patches] [PATCH luajit] LJ_GC64: Fix lua_concat() Sergey Bronnikov via Tarantool-patches 2023-09-29 8:24 ` Maxim Kokryashkin via Tarantool-patches 2023-10-03 15:35 ` Sergey Bronnikov via Tarantool-patches 2023-10-04 10:48 ` Maxim Kokryashkin via Tarantool-patches 2023-10-06 13:51 ` Sergey Bronnikov via Tarantool-patches 2023-10-31 18:11 ` [Tarantool-patches] [PATCH luajit 1/2] test: introduce asserts assert_str{_not}_equal Sergey Bronnikov via Tarantool-patches 2023-11-01 7:40 ` Sergey Kaplun via Tarantool-patches 2023-11-01 8:28 ` Igor Munkin via Tarantool-patches 2023-11-10 11:41 ` Sergey Bronnikov via Tarantool-patches 2023-11-14 8:55 ` Sergey Kaplun via Tarantool-patches 2023-11-15 9:32 ` Sergey Bronnikov via Tarantool-patches [this message] 2023-11-16 8:02 ` Sergey Kaplun via Tarantool-patches 2023-11-18 16:40 ` Sergey Bronnikov via Tarantool-patches 2023-11-20 9:28 ` Sergey Kaplun via Tarantool-patches 2023-11-20 13:19 ` Igor Munkin via Tarantool-patches 2023-11-10 11:40 ` Sergey Bronnikov via Tarantool-patches 2023-11-23 6:31 ` [Tarantool-patches] [PATCH luajit] LJ_GC64: Fix lua_concat() Igor Munkin via Tarantool-patches
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=a6d3ed67-620a-4de3-a168-5bf107f272dd@tarantool.org \ --to=tarantool-patches@dev.tarantool.org \ --cc=estetus@gmail.com \ --cc=max.kokryashkin@gmail.com \ --cc=sergeyb@tarantool.org \ --cc=skaplun@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH luajit 1/2] test: introduce asserts assert_str{_not}_equal' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox