diff options
Diffstat (limited to 'src/util/test_container_slist.c')
-rw-r--r-- | src/util/test_container_slist.c | 94 |
1 files changed, 46 insertions, 48 deletions
diff --git a/src/util/test_container_slist.c b/src/util/test_container_slist.c index c0a832073..13c12bc5a 100644 --- a/src/util/test_container_slist.c +++ b/src/util/test_container_slist.c | |||
@@ -54,21 +54,19 @@ main (int argc, char *argv[]) | |||
54 | for (it = GNUNET_CONTAINER_slist_begin (l), i = 99; | 54 | for (it = GNUNET_CONTAINER_slist_begin (l), i = 99; |
55 | GNUNET_CONTAINER_slist_end (it) != GNUNET_YES; | 55 | GNUNET_CONTAINER_slist_end (it) != GNUNET_YES; |
56 | GNUNET_CONTAINER_slist_next (it), i--) | 56 | GNUNET_CONTAINER_slist_next (it), i--) |
57 | { | ||
58 | p = GNUNET_CONTAINER_slist_get (it, &s); | ||
59 | |||
60 | if ((p == NULL) || (i != (j = *(int *) p)) || (s != sizeof (i))) | ||
57 | { | 61 | { |
58 | p = GNUNET_CONTAINER_slist_get (it, &s); | 62 | GNUNET_CONTAINER_slist_iter_destroy (it); |
59 | 63 | GNUNET_assert (0); | |
60 | if ( (p == NULL) || | ||
61 | (i != (j = *(int *) p)) || | ||
62 | (s != sizeof (i)) ) | ||
63 | { | ||
64 | GNUNET_CONTAINER_slist_iter_destroy (it); | ||
65 | GNUNET_assert (0); | ||
66 | } | ||
67 | j *= 2; | ||
68 | GNUNET_CONTAINER_slist_insert (it, | ||
69 | GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, | ||
70 | &j, sizeof (j)); | ||
71 | } | 64 | } |
65 | j *= 2; | ||
66 | GNUNET_CONTAINER_slist_insert (it, | ||
67 | GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, | ||
68 | &j, sizeof (j)); | ||
69 | } | ||
72 | GNUNET_CONTAINER_slist_iter_destroy (it); | 70 | GNUNET_CONTAINER_slist_iter_destroy (it); |
73 | GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 200); | 71 | GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 200); |
74 | i = 198; | 72 | i = 198; |
@@ -76,30 +74,32 @@ main (int argc, char *argv[]) | |||
76 | 74 | ||
77 | for (it = GNUNET_CONTAINER_slist_begin (l); | 75 | for (it = GNUNET_CONTAINER_slist_begin (l); |
78 | GNUNET_CONTAINER_slist_end (it) != GNUNET_YES;) | 76 | GNUNET_CONTAINER_slist_end (it) != GNUNET_YES;) |
79 | { | 77 | { |
80 | p = GNUNET_CONTAINER_slist_get (it, &s); | 78 | p = GNUNET_CONTAINER_slist_get (it, &s); |
81 | GNUNET_assert (p != NULL); | 79 | GNUNET_assert (p != NULL); |
82 | GNUNET_assert (s == sizeof (i)); | 80 | GNUNET_assert (s == sizeof (i)); |
83 | i = *(int *) p; | 81 | i = *(int *) p; |
84 | 82 | ||
85 | GNUNET_assert (GNUNET_CONTAINER_slist_next (it) == GNUNET_YES); | 83 | GNUNET_assert (GNUNET_CONTAINER_slist_next (it) == GNUNET_YES); |
86 | GNUNET_assert (GNUNET_CONTAINER_slist_end (it) != GNUNET_YES); | 84 | GNUNET_assert (GNUNET_CONTAINER_slist_end (it) != GNUNET_YES); |
87 | 85 | ||
88 | p = GNUNET_CONTAINER_slist_get (it, &s); | 86 | p = GNUNET_CONTAINER_slist_get (it, &s); |
89 | GNUNET_assert (p != NULL); | 87 | GNUNET_assert (p != NULL); |
90 | GNUNET_assert (s == sizeof (j)); | 88 | GNUNET_assert (s == sizeof (j)); |
91 | j = *(int *) p; | 89 | j = *(int *) p; |
92 | 90 | ||
93 | GNUNET_assert (j * 2 == i); | 91 | GNUNET_assert (j * 2 == i); |
94 | 92 | ||
95 | GNUNET_CONTAINER_slist_erase (it); | 93 | GNUNET_CONTAINER_slist_erase (it); |
96 | } | 94 | } |
97 | GNUNET_CONTAINER_slist_iter_destroy (it); | 95 | GNUNET_CONTAINER_slist_iter_destroy (it); |
98 | GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 100); | 96 | GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 100); |
99 | i = 99; | 97 | i = 99; |
100 | GNUNET_assert (GNUNET_CONTAINER_slist_contains (l, &i, sizeof (i)) == GNUNET_NO); | 98 | GNUNET_assert (GNUNET_CONTAINER_slist_contains (l, &i, sizeof (i)) == |
99 | GNUNET_NO); | ||
101 | i = 198; | 100 | i = 198; |
102 | GNUNET_assert (GNUNET_CONTAINER_slist_contains (l, &i, sizeof (i)) == GNUNET_YES); | 101 | GNUNET_assert (GNUNET_CONTAINER_slist_contains (l, &i, sizeof (i)) == |
102 | GNUNET_YES); | ||
103 | 103 | ||
104 | GNUNET_CONTAINER_slist_clear (l); | 104 | GNUNET_CONTAINER_slist_clear (l); |
105 | GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 0); | 105 | GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 0); |
@@ -108,18 +108,18 @@ main (int argc, char *argv[]) | |||
108 | GNUNET_CONTAINER_slist_add (l, | 108 | GNUNET_CONTAINER_slist_add (l, |
109 | GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, | 109 | GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, |
110 | &i, sizeof (i)); | 110 | &i, sizeof (i)); |
111 | /*check slist_append*/ | 111 | /*check slist_append */ |
112 | GNUNET_CONTAINER_slist_append(l,l); | 112 | GNUNET_CONTAINER_slist_append (l, l); |
113 | GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 200); | 113 | GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 200); |
114 | 114 | ||
115 | GNUNET_CONTAINER_slist_destroy (l); | 115 | GNUNET_CONTAINER_slist_destroy (l); |
116 | 116 | ||
117 | /*check slist_add_end*/ | 117 | /*check slist_add_end */ |
118 | l = GNUNET_CONTAINER_slist_create (); | 118 | l = GNUNET_CONTAINER_slist_create (); |
119 | for (i = 0; i < 100; i++) | 119 | for (i = 0; i < 100; i++) |
120 | GNUNET_CONTAINER_slist_add_end (l, | 120 | GNUNET_CONTAINER_slist_add_end (l, |
121 | GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, | 121 | GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, |
122 | &i, sizeof (i)); | 122 | &i, sizeof (i)); |
123 | 123 | ||
124 | GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 100); | 124 | GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 100); |
125 | 125 | ||
@@ -129,9 +129,7 @@ main (int argc, char *argv[]) | |||
129 | { | 129 | { |
130 | p = GNUNET_CONTAINER_slist_get (it, &s); | 130 | p = GNUNET_CONTAINER_slist_get (it, &s); |
131 | 131 | ||
132 | if ((p == NULL) || | 132 | if ((p == NULL) || (i != *(int *) p) || (s != sizeof (i))) |
133 | (i != *(int *) p) || | ||
134 | (s != sizeof (i))) | ||
135 | { | 133 | { |
136 | GNUNET_CONTAINER_slist_iter_destroy (it); | 134 | GNUNET_CONTAINER_slist_iter_destroy (it); |
137 | GNUNET_assert (0); | 135 | GNUNET_assert (0); |
@@ -140,28 +138,28 @@ main (int argc, char *argv[]) | |||
140 | GNUNET_CONTAINER_slist_iter_destroy (it); | 138 | GNUNET_CONTAINER_slist_iter_destroy (it); |
141 | GNUNET_CONTAINER_slist_destroy (l); | 139 | GNUNET_CONTAINER_slist_destroy (l); |
142 | 140 | ||
143 | /*check if disp = GNUNET_CONTAINER_SLIST_DISPOSITION_DYNAMIC*/ | 141 | /*check if disp = GNUNET_CONTAINER_SLIST_DISPOSITION_DYNAMIC */ |
144 | l = GNUNET_CONTAINER_slist_create (); | 142 | l = GNUNET_CONTAINER_slist_create (); |
145 | 143 | ||
146 | for (i = 0; i < 100; i++) | 144 | for (i = 0; i < 100; i++) |
147 | { | 145 | { |
148 | ip = GNUNET_malloc (sizeof (int)); | 146 | ip = GNUNET_malloc (sizeof (int)); |
149 | *ip = i; | 147 | *ip = i; |
150 | GNUNET_CONTAINER_slist_add (l, | 148 | GNUNET_CONTAINER_slist_add (l, |
151 | GNUNET_CONTAINER_SLIST_DISPOSITION_DYNAMIC, | 149 | GNUNET_CONTAINER_SLIST_DISPOSITION_DYNAMIC, |
152 | ip, sizeof (int)); | 150 | ip, sizeof (int)); |
153 | } | 151 | } |
154 | //creat_add | 152 | //creat_add |
155 | it = GNUNET_CONTAINER_slist_begin (l); | 153 | it = GNUNET_CONTAINER_slist_begin (l); |
156 | p = GNUNET_CONTAINER_slist_get (it, &s); | 154 | p = GNUNET_CONTAINER_slist_get (it, &s); |
157 | GNUNET_assert (p != NULL); | 155 | GNUNET_assert (p != NULL); |
158 | //slist_erase | 156 | //slist_erase |
159 | GNUNET_assert (GNUNET_CONTAINER_slist_next (it) == GNUNET_YES); | 157 | GNUNET_assert (GNUNET_CONTAINER_slist_next (it) == GNUNET_YES); |
160 | GNUNET_CONTAINER_slist_erase (it); | 158 | GNUNET_CONTAINER_slist_erase (it); |
161 | GNUNET_CONTAINER_slist_iter_destroy (it); | 159 | GNUNET_CONTAINER_slist_iter_destroy (it); |
162 | GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 99); | 160 | GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 99); |
163 | //slist_clear | 161 | //slist_clear |
164 | GNUNET_CONTAINER_slist_clear(l); | 162 | GNUNET_CONTAINER_slist_clear (l); |
165 | GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 0); | 163 | GNUNET_assert (GNUNET_CONTAINER_slist_count (l) == 0); |
166 | GNUNET_CONTAINER_slist_destroy (l); | 164 | GNUNET_CONTAINER_slist_destroy (l); |
167 | 165 | ||