From: Sergey Bronnikov via Tarantool-patches <tarantool-patches@dev.tarantool.org>
To: tarantool-patches@dev.tarantool.org,
Sergey Kaplun <skaplun@tarantool.org>,
max.kokryashkin@gmail.com
Subject: [Tarantool-patches] [PATCH luajit 1/2] test: introduce asserts assert_str{_not}_equal
Date: Tue, 31 Oct 2023 21:11:43 +0300 [thread overview]
Message-ID: <a860626525b4c5c6c82f1983d8ed9ffdb20a5a30.1698775628.git.sergeyb@tarantool.org> (raw)
In-Reply-To: <26636e3dcb8ade3bdc23d9544f9a7e2ffe4322b2.1695711374.git.sergeyb@tarantool.org>
From: Sergey Bronnikov <sergeyb@tarantool.org>
The patch follows up commit a0483bd214f2 ("test: introduce module for C
tests") and adds additional asserts suitable for comparing strings.
---
test/tarantool-c-tests/README.md | 2 ++
test/tarantool-c-tests/test.h | 17 +++++++++++++++--
2 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/test/tarantool-c-tests/README.md b/test/tarantool-c-tests/README.md
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..bbf573b2 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,19 @@ static inline int todo(const char *reason)
); \
} while (0)
+#define assert_str_equal(got, expected, n) do { \
+ assert_general(strncmp(got, expected, n) == 0, \
+ ASSERT_EQUAL_FMT(int, "%d"), \
+ __FILE__, __LINE__, (got), (expected) \
+ ); \
+} while (0)
+
+#define assert_str_not_equal(got, unexpected, n) do { \
+ assert_general(strncmp(got, expected, n) != 0, \
+ ASSERT_NOT_EQUAL_FMT(int, "%d"), \
+ __FILE__, __LINE__, (got), (unexpected) \
+ ); \
+} while (0)
+
+
#endif /* TARANTOOL_LUAJIT_TEST_H */
--
2.34.1
next prev parent reply other threads:[~2023-10-31 18:12 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 ` Sergey Bronnikov via Tarantool-patches [this message]
2023-11-01 7:40 ` [Tarantool-patches] [PATCH luajit 1/2] test: introduce asserts assert_str{_not}_equal 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
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=a860626525b4c5c6c82f1983d8ed9ffdb20a5a30.1698775628.git.sergeyb@tarantool.org \
--to=tarantool-patches@dev.tarantool.org \
--cc=estetus@gmail.com \
--cc=max.kokryashkin@gmail.com \
--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