btree_t -> gmock

This commit is contained in:
Joe Thornber
2013-03-22 14:57:46 +00:00
parent 9c4bfe4cf9
commit a018647d0a
2 changed files with 14 additions and 18 deletions

View File

@@ -34,9 +34,6 @@ unit-test: $(TEST_PROGRAMS)
.PHONY: unit-test .PHONY: unit-test
unit-tests/btree_t: unit-tests/btree_t.o $(OBJECTS)
g++ $(CXXFLAGS) $(INCLUDES) -o $@ $+ $(LIBS) $(LIBEXPAT)
unit-tests/run_list_t: unit-tests/run_list_t.o $(OBJECTS) unit-tests/run_list_t: unit-tests/run_list_t.o $(OBJECTS)
g++ $(CXXFLAGS) $(INCLUDES) -o $@ $+ $(LIBS) $(LIBEXPAT) g++ $(CXXFLAGS) $(INCLUDES) -o $@ $+ $(LIBS) $(LIBEXPAT)
@@ -81,6 +78,7 @@ MOCK_SOURCE=\
unit-tests/array_t.cc \ unit-tests/array_t.cc \
unit-tests/bitset_t.cc \ unit-tests/bitset_t.cc \
unit-tests/block_t.cc \ unit-tests/block_t.cc \
unit-tests/btree_t.cc \
unit-tests/buffer_t.cc \ unit-tests/buffer_t.cc \
unit-tests/cache_t.cc \ unit-tests/cache_t.cc \
unit-tests/endian_t.cc unit-tests/endian_t.cc

View File

@@ -16,16 +16,14 @@
// with thin-provisioning-tools. If not, see // with thin-provisioning-tools. If not, see
// <http://www.gnu.org/licenses/>. // <http://www.gnu.org/licenses/>.
#include "gmock/gmock.h"
#include "persistent-data/transaction_manager.h" #include "persistent-data/transaction_manager.h"
#include "persistent-data/space-maps/core.h" #include "persistent-data/space-maps/core.h"
#include "persistent-data/data-structures/btree.h" #include "persistent-data/data-structures/btree.h"
#define BOOST_TEST_MODULE BTreeTests
#include <boost/test/included/unit_test.hpp>
using namespace std; using namespace std;
using namespace boost;
using namespace persistent_data; using namespace persistent_data;
using namespace testing;
//---------------------------------------------------------------- //----------------------------------------------------------------
@@ -102,18 +100,18 @@ namespace {
//---------------------------------------------------------------- //----------------------------------------------------------------
BOOST_AUTO_TEST_CASE(empty_btree_contains_nothing) TEST(BtreeTests, empty_btree_contains_nothing)
{ {
btree<1, uint64_traits>::ptr tree = create_btree(); btree<1, uint64_traits>::ptr tree = create_btree();
check_constraints(tree); check_constraints(tree);
for (uint64_t i = 0; i < 1000; i++) { for (uint64_t i = 0; i < 1000; i++) {
uint64_t key[1] = {i}; uint64_t key[1] = {i};
BOOST_CHECK(!tree->lookup(key)); ASSERT_FALSE(tree->lookup(key));
} }
} }
BOOST_AUTO_TEST_CASE(insert_works) TEST(BtreeTests, insert_works)
{ {
unsigned const COUNT = 100000; unsigned const COUNT = 100000;
@@ -125,36 +123,36 @@ BOOST_AUTO_TEST_CASE(insert_works)
tree->insert(key, value); tree->insert(key, value);
btree<1, uint64_traits>::maybe_value l = tree->lookup(key); btree<1, uint64_traits>::maybe_value l = tree->lookup(key);
BOOST_REQUIRE(l); ASSERT_TRUE(l);
BOOST_CHECK_EQUAL(*l, i); ASSERT_THAT(*l, Eq(i));
} }
check_constraints(tree); check_constraints(tree);
} }
BOOST_AUTO_TEST_CASE(insert_does_not_insert_imaginary_values) TEST(BtreeTests, insert_does_not_insert_imaginary_values)
{ {
btree<1, uint64_traits>::ptr tree = create_btree(); btree<1, uint64_traits>::ptr tree = create_btree();
uint64_t key[1] = {0}; uint64_t key[1] = {0};
uint64_t value = 100; uint64_t value = 100;
btree<1, uint64_traits>::maybe_value l = tree->lookup(key); btree<1, uint64_traits>::maybe_value l = tree->lookup(key);
BOOST_CHECK(!l); ASSERT_FALSE(l);
key[0] = 1; key[0] = 1;
l = tree->lookup(key); l = tree->lookup(key);
BOOST_CHECK(!l); ASSERT_FALSE(l);
key[0] = 0; key[0] = 0;
tree->insert(key, value); tree->insert(key, value);
l = tree->lookup(key); l = tree->lookup(key);
BOOST_REQUIRE(l); ASSERT_TRUE(l);
BOOST_CHECK_EQUAL(*l, 100); ASSERT_THAT(*l, Eq(100u));
key[0] = 1; key[0] = 1;
l = tree->lookup(key); l = tree->lookup(key);
BOOST_CHECK(!l); ASSERT_FALSE(l);
check_constraints(tree); check_constraints(tree);
} }