Skip to content

Commit 8b4e8a7

Browse files
committed
Update tests to use Google Test framework
This modified the tests to use the newer Google Test framework. I also needed to rename the test file from `.c` to `.cpp` since Google Test files are C++.
1 parent 70dc965 commit 8b4e8a7

File tree

1 file changed

+21
-34
lines changed

1 file changed

+21
-34
lines changed
Lines changed: 21 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,26 @@
1-
#include <stdarg.h>
2-
#include <setjmp.h>
3-
#include <stdlib.h>
1+
#include <gtest/gtest.h>
42

5-
#include "../include/cmockery.h"
63
#include "array_merge.h"
74

8-
bool arrays_match(int size, int a[], int b[]) {
5+
void arrays_match(int size, int a[], int b[]) {
96
int i;
107

118
for (i=0; i<size; ++i) {
12-
assert_int_equal(a[i], b[i]);
9+
ASSERT_EQ(b[i], a[i]);
1310
}
14-
15-
return true;
1611
}
1712

18-
void test_empty_list() {
13+
TEST(ArrayMerge, Handle_empty_list) {
1914
int* a[] = { };
2015
int sizes[] = { };
2116
int expected[] = { 0 };
2217
int* result;
2318

2419
result = array_merge(0, sizes, a);
25-
assert_true(arrays_match(1, result, expected));
20+
arrays_match(1, result, expected);
2621
}
2722

28-
void test_singleton_list() {
23+
TEST(ArrayMerge, Handle_singleton_list) {
2924
int num_arrays = 1;
3025
int sizes[] = { 1 };
3126
int a0[] = { 5 };
@@ -34,10 +29,10 @@ void test_singleton_list() {
3429
int* result;
3530

3631
result = array_merge(num_arrays, sizes, a);
37-
assert_true(arrays_match(2, result, expected));
32+
arrays_match(2, result, expected);
3833
}
3934

40-
void test_one_longer_list() {
35+
TEST(ArrayMerge, Handle_one_longer_list) {
4136
int num_arrays = 1;
4237
int sizes[] = { 10 };
4338
int a0[] = { 3, 2, 0, 5, 8, 9, 6, 3, 2, 0 };
@@ -46,10 +41,10 @@ void test_one_longer_list() {
4641
int* result;
4742

4843
result = array_merge(num_arrays, sizes, a);
49-
assert_true(arrays_match(8, result, expected));
44+
arrays_match(8, result, expected);
5045
}
5146

52-
void test_multiple_copies_of_longer_list() {
47+
TEST(ArrayMerge, Handle_multiple_copies_of_longer_list) {
5348
int num_arrays = 10;
5449
int sizes[] = { 10, 10, 10, 10, 10, 10, 10, 10, 10, 10 };
5550
int a0[] = { 3, 2, 0, 5, 8, 9, 6, 3, 2, 0 };
@@ -58,10 +53,10 @@ void test_multiple_copies_of_longer_list() {
5853
int* result;
5954

6055
result = array_merge(num_arrays, sizes, a);
61-
assert_true(arrays_match(8, result, expected));
56+
arrays_match(8, result, expected);
6257
}
6358

64-
void test_multiple_copies_of_longer_list_different_orders() {
59+
TEST(ArrayMerge, Handle_multiple_copies_of_longer_list_different_orders) {
6560
int num_arrays = 9;
6661
int sizes[] = { 10, 10, 10, 10, 10, 10, 10, 10, 10 };
6762
int a0[] = { 3, 2, 0, 5, 8, 9, 6, 3, 2, 0 };
@@ -72,10 +67,10 @@ void test_multiple_copies_of_longer_list_different_orders() {
7267
int* result;
7368

7469
result = array_merge(num_arrays, sizes, a);
75-
assert_true(arrays_match(8, result, expected));
70+
arrays_match(8, result, expected);
7671
}
7772

78-
void test_different_sizes() {
73+
TEST(ArrayMerge, Handle_different_sizes) {
7974
int num_arrays = 11;
8075
int sizes[num_arrays];
8176
int* a[num_arrays];
@@ -85,17 +80,17 @@ void test_different_sizes() {
8580

8681
for (i=0; i<num_arrays; ++i) {
8782
sizes[i] = i;
88-
a[i] = calloc(i, sizeof(int));
83+
a[i] = (int*) calloc(i, sizeof(int));
8984
for (j=0; j<i; ++j) {
9085
a[i][j] = j;
9186
}
9287
}
9388

9489
result = array_merge(num_arrays, sizes, a);
95-
assert_true(arrays_match(11, result, expected));
90+
arrays_match(11, result, expected);
9691
}
9792

98-
void test_different_sizes_reversed() {
93+
TEST(ArrayMerge, Handle_different_sizes_reversed) {
9994
int num_arrays = 11;
10095
int sizes[num_arrays];
10196
int* a[num_arrays];
@@ -105,25 +100,17 @@ void test_different_sizes_reversed() {
105100

106101
for (i=num_arrays-1; i>=0; --i) {
107102
sizes[i] = i;
108-
a[i] = calloc(i, sizeof(int));
103+
a[i] = (int*) calloc(i, sizeof(int));
109104
for (j=0; j<i; ++j) {
110105
a[i][j] = j;
111106
}
112107
}
113108

114109
result = array_merge(num_arrays, sizes, a);
115-
assert_true(arrays_match(11, result, expected));
110+
arrays_match(11, result, expected);
116111
}
117112

118113
int main(int argc, char* argv[]) {
119-
UnitTest tests[] = {
120-
unit_test(test_empty_list),
121-
unit_test(test_singleton_list),
122-
unit_test(test_one_longer_list),
123-
unit_test(test_multiple_copies_of_longer_list),
124-
unit_test(test_multiple_copies_of_longer_list_different_orders),
125-
unit_test(test_different_sizes),
126-
unit_test(test_different_sizes_reversed),
127-
};
128-
return run_tests(tests);
114+
::testing::InitGoogleTest(&argc, argv);
115+
return RUN_ALL_TESTS();
129116
}

0 commit comments

Comments
 (0)