null+****@clear*****
null+****@clear*****
2011年 11月 11日 (金) 16:45:59 JST
Susumu Yata 2011-11-11 07:45:59 +0000 (Fri, 11 Nov 2011)
New Revision: 96a75ef77dd8f0725c04d4bac6de2529b6a36f23
Log:
replace cppcut_assert_equals by cut_assert_nulls and cut_assert_not_nulls.
Modified files:
test/unit/core/dat/test-cursor-factory.cpp
test/unit/core/dat/test-file.cpp
test/unit/core/dat/test-header.cpp
test/unit/core/dat/test-key.cpp
test/unit/core/dat/test-string.cpp
test/unit/core/dat/test-trie.cpp
Modified: test/unit/core/dat/test-cursor-factory.cpp (+4 -4)
===================================================================
--- test/unit/core/dat/test-cursor-factory.cpp 2011-11-11 07:21:18 +0000 (b333ba9)
+++ test/unit/core/dat/test-cursor-factory.cpp 2011-11-11 07:45:59 +0000 (1348927)
@@ -81,7 +81,7 @@ namespace test_dat_cursor_factory
std::auto_ptr<grn::dat::Cursor> cursor(grn::dat::CursorFactory::open(
trie, NULL, 3, "apple", 5, 0, 1,
grn::dat::PREFIX_CURSOR | grn::dat::DESCENDING_CURSOR));
- cut_assert(cursor.get() != static_cast<grn::dat::Cursor *>(NULL));
+ cut_assert_not_null(cursor.get());
cppcut_assert_equal(grn::dat::UInt32(0), cursor->offset());
cppcut_assert_equal(grn::dat::UInt32(1), cursor->limit());
@@ -97,12 +97,12 @@ namespace test_dat_cursor_factory
std::auto_ptr<grn::dat::Cursor> cursor(grn::dat::CursorFactory::open(
trie, "apple", 5, NULL, 0, 1, 2,
grn::dat::PREDICTIVE_CURSOR | grn::dat::EXCEPT_EXACT_MATCH));
- cut_assert(cursor.get() != static_cast<grn::dat::Cursor *>(NULL));
+ cut_assert_not_null(cursor.get());
cppcut_assert_equal(grn::dat::UInt32(1), cursor->offset());
cppcut_assert_equal(grn::dat::UInt32(2), cursor->limit());
- cppcut_assert_equal(grn::dat::PREDICTIVE_CURSOR |
- grn::dat::ASCENDING_CURSOR | grn::dat::EXCEPT_EXACT_MATCH,
+ cppcut_assert_equal(grn::dat::PREDICTIVE_CURSOR | grn::dat::ASCENDING_CURSOR |
+ grn::dat::EXCEPT_EXACT_MATCH,
cursor->flags());
}
}
Modified: test/unit/core/dat/test-file.cpp (+9 -9)
===================================================================
--- test/unit/core/dat/test-file.cpp 2011-11-11 07:21:18 +0000 (2092b83)
+++ test/unit/core/dat/test-file.cpp 2011-11-11 07:45:59 +0000 (0c7dff1)
@@ -46,7 +46,7 @@ namespace test_dat_file
{
const grn::dat::File file;
- cppcut_assert_equal(static_cast<void *>(NULL), file.ptr());
+ cut_assert_null(file.ptr());
cppcut_assert_equal(grn::dat::UInt64(0), file.size());
}
@@ -61,7 +61,7 @@ namespace test_dat_file
}
file.create(NULL, 32);
- cut_assert(file.ptr() != NULL);
+ cut_assert_not_null(file.ptr());
cppcut_assert_equal(grn::dat::UInt64(32), file.size());
grn::dat::UInt8 * const buf = static_cast<grn::dat::UInt8 *>(file.ptr());
@@ -86,7 +86,7 @@ namespace test_dat_file
}
file.create(path, 32);
- cut_assert(file.ptr() != NULL);
+ cut_assert_not_null(file.ptr());
cppcut_assert_equal(grn::dat::UInt64(32), file.size());
grn::dat::UInt8 * const buf = static_cast<grn::dat::UInt8 *>(file.ptr());
@@ -114,13 +114,13 @@ namespace test_dat_file
std::strcpy(static_cast<char *>(file.ptr()), "This is a pen.");
file.close();
- cppcut_assert_equal(static_cast<void *>(NULL), file.ptr());
+ cut_assert_null(file.ptr());
cppcut_assert_equal(grn::dat::UInt64(0), file.size());
file.open(path);
- cut_assert(file.ptr() != NULL);
+ cut_assert_not_null(file.ptr());
cppcut_assert_equal(grn::dat::UInt64(32), file.size());
- cut_assert(!std::strcmp(static_cast<char *>(file.ptr()), "This is a pen."));
+ cppcut_assert_equal(0, std::strcmp(static_cast<char *>(file.ptr()), "This is a pen."));
}
void test_swap(void)
@@ -128,16 +128,16 @@ namespace test_dat_file
grn::dat::File file;
file.create(NULL, 100);
- cut_assert(file.ptr() != NULL);
+ cut_assert_not_null(file.ptr());
cppcut_assert_equal(grn::dat::UInt64(100), file.size());
grn::dat::File file_new;
file_new.swap(&file);
- cppcut_assert_equal(static_cast<void *>(NULL), file.ptr());
+ cut_assert_null(file.ptr());
cppcut_assert_equal(grn::dat::UInt64(0), file.size());
- cut_assert(file_new.ptr() != NULL);
+ cut_assert_not_null(file_new.ptr());
cppcut_assert_equal(grn::dat::UInt64(100), file_new.size());
}
}
Modified: test/unit/core/dat/test-header.cpp (+1 -1)
===================================================================
--- test/unit/core/dat/test-header.cpp 2011-11-11 07:21:18 +0000 (0e5eb78)
+++ test/unit/core/dat/test-header.cpp 2011-11-11 07:45:59 +0000 (8bd27be)
@@ -98,7 +98,7 @@ namespace test_dat_header
}
for (grn::dat::UInt32 i = 0; i <= grn::dat::MAX_BLOCK_LEVEL; ++i) {
- cppcut_assert_equal((i + 1), header.ith_leader(i));
+ cppcut_assert_equal(i + 1, header.ith_leader(i));
}
}
}
Modified: test/unit/core/dat/test-key.cpp (+1 -1)
===================================================================
--- test/unit/core/dat/test-key.cpp 2011-11-11 07:21:18 +0000 (7dc24ad)
+++ test/unit/core/dat/test-key.cpp 2011-11-11 07:45:59 +0000 (e1b36d0)
@@ -44,7 +44,7 @@ namespace test_dat_key
cppcut_assert_equal(grn::dat::INVALID_KEY_ID, key.id());
cppcut_assert_equal(grn::dat::UInt32(0), key.length());
- cut_assert(key.ptr() != static_cast<const void *>(NULL));
+ cut_assert_not_null(key.ptr());
}
void test_creation(void)
Modified: test/unit/core/dat/test-string.cpp (+1 -1)
===================================================================
--- test/unit/core/dat/test-string.cpp 2011-11-11 07:21:18 +0000 (38788be)
+++ test/unit/core/dat/test-string.cpp 2011-11-11 07:45:59 +0000 (a0271e3)
@@ -30,7 +30,7 @@ namespace test_dat_string
{
const grn::dat::String str;
- cppcut_assert_equal(static_cast<const void *>(NULL), str.ptr());
+ cut_assert_null(str.ptr());
cppcut_assert_equal(grn::dat::UInt32(0), str.length());
}
Modified: test/unit/core/dat/test-trie.cpp (+1 -1)
===================================================================
--- test/unit/core/dat/test-trie.cpp 2011-11-11 07:21:18 +0000 (28f7ee9)
+++ test/unit/core/dat/test-trie.cpp 2011-11-11 07:45:59 +0000 (0da174e)
@@ -50,7 +50,7 @@ namespace
GError *glib_error = NULL;
thread_ = g_thread_create(func, data, TRUE, &glib_error);
gcut_assert_error(glib_error, cut_message("g_thread_create() failed"));
- cppcut_assert_equal(false, thread_ == NULL);
+ cut_assert_not_null(thread_);
}
void join() {