diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-07-15 11:03:57 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-07-15 11:03:57 +0000 |
commit | 1d14c2498249ac66a3f28816c55e502ef0aaed82 (patch) | |
tree | 1c2a53c99ac65f5b338dc9a39992c92858c94917 /src/util/test_container_slist.c | |
parent | cbdf1bed3ea471be4ba3c1ff546a2dfa290eff08 (diff) | |
download | gnunet-1d14c2498249ac66a3f28816c55e502ef0aaed82.tar.gz gnunet-1d14c2498249ac66a3f28816c55e502ef0aaed82.zip |
fix
Diffstat (limited to 'src/util/test_container_slist.c')
-rw-r--r-- | src/util/test_container_slist.c | 50 |
1 files changed, 24 insertions, 26 deletions
diff --git a/src/util/test_container_slist.c b/src/util/test_container_slist.c index fc3e8a2a4..f1aa40f94 100644 --- a/src/util/test_container_slist.c +++ b/src/util/test_container_slist.c | |||
@@ -28,8 +28,6 @@ | |||
28 | #include "gnunet_common.h" | 28 | #include "gnunet_common.h" |
29 | #include "gnunet_container_lib.h" | 29 | #include "gnunet_container_lib.h" |
30 | 30 | ||
31 | #define CHECK(c) do { if (! (c)) { fprintf(stderr, "Error at %s:%d\n", __FILE__, __LINE__); GNUNET_CONTAINER_slist_destroy (l); return 1; } } while (0) | ||
32 | |||
33 | int | 31 | int |
34 | main (int argc, char *argv[]) | 32 | main (int argc, char *argv[]) |
35 | { | 33 | { |
@@ -44,14 +42,14 @@ main (int argc, char *argv[]) | |||
44 | GNUNET_log_setup ("test-container-slist", "WARNING", NULL); | 42 | GNUNET_log_setup ("test-container-slist", "WARNING", NULL); |
45 | 43 | ||
46 | l = GNUNET_CONTAINER_slist_create (); | 44 | l = GNUNET_CONTAINER_slist_create (); |
47 | CHECK (l != NULL); | 45 | GNUNET_assert (l != NULL); |
48 | CHECK (GNUNET_CONTAINER_slist_count (l) == 0); | 46 | GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 0); |
49 | 47 | ||
50 | for (i = 0; i < 100; i++) | 48 | for (i = 0; i < 100; i++) |
51 | GNUNET_CONTAINER_slist_add (l, | 49 | GNUNET_CONTAINER_slist_add (l, |
52 | GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, | 50 | GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, |
53 | &i, sizeof (i)); | 51 | &i, sizeof (i)); |
54 | CHECK (GNUNET_CONTAINER_slist_count (l) == 100); | 52 | GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 100); |
55 | 53 | ||
56 | for (it = GNUNET_CONTAINER_slist_begin (l), i = 99; | 54 | for (it = GNUNET_CONTAINER_slist_begin (l), i = 99; |
57 | GNUNET_CONTAINER_slist_end (it) != GNUNET_YES; | 55 | GNUNET_CONTAINER_slist_end (it) != GNUNET_YES; |
@@ -64,7 +62,7 @@ main (int argc, char *argv[]) | |||
64 | (s != sizeof (i)) ) | 62 | (s != sizeof (i)) ) |
65 | { | 63 | { |
66 | GNUNET_CONTAINER_slist_iter_destroy (it); | 64 | GNUNET_CONTAINER_slist_iter_destroy (it); |
67 | CHECK (0); | 65 | GNUNET_assert (0); |
68 | } | 66 | } |
69 | j *= 2; | 67 | j *= 2; |
70 | GNUNET_CONTAINER_slist_insert (it, | 68 | GNUNET_CONTAINER_slist_insert (it, |
@@ -72,39 +70,39 @@ main (int argc, char *argv[]) | |||
72 | &j, sizeof (j)); | 70 | &j, sizeof (j)); |
73 | } | 71 | } |
74 | GNUNET_CONTAINER_slist_iter_destroy (it); | 72 | GNUNET_CONTAINER_slist_iter_destroy (it); |
75 | CHECK (GNUNET_CONTAINER_slist_count (l) == 200); | 73 | GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 200); |
76 | i = 198; | 74 | i = 198; |
77 | CHECK (GNUNET_CONTAINER_slist_contains (l, &i, sizeof (i))); | 75 | GNUNET_assert (GNUNET_CONTAINER_slist_contains (l, &i, sizeof (i))); |
78 | 76 | ||
79 | for (it = GNUNET_CONTAINER_slist_begin (l); | 77 | for (it = GNUNET_CONTAINER_slist_begin (l); |
80 | GNUNET_CONTAINER_slist_end (it) != GNUNET_YES;) | 78 | GNUNET_CONTAINER_slist_end (it) != GNUNET_YES;) |
81 | { | 79 | { |
82 | p = GNUNET_CONTAINER_slist_get (it, &s); | 80 | p = GNUNET_CONTAINER_slist_get (it, &s); |
83 | CHECK (p != NULL); | 81 | GNUNET_assert (p != NULL); |
84 | CHECK (s == sizeof (i)); | 82 | GNUNET_assert (s == sizeof (i)); |
85 | i = *(int *) p; | 83 | i = *(int *) p; |
86 | 84 | ||
87 | CHECK (GNUNET_CONTAINER_slist_next (it) == GNUNET_YES); | 85 | GNUNET_assert (GNUNET_CONTAINER_slist_next (it) == GNUNET_YES); |
88 | CHECK (GNUNET_CONTAINER_slist_end (it) != GNUNET_YES); | 86 | GNUNET_assert (GNUNET_CONTAINER_slist_end (it) != GNUNET_YES); |
89 | 87 | ||
90 | p = GNUNET_CONTAINER_slist_get (it, &s); | 88 | p = GNUNET_CONTAINER_slist_get (it, &s); |
91 | CHECK (p != NULL); | 89 | GNUNET_assert (p != NULL); |
92 | CHECK (s == sizeof (j)); | 90 | GNUNET_assert (s == sizeof (j)); |
93 | j = *(int *) p; | 91 | j = *(int *) p; |
94 | 92 | ||
95 | CHECK (j * 2 == i); | 93 | GNUNET_assert (j * 2 == i); |
96 | 94 | ||
97 | GNUNET_CONTAINER_slist_erase (it); | 95 | GNUNET_CONTAINER_slist_erase (it); |
98 | } | 96 | } |
99 | GNUNET_CONTAINER_slist_iter_destroy (it); | 97 | GNUNET_CONTAINER_slist_iter_destroy (it); |
100 | CHECK (GNUNET_CONTAINER_slist_count (l) == 100); | 98 | GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 100); |
101 | i = 99; | 99 | i = 99; |
102 | CHECK (GNUNET_CONTAINER_slist_contains (l, &i, sizeof (i)) == GNUNET_NO); | 100 | GNUNET_assert (GNUNET_CONTAINER_slist_contains (l, &i, sizeof (i)) == GNUNET_NO); |
103 | i = 198; | 101 | i = 198; |
104 | CHECK (GNUNET_CONTAINER_slist_contains (l, &i, sizeof (i)) == GNUNET_YES); | 102 | GNUNET_assert (GNUNET_CONTAINER_slist_contains (l, &i, sizeof (i)) == GNUNET_YES); |
105 | 103 | ||
106 | GNUNET_CONTAINER_slist_clear (l); | 104 | GNUNET_CONTAINER_slist_clear (l); |
107 | CHECK (GNUNET_CONTAINER_slist_count (l) == 0); | 105 | GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 0); |
108 | 106 | ||
109 | for (i = 0; i < 100; i++) | 107 | for (i = 0; i < 100; i++) |
110 | GNUNET_CONTAINER_slist_add (l, | 108 | GNUNET_CONTAINER_slist_add (l, |
@@ -112,7 +110,7 @@ main (int argc, char *argv[]) | |||
112 | &i, sizeof (i)); | 110 | &i, sizeof (i)); |
113 | /*check slist_append*/ | 111 | /*check slist_append*/ |
114 | GNUNET_CONTAINER_slist_append(l,l); | 112 | GNUNET_CONTAINER_slist_append(l,l); |
115 | CHECK (GNUNET_CONTAINER_slist_count (l) == 200); | 113 | GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 200); |
116 | 114 | ||
117 | GNUNET_CONTAINER_slist_destroy (l); | 115 | GNUNET_CONTAINER_slist_destroy (l); |
118 | 116 | ||
@@ -123,7 +121,7 @@ main (int argc, char *argv[]) | |||
123 | GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, | 121 | GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, |
124 | &i, sizeof (i)); | 122 | &i, sizeof (i)); |
125 | 123 | ||
126 | CHECK (GNUNET_CONTAINER_slist_count (l) == 100); | 124 | GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 100); |
127 | 125 | ||
128 | for (it = GNUNET_CONTAINER_slist_begin (l), i = 0; | 126 | for (it = GNUNET_CONTAINER_slist_begin (l), i = 0; |
129 | GNUNET_CONTAINER_slist_end (it) != GNUNET_YES; | 127 | GNUNET_CONTAINER_slist_end (it) != GNUNET_YES; |
@@ -136,7 +134,7 @@ main (int argc, char *argv[]) | |||
136 | (s != sizeof (i))) | 134 | (s != sizeof (i))) |
137 | { | 135 | { |
138 | GNUNET_CONTAINER_slist_iter_destroy (it); | 136 | GNUNET_CONTAINER_slist_iter_destroy (it); |
139 | CHECK (0); | 137 | GNUNET_assert (0); |
140 | } | 138 | } |
141 | } | 139 | } |
142 | 140 | ||
@@ -156,15 +154,15 @@ main (int argc, char *argv[]) | |||
156 | //creat_add | 154 | //creat_add |
157 | it = GNUNET_CONTAINER_slist_begin (l); | 155 | it = GNUNET_CONTAINER_slist_begin (l); |
158 | p = GNUNET_CONTAINER_slist_get (it, &s); | 156 | p = GNUNET_CONTAINER_slist_get (it, &s); |
159 | CHECK (p != NULL); | 157 | GNUNET_assert (p != NULL); |
160 | //slist_erase | 158 | //slist_erase |
161 | CHECK (GNUNET_CONTAINER_slist_next (it) == GNUNET_YES); | 159 | GNUNET_assert (GNUNET_CONTAINER_slist_next (it) == GNUNET_YES); |
162 | GNUNET_CONTAINER_slist_erase (it); | 160 | GNUNET_CONTAINER_slist_erase (it); |
163 | GNUNET_CONTAINER_slist_iter_destroy (it); | 161 | GNUNET_CONTAINER_slist_iter_destroy (it); |
164 | CHECK (GNUNET_CONTAINER_slist_count (l) == 99); | 162 | GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 99); |
165 | //slist_clear | 163 | //slist_clear |
166 | GNUNET_CONTAINER_slist_clear(l); | 164 | GNUNET_CONTAINER_slist_clear(l); |
167 | CHECK (GNUNET_CONTAINER_slist_count (l) == 0); | 165 | GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 0); |
168 | GNUNET_CONTAINER_slist_destroy (l); | 166 | GNUNET_CONTAINER_slist_destroy (l); |
169 | 167 | ||
170 | return 0; | 168 | return 0; |