Sat, 15 Jul 2017 19:20:06 +0200
adds distance function and ucx_avl_find_node()
20
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1 | /* |
103
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
2 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. |
20
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
3 | * |
225
a1a068c2c4ef
updates documenting comments
Mike Becker <universe@uap-core.de>
parents:
206
diff
changeset
|
4 | * Copyright 2016 Olaf Wintermann. All rights reserved. |
103
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
5 | * |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
6 | * Redistribution and use in source and binary forms, with or without |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
7 | * modification, are permitted provided that the following conditions are met: |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
8 | * |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
9 | * 1. Redistributions of source code must retain the above copyright |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
10 | * notice, this list of conditions and the following disclaimer. |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
11 | * |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
12 | * 2. Redistributions in binary form must reproduce the above copyright |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
13 | * notice, this list of conditions and the following disclaimer in the |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
14 | * documentation and/or other materials provided with the distribution. |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
15 | * |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
16 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
17 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
18 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
19 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
20 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
08018864fb91
added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents:
95
diff
changeset
|
26 | * POSSIBILITY OF SUCH DAMAGE. |
20
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
27 | */ |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
28 | |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
29 | #include "map_tests.h" |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
30 | |
134
4d320dc3a7af
documented test.h and removed duplicated implement/declare macros for UCX_TEST
Mike Becker <universe@uap-core.de>
parents:
112
diff
changeset
|
31 | UCX_TEST(test_ucx_map_new) { |
20
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
32 | UcxMap *map = ucx_map_new(16); |
33
9c219a62070d
major refactoring of test framework
Mike Becker <universe@uap-core.de>
parents:
32
diff
changeset
|
33 | UCX_TEST_BEGIN |
40
583718dd4cf3
added semicolons to assert makros
Mike Becker <universe@uap-core.de>
parents:
34
diff
changeset
|
34 | UCX_TEST_ASSERT(map->size == 16, "wrong size"); |
583718dd4cf3
added semicolons to assert makros
Mike Becker <universe@uap-core.de>
parents:
34
diff
changeset
|
35 | UCX_TEST_ASSERT(map->map != NULL, "failed"); |
29
bce0d7f2912b
fixed map with the help of new tests
Mike Becker <universe@uap-core.de>
parents:
20
diff
changeset
|
36 | |
33
9c219a62070d
major refactoring of test framework
Mike Becker <universe@uap-core.de>
parents:
32
diff
changeset
|
37 | UCX_TEST_END |
29
bce0d7f2912b
fixed map with the help of new tests
Mike Becker <universe@uap-core.de>
parents:
20
diff
changeset
|
38 | ucx_map_free(map); |
bce0d7f2912b
fixed map with the help of new tests
Mike Becker <universe@uap-core.de>
parents:
20
diff
changeset
|
39 | } |
20
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
40 | |
134
4d320dc3a7af
documented test.h and removed duplicated implement/declare macros for UCX_TEST
Mike Becker <universe@uap-core.de>
parents:
112
diff
changeset
|
41 | UCX_TEST(test_ucx_key) { |
71
303dabadff1c
made the code work with g++ without errors (but warnings)
Mike Becker <universe@uap-core.de>
parents:
69
diff
changeset
|
42 | UcxKey key = ucx_key((void*)"This is a text.", 15); |
33
9c219a62070d
major refactoring of test framework
Mike Becker <universe@uap-core.de>
parents:
32
diff
changeset
|
43 | UCX_TEST_BEGIN |
69
fb59270b1de3
made the code work with VC++ compiler (use make CONF=windows)
Mike Becker <universe@uap-core.de>
parents:
55
diff
changeset
|
44 | UCX_TEST_ASSERT(strncmp((const char*)key.data, "This is a text.", 15) == 0, |
fb59270b1de3
made the code work with VC++ compiler (use make CONF=windows)
Mike Becker <universe@uap-core.de>
parents:
55
diff
changeset
|
45 | "failed"); |
40
583718dd4cf3
added semicolons to assert makros
Mike Becker <universe@uap-core.de>
parents:
34
diff
changeset
|
46 | UCX_TEST_ASSERT(key.len == 15, "failed"); |
583718dd4cf3
added semicolons to assert makros
Mike Becker <universe@uap-core.de>
parents:
34
diff
changeset
|
47 | UCX_TEST_ASSERT(key.hash == 1261186027, "hash failed"); |
29
bce0d7f2912b
fixed map with the help of new tests
Mike Becker <universe@uap-core.de>
parents:
20
diff
changeset
|
48 | |
bce0d7f2912b
fixed map with the help of new tests
Mike Becker <universe@uap-core.de>
parents:
20
diff
changeset
|
49 | UCX_TEST_END |
bce0d7f2912b
fixed map with the help of new tests
Mike Becker <universe@uap-core.de>
parents:
20
diff
changeset
|
50 | } |
bce0d7f2912b
fixed map with the help of new tests
Mike Becker <universe@uap-core.de>
parents:
20
diff
changeset
|
51 | |
134
4d320dc3a7af
documented test.h and removed duplicated implement/declare macros for UCX_TEST
Mike Becker <universe@uap-core.de>
parents:
112
diff
changeset
|
52 | UCX_TEST(test_ucx_map_put) { |
29
bce0d7f2912b
fixed map with the help of new tests
Mike Becker <universe@uap-core.de>
parents:
20
diff
changeset
|
53 | |
bce0d7f2912b
fixed map with the help of new tests
Mike Becker <universe@uap-core.de>
parents:
20
diff
changeset
|
54 | UcxMap *map = ucx_map_new(4); |
bce0d7f2912b
fixed map with the help of new tests
Mike Becker <universe@uap-core.de>
parents:
20
diff
changeset
|
55 | |
bce0d7f2912b
fixed map with the help of new tests
Mike Becker <universe@uap-core.de>
parents:
20
diff
changeset
|
56 | int td[5]; |
bce0d7f2912b
fixed map with the help of new tests
Mike Becker <universe@uap-core.de>
parents:
20
diff
changeset
|
57 | td[0] = 10; td[1] = 42; td[2] = 70; td[3] = 11200; td[4] = 80000; |
20
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
58 | |
33
9c219a62070d
major refactoring of test framework
Mike Becker <universe@uap-core.de>
parents:
32
diff
changeset
|
59 | UCX_TEST_BEGIN |
80
0125e4089f88
Fixed map tests + added some formatting options to logger
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
60 | ucx_map_cstr_put(map, "Key2", &td[2]); /* 3.2 */ |
0125e4089f88
Fixed map tests + added some formatting options to logger
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
61 | ucx_map_cstr_put(map, "Key0", &td[0]); /* 0.0 */ |
0125e4089f88
Fixed map tests + added some formatting options to logger
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
62 | ucx_map_cstr_put(map, "Key1", &td[1]); /* 3.0 */ |
0125e4089f88
Fixed map tests + added some formatting options to logger
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
63 | ucx_map_cstr_put(map, "KeY3", &td[3]); /* 3.1 */ |
0125e4089f88
Fixed map tests + added some formatting options to logger
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
64 | ucx_map_cstr_put(map, "KEY4", &td[4]); /* 1.0 */ |
29
bce0d7f2912b
fixed map with the help of new tests
Mike Becker <universe@uap-core.de>
parents:
20
diff
changeset
|
65 | |
40
583718dd4cf3
added semicolons to assert makros
Mike Becker <universe@uap-core.de>
parents:
34
diff
changeset
|
66 | UCX_TEST_ASSERT(*((int*)map->map[0]->data) == td[0], "failed Key0"); |
80
0125e4089f88
Fixed map tests + added some formatting options to logger
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
67 | UCX_TEST_ASSERT(*((int*)map->map[1]->data) == td[4], "failed KEY4"); |
0125e4089f88
Fixed map tests + added some formatting options to logger
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
68 | UCX_TEST_ASSERT(*((int*)map->map[3]->data) == td[1], "failed Key1"); |
0125e4089f88
Fixed map tests + added some formatting options to logger
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
69 | |
0125e4089f88
Fixed map tests + added some formatting options to logger
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
70 | UCX_TEST_ASSERT(map->map[3]->next != NULL, "no list at slot 3"); |
0125e4089f88
Fixed map tests + added some formatting options to logger
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
71 | UCX_TEST_ASSERT(map->map[3]->next->next != NULL, "list corrupt at slot 3"); |
0125e4089f88
Fixed map tests + added some formatting options to logger
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
72 | UCX_TEST_ASSERT(*((int*)map->map[3]->next->data) == td[3], |
0125e4089f88
Fixed map tests + added some formatting options to logger
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
73 | "failed KeY3") |
0125e4089f88
Fixed map tests + added some formatting options to logger
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
74 | UCX_TEST_ASSERT(*((int*)map->map[3]->next->next->data) == td[2], |
0125e4089f88
Fixed map tests + added some formatting options to logger
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
75 | "failed KeY2"); |
29
bce0d7f2912b
fixed map with the help of new tests
Mike Becker <universe@uap-core.de>
parents:
20
diff
changeset
|
76 | |
80
0125e4089f88
Fixed map tests + added some formatting options to logger
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
77 | UCX_TEST_ASSERT(map->map[0]->next == NULL, "slot 0 not terminated"); |
0125e4089f88
Fixed map tests + added some formatting options to logger
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
78 | UCX_TEST_ASSERT(map->map[1]->next == NULL, "slot 1 not terminated"); |
0125e4089f88
Fixed map tests + added some formatting options to logger
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
79 | UCX_TEST_ASSERT(map->map[2] == NULL, "slot 2 not empty"); |
0125e4089f88
Fixed map tests + added some formatting options to logger
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
80 | UCX_TEST_ASSERT(map->map[3]->next->next->next == NULL, |
0125e4089f88
Fixed map tests + added some formatting options to logger
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
81 | "slot 3 not terminated") |
20
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
82 | |
80
0125e4089f88
Fixed map tests + added some formatting options to logger
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
83 | ucx_map_cstr_put(map, "KeY3", &td[4]); /* replace 3.1 */ |
29
bce0d7f2912b
fixed map with the help of new tests
Mike Becker <universe@uap-core.de>
parents:
20
diff
changeset
|
84 | |
80
0125e4089f88
Fixed map tests + added some formatting options to logger
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
85 | UCX_TEST_ASSERT(*((int*)map->map[3]->data) == td[1], |
29
bce0d7f2912b
fixed map with the help of new tests
Mike Becker <universe@uap-core.de>
parents:
20
diff
changeset
|
86 | "overwrite failed") |
80
0125e4089f88
Fixed map tests + added some formatting options to logger
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
87 | UCX_TEST_ASSERT(*((int*)map->map[3]->next->data) == td[4], |
0125e4089f88
Fixed map tests + added some formatting options to logger
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
88 | "overwrite failed"); |
0125e4089f88
Fixed map tests + added some formatting options to logger
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
89 | UCX_TEST_ASSERT(*((int*)map->map[3]->next->next->data) == td[2], |
29
bce0d7f2912b
fixed map with the help of new tests
Mike Becker <universe@uap-core.de>
parents:
20
diff
changeset
|
90 | "overwrite failed") |
80
0125e4089f88
Fixed map tests + added some formatting options to logger
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
91 | UCX_TEST_ASSERT(map->map[3]->next->next->next == NULL, "overwrite failed"); |
29
bce0d7f2912b
fixed map with the help of new tests
Mike Becker <universe@uap-core.de>
parents:
20
diff
changeset
|
92 | |
33
9c219a62070d
major refactoring of test framework
Mike Becker <universe@uap-core.de>
parents:
32
diff
changeset
|
93 | UCX_TEST_END |
29
bce0d7f2912b
fixed map with the help of new tests
Mike Becker <universe@uap-core.de>
parents:
20
diff
changeset
|
94 | ucx_map_free(map); |
33
9c219a62070d
major refactoring of test framework
Mike Becker <universe@uap-core.de>
parents:
32
diff
changeset
|
95 | } |
9c219a62070d
major refactoring of test framework
Mike Becker <universe@uap-core.de>
parents:
32
diff
changeset
|
96 | |
134
4d320dc3a7af
documented test.h and removed duplicated implement/declare macros for UCX_TEST
Mike Becker <universe@uap-core.de>
parents:
112
diff
changeset
|
97 | UCX_TEST(test_ucx_map_get) { |
34 | 98 | UcxMap *map = ucx_map_new(4); |
99 | ||
100 | int td[5]; | |
101 | td[0] = 10; td[1] = 42; td[2] = 70; td[3] = 11200; td[4] = 80000; | |
102 | ||
80
0125e4089f88
Fixed map tests + added some formatting options to logger
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
103 | ucx_map_cstr_put(map, "Key2", &td[2]); |
0125e4089f88
Fixed map tests + added some formatting options to logger
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
104 | ucx_map_cstr_put(map, "Key0", &td[0]); |
0125e4089f88
Fixed map tests + added some formatting options to logger
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
105 | ucx_map_cstr_put(map, "Key1", &td[1]); |
0125e4089f88
Fixed map tests + added some formatting options to logger
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
106 | ucx_map_cstr_put(map, "KeY3", &td[3]); |
0125e4089f88
Fixed map tests + added some formatting options to logger
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
107 | ucx_map_cstr_put(map, "KEY4", &td[4]); |
33
9c219a62070d
major refactoring of test framework
Mike Becker <universe@uap-core.de>
parents:
32
diff
changeset
|
108 | UCX_TEST_BEGIN |
34 | 109 | |
110 | td[0] = *((int*)ucx_map_cstr_get(map, "Key0")); | |
111 | td[1] = *((int*)ucx_map_cstr_get(map, "Key1")); | |
112 | td[2] = *((int*)ucx_map_cstr_get(map, "Key2")); | |
113 | td[3] = *((int*)ucx_map_cstr_get(map, "KeY3")); | |
114 | td[4] = *((int*)ucx_map_cstr_get(map, "KEY4")); | |
40
583718dd4cf3
added semicolons to assert makros
Mike Becker <universe@uap-core.de>
parents:
34
diff
changeset
|
115 | UCX_TEST_ASSERT(td[0] == 10, "failed key 0"); |
583718dd4cf3
added semicolons to assert makros
Mike Becker <universe@uap-core.de>
parents:
34
diff
changeset
|
116 | UCX_TEST_ASSERT(td[1] == 42, "failed key 1"); |
583718dd4cf3
added semicolons to assert makros
Mike Becker <universe@uap-core.de>
parents:
34
diff
changeset
|
117 | UCX_TEST_ASSERT(td[2] == 70, "failed key 2"); |
583718dd4cf3
added semicolons to assert makros
Mike Becker <universe@uap-core.de>
parents:
34
diff
changeset
|
118 | UCX_TEST_ASSERT(td[3] == 11200, "failed key 3"); |
583718dd4cf3
added semicolons to assert makros
Mike Becker <universe@uap-core.de>
parents:
34
diff
changeset
|
119 | UCX_TEST_ASSERT(td[4] == 80000, "failed key 4"); |
34 | 120 | |
53 | 121 | UCX_TEST_ASSERT(map->count == 5, "expected 5 remaining values"); |
122 | UCX_TEST_ASSERT(ucx_map_cstr_get(map, "Key0") != NULL, "element removed"); | |
123 | ||
124 | UCX_TEST_END | |
125 | ucx_map_free(map); | |
126 | } | |
127 | ||
134
4d320dc3a7af
documented test.h and removed duplicated implement/declare macros for UCX_TEST
Mike Becker <universe@uap-core.de>
parents:
112
diff
changeset
|
128 | UCX_TEST(test_ucx_map_remove) { |
53 | 129 | UcxMap *map = ucx_map_new(4); |
130 | ||
131 | int td[5]; | |
132 | td[0] = 10; td[1] = 42; td[2] = 70; td[3] = 11200; td[4] = 80000; | |
133 | ||
134 | ucx_map_cstr_put(map, "Key2", &td[2]); /* 0 */ | |
135 | ucx_map_cstr_put(map, "Key0", &td[0]); /* 0 */ | |
136 | ucx_map_cstr_put(map, "Key1", &td[1]); /* 3 */ | |
137 | ucx_map_cstr_put(map, "KeY3", &td[3]); /* 2 */ | |
138 | ucx_map_cstr_put(map, "KEY4", &td[4]); /* 0 */ | |
139 | UCX_TEST_BEGIN | |
140 | ||
141 | td[0] = *((int*)ucx_map_cstr_remove(map, "Key0")); | |
142 | td[1] = *((int*)ucx_map_cstr_get(map, "Key1")); | |
143 | td[2] = *((int*)ucx_map_cstr_remove(map, "Key2")); | |
144 | td[3] = *((int*)ucx_map_cstr_get(map, "KeY3")); | |
145 | td[4] = *((int*)ucx_map_cstr_get(map, "KEY4")); | |
146 | UCX_TEST_ASSERT(td[0] == 10, "failed key 0"); | |
147 | UCX_TEST_ASSERT(td[1] == 42, "failed key 1"); | |
148 | UCX_TEST_ASSERT(td[2] == 70, "failed key 2"); | |
149 | UCX_TEST_ASSERT(td[3] == 11200, "failed key 3"); | |
150 | UCX_TEST_ASSERT(td[4] == 80000, "failed key 4"); | |
151 | ||
152 | UCX_TEST_ASSERT(map->count == 3, "expected 3 remaining values"); | |
153 | UCX_TEST_ASSERT(ucx_map_cstr_get(map, "Key0")==NULL, "element not removed"); | |
154 | UCX_TEST_ASSERT(ucx_map_cstr_get(map, "Key1")!=NULL, "element removed"); | |
155 | UCX_TEST_ASSERT(ucx_map_cstr_get(map, "Key2")==NULL, "element not removed"); | |
156 | UCX_TEST_ASSERT(ucx_map_cstr_get(map, "KeY3")!=NULL, "element removed"); | |
157 | UCX_TEST_ASSERT(ucx_map_cstr_get(map, "KEY4")!=NULL, "element removed"); | |
158 | ||
159 | UCX_TEST_ASSERT(ucx_map_cstr_remove(map, "Key2") == NULL, | |
160 | "subsequent remove call shall return NULL"); | |
161 | ||
29
bce0d7f2912b
fixed map with the help of new tests
Mike Becker <universe@uap-core.de>
parents:
20
diff
changeset
|
162 | UCX_TEST_END |
34 | 163 | ucx_map_free(map); |
20
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
164 | } |
29
bce0d7f2912b
fixed map with the help of new tests
Mike Becker <universe@uap-core.de>
parents:
20
diff
changeset
|
165 | |
206 | 166 | UCX_TEST(test_ucx_map_clear) { |
167 | UcxMap *map = ucx_map_new(4); | |
168 | ||
169 | int value = 42; | |
170 | ||
171 | ucx_map_cstr_put(map, "Key0", &value); | |
172 | ucx_map_cstr_put(map, "Key1", &value); | |
173 | ucx_map_cstr_put(map, "Key2", &value); | |
174 | ucx_map_cstr_put(map, "Key3", &value); | |
175 | ucx_map_cstr_put(map, "Key4", &value); | |
176 | ucx_map_cstr_put(map, "Key5", &value); | |
177 | ucx_map_cstr_put(map, "Key6", &value); | |
178 | UCX_TEST_BEGIN | |
179 | ||
180 | ucx_map_clear(map); | |
181 | ||
182 | UCX_TEST_ASSERT(map->count == 0, "map has not been cleared"); | |
183 | UCX_TEST_ASSERT(map->size == 4, "map size has changed unexpectedly"); | |
184 | ||
185 | UCX_TEST_ASSERT(ucx_map_cstr_get(map, "Key0")==NULL, "element not removed"); | |
186 | UCX_TEST_ASSERT(ucx_map_cstr_get(map, "Key1")==NULL, "element not removed"); | |
187 | UCX_TEST_ASSERT(ucx_map_cstr_get(map, "Key2")==NULL, "element not removed"); | |
188 | UCX_TEST_ASSERT(ucx_map_cstr_get(map, "Key3")==NULL, "element not removed"); | |
189 | UCX_TEST_ASSERT(ucx_map_cstr_get(map, "Key4")==NULL, "element not removed"); | |
190 | UCX_TEST_ASSERT(ucx_map_cstr_get(map, "Key5")==NULL, "element not removed"); | |
191 | UCX_TEST_ASSERT(ucx_map_cstr_get(map, "Key6")==NULL, "element not removed"); | |
192 | ||
193 | UCX_TEST_END | |
194 | ucx_map_free(map); | |
195 | } | |
196 | ||
88
18823857ce79
variadic test subroutines
Mike Becker <universe@uap-core.de>
parents:
80
diff
changeset
|
197 | UCX_TEST_SUBROUTINE(test_ucx_map_itersrt, UcxMap *map) { |
31
91ac86557290
added map iterator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
198 | int v1 = 10; |
91ac86557290
added map iterator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
199 | int v2 = 15; |
91ac86557290
added map iterator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
200 | int v3 = 7; |
91ac86557290
added map iterator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
201 | int v4 = 9; |
32
c7af4ec56e19
consequently used intptr_t in mpool tests
Mike Becker <universe@uap-core.de>
parents:
31
diff
changeset
|
202 | |
31
91ac86557290
added map iterator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
203 | ucx_map_cstr_put(map, "v1", &v1); |
91ac86557290
added map iterator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
204 | ucx_map_cstr_put(map, "v2", &v2); |
91ac86557290
added map iterator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
205 | ucx_map_cstr_put(map, "v3", &v3); |
91ac86557290
added map iterator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
206 | ucx_map_cstr_put(map, "v4", &v4); |
32
c7af4ec56e19
consequently used intptr_t in mpool tests
Mike Becker <universe@uap-core.de>
parents:
31
diff
changeset
|
207 | |
31
91ac86557290
added map iterator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
208 | UcxMapIterator i = ucx_map_iterator(map); |
91ac86557290
added map iterator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
209 | int check = 0; |
91ac86557290
added map iterator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
210 | int hit = 0; |
32
c7af4ec56e19
consequently used intptr_t in mpool tests
Mike Becker <universe@uap-core.de>
parents:
31
diff
changeset
|
211 | |
152
3238f65db163
minor code fixes + added clang support + improved build system
Mike Becker <universe@uap-core.de>
parents:
134
diff
changeset
|
212 | void* v; |
111
c8c59d7f4536
new map foreach macro
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
213 | UCX_MAP_FOREACH(key, v, i) { |
152
3238f65db163
minor code fixes + added clang support + improved build system
Mike Becker <universe@uap-core.de>
parents:
134
diff
changeset
|
214 | check += *((int*)v); |
31
91ac86557290
added map iterator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
215 | hit++; |
91ac86557290
added map iterator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
216 | } |
32
c7af4ec56e19
consequently used intptr_t in mpool tests
Mike Becker <universe@uap-core.de>
parents:
31
diff
changeset
|
217 | |
31
91ac86557290
added map iterator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
218 | UCX_TEST_ASSERT(hit == 4, "test1: wrong number of hits"); |
91ac86557290
added map iterator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
219 | UCX_TEST_ASSERT(check == v1+v2+v3+v4, "test1: wrong result"); |
33
9c219a62070d
major refactoring of test framework
Mike Becker <universe@uap-core.de>
parents:
32
diff
changeset
|
220 | } |
32
c7af4ec56e19
consequently used intptr_t in mpool tests
Mike Becker <universe@uap-core.de>
parents:
31
diff
changeset
|
221 | |
134
4d320dc3a7af
documented test.h and removed duplicated implement/declare macros for UCX_TEST
Mike Becker <universe@uap-core.de>
parents:
112
diff
changeset
|
222 | UCX_TEST(test_ucx_map_iterator) { |
33
9c219a62070d
major refactoring of test framework
Mike Becker <universe@uap-core.de>
parents:
32
diff
changeset
|
223 | UcxMap *map = ucx_map_new(16); |
9c219a62070d
major refactoring of test framework
Mike Becker <universe@uap-core.de>
parents:
32
diff
changeset
|
224 | UCX_TEST_BEGIN |
9c219a62070d
major refactoring of test framework
Mike Becker <universe@uap-core.de>
parents:
32
diff
changeset
|
225 | UCX_TEST_CALL_SUBROUTINE(test_ucx_map_itersrt, map) |
9c219a62070d
major refactoring of test framework
Mike Becker <universe@uap-core.de>
parents:
32
diff
changeset
|
226 | UCX_TEST_END |
31
91ac86557290
added map iterator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
227 | ucx_map_free(map); |
33
9c219a62070d
major refactoring of test framework
Mike Becker <universe@uap-core.de>
parents:
32
diff
changeset
|
228 | } |
9c219a62070d
major refactoring of test framework
Mike Becker <universe@uap-core.de>
parents:
32
diff
changeset
|
229 | |
134
4d320dc3a7af
documented test.h and removed duplicated implement/declare macros for UCX_TEST
Mike Becker <universe@uap-core.de>
parents:
112
diff
changeset
|
230 | UCX_TEST(test_ucx_map_iterator_chain) { |
33
9c219a62070d
major refactoring of test framework
Mike Becker <universe@uap-core.de>
parents:
32
diff
changeset
|
231 | UcxMap *map = ucx_map_new(1); |
9c219a62070d
major refactoring of test framework
Mike Becker <universe@uap-core.de>
parents:
32
diff
changeset
|
232 | UCX_TEST_BEGIN |
9c219a62070d
major refactoring of test framework
Mike Becker <universe@uap-core.de>
parents:
32
diff
changeset
|
233 | UCX_TEST_CALL_SUBROUTINE(test_ucx_map_itersrt, map) |
9c219a62070d
major refactoring of test framework
Mike Becker <universe@uap-core.de>
parents:
32
diff
changeset
|
234 | UCX_TEST_END |
31
91ac86557290
added map iterator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
235 | ucx_map_free(map); |
91ac86557290
added map iterator
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
29
diff
changeset
|
236 | } |
42
ff3dd1ee7dee
(broken-commit) - added load and store functions, tests failing
Mike Becker <universe@uap-core.de>
parents:
41
diff
changeset
|
237 | |
134
4d320dc3a7af
documented test.h and removed duplicated implement/declare macros for UCX_TEST
Mike Becker <universe@uap-core.de>
parents:
112
diff
changeset
|
238 | UCX_TEST(test_ucx_map_clone) { |
44 | 239 | UcxMap *map = ucx_map_new(4); |
240 | ||
71
303dabadff1c
made the code work with g++ without errors (but warnings)
Mike Becker <universe@uap-core.de>
parents:
69
diff
changeset
|
241 | ucx_map_cstr_put(map, "key1", (void*)"value1"); |
303dabadff1c
made the code work with g++ without errors (but warnings)
Mike Becker <universe@uap-core.de>
parents:
69
diff
changeset
|
242 | ucx_map_cstr_put(map, "key2", (void*)"value2"); |
303dabadff1c
made the code work with g++ without errors (but warnings)
Mike Becker <universe@uap-core.de>
parents:
69
diff
changeset
|
243 | ucx_map_cstr_put(map, "key3", (void*)"value3"); |
44 | 244 | |
245 | UcxMap *clone = ucx_map_clone(map, NULL, NULL); | |
246 | ||
69
fb59270b1de3
made the code work with VC++ compiler (use make CONF=windows)
Mike Becker <universe@uap-core.de>
parents:
55
diff
changeset
|
247 | const char *v1 = (const char *) ucx_map_cstr_get(map, "key1"); |
fb59270b1de3
made the code work with VC++ compiler (use make CONF=windows)
Mike Becker <universe@uap-core.de>
parents:
55
diff
changeset
|
248 | const char *v2 = (const char *) ucx_map_cstr_get(map, "key2"); |
fb59270b1de3
made the code work with VC++ compiler (use make CONF=windows)
Mike Becker <universe@uap-core.de>
parents:
55
diff
changeset
|
249 | const char *v3 = (const char *) ucx_map_cstr_get(map, "key3"); |
44 | 250 | |
251 | UCX_TEST_BEGIN | |
252 | ||
253 | UCX_TEST_ASSERT(v1 != NULL, "failed key 1"); | |
254 | UCX_TEST_ASSERT(v2 != NULL, "failed key 2"); | |
255 | UCX_TEST_ASSERT(v3 != NULL, "failed key 3"); | |
256 | ||
69
fb59270b1de3
made the code work with VC++ compiler (use make CONF=windows)
Mike Becker <universe@uap-core.de>
parents:
55
diff
changeset
|
257 | const char *c1 = (const char *) ucx_map_cstr_get(clone, "key1"); |
fb59270b1de3
made the code work with VC++ compiler (use make CONF=windows)
Mike Becker <universe@uap-core.de>
parents:
55
diff
changeset
|
258 | const char *c2 = (const char *) ucx_map_cstr_get(clone, "key2"); |
fb59270b1de3
made the code work with VC++ compiler (use make CONF=windows)
Mike Becker <universe@uap-core.de>
parents:
55
diff
changeset
|
259 | const char *c3 = (const char *) ucx_map_cstr_get(clone, "key3"); |
44 | 260 | |
261 | UCX_TEST_ASSERT(c1 != NULL, "failed key 1 (clone)"); | |
262 | UCX_TEST_ASSERT(c2 != NULL, "failed key 2 (clone)"); | |
263 | UCX_TEST_ASSERT(c3 != NULL, "failed key 3 (clone)"); | |
264 | ||
265 | UCX_TEST_ASSERT(strcmp(c1, v1) == 0, "value error for key1"); | |
266 | UCX_TEST_ASSERT(strcmp(c2, v2) == 0, "value error for key2"); | |
267 | UCX_TEST_ASSERT(strcmp(c3, v3) == 0, "value error for key3"); | |
268 | ||
269 | UCX_TEST_END | |
270 | ||
271 | ucx_map_free(map); | |
272 | ucx_map_free(clone); | |
273 | } | |
51
1c78cd19fb6b
added rehashing to maps by using clone function
Mike Becker <universe@uap-core.de>
parents:
48
diff
changeset
|
274 | |
134
4d320dc3a7af
documented test.h and removed duplicated implement/declare macros for UCX_TEST
Mike Becker <universe@uap-core.de>
parents:
112
diff
changeset
|
275 | UCX_TEST(test_ucx_map_rehash) { |
51
1c78cd19fb6b
added rehashing to maps by using clone function
Mike Becker <universe@uap-core.de>
parents:
48
diff
changeset
|
276 | UcxMap *map = ucx_map_new(4); |
1c78cd19fb6b
added rehashing to maps by using clone function
Mike Becker <universe@uap-core.de>
parents:
48
diff
changeset
|
277 | |
1c78cd19fb6b
added rehashing to maps by using clone function
Mike Becker <universe@uap-core.de>
parents:
48
diff
changeset
|
278 | char keys[10][5]; |
1c78cd19fb6b
added rehashing to maps by using clone function
Mike Becker <universe@uap-core.de>
parents:
48
diff
changeset
|
279 | char values[10][7]; |
1c78cd19fb6b
added rehashing to maps by using clone function
Mike Becker <universe@uap-core.de>
parents:
48
diff
changeset
|
280 | for (int i = 0 ; i < 10 ; i++) { |
1c78cd19fb6b
added rehashing to maps by using clone function
Mike Becker <universe@uap-core.de>
parents:
48
diff
changeset
|
281 | strcpy(keys[i], "key"); |
1c78cd19fb6b
added rehashing to maps by using clone function
Mike Becker <universe@uap-core.de>
parents:
48
diff
changeset
|
282 | keys[i][3] = 48+i; keys[i][4] = 0; |
1c78cd19fb6b
added rehashing to maps by using clone function
Mike Becker <universe@uap-core.de>
parents:
48
diff
changeset
|
283 | strcpy(values[i], "value"); |
1c78cd19fb6b
added rehashing to maps by using clone function
Mike Becker <universe@uap-core.de>
parents:
48
diff
changeset
|
284 | values[i][5] = 48+i; values[i][6] = 0; |
1c78cd19fb6b
added rehashing to maps by using clone function
Mike Becker <universe@uap-core.de>
parents:
48
diff
changeset
|
285 | |
1c78cd19fb6b
added rehashing to maps by using clone function
Mike Becker <universe@uap-core.de>
parents:
48
diff
changeset
|
286 | ucx_map_cstr_put(map, keys[i], values[i]); |
1c78cd19fb6b
added rehashing to maps by using clone function
Mike Becker <universe@uap-core.de>
parents:
48
diff
changeset
|
287 | } |
1c78cd19fb6b
added rehashing to maps by using clone function
Mike Becker <universe@uap-core.de>
parents:
48
diff
changeset
|
288 | |
52
34f50d0bada4
added ucx_map_copy and fixed ucx_map_rehash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
289 | ucx_map_rehash(map); |
51
1c78cd19fb6b
added rehashing to maps by using clone function
Mike Becker <universe@uap-core.de>
parents:
48
diff
changeset
|
290 | |
1c78cd19fb6b
added rehashing to maps by using clone function
Mike Becker <universe@uap-core.de>
parents:
48
diff
changeset
|
291 | UCX_TEST_BEGIN |
1c78cd19fb6b
added rehashing to maps by using clone function
Mike Becker <universe@uap-core.de>
parents:
48
diff
changeset
|
292 | UCX_TEST_ASSERT(map->size == 25, "new capacity shall be 2.5 * count"); |
1c78cd19fb6b
added rehashing to maps by using clone function
Mike Becker <universe@uap-core.de>
parents:
48
diff
changeset
|
293 | UCX_TEST_ASSERT(map->count == 10, "new map element count incorrect"); |
1c78cd19fb6b
added rehashing to maps by using clone function
Mike Becker <universe@uap-core.de>
parents:
48
diff
changeset
|
294 | for (int i = 0 ; i < 10 ; i++) { |
69
fb59270b1de3
made the code work with VC++ compiler (use make CONF=windows)
Mike Becker <universe@uap-core.de>
parents:
55
diff
changeset
|
295 | const char *value = (const char *) ucx_map_cstr_get(map, keys[i]); |
51
1c78cd19fb6b
added rehashing to maps by using clone function
Mike Becker <universe@uap-core.de>
parents:
48
diff
changeset
|
296 | UCX_TEST_ASSERT(value != NULL, "new map is missing old keys"); |
1c78cd19fb6b
added rehashing to maps by using clone function
Mike Becker <universe@uap-core.de>
parents:
48
diff
changeset
|
297 | UCX_TEST_ASSERT(strncmp(value, values[i], 6) == 0, |
1c78cd19fb6b
added rehashing to maps by using clone function
Mike Becker <universe@uap-core.de>
parents:
48
diff
changeset
|
298 | "new map contains incorrect values"); |
1c78cd19fb6b
added rehashing to maps by using clone function
Mike Becker <universe@uap-core.de>
parents:
48
diff
changeset
|
299 | } |
52
34f50d0bada4
added ucx_map_copy and fixed ucx_map_rehash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
300 | ucx_map_rehash(map); |
34f50d0bada4
added ucx_map_copy and fixed ucx_map_rehash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
301 | UCX_TEST_ASSERT(map->size == 25, |
51
1c78cd19fb6b
added rehashing to maps by using clone function
Mike Becker <universe@uap-core.de>
parents:
48
diff
changeset
|
302 | "subsequent rehashing call shall not change size"); |
1c78cd19fb6b
added rehashing to maps by using clone function
Mike Becker <universe@uap-core.de>
parents:
48
diff
changeset
|
303 | UCX_TEST_END |
1c78cd19fb6b
added rehashing to maps by using clone function
Mike Becker <universe@uap-core.de>
parents:
48
diff
changeset
|
304 | |
1c78cd19fb6b
added rehashing to maps by using clone function
Mike Becker <universe@uap-core.de>
parents:
48
diff
changeset
|
305 | ucx_map_free(map); |
1c78cd19fb6b
added rehashing to maps by using clone function
Mike Becker <universe@uap-core.de>
parents:
48
diff
changeset
|
306 | } |