collabvm/r3
8
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

use ck_assert instead of ck_assert_int_gt

Browse source
This commit is contained in:
c9s 2014-05-20 15:10:09 +08:00
parent 9d19d233c6
commit af3cdbbff4
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tests/check_tree.c
View file

@ -112,7 +112,7 @@ START_TEST (test_compile)
entry = match_entry_createl( "/some_id" , strlen("/some_id") ); entry = match_entry_createl( "/some_id" , strlen("/some_id") );
m = r3_tree_matchl( n , "/some_id", strlen("/some_id"), entry); m = r3_tree_matchl( n , "/some_id", strlen("/some_id"), entry);
fail_if( NULL == m ); fail_if( NULL == m );
ck_assert_int_gt( m->endpoint , 0 ); // should not be an endpoint ck_assert( m->endpoint > 0 ); // should not be an endpoint
} }
END_TEST END_TEST
@ -174,7 +174,7 @@ START_TEST (test_pcre_patterns_insert)
node *matched; node *matched;
matched = r3_tree_matchl(n, "/post/111-222", strlen("/post/111-222"), NULL); matched = r3_tree_matchl(n, "/post/111-222", strlen("/post/111-222"), NULL);
ck_assert(matched); ck_assert(matched);
ck_assert_int_gt(matched->endpoint, 0); ck_assert(matched->endpoint > 0);
// incomplete string shouldn't match // incomplete string shouldn't match
matched = r3_tree_matchl(n, "/post/111-", strlen("/post/111-"), NULL); matched = r3_tree_matchl(n, "/post/111-", strlen("/post/111-"), NULL);
@ -280,7 +280,7 @@ START_TEST(test_pcre_pattern_simple)
node *matched; node *matched;
matched = r3_tree_matchl(n, "/user/123", strlen("/user/123"), entry); matched = r3_tree_matchl(n, "/user/123", strlen("/user/123"), entry);
fail_if(matched == NULL); fail_if(matched == NULL);
ck_assert_int_gt(entry->vars->len, 0); ck_assert(entry->vars->len > 0);
ck_assert_str_eq(entry->vars->tokens[0],"123"); ck_assert_str_eq(entry->vars->tokens[0],"123");
} }
END_TEST END_TEST
@ -312,7 +312,7 @@ START_TEST(test_pcre_pattern_more)
matched = r3_tree_matchl(n, "/user/123", strlen("/user/123"), entry); matched = r3_tree_matchl(n, "/user/123", strlen("/user/123"), entry);
fail_if(matched == NULL); fail_if(matched == NULL);
ck_assert_int_gt(entry->vars->len, 0); ck_assert(entry->vars->len > 0);
ck_assert_str_eq(entry->vars->tokens[0],"123"); ck_assert_str_eq(entry->vars->tokens[0],"123");
info("matched %p\n", matched->data); info("matched %p\n", matched->data);
@ -321,13 +321,13 @@ START_TEST(test_pcre_pattern_more)
matched = r3_tree_matchl(n, "/user2/123", strlen("/user2/123"), entry); matched = r3_tree_matchl(n, "/user2/123", strlen("/user2/123"), entry);
fail_if(matched == NULL); fail_if(matched == NULL);
ck_assert_int_gt(entry->vars->len, 0); ck_assert(entry->vars->len > 0);
ck_assert_str_eq(entry->vars->tokens[0],"123"); ck_assert_str_eq(entry->vars->tokens[0],"123");
ck_assert_int_eq( *((int*)matched->data), var2); ck_assert_int_eq( *((int*)matched->data), var2);
matched = r3_tree_matchl(n, "/user3/123", strlen("/user3/123"), entry); matched = r3_tree_matchl(n, "/user3/123", strlen("/user3/123"), entry);
fail_if(matched == NULL); fail_if(matched == NULL);
ck_assert_int_gt(entry->vars->len, 0); ck_assert(entry->vars->len > 0);
ck_assert_str_eq(entry->vars->tokens[0],"123"); ck_assert_str_eq(entry->vars->tokens[0],"123");
ck_assert_int_eq( *((int*)matched->data), var3); ck_assert_int_eq( *((int*)matched->data), var3);
} }