Skip to content

Commit

Permalink
refactor ::equals tests and mock object for readability
Browse files Browse the repository at this point in the history
  • Loading branch information
@karlnapf
karlnapf committed Jan 23, 2018
1 parent 103e8a0 commit 31c2a44
Show file tree
Hide file tree
Showing 2 changed files with 81 additions and 49 deletions.
102 changes: 67 additions & 35 deletions tests/unit/base/MockObject.h
View file
Expand Up @@ -48,21 +48,46 @@ namespace shogun
{
public:
CCloneEqualsMock()
{
init_single();
init_sg_vector_matrix();
init_sg_sparse_vector_matrix();
init_raw_vector();
}

~CCloneEqualsMock()
{
free_single();
free_raw_vector();
}

void init_single()
{
m_basic = 1;
watch_param("basic", &m_basic);

m_object = new CCloneEqualsMockParameter<T>();
watch_param("object", &m_object);
}

void free_single()
{
delete m_object;
}

void init_sg_vector_matrix()
{
m_sg_vector = SGVector<T>(2);
m_sg_vector.set_const(m_basic);
watch_param("sg_vector", &m_sg_vector);

m_sg_matrix = SGMatrix<T>(3, 4);
m_sg_matrix.set_const(m_basic);
watch_param("sg_matrix", &m_sg_matrix);
}

void init_sg_sparse_vector_matrix()
{
m_sg_sparse_vector = SGSparseVector<T>(4);
for (auto i : range(m_sg_sparse_vector.num_feat_entries))
{
Expand All @@ -88,45 +113,52 @@ namespace shogun
m_sg_sparse_matrix.sparse_matrix[i] = vec;
}
watch_param("sg_sparse_matrix", &m_sg_sparse_matrix);
}

m_vector_basic_len = 5;
m_vector_basic = new T[m_vector_basic_len];
for (auto i : range(m_vector_basic_len))
m_vector_basic[i] = m_basic;
watch_param("vector_basic", &m_vector_basic, &m_vector_basic_len);
void init_raw_vector()
{
m_raw_vector_basic_len = 5;
m_raw_vector_basic = new T[m_raw_vector_basic_len];
for (auto i : range(m_raw_vector_basic_len))
m_raw_vector_basic[i] = m_basic;
watch_param(
"raw_vector_basic", &m_raw_vector_basic,
&m_raw_vector_basic_len);

m_vector_sg_string_len = 7;
m_vector_sg_string = new SGString<T>[m_vector_sg_string_len];
for (auto i : range(m_vector_sg_string_len))
m_raw_vector_sg_string_len = 7;
m_raw_vector_sg_string =
new SGString<T>[m_raw_vector_sg_string_len];
for (auto i : range(m_raw_vector_sg_string_len))
{
m_vector_sg_string[i] = SGString<T>(i + 1, true);
for (auto j : range(m_vector_sg_string[i].slen))
m_vector_sg_string[i].string[j] = 1;
m_raw_vector_sg_string[i] = SGString<T>(i + 1, true);
for (auto j : range(m_raw_vector_sg_string[i].slen))
m_raw_vector_sg_string[i].string[j] = 1;
}
watch_param(
"vector_sg_string", &m_vector_sg_string,
&m_vector_sg_string_len);

m_vector_object_len = 6;
m_vector_object =
new CCloneEqualsMockParameter<T>*[m_vector_object_len];
for (auto i : range(m_vector_object_len))
m_vector_object[i] = new CCloneEqualsMockParameter<T>();
"raw_vector_sg_string", &m_raw_vector_sg_string,
&m_raw_vector_sg_string_len);

m_raw_vector_object_len = 6;
m_raw_vector_object =
new CCloneEqualsMockParameter<T>*[m_raw_vector_object_len];
for (auto i : range(m_raw_vector_object_len))
m_raw_vector_object[i] = new CCloneEqualsMockParameter<T>();
watch_param(
"vector_object", &m_vector_object, &m_vector_object_len);
"raw_vector_object", &m_raw_vector_object,
&m_raw_vector_object_len);
}

~CCloneEqualsMock()
void free_raw_vector()
{
delete m_object;
delete m_vector_basic;
for (auto i : range(m_vector_object_len))
delete m_vector_object[i];
delete m_vector_object;
delete m_raw_vector_basic;

for (auto i : range(m_raw_vector_object_len))
delete m_raw_vector_object[i];
delete m_raw_vector_object;

for (auto i : range(m_vector_sg_string_len))
m_vector_sg_string[i].free_string();
delete m_vector_sg_string;
for (auto i : range(m_raw_vector_sg_string_len))
m_raw_vector_sg_string[i].free_string();
delete m_raw_vector_sg_string;
}

const char* get_name() const
Expand All @@ -143,14 +175,14 @@ namespace shogun
SGSparseVector<T> m_sg_sparse_vector;
SGSparseMatrix<T> m_sg_sparse_matrix;

T* m_vector_basic;
index_t m_vector_basic_len;
T* m_raw_vector_basic;
index_t m_raw_vector_basic_len;

SGString<T>* m_vector_sg_string;
index_t m_vector_sg_string_len;
SGString<T>* m_raw_vector_sg_string;
index_t m_raw_vector_sg_string_len;

CCloneEqualsMockParameter<T>** m_vector_object;
index_t m_vector_object_len;
CCloneEqualsMockParameter<T>** m_raw_vector_object;
index_t m_raw_vector_object_len;
};

/** @brief Used to test the tags-parameter framework
Expand Down
28 changes: 14 additions & 14 deletions tests/unit/base/SGObject_unittest.cc
View file
Expand Up @@ -27,11 +27,6 @@

using namespace shogun;

TEST(SGObject, CCloneEqualsMock_allocate_delete)
{
auto obj = some<CCloneEqualsMock<int32_t>>();
}

template <typename T>
class SGObjectEquals : public ::testing::Test
{
Expand All @@ -52,6 +47,11 @@ TYPED_TEST(SGObjectEquals, same)
EXPECT_TRUE(obj2->equals(obj1));
}

TYPED_TEST(SGObjectEquals, mock_allocate_delete)
{
auto obj = some<CCloneEqualsMock<int32_t>>();
}

TYPED_TEST(SGObjectEquals, different_null)
{
auto obj1 = some<CCloneEqualsMock<TypeParam>>();
Expand Down Expand Up @@ -125,38 +125,38 @@ TYPED_TEST(SGObjectEquals, different_sg_matrix)
EXPECT_FALSE(obj2->equals(obj1));
}

TYPED_TEST(SGObjectEquals, different_vector_basic)
TYPED_TEST(SGObjectEquals, different_raw_vector_basic)
{
auto obj1 = some<CCloneEqualsMock<TypeParam>>();
auto obj2 = some<CCloneEqualsMock<TypeParam>>();

obj1->m_vector_basic[0] -= 1;
obj1->m_raw_vector_basic[0] -= 1;
EXPECT_FALSE(obj1->equals(obj2));
EXPECT_FALSE(obj2->equals(obj1));
}

TYPED_TEST(SGObjectEquals, different_vector_sg_string)
TYPED_TEST(SGObjectEquals, different_raw_vector_sg_string)
{
auto obj1 = some<CCloneEqualsMock<TypeParam>>();
auto obj2 = some<CCloneEqualsMock<TypeParam>>();

obj1->m_vector_sg_string[0].string[0] -= 1;
obj1->m_raw_vector_sg_string[0].string[0] -= 1;
EXPECT_FALSE(obj1->equals(obj2));
EXPECT_FALSE(obj2->equals(obj1));
}

TYPED_TEST(SGObjectEquals, different_vector_object)
TYPED_TEST(SGObjectEquals, different_raw_vector_object)
{
auto obj1 = some<CCloneEqualsMock<TypeParam>>();
auto obj2 = some<CCloneEqualsMock<TypeParam>>();

obj1->m_vector_object[0]->m_some_value -= 1;
obj1->m_raw_vector_object[0]->m_some_value -= 1;
EXPECT_FALSE(obj1->equals(obj2));
EXPECT_FALSE(obj2->equals(obj1));
obj1->m_vector_object[0]->m_some_value += 1;
obj1->m_raw_vector_object[0]->m_some_value += 1;

delete obj1->m_vector_object[0];
obj1->m_vector_object[0] = nullptr;
delete obj1->m_raw_vector_object[0];
obj1->m_raw_vector_object[0] = nullptr;
EXPECT_FALSE(obj1->equals(obj2));
EXPECT_FALSE(obj2->equals(obj1));
}
Expand Down

0 comments on commit 31c2a44

Please sign in to comment.