Skip to content

Commit

Permalink
fix unit test code style
Browse files Browse the repository at this point in the history
  • Loading branch information
zhangjipeng committed Feb 12, 2025
1 parent 99418ac commit e3f4408
Show file tree
Hide file tree
Showing 10 changed files with 187 additions and 159 deletions.
1 change: 0 additions & 1 deletion ext/svg/psx_xml_token.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ extern "C" {

#define TOKEN_LEN(t) ((t)->end - (t)->start)


bool psx_xml_tokenizer(const char* xml_data, uint32_t data_len, xml_token_process, void* data)
{
return false;
Expand Down
2 changes: 1 addition & 1 deletion src/gfx/gfx_gradient_adapter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ class gfx_span_gradient
do {
m_interpolator->coordinates(&x, &y);
int32_t d = m_gradient_function->calculate(x >> downscale_shift,
y >> downscale_shift, m_d2);
y >> downscale_shift, m_d2);
d = ((d - m_d1) * (int)m_color_function->size()) / dd;

if (d < 0) {
Expand Down
8 changes: 2 additions & 6 deletions unit_tests/context.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ ps_context* get_context()

TEST(Context, AntialiasAndGamma)
{
ps_context * ctx = get_context();
// gamma
ps_context* ctx = get_context();
// gamma
float g = 1.5;
float old = ps_set_gamma(ctx, g);
ASSERT_EQ(STATUS_SUCCEED, ps_last_status());
Expand All @@ -24,7 +24,3 @@ TEST(Context, AntialiasAndGamma)
ps_set_antialias(ctx, False);
ASSERT_EQ(STATUS_SUCCEED, ps_last_status());
}




36 changes: 24 additions & 12 deletions unit_tests/ext_array.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,32 @@

#include "psx_array.h"

class PsxArrayTest : public ::testing::Test {
class PsxArrayTest : public ::testing::Test
{
protected:
psx_array_t array;

void SetUp() override {
void SetUp() override
{
psx_array_init_type(&array, int);
}

void TearDown() override {
void TearDown() override
{
psx_array_destroy(&array);
}
};

TEST_F(PsxArrayTest, CreateTest) {
TEST_F(PsxArrayTest, CreateTest)
{
EXPECT_EQ(psx_array_size(&array), 0);
EXPECT_EQ(psx_array_capacity(&array), PSX_ARRAY_DEFAULT_CAPACITY);
EXPECT_EQ(array.element_size, sizeof(int));
EXPECT_NE(array.data, nullptr);
}

TEST_F(PsxArrayTest, AppendTest) {
TEST_F(PsxArrayTest, AppendTest)
{
int value = 10;
EXPECT_TRUE(psx_array_append(&array, &value));
EXPECT_EQ(*psx_array_get(&array, 0, int), value);
Expand All @@ -33,7 +38,8 @@ TEST_F(PsxArrayTest, AppendTest) {
EXPECT_TRUE(psx_array_append(&array, nullptr));
}

TEST_F(PsxArrayTest, ExpandTest) {
TEST_F(PsxArrayTest, ExpandTest)
{
for (int i = 0; i < PSX_ARRAY_DEFAULT_CAPACITY; ++i) {
int value = i;
EXPECT_TRUE(psx_array_append(&array, &value));
Expand All @@ -48,7 +54,8 @@ TEST_F(PsxArrayTest, ExpandTest) {
EXPECT_EQ(*psx_array_get(&array, PSX_ARRAY_DEFAULT_CAPACITY, int), value);
}

TEST_F(PsxArrayTest, GetValueTest) {
TEST_F(PsxArrayTest, GetValueTest)
{
int value = 10;
psx_array_append(&array, &value);
EXPECT_EQ(*psx_array_get(&array, 0, int), value);
Expand All @@ -57,7 +64,8 @@ TEST_F(PsxArrayTest, GetValueTest) {
EXPECT_EQ(psx_array_get(&array, array.size, int), nullptr);
}

TEST_F(PsxArrayTest, ShrinkTest) {
TEST_F(PsxArrayTest, ShrinkTest)
{
for (int i = 0; i < PSX_ARRAY_DEFAULT_CAPACITY * 2; ++i) {
int value = i;
EXPECT_TRUE(psx_array_append(&array, &value));
Expand All @@ -70,22 +78,25 @@ TEST_F(PsxArrayTest, ShrinkTest) {
EXPECT_EQ(psx_array_capacity(&array), PSX_ARRAY_DEFAULT_CAPACITY);
}

TEST_F(PsxArrayTest, ClearTest) {
TEST_F(PsxArrayTest, ClearTest)
{
int value = 10;
psx_array_append(&array, &value);
EXPECT_EQ(psx_array_size(&array), 1);
psx_array_clear(&array);
EXPECT_EQ(psx_array_size(&array), 0);
}

TEST_F(PsxArrayTest, EmptyTest) {
TEST_F(PsxArrayTest, EmptyTest)
{
EXPECT_TRUE(psx_array_empty(&array));
int value = 10;
psx_array_append(&array, &value);
EXPECT_FALSE(psx_array_empty(&array));
}

TEST_F(PsxArrayTest, RemoveTest) {
TEST_F(PsxArrayTest, RemoveTest)
{
int value1 = 10, value2 = 20;
psx_array_append(&array, &value1);
psx_array_append(&array, &value2);
Expand All @@ -97,7 +108,8 @@ TEST_F(PsxArrayTest, RemoveTest) {
EXPECT_FALSE(psx_array_remove(&array, array.size));
}

TEST_F(PsxArrayTest, RemoveLastTest) {
TEST_F(PsxArrayTest, RemoveLastTest)
{
int value1 = 10, value2 = 20;
psx_array_append(&array, &value1);
psx_array_append(&array, &value2);
Expand Down
120 changes: 63 additions & 57 deletions unit_tests/ext_list.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,58 +1,64 @@
#include "test.h"
#include "timeuse.h"

#include "psx_list.h"

TEST(ListTest, TestListInit) {
list_hdr_t list;
list_init(&list);
EXPECT_EQ(&list, list.next);
EXPECT_EQ(&list, list.prev);
}

TEST(ListTest, TestListEmpty) {
list_hdr_t list, entry;
list_init(&list);
EXPECT_TRUE(list_empty(&list));
list_add_entry(&list, &list);
EXPECT_TRUE(list_empty(&list));
list_add_entry(&list, &entry);
EXPECT_FALSE(list_empty(&list));
}

TEST(ListTest, TestListAdd) {
list_hdr_t list, entry;
list_init(&list);
list_add(&list, &entry);
EXPECT_FALSE(list_empty(&list));
EXPECT_EQ(&entry, list.next);
EXPECT_EQ(&list, entry.prev);
}

TEST(ListTest, TestListAddTail) {
list_hdr_t list, entry;
list_init(&list);
list_add_tail(&list, &entry);
EXPECT_FALSE(list_empty(&list));
EXPECT_EQ(&entry, list.prev);
EXPECT_EQ(&list, entry.next);
}

TEST(ListTest, TestListRemove) {
list_hdr_t list, entry;
list_init(&list);
list_add(&list, &entry);
list_remove_entry(&entry);
EXPECT_TRUE(list_empty(&list));
}

TEST(ListTest, TestListForEach) {
list_hdr_t list, entry1, entry2;
list_init(&list);
list_add(&list, &entry1);
list_add(&list, &entry2);
list_hdr_t* iterator;
list_for_each(&list, iterator) {
EXPECT_TRUE(&entry1 == iterator || &entry2 == iterator);
}
#include "test.h"
#include "timeuse.h"

#include "psx_list.h"

TEST(ListTest, TestListInit)
{
list_hdr_t list;
list_init(&list);
EXPECT_EQ(&list, list.next);
EXPECT_EQ(&list, list.prev);
}

TEST(ListTest, TestListEmpty)
{
list_hdr_t list, entry;
list_init(&list);
EXPECT_TRUE(list_empty(&list));
list_add_entry(&list, &list);
EXPECT_TRUE(list_empty(&list));
list_add_entry(&list, &entry);
EXPECT_FALSE(list_empty(&list));
}

TEST(ListTest, TestListAdd)
{
list_hdr_t list, entry;
list_init(&list);
list_add(&list, &entry);
EXPECT_FALSE(list_empty(&list));
EXPECT_EQ(&entry, list.next);
EXPECT_EQ(&list, entry.prev);
}

TEST(ListTest, TestListAddTail)
{
list_hdr_t list, entry;
list_init(&list);
list_add_tail(&list, &entry);
EXPECT_FALSE(list_empty(&list));
EXPECT_EQ(&entry, list.prev);
EXPECT_EQ(&list, entry.next);
}

TEST(ListTest, TestListRemove)
{
list_hdr_t list, entry;
list_init(&list);
list_add(&list, &entry);
list_remove_entry(&entry);
EXPECT_TRUE(list_empty(&list));
}

TEST(ListTest, TestListForEach)
{
list_hdr_t list, entry1, entry2;
list_init(&list);
list_add(&list, &entry1);
list_add(&list, &entry2);
list_hdr_t* iterator;
list_for_each(&list, iterator) {
EXPECT_TRUE(&entry1 == iterator || &entry2 == iterator);
}
}
47 changes: 30 additions & 17 deletions unit_tests/ext_tree.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,37 @@

#include "psx_tree.h"

class test_tree : public psx_tree_node {
class test_tree : public psx_tree_node
{
public:
test_tree(test_tree * parent)
test_tree(test_tree* parent)
: psx_tree_node(parent)
{
}

virtual ~test_tree()
{
}
};

class PsxTreeTest : public ::testing::Test {
class PsxTreeTest : public ::testing::Test
{
protected:
test_tree* root;

virtual void SetUp() {
virtual void SetUp()
{
root = new test_tree(nullptr);
}

virtual void TearDown() {
virtual void TearDown()
{
delete root;
}
};

TEST_F(PsxTreeTest, CreateAndDestroy) {
TEST_F(PsxTreeTest, CreateAndDestroy)
{
EXPECT_EQ(root->child_count(), 0u);
EXPECT_EQ(root->parent(), nullptr);

Expand All @@ -40,13 +45,15 @@ TEST_F(PsxTreeTest, CreateAndDestroy) {
EXPECT_EQ(root->child_count(), 1u); // chrrent child is nullptr
}

bool b_work(const psx_tree_node* node, void* data) {
bool b_work(const psx_tree_node* node, void* data)
{
psx_tree_node** p = static_cast<psx_tree_node**>(data);
*p = const_cast<psx_tree_node*>(node);
return true;
}

bool tree_work(const psx_tree_node* node, void* data) {
bool tree_work(const psx_tree_node* node, void* data)
{
psx_tree_node** p = static_cast<psx_tree_node**>(data);
printf("node access : %p === %p\n", *p, node);
if (node == *p) {
Expand All @@ -55,27 +62,32 @@ bool tree_work(const psx_tree_node* node, void* data) {
return false;
}

bool a_work(const psx_tree_node* node, void* data) {
bool a_work(const psx_tree_node* node, void* data)
{
psx_tree_node** p = static_cast<psx_tree_node**>(data);
*p = nullptr;
return true;
}

bool b_work2(const psx_tree_node* node, void* data) {
bool b_work2(const psx_tree_node* node, void* data)
{
return true;
}

bool tree_work2(const psx_tree_node* node, void* data) {
bool tree_work2(const psx_tree_node* node, void* data)
{
uint32_t* p = static_cast<uint32_t*>(data);
(*p)++;
return true;
}

bool a_work2(const psx_tree_node* node, void* data) {
bool a_work2(const psx_tree_node* node, void* data)
{
return true;
}

TEST_F(PsxTreeTest, TraversalPreOrder) {
TEST_F(PsxTreeTest, TraversalPreOrder)
{
test_tree* child1 = new test_tree(root);
test_tree* child2 = new test_tree(root);

Expand All @@ -87,7 +99,8 @@ TEST_F(PsxTreeTest, TraversalPreOrder) {
delete child1;
}

TEST_F(PsxTreeTest, TraversalPostOrder) {
TEST_F(PsxTreeTest, TraversalPostOrder)
{
test_tree* child1 = new test_tree(root);
test_tree* child2 = new test_tree(root);

Expand All @@ -99,7 +112,8 @@ TEST_F(PsxTreeTest, TraversalPostOrder) {
delete child1;
}

TEST_F(PsxTreeTest, CallbackCombination) {
TEST_F(PsxTreeTest, CallbackCombination)
{
test_tree* child = new test_tree(root);
new test_tree(root); // remove with parent
new test_tree(root); // remove with parent
Expand All @@ -112,4 +126,3 @@ TEST_F(PsxTreeTest, CallbackCombination) {

delete child;
}

Loading

0 comments on commit e3f4408

Please sign in to comment.