Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
hiredis
Commits
50c41814
Commit
50c41814
authored
Mar 06, 2012
by
Pieter Noordhuis
Browse files
Factor out test setup macro
parent
2a37c4a1
Changes
1
Hide whitespace changes
Inline
Side-by-side
test/test-request.c
View file @
50c41814
...
@@ -260,15 +260,15 @@ TEST(insert_request) {
...
@@ -260,15 +260,15 @@ TEST(insert_request) {
(_var).len = strlen((_var).buf); \
(_var).len = strlen((_var).buf); \
(_var).emit = (_var).len;
(_var).emit = (_var).len;
#define SETUP_INSERTED(
)
\
#define SETUP_INSERTED(
_var1, _var2)
\
SETUP(); \
SETUP(); \
INIT_REQUEST(req1,
"hello"
); \
INIT_REQUEST(req1,
(_var1)
); \
INIT_REQUEST(req2,
"world"
); \
INIT_REQUEST(req2,
(_var2)
); \
redis_request_queue_insert(&q, (redis_request*)&req1); \
redis_request_queue_insert(&q, (redis_request*)&req1); \
redis_request_queue_insert(&q, (redis_request*)&req2); \
redis_request_queue_insert(&q, (redis_request*)&req2); \
TEST
(
write_ptr
)
{
TEST
(
write_ptr
)
{
SETUP_INSERTED
();
SETUP_INSERTED
(
"hello"
,
"world"
);
const
char
*
buf
;
const
char
*
buf
;
size_t
len
;
size_t
len
;
...
@@ -317,13 +317,7 @@ TEST(write_ptr) {
...
@@ -317,13 +317,7 @@ TEST(write_ptr) {
}
}
TEST
(
write_ptr_skip_empty
)
{
TEST
(
write_ptr_skip_empty
)
{
SETUP
();
SETUP_INSERTED
(
""
,
"hello"
);
INIT_REQUEST
(
req1
,
""
);
INIT_REQUEST
(
req2
,
"hello"
);
redis_request_queue_insert
(
&
q
,
(
redis_request
*
)
&
req1
);
redis_request_queue_insert
(
&
q
,
(
redis_request
*
)
&
req2
);
const
char
*
buf
;
const
char
*
buf
;
size_t
len
;
size_t
len
;
...
@@ -340,14 +334,17 @@ TEST(write_ptr_skip_empty) {
...
@@ -340,14 +334,17 @@ TEST(write_ptr_skip_empty) {
TEARDOWN
();
TEARDOWN
();
}
}
#define SETUP_WRITTEN_UNCONFIRMED() \
#define SETUP_DRAIN_WRITE_PTR() \
SETUP_INSERTED(); \
do { \
do { \
const char *buf; \
const char *buf; \
size_t len; \
size_t len; \
rv = redis_request_queue_write_ptr(&q, &buf, &len); \
rv = redis_request_queue_write_ptr(&q, &buf, &len); \
} while (rv == 0);
} while (rv == 0);
#define SETUP_WRITTEN_UNCONFIRMED() \
SETUP_INSERTED("hello", "world"); \
SETUP_DRAIN_WRITE_PTR();
TEST
(
write_cb
)
{
TEST
(
write_cb
)
{
SETUP_WRITTEN_UNCONFIRMED
();
SETUP_WRITTEN_UNCONFIRMED
();
...
@@ -456,7 +453,7 @@ TEST(read_cb_with_parse_error) {
...
@@ -456,7 +453,7 @@ TEST(read_cb_with_parse_error) {
}
}
TEST
(
read_cb_with_pending_write_ptr_emit
)
{
TEST
(
read_cb_with_pending_write_ptr_emit
)
{
SETUP_INSERTED
();
SETUP_INSERTED
(
"hello"
,
"world"
);
const
char
*
buf
;
const
char
*
buf
;
size_t
len
;
size_t
len
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment