Skip to content

Commit c7ad9fe

Browse files
karthyuommadolson
andauthored
Migrate endianconv.c unit tests to new test framework (#458)
This PR migrates all tests related to endianconv into new test framework as part of the parent issue #428. --------- Signed-off-by: Karthick Ariyaratnam <[email protected]> Signed-off-by: Madelyn Olson <[email protected]> Co-authored-by: Madelyn Olson <[email protected]>
1 parent dca1722 commit c7ad9fe

4 files changed

Lines changed: 29 additions & 32 deletions

File tree

src/endianconv.c

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -100,30 +100,3 @@ uint64_t intrev64(uint64_t v) {
100100
memrev64(&v);
101101
return v;
102102
}
103-
104-
#ifdef SERVER_TEST
105-
#include <stdio.h>
106-
107-
#define UNUSED(x) (void)(x)
108-
int endianconvTest(int argc, char *argv[], int flags) {
109-
char buf[32];
110-
111-
UNUSED(argc);
112-
UNUSED(argv);
113-
UNUSED(flags);
114-
115-
snprintf(buf,sizeof(buf),"ciaoroma");
116-
memrev16(buf);
117-
printf("%s\n", buf);
118-
119-
snprintf(buf,sizeof(buf),"ciaoroma");
120-
memrev32(buf);
121-
printf("%s\n", buf);
122-
123-
snprintf(buf,sizeof(buf),"ciaoroma");
124-
memrev64(buf);
125-
printf("%s\n", buf);
126-
127-
return 0;
128-
}
129-
#endif

src/endianconv.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,4 @@ uint64_t intrev64(uint64_t v);
7070
#define htonu64(v) intrev64(v)
7171
#define ntohu64(v) intrev64(v)
7272
#endif
73-
74-
#ifdef SERVER_TEST
75-
int endianconvTest(int argc, char *argv[], int flags);
76-
#endif
77-
7873
#endif

src/unit/test_endianconv.c

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#include <string.h>
2+
3+
#include "../endianconv.h"
4+
#include "test_help.h"
5+
6+
int test_endianconv(int argc, char *argv[], int flags) {
7+
UNUSED(argc);
8+
UNUSED(argv);
9+
UNUSED(flags);
10+
11+
char buf[32];
12+
13+
snprintf(buf,sizeof(buf),"ciaoroma");
14+
memrev16(buf);
15+
TEST_ASSERT(!strcmp(buf, "icaoroma"));
16+
17+
snprintf(buf,sizeof(buf),"ciaoroma");
18+
memrev32(buf);
19+
TEST_ASSERT(!strcmp(buf, "oaicroma"));
20+
21+
snprintf(buf,sizeof(buf),"ciaoroma");
22+
memrev64(buf);
23+
TEST_ASSERT(!strcmp(buf, "amoroaic"));
24+
25+
return 0;
26+
}

src/unit/test_files.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ typedef struct unitTest {
88

99
int test_crc64(int argc, char **argv, int flags);
1010
int test_crc64combine(int argc, char **argv, int flags);
11+
int test_endianconv(int argc, char *argv[], int flags);
1112
int test_intsetValueEncodings(int argc, char **argv, int flags);
1213
int test_intsetBasicAdding(int argc, char **argv, int flags);
1314
int test_intsetLargeNumberRandomAdd(int argc, char **argv, int flags);
@@ -32,6 +33,7 @@ int test_reclaimFilePageCache(int argc, char **argv, int flags);
3233

3334
unitTest __test_crc64_c[] = {{"test_crc64", test_crc64}, {NULL, NULL}};
3435
unitTest __test_crc64combine_c[] = {{"test_crc64combine", test_crc64combine}, {NULL, NULL}};
36+
unitTest __test_endianconv_c[] = {{"test_endianconv", test_endianconv}, {NULL, NULL}};
3537
unitTest __test_intset_c[] = {{"test_intsetValueEncodings", test_intsetValueEncodings}, {"test_intsetBasicAdding", test_intsetBasicAdding}, {"test_intsetLargeNumberRandomAdd", test_intsetLargeNumberRandomAdd}, {"test_intsetUpgradeFromint16Toint32", test_intsetUpgradeFromint16Toint32}, {"test_intsetUpgradeFromint16Toint64", test_intsetUpgradeFromint16Toint64}, {"test_intsetUpgradeFromint32Toint64", test_intsetUpgradeFromint32Toint64}, {"test_intsetStressLookups", test_intsetStressLookups}, {"test_intsetStressAddDelete", test_intsetStressAddDelete}, {NULL, NULL}};
3638
unitTest __test_kvstore_c[] = {{"test_kvstoreAdd16Keys", test_kvstoreAdd16Keys}, {"test_kvstoreIteratorRemoveAllKeysNoDeleteEmptyDict", test_kvstoreIteratorRemoveAllKeysNoDeleteEmptyDict}, {"test_kvstoreIteratorRemoveAllKeysDeleteEmptyDict", test_kvstoreIteratorRemoveAllKeysDeleteEmptyDict}, {"test_kvstoreDictIteratorRemoveAllKeysNoDeleteEmptyDict", test_kvstoreDictIteratorRemoveAllKeysNoDeleteEmptyDict}, {"test_kvstoreDictIteratorRemoveAllKeysDeleteEmptyDict", test_kvstoreDictIteratorRemoveAllKeysDeleteEmptyDict}, {NULL, NULL}};
3739
unitTest __test_sds_c[] = {{"test_sds", test_sds}, {NULL, NULL}};
@@ -44,6 +46,7 @@ struct unitTestSuite {
4446
} unitTestSuite[] = {
4547
{"test_crc64.c", __test_crc64_c},
4648
{"test_crc64combine.c", __test_crc64combine_c},
49+
{"test_endianconv.c", __test_endianconv_c},
4750
{"test_intset.c", __test_intset_c},
4851
{"test_kvstore.c", __test_kvstore_c},
4952
{"test_sds.c", __test_sds_c},

0 commit comments

Comments
 (0)