null+****@clear*****
null+****@clear*****
2012年 4月 10日 (火) 10:06:55 JST
Kouhei Sutou 2012-04-10 10:06:55 +0900 (Tue, 10 Apr 2012) New Revision: 12fd1db3d310dfefd6563210467c455e09eea1bc Log: test unit: use cut_assert_true/false Modified files: test/unit/test_mrn_sys.cpp Modified: test/unit/test_mrn_sys.cpp (+7 -7) =================================================================== --- test/unit/test_mrn_sys.cpp 2012-04-10 10:04:56 +0900 (4051790) +++ test/unit/test_mrn_sys.cpp 2012-04-10 10:06:55 +0900 (fcc4b76) @@ -64,8 +64,8 @@ namespace test_mrn_sys { const char *key = "mroonga"; - cut_assert_equal_int(0, mrn_hash_put(ctx, hash, key, &buffer)); - cut_assert_equal_int(-1, mrn_hash_put(ctx, hash, key, &buffer)); + cut_assert_true(mrn_hash_put(ctx, hash, key, &buffer)); + cut_assert_false(mrn_hash_put(ctx, hash, key, &buffer)); } void test_mrn_hash_get() @@ -78,8 +78,8 @@ namespace test_mrn_sys GRN_TEXT_PUT(ctx, &buffer, "\0", 1); mrn_hash_put(ctx, hash, key, &buffer); - cut_assert_equal_int(0, mrn_hash_get(ctx, hash, key, &result)); - cut_assert_equal_string(value, GRN_TEXT_VALUE(&buffer)); + cut_assert_true(mrn_hash_get(ctx, hash, key, &result)); + cppcut_assert_equal(value, GRN_TEXT_VALUE(&buffer)); } void test_mrn_hash_remove() @@ -88,8 +88,8 @@ namespace test_mrn_sys mrn_hash_put(ctx, hash, key, &buffer); - cut_assert_equal_int(-1, mrn_hash_remove(ctx, hash, "nonexistent")); - cut_assert_equal_int(0, mrn_hash_remove(ctx, hash, key)); - cut_assert_equal_int(-1, mrn_hash_remove(ctx, hash, key)); + cut_assert_false(mrn_hash_remove(ctx, hash, "nonexistent")); + cut_assert_true(mrn_hash_remove(ctx, hash, key)); + cut_assert_false(mrn_hash_remove(ctx, hash, key)); } }