aboutsummaryrefslogtreecommitdiff
path: root/src/util/test_container_heap.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2010-09-03 21:29:15 +0000
committerChristian Grothoff <christian@grothoff.org>2010-09-03 21:29:15 +0000
commitefb3110524052367a4f9adfb3d21ef0f382149e1 (patch)
treee4dfcd418aa310bc82dd80e491cef0af9e304fc9 /src/util/test_container_heap.c
parent1c07f1fdcb46dece710954411547520128fce94c (diff)
downloadgnunet-efb3110524052367a4f9adfb3d21ef0f382149e1.tar.gz
gnunet-efb3110524052367a4f9adfb3d21ef0f382149e1.zip
add null check
Diffstat (limited to 'src/util/test_container_heap.c')
-rw-r--r--src/util/test_container_heap.c77
1 files changed, 48 insertions, 29 deletions
diff --git a/src/util/test_container_heap.c b/src/util/test_container_heap.c
index 091e42ce1..87bc49129 100644
--- a/src/util/test_container_heap.c
+++ b/src/util/test_container_heap.c
@@ -38,6 +38,15 @@ iterator_callback (void *cls,
38} 38}
39 39
40static int 40static int
41nstrcmp (const char *a,
42 const char *b)
43{
44 GNUNET_assert (a != NULL);
45 GNUNET_assert (b != NULL);
46 return strcmp (a,b);
47}
48
49static int
41check () 50check ()
42{ 51{
43 struct GNUNET_CONTAINER_Heap *myHeap; 52 struct GNUNET_CONTAINER_Heap *myHeap;
@@ -128,14 +137,20 @@ check ()
128 n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10); 137 n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10);
129 GNUNET_CONTAINER_heap_update_cost (myHeap, n1, 15); 138 GNUNET_CONTAINER_heap_update_cost (myHeap, n1, 15);
130 139
131 GNUNET_assert (0 == strcmp ("10", GNUNET_CONTAINER_heap_remove_node (myHeap,n1))); 140 r = GNUNET_CONTAINER_heap_remove_node (myHeap,n1);
141 GNUNET_assert (NULL != r);
142 GNUNET_assert (0 == strcmp ("10", r));
132 143
133 n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10); 144 n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10);
134 n2 = GNUNET_CONTAINER_heap_insert (myHeap, "20", 10); 145 n2 = GNUNET_CONTAINER_heap_insert (myHeap, "20", 10);
135 146
136 GNUNET_CONTAINER_heap_walk_get_next (myHeap); 147 GNUNET_CONTAINER_heap_walk_get_next (myHeap);
137 GNUNET_assert (0 == strcmp ("20", GNUNET_CONTAINER_heap_remove_node (myHeap,n2))); 148 r = GNUNET_CONTAINER_heap_remove_node (myHeap,n2);
138 GNUNET_assert (0 == strcmp ("10", GNUNET_CONTAINER_heap_remove_node (myHeap,n1))); 149 GNUNET_assert (NULL != r);
150 GNUNET_assert (0 == strcmp ("20", r));
151 r = GNUNET_CONTAINER_heap_remove_node (myHeap,n1);
152 GNUNET_assert (NULL != r);
153 GNUNET_assert (0 == strcmp ("10", r));
139 154
140 n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10); 155 n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10);
141 n2 = GNUNET_CONTAINER_heap_insert (myHeap, "20", 10); 156 n2 = GNUNET_CONTAINER_heap_insert (myHeap, "20", 10);
@@ -143,7 +158,9 @@ check ()
143 158
144 GNUNET_CONTAINER_heap_remove_node (myHeap,n2); 159 GNUNET_CONTAINER_heap_remove_node (myHeap,n2);
145 GNUNET_CONTAINER_heap_remove_node (myHeap,n1); 160 GNUNET_CONTAINER_heap_remove_node (myHeap,n1);
146 GNUNET_assert (0 == strcmp ("30", GNUNET_CONTAINER_heap_remove_root (myHeap))); 161 r = GNUNET_CONTAINER_heap_remove_root (myHeap);
162 GNUNET_assert (NULL != r);
163 GNUNET_assert (0 == strcmp ("30", r));
147 164
148 n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10); 165 n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10);
149 n2 = GNUNET_CONTAINER_heap_insert (myHeap, "20", 10); 166 n2 = GNUNET_CONTAINER_heap_insert (myHeap, "20", 10);
@@ -151,15 +168,17 @@ check ()
151 168
152 GNUNET_CONTAINER_heap_remove_node (myHeap,n2); 169 GNUNET_CONTAINER_heap_remove_node (myHeap,n2);
153 GNUNET_CONTAINER_heap_remove_node (myHeap,n1); 170 GNUNET_CONTAINER_heap_remove_node (myHeap,n1);
154 GNUNET_assert (0 == strcmp ("30", GNUNET_CONTAINER_heap_remove_node (myHeap,n3))); 171 r = GNUNET_CONTAINER_heap_remove_node (myHeap, n3);
172 GNUNET_assert (NULL != r);
173 GNUNET_assert (0 == strcmp ("30", r));
155 174
156 n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10); 175 n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10);
157 n2 = GNUNET_CONTAINER_heap_insert (myHeap, "20", 20); 176 n2 = GNUNET_CONTAINER_heap_insert (myHeap, "20", 20);
158 n3 = GNUNET_CONTAINER_heap_insert (myHeap, "30", 30); 177 n3 = GNUNET_CONTAINER_heap_insert (myHeap, "30", 30);
159 178
160 GNUNET_assert (0 == strcmp ("20", GNUNET_CONTAINER_heap_remove_node (myHeap,n2))); 179 GNUNET_assert (0 == nstrcmp ("20", GNUNET_CONTAINER_heap_remove_node (myHeap,n2)));
161 GNUNET_assert (0 == strcmp ("10", GNUNET_CONTAINER_heap_remove_root (myHeap))); 180 GNUNET_assert (0 == nstrcmp ("10", GNUNET_CONTAINER_heap_remove_root (myHeap)));
162 GNUNET_assert (0 == strcmp ("30", GNUNET_CONTAINER_heap_remove_root (myHeap))); 181 GNUNET_assert (0 == nstrcmp ("30", GNUNET_CONTAINER_heap_remove_root (myHeap)));
163 182
164 n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10); 183 n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10);
165 n2 = GNUNET_CONTAINER_heap_insert (myHeap, "20", 20); 184 n2 = GNUNET_CONTAINER_heap_insert (myHeap, "20", 20);
@@ -172,11 +191,11 @@ check ()
172 n7 = GNUNET_CONTAINER_heap_insert (myHeap, "70", 10); 191 n7 = GNUNET_CONTAINER_heap_insert (myHeap, "70", 10);
173 n8 = GNUNET_CONTAINER_heap_insert (myHeap, "80", 10); 192 n8 = GNUNET_CONTAINER_heap_insert (myHeap, "80", 10);
174 193
175 GNUNET_assert (0 == strcmp ("30", GNUNET_CONTAINER_heap_remove_node (myHeap,n3))); 194 GNUNET_assert (0 == nstrcmp ("30", GNUNET_CONTAINER_heap_remove_node (myHeap,n3)));
176 195
177 // Cleaning up... 196 // Cleaning up...
178 GNUNET_assert (0 == strcmp ("60", GNUNET_CONTAINER_heap_remove_node (myHeap,n6))); 197 GNUNET_assert (0 == nstrcmp ("60", GNUNET_CONTAINER_heap_remove_node (myHeap,n6)));
179 GNUNET_assert (0 == strcmp ("50", GNUNET_CONTAINER_heap_remove_node (myHeap,n5))); 198 GNUNET_assert (0 == nstrcmp ("50", GNUNET_CONTAINER_heap_remove_node (myHeap,n5)));
180 199
181 // Testing heap_walk_get_next 200 // Testing heap_walk_get_next
182 GNUNET_CONTAINER_heap_walk_get_next (myHeap); 201 GNUNET_CONTAINER_heap_walk_get_next (myHeap);
@@ -185,11 +204,11 @@ check ()
185 GNUNET_CONTAINER_heap_walk_get_next (myHeap); 204 GNUNET_CONTAINER_heap_walk_get_next (myHeap);
186 GNUNET_CONTAINER_heap_walk_get_next (myHeap); 205 GNUNET_CONTAINER_heap_walk_get_next (myHeap);
187 206
188 GNUNET_assert (0 == strcmp ("10", GNUNET_CONTAINER_heap_remove_node (myHeap,n1))); 207 GNUNET_assert (0 == nstrcmp ("10", GNUNET_CONTAINER_heap_remove_node (myHeap,n1)));
189 GNUNET_assert (0 == strcmp ("20", GNUNET_CONTAINER_heap_remove_node (myHeap,n2))); 208 GNUNET_assert (0 == nstrcmp ("20", GNUNET_CONTAINER_heap_remove_node (myHeap,n2)));
190 GNUNET_assert (0 == strcmp ("40", GNUNET_CONTAINER_heap_remove_node (myHeap,n4))); 209 GNUNET_assert (0 == nstrcmp ("40", GNUNET_CONTAINER_heap_remove_node (myHeap,n4)));
191 GNUNET_assert (0 == strcmp ("70", GNUNET_CONTAINER_heap_remove_node (myHeap,n7))); 210 GNUNET_assert (0 == nstrcmp ("70", GNUNET_CONTAINER_heap_remove_node (myHeap,n7)));
192 GNUNET_assert (0 == strcmp ("80", GNUNET_CONTAINER_heap_remove_node (myHeap,n8))); 211 GNUNET_assert (0 == nstrcmp ("80", GNUNET_CONTAINER_heap_remove_node (myHeap,n8)));
193 212
194 // End Testing remove_node 213 // End Testing remove_node
195 214
@@ -201,14 +220,14 @@ check ()
201 n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10); 220 n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10);
202 GNUNET_CONTAINER_heap_update_cost (myHeap, n1, 15); 221 GNUNET_CONTAINER_heap_update_cost (myHeap, n1, 15);
203 222
204 GNUNET_assert (0 == strcmp ("10", GNUNET_CONTAINER_heap_remove_node (myHeap,n1))); 223 GNUNET_assert (0 == nstrcmp ("10", GNUNET_CONTAINER_heap_remove_node (myHeap,n1)));
205 224
206 n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10); 225 n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10);
207 n2 = GNUNET_CONTAINER_heap_insert (myHeap, "20", 10); 226 n2 = GNUNET_CONTAINER_heap_insert (myHeap, "20", 10);
208 227
209 GNUNET_CONTAINER_heap_walk_get_next (myHeap); 228 GNUNET_CONTAINER_heap_walk_get_next (myHeap);
210 GNUNET_assert (0 == strcmp ("20", GNUNET_CONTAINER_heap_remove_node (myHeap,n2))); 229 GNUNET_assert (0 == nstrcmp ("20", GNUNET_CONTAINER_heap_remove_node (myHeap,n2)));
211 GNUNET_assert (0 == strcmp ("10", GNUNET_CONTAINER_heap_remove_node (myHeap,n1))); 230 GNUNET_assert (0 == nstrcmp ("10", GNUNET_CONTAINER_heap_remove_node (myHeap,n1)));
212 231
213 n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10); 232 n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10);
214 n2 = GNUNET_CONTAINER_heap_insert (myHeap, "20", 10); 233 n2 = GNUNET_CONTAINER_heap_insert (myHeap, "20", 10);
@@ -216,7 +235,7 @@ check ()
216 235
217 GNUNET_CONTAINER_heap_remove_node (myHeap,n2); 236 GNUNET_CONTAINER_heap_remove_node (myHeap,n2);
218 GNUNET_CONTAINER_heap_remove_node (myHeap,n1); 237 GNUNET_CONTAINER_heap_remove_node (myHeap,n1);
219 GNUNET_assert (0 == strcmp ("30", GNUNET_CONTAINER_heap_remove_root (myHeap))); 238 GNUNET_assert (0 == nstrcmp ("30", GNUNET_CONTAINER_heap_remove_root (myHeap)));
220 239
221 n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10); 240 n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10);
222 n2 = GNUNET_CONTAINER_heap_insert (myHeap, "20", 10); 241 n2 = GNUNET_CONTAINER_heap_insert (myHeap, "20", 10);
@@ -224,7 +243,7 @@ check ()
224 243
225 GNUNET_CONTAINER_heap_remove_node (myHeap,n2); 244 GNUNET_CONTAINER_heap_remove_node (myHeap,n2);
226 GNUNET_CONTAINER_heap_remove_node (myHeap,n1); 245 GNUNET_CONTAINER_heap_remove_node (myHeap,n1);
227 GNUNET_assert (0 == strcmp ("30", GNUNET_CONTAINER_heap_remove_node (myHeap,n3))); 246 GNUNET_assert (0 == nstrcmp ("30", GNUNET_CONTAINER_heap_remove_node (myHeap,n3)));
228 247
229 n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10); 248 n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10);
230 n2 = GNUNET_CONTAINER_heap_insert (myHeap, "20", 20); 249 n2 = GNUNET_CONTAINER_heap_insert (myHeap, "20", 20);
@@ -237,11 +256,11 @@ check ()
237 n7 = GNUNET_CONTAINER_heap_insert (myHeap, "70", 10); 256 n7 = GNUNET_CONTAINER_heap_insert (myHeap, "70", 10);
238 n8 = GNUNET_CONTAINER_heap_insert (myHeap, "80", 10); 257 n8 = GNUNET_CONTAINER_heap_insert (myHeap, "80", 10);
239 258
240 GNUNET_assert (0 == strcmp ("30", GNUNET_CONTAINER_heap_remove_node (myHeap,n3))); 259 GNUNET_assert (0 == nstrcmp ("30", GNUNET_CONTAINER_heap_remove_node (myHeap,n3)));
241 260
242 // Cleaning up... 261 // Cleaning up...
243 GNUNET_assert (0 == strcmp ("60", GNUNET_CONTAINER_heap_remove_node (myHeap,n6))); 262 GNUNET_assert (0 == nstrcmp ("60", GNUNET_CONTAINER_heap_remove_node (myHeap,n6)));
244 GNUNET_assert (0 == strcmp ("50", GNUNET_CONTAINER_heap_remove_node (myHeap,n5))); 263 GNUNET_assert (0 == nstrcmp ("50", GNUNET_CONTAINER_heap_remove_node (myHeap,n5)));
245 264
246 // Testing heap_walk_get_next 265 // Testing heap_walk_get_next
247 GNUNET_CONTAINER_heap_walk_get_next (myHeap); 266 GNUNET_CONTAINER_heap_walk_get_next (myHeap);
@@ -250,11 +269,11 @@ check ()
250 GNUNET_CONTAINER_heap_walk_get_next (myHeap); 269 GNUNET_CONTAINER_heap_walk_get_next (myHeap);
251 GNUNET_CONTAINER_heap_walk_get_next (myHeap); 270 GNUNET_CONTAINER_heap_walk_get_next (myHeap);
252 271
253 GNUNET_assert (0 == strcmp ("10", GNUNET_CONTAINER_heap_remove_node (myHeap,n1))); 272 GNUNET_assert (0 == nstrcmp ("10", GNUNET_CONTAINER_heap_remove_node (myHeap,n1)));
254 GNUNET_assert (0 == strcmp ("20", GNUNET_CONTAINER_heap_remove_node (myHeap,n2))); 273 GNUNET_assert (0 == nstrcmp ("20", GNUNET_CONTAINER_heap_remove_node (myHeap,n2)));
255 GNUNET_assert (0 == strcmp ("40", GNUNET_CONTAINER_heap_remove_node (myHeap,n4))); 274 GNUNET_assert (0 == nstrcmp ("40", GNUNET_CONTAINER_heap_remove_node (myHeap,n4)));
256 GNUNET_assert (0 == strcmp ("70", GNUNET_CONTAINER_heap_remove_node (myHeap,n7))); 275 GNUNET_assert (0 == nstrcmp ("70", GNUNET_CONTAINER_heap_remove_node (myHeap,n7)));
257 GNUNET_assert (0 == strcmp ("80", GNUNET_CONTAINER_heap_remove_node (myHeap,n8))); 276 GNUNET_assert (0 == nstrcmp ("80", GNUNET_CONTAINER_heap_remove_node (myHeap,n8)));
258 277
259 // End Testing remove_node 278 // End Testing remove_node
260 279
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 05:56:01 +0000