diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-08-15 21:54:06 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-08-15 21:54:06 +0000 |
commit | 5746309cb4be2073d550ad7a6885e918631dbc38 (patch) | |
tree | 89455bc4aadf977816b38df13f990372cd81d71a /src/util/test_container_meta_data.c | |
parent | 6fd3e715cae09fa6e657c96f1c6f9711ee51f42f (diff) | |
download | gnunet-5746309cb4be2073d550ad7a6885e918631dbc38.tar.gz gnunet-5746309cb4be2073d550ad7a6885e918631dbc38.zip |
indentation
Diffstat (limited to 'src/util/test_container_meta_data.c')
-rw-r--r-- | src/util/test_container_meta_data.c | 93 |
1 files changed, 39 insertions, 54 deletions
diff --git a/src/util/test_container_meta_data.c b/src/util/test_container_meta_data.c index cee550f96..fe1dd79c1 100644 --- a/src/util/test_container_meta_data.c +++ b/src/util/test_container_meta_data.c | |||
@@ -41,20 +41,17 @@ testMeta (int i) | |||
41 | 41 | ||
42 | m = GNUNET_CONTAINER_meta_data_create (); | 42 | m = GNUNET_CONTAINER_meta_data_create (); |
43 | if (GNUNET_OK != | 43 | if (GNUNET_OK != |
44 | GNUNET_CONTAINER_meta_data_insert (m, | 44 | GNUNET_CONTAINER_meta_data_insert (m, "<test>", EXTRACTOR_METATYPE_TITLE, |
45 | "<test>", | ||
46 | EXTRACTOR_METATYPE_TITLE, | ||
47 | EXTRACTOR_METAFORMAT_UTF8, | 45 | EXTRACTOR_METAFORMAT_UTF8, |
48 | "text/plain", | 46 | "text/plain", "TestTitle", |
49 | "TestTitle", strlen ("TestTitle") + 1)) | 47 | strlen ("TestTitle") + 1)) |
50 | ABORT (m); | 48 | ABORT (m); |
51 | if (GNUNET_OK != | 49 | if (GNUNET_OK != |
52 | GNUNET_CONTAINER_meta_data_insert (m, | 50 | GNUNET_CONTAINER_meta_data_insert (m, "<test>", |
53 | "<test>", | ||
54 | EXTRACTOR_METATYPE_AUTHOR_NAME, | 51 | EXTRACTOR_METATYPE_AUTHOR_NAME, |
55 | EXTRACTOR_METAFORMAT_UTF8, | 52 | EXTRACTOR_METAFORMAT_UTF8, |
56 | "text/plain", | 53 | "text/plain", "TestTitle", |
57 | "TestTitle", strlen ("TestTitle") + 1)) | 54 | strlen ("TestTitle") + 1)) |
58 | ABORT (m); | 55 | ABORT (m); |
59 | if (GNUNET_OK == GNUNET_CONTAINER_meta_data_insert (m, "<test>", EXTRACTOR_METATYPE_TITLE, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "TestTitle", strlen ("TestTitle") + 1)) /* dup! */ | 56 | if (GNUNET_OK == GNUNET_CONTAINER_meta_data_insert (m, "<test>", EXTRACTOR_METATYPE_TITLE, EXTRACTOR_METAFORMAT_UTF8, "text/plain", "TestTitle", strlen ("TestTitle") + 1)) /* dup! */ |
60 | ABORT (m); | 57 | ABORT (m); |
@@ -63,8 +60,7 @@ testMeta (int i) | |||
63 | if (2 != GNUNET_CONTAINER_meta_data_iterate (m, NULL, NULL)) | 60 | if (2 != GNUNET_CONTAINER_meta_data_iterate (m, NULL, NULL)) |
64 | ABORT (m); | 61 | ABORT (m); |
65 | if (GNUNET_OK != | 62 | if (GNUNET_OK != |
66 | GNUNET_CONTAINER_meta_data_delete (m, | 63 | GNUNET_CONTAINER_meta_data_delete (m, EXTRACTOR_METATYPE_AUTHOR_NAME, |
67 | EXTRACTOR_METATYPE_AUTHOR_NAME, | ||
68 | "TestTitle", strlen ("TestTitle") + 1)) | 64 | "TestTitle", strlen ("TestTitle") + 1)) |
69 | ABORT (m); | 65 | ABORT (m); |
70 | if (GNUNET_OK == GNUNET_CONTAINER_meta_data_delete (m, EXTRACTOR_METATYPE_AUTHOR_NAME, "TestTitle", strlen ("TestTitle") + 1)) /* already gone */ | 66 | if (GNUNET_OK == GNUNET_CONTAINER_meta_data_delete (m, EXTRACTOR_METATYPE_AUTHOR_NAME, "TestTitle", strlen ("TestTitle") + 1)) /* already gone */ |
@@ -72,8 +68,7 @@ testMeta (int i) | |||
72 | if (1 != GNUNET_CONTAINER_meta_data_iterate (m, NULL, NULL)) | 68 | if (1 != GNUNET_CONTAINER_meta_data_iterate (m, NULL, NULL)) |
73 | ABORT (m); | 69 | ABORT (m); |
74 | if (GNUNET_OK != | 70 | if (GNUNET_OK != |
75 | GNUNET_CONTAINER_meta_data_delete (m, | 71 | GNUNET_CONTAINER_meta_data_delete (m, EXTRACTOR_METATYPE_TITLE, |
76 | EXTRACTOR_METATYPE_TITLE, | ||
77 | "TestTitle", strlen ("TestTitle") + 1)) | 72 | "TestTitle", strlen ("TestTitle") + 1)) |
78 | ABORT (m); | 73 | ABORT (m); |
79 | if (GNUNET_OK == GNUNET_CONTAINER_meta_data_delete (m, EXTRACTOR_METATYPE_TITLE, "TestTitle", strlen ("TestTitle") + 1)) /* already gone */ | 74 | if (GNUNET_OK == GNUNET_CONTAINER_meta_data_delete (m, EXTRACTOR_METATYPE_TITLE, "TestTitle", strlen ("TestTitle") + 1)) /* already gone */ |
@@ -82,12 +77,10 @@ testMeta (int i) | |||
82 | ABORT (m); | 77 | ABORT (m); |
83 | for (j = 0; j < i; j++) | 78 | for (j = 0; j < i; j++) |
84 | { | 79 | { |
85 | GNUNET_snprintf (val, | 80 | GNUNET_snprintf (val, sizeof (val), "%s.%d", |
86 | sizeof (val), | 81 | "A teststring that should compress well.", j); |
87 | "%s.%d", "A teststring that should compress well.", j); | ||
88 | if (GNUNET_OK != | 82 | if (GNUNET_OK != |
89 | GNUNET_CONTAINER_meta_data_insert (m, | 83 | GNUNET_CONTAINER_meta_data_insert (m, "<test>", |
90 | "<test>", | ||
91 | EXTRACTOR_METATYPE_UNKNOWN, | 84 | EXTRACTOR_METATYPE_UNKNOWN, |
92 | EXTRACTOR_METAFORMAT_UTF8, | 85 | EXTRACTOR_METAFORMAT_UTF8, |
93 | "text/plain", val, strlen (val) + 1)) | 86 | "text/plain", val, strlen (val) + 1)) |
@@ -98,9 +91,9 @@ testMeta (int i) | |||
98 | 91 | ||
99 | size = GNUNET_CONTAINER_meta_data_get_serialized_size (m); | 92 | size = GNUNET_CONTAINER_meta_data_get_serialized_size (m); |
100 | sval = NULL; | 93 | sval = NULL; |
101 | if (size != GNUNET_CONTAINER_meta_data_serialize (m, | 94 | if (size != |
102 | &sval, size, | 95 | GNUNET_CONTAINER_meta_data_serialize (m, &sval, size, |
103 | GNUNET_CONTAINER_META_DATA_SERIALIZE_FULL)) | 96 | GNUNET_CONTAINER_META_DATA_SERIALIZE_FULL)) |
104 | { | 97 | { |
105 | GNUNET_free_non_null (sval); | 98 | GNUNET_free_non_null (sval); |
106 | ABORT (m); | 99 | ABORT (m); |
@@ -112,13 +105,11 @@ testMeta (int i) | |||
112 | ABORT (m); | 105 | ABORT (m); |
113 | for (j = 0; j < i; j++) | 106 | for (j = 0; j < i; j++) |
114 | { | 107 | { |
115 | GNUNET_snprintf (val, | 108 | GNUNET_snprintf (val, sizeof (val), "%s.%d", |
116 | sizeof (val), "%s.%d", | ||
117 | "A teststring that should compress well.", j); | 109 | "A teststring that should compress well.", j); |
118 | if (GNUNET_OK != | 110 | if (GNUNET_OK != |
119 | GNUNET_CONTAINER_meta_data_delete (m, | 111 | GNUNET_CONTAINER_meta_data_delete (m, EXTRACTOR_METATYPE_UNKNOWN, val, |
120 | EXTRACTOR_METATYPE_UNKNOWN, | 112 | strlen (val) + 1)) |
121 | val, strlen (val) + 1)) | ||
122 | { | 113 | { |
123 | ABORT (m); | 114 | ABORT (m); |
124 | } | 115 | } |
@@ -142,17 +133,16 @@ testMetaMore (int i) | |||
142 | for (q = 0; q <= i; q++) | 133 | for (q = 0; q <= i; q++) |
143 | { | 134 | { |
144 | GNUNET_snprintf (txt, 128, "%u -- %u\n", i, q); | 135 | GNUNET_snprintf (txt, 128, "%u -- %u\n", i, q); |
145 | GNUNET_CONTAINER_meta_data_insert (meta, | 136 | GNUNET_CONTAINER_meta_data_insert (meta, "<test>", |
146 | "<test>", | ||
147 | q % EXTRACTOR_metatype_get_max (), | 137 | q % EXTRACTOR_metatype_get_max (), |
148 | EXTRACTOR_METAFORMAT_UTF8, | 138 | EXTRACTOR_METAFORMAT_UTF8, "text/plain", |
149 | "text/plain", txt, strlen (txt) + 1); | 139 | txt, strlen (txt) + 1); |
150 | } | 140 | } |
151 | size = GNUNET_CONTAINER_meta_data_get_serialized_size (meta); | 141 | size = GNUNET_CONTAINER_meta_data_get_serialized_size (meta); |
152 | data = GNUNET_malloc (size * 4); | 142 | data = GNUNET_malloc (size * 4); |
153 | if (size != GNUNET_CONTAINER_meta_data_serialize (meta, | 143 | if (size != |
154 | &data, size * 4, | 144 | GNUNET_CONTAINER_meta_data_serialize (meta, &data, size * 4, |
155 | GNUNET_CONTAINER_META_DATA_SERIALIZE_FULL)) | 145 | GNUNET_CONTAINER_META_DATA_SERIALIZE_FULL)) |
156 | { | 146 | { |
157 | GNUNET_free (data); | 147 | GNUNET_free (data); |
158 | ABORT (meta); | 148 | ABORT (meta); |
@@ -171,25 +161,23 @@ testMetaLink () | |||
171 | 161 | ||
172 | m = GNUNET_CONTAINER_meta_data_create (); | 162 | m = GNUNET_CONTAINER_meta_data_create (); |
173 | if (GNUNET_OK != | 163 | if (GNUNET_OK != |
174 | GNUNET_CONTAINER_meta_data_insert (m, | 164 | GNUNET_CONTAINER_meta_data_insert (m, "<test>", |
175 | "<test>", | ||
176 | EXTRACTOR_METATYPE_UNKNOWN, | 165 | EXTRACTOR_METATYPE_UNKNOWN, |
177 | EXTRACTOR_METAFORMAT_UTF8, | 166 | EXTRACTOR_METAFORMAT_UTF8, |
178 | "text/plain", | 167 | "text/plain", "link", |
179 | "link", strlen ("link") + 1)) | 168 | strlen ("link") + 1)) |
180 | ABORT (m); | 169 | ABORT (m); |
181 | if (GNUNET_OK != | 170 | if (GNUNET_OK != |
182 | GNUNET_CONTAINER_meta_data_insert (m, | 171 | GNUNET_CONTAINER_meta_data_insert (m, "<test>", |
183 | "<test>", | ||
184 | EXTRACTOR_METATYPE_FILENAME, | 172 | EXTRACTOR_METATYPE_FILENAME, |
185 | EXTRACTOR_METAFORMAT_UTF8, | 173 | EXTRACTOR_METAFORMAT_UTF8, |
186 | "text/plain", | 174 | "text/plain", "lib-link.m4", |
187 | "lib-link.m4", | ||
188 | strlen ("lib-link.m4") + 1)) | 175 | strlen ("lib-link.m4") + 1)) |
189 | ABORT (m); | 176 | ABORT (m); |
190 | val = NULL; | 177 | val = NULL; |
191 | size = GNUNET_CONTAINER_meta_data_serialize (m, &val, (size_t) - 1, | 178 | size = |
192 | GNUNET_CONTAINER_META_DATA_SERIALIZE_FULL); | 179 | GNUNET_CONTAINER_meta_data_serialize (m, &val, (size_t) - 1, |
180 | GNUNET_CONTAINER_META_DATA_SERIALIZE_FULL); | ||
193 | GNUNET_CONTAINER_meta_data_destroy (m); | 181 | GNUNET_CONTAINER_meta_data_destroy (m); |
194 | m = GNUNET_CONTAINER_meta_data_deserialize (val, size); | 182 | m = GNUNET_CONTAINER_meta_data_deserialize (val, size); |
195 | GNUNET_free (val); | 183 | GNUNET_free (val); |
@@ -215,17 +203,13 @@ check () | |||
215 | for (q = 0; q <= i; q++) | 203 | for (q = 0; q <= i; q++) |
216 | { | 204 | { |
217 | GNUNET_snprintf (txt, 128, "%u -- %u\n", i, q); | 205 | GNUNET_snprintf (txt, 128, "%u -- %u\n", i, q); |
218 | GNUNET_CONTAINER_meta_data_insert (meta, | 206 | GNUNET_CONTAINER_meta_data_insert (meta, "<test>", |
219 | "<test>", | ||
220 | EXTRACTOR_METATYPE_UNKNOWN, | 207 | EXTRACTOR_METATYPE_UNKNOWN, |
221 | EXTRACTOR_METAFORMAT_UTF8, | 208 | EXTRACTOR_METAFORMAT_UTF8, "text/plain", |
222 | "text/plain", | ||
223 | "TestTitle", strlen ("TestTitle") + 1); | 209 | "TestTitle", strlen ("TestTitle") + 1); |
224 | GNUNET_CONTAINER_meta_data_insert (meta2, | 210 | GNUNET_CONTAINER_meta_data_insert (meta2, "<test>", |
225 | "<test>", | ||
226 | EXTRACTOR_METATYPE_UNKNOWN, | 211 | EXTRACTOR_METATYPE_UNKNOWN, |
227 | EXTRACTOR_METAFORMAT_UTF8, | 212 | EXTRACTOR_METAFORMAT_UTF8, "text/plain", |
228 | "text/plain", | ||
229 | "TestTitle", strlen ("TestTitle") + 1); | 213 | "TestTitle", strlen ("TestTitle") + 1); |
230 | } | 214 | } |
231 | 215 | ||
@@ -303,9 +287,10 @@ check () | |||
303 | } | 287 | } |
304 | 288 | ||
305 | //check meta_data_get_first_by_types | 289 | //check meta_data_get_first_by_types |
306 | str = GNUNET_CONTAINER_meta_data_get_first_by_types (meta, | 290 | str = |
307 | EXTRACTOR_METATYPE_UNKNOWN, | 291 | GNUNET_CONTAINER_meta_data_get_first_by_types (meta, |
308 | -1); | 292 | EXTRACTOR_METATYPE_UNKNOWN, |
293 | -1); | ||
309 | GNUNET_assert (NULL != str); | 294 | GNUNET_assert (NULL != str); |
310 | if (str[0] != 'T') | 295 | if (str[0] != 'T') |
311 | { | 296 | { |