Skip to content

Commit 22202e1

Browse files
vfjplalanxz
vfjpl
authored and
alanxz
committed
convert tests to amqp_literal_bytes
1 parent d279b3e commit 22202e1

File tree

2 files changed

+37
-37
lines changed

2 files changed

+37
-37
lines changed

‎tests/test_sasl_mechanism.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ static void parse_fail(amqp_bytes_t mechanisms, amqp_sasl_method_enum method) {
2626
}
2727

2828
int main(void) {
29-
parse_success(amqp_cstring_bytes("DIGEST-MD5 CRAM-MD5 LOGIN PLAIN"),
29+
parse_success(amqp_literal_bytes("DIGEST-MD5 CRAM-MD5 LOGIN PLAIN"),
3030
AMQP_SASL_METHOD_PLAIN);
31-
parse_fail(amqp_cstring_bytes("DIGEST-MD5 CRAM-MD5 LOGIN PLAIN"),
31+
parse_fail(amqp_literal_bytes("DIGEST-MD5 CRAM-MD5 LOGIN PLAIN"),
3232
AMQP_SASL_METHOD_EXTERNAL);
33-
parse_success(amqp_cstring_bytes("DIGEST-MD5 CRAM-MD5 EXTERNAL"),
33+
parse_success(amqp_literal_bytes("DIGEST-MD5 CRAM-MD5 EXTERNAL"),
3434
AMQP_SASL_METHOD_EXTERNAL);
35-
parse_fail(amqp_cstring_bytes("DIGEST-MD5 CRAM-MD5 EXTERNAL"),
35+
parse_fail(amqp_literal_bytes("DIGEST-MD5 CRAM-MD5 EXTERNAL"),
3636
AMQP_SASL_METHOD_PLAIN);
3737
return 0;
3838
}

‎tests/test_tables.c‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -139,38 +139,38 @@ static void test_dump_value(FILE *out) {
139139
amqp_table_t table;
140140
amqp_field_value_t val;
141141

142-
entries[0].key = amqp_cstring_bytes("zebra");
142+
entries[0].key = amqp_literal_bytes("zebra");
143143
entries[0].value.kind = AMQP_FIELD_KIND_UTF8;
144-
entries[0].value.value.bytes = amqp_cstring_bytes("last");
144+
entries[0].value.value.bytes = amqp_literal_bytes("last");
145145

146-
entries[1].key = amqp_cstring_bytes("aardvark");
146+
entries[1].key = amqp_literal_bytes("aardvark");
147147
entries[1].value.kind = AMQP_FIELD_KIND_UTF8;
148-
entries[1].value.value.bytes = amqp_cstring_bytes("first");
148+
entries[1].value.value.bytes = amqp_literal_bytes("first");
149149

150-
entries[2].key = amqp_cstring_bytes("middle");
150+
entries[2].key = amqp_literal_bytes("middle");
151151
entries[2].value.kind = AMQP_FIELD_KIND_UTF8;
152-
entries[2].value.value.bytes = amqp_cstring_bytes("third");
152+
entries[2].value.value.bytes = amqp_literal_bytes("third");
153153

154-
entries[3].key = amqp_cstring_bytes("number");
154+
entries[3].key = amqp_literal_bytes("number");
155155
entries[3].value.kind = AMQP_FIELD_KIND_I32;
156156
entries[3].value.value.i32 = 1234;
157157

158-
entries[4].key = amqp_cstring_bytes("decimal");
158+
entries[4].key = amqp_literal_bytes("decimal");
159159
entries[4].value.kind = AMQP_FIELD_KIND_DECIMAL;
160160
entries[4].value.value.decimal.decimals = 2;
161161
entries[4].value.value.decimal.value = 1234;
162162

163-
entries[5].key = amqp_cstring_bytes("time");
163+
entries[5].key = amqp_literal_bytes("time");
164164
entries[5].value.kind = AMQP_FIELD_KIND_TIMESTAMP;
165165
entries[5].value.value.u64 = 1234123412341234;
166166

167-
entries[6].key = amqp_cstring_bytes("beta");
167+
entries[6].key = amqp_literal_bytes("beta");
168168
entries[6].value.kind = AMQP_FIELD_KIND_UTF8;
169-
entries[6].value.value.bytes = amqp_cstring_bytes("second");
169+
entries[6].value.value.bytes = amqp_literal_bytes("second");
170170

171-
entries[7].key = amqp_cstring_bytes("wombat");
171+
entries[7].key = amqp_literal_bytes("wombat");
172172
entries[7].value.kind = AMQP_FIELD_KIND_UTF8;
173-
entries[7].value.value.bytes = amqp_cstring_bytes("fourth");
173+
entries[7].value.value.bytes = amqp_literal_bytes("fourth");
174174

175175
table.num_entries = 8;
176176
table.entries = entries;
@@ -221,13 +221,13 @@ static void test_table_codec(FILE *out) {
221221
amqp_table_entry_t entries[14];
222222
amqp_table_t table;
223223

224-
inner_entries[0].key = amqp_cstring_bytes("one");
224+
inner_entries[0].key = amqp_literal_bytes("one");
225225
inner_entries[0].value.kind = AMQP_FIELD_KIND_I32;
226226
inner_entries[0].value.value.i32 = 54321;
227227

228-
inner_entries[1].key = amqp_cstring_bytes("two");
228+
inner_entries[1].key = amqp_literal_bytes("two");
229229
inner_entries[1].value.kind = AMQP_FIELD_KIND_UTF8;
230-
inner_entries[1].value.value.bytes = amqp_cstring_bytes("A long string");
230+
inner_entries[1].value.value.bytes = amqp_literal_bytes("A long string");
231231

232232
inner_table.num_entries = 2;
233233
inner_table.entries = inner_entries;
@@ -236,64 +236,64 @@ static void test_table_codec(FILE *out) {
236236
inner_values[0].value.i32 = 54321;
237237

238238
inner_values[1].kind = AMQP_FIELD_KIND_UTF8;
239-
inner_values[1].value.bytes = amqp_cstring_bytes("A long string");
239+
inner_values[1].value.bytes = amqp_literal_bytes("A long string");
240240

241241
inner_array.num_entries = 2;
242242
inner_array.entries = inner_values;
243243

244-
entries[0].key = amqp_cstring_bytes("longstr");
244+
entries[0].key = amqp_literal_bytes("longstr");
245245
entries[0].value.kind = AMQP_FIELD_KIND_UTF8;
246-
entries[0].value.value.bytes = amqp_cstring_bytes("Here is a long string");
246+
entries[0].value.value.bytes = amqp_literal_bytes("Here is a long string");
247247

248-
entries[1].key = amqp_cstring_bytes("signedint");
248+
entries[1].key = amqp_literal_bytes("signedint");
249249
entries[1].value.kind = AMQP_FIELD_KIND_I32;
250250
entries[1].value.value.i32 = 12345;
251251

252-
entries[2].key = amqp_cstring_bytes("decimal");
252+
entries[2].key = amqp_literal_bytes("decimal");
253253
entries[2].value.kind = AMQP_FIELD_KIND_DECIMAL;
254254
entries[2].value.value.decimal.decimals = 3;
255255
entries[2].value.value.decimal.value = 123456;
256256

257-
entries[3].key = amqp_cstring_bytes("timestamp");
257+
entries[3].key = amqp_literal_bytes("timestamp");
258258
entries[3].value.kind = AMQP_FIELD_KIND_TIMESTAMP;
259259
entries[3].value.value.u64 = 109876543209876;
260260

261-
entries[4].key = amqp_cstring_bytes("table");
261+
entries[4].key = amqp_literal_bytes("table");
262262
entries[4].value.kind = AMQP_FIELD_KIND_TABLE;
263263
entries[4].value.value.table = inner_table;
264264

265-
entries[5].key = amqp_cstring_bytes("byte");
265+
entries[5].key = amqp_literal_bytes("byte");
266266
entries[5].value.kind = AMQP_FIELD_KIND_I8;
267267
entries[5].value.value.i8 = (int8_t)-1;
268268

269-
entries[6].key = amqp_cstring_bytes("long");
269+
entries[6].key = amqp_literal_bytes("long");
270270
entries[6].value.kind = AMQP_FIELD_KIND_I64;
271271
entries[6].value.value.i64 = 1234567890;
272272

273-
entries[7].key = amqp_cstring_bytes("short");
273+
entries[7].key = amqp_literal_bytes("short");
274274
entries[7].value.kind = AMQP_FIELD_KIND_I16;
275275
entries[7].value.value.i16 = 655;
276276

277-
entries[8].key = amqp_cstring_bytes("bool");
277+
entries[8].key = amqp_literal_bytes("bool");
278278
entries[8].value.kind = AMQP_FIELD_KIND_BOOLEAN;
279279
entries[8].value.value.boolean = 1;
280280

281-
entries[9].key = amqp_cstring_bytes("binary");
281+
entries[9].key = amqp_literal_bytes("binary");
282282
entries[9].value.kind = AMQP_FIELD_KIND_BYTES;
283-
entries[9].value.value.bytes = amqp_cstring_bytes("a binary string");
283+
entries[9].value.value.bytes = amqp_literal_bytes("a binary string");
284284

285-
entries[10].key = amqp_cstring_bytes("void");
285+
entries[10].key = amqp_literal_bytes("void");
286286
entries[10].value.kind = AMQP_FIELD_KIND_VOID;
287287

288-
entries[11].key = amqp_cstring_bytes("array");
288+
entries[11].key = amqp_literal_bytes("array");
289289
entries[11].value.kind = AMQP_FIELD_KIND_ARRAY;
290290
entries[11].value.value.array = inner_array;
291291

292-
entries[12].key = amqp_cstring_bytes("float");
292+
entries[12].key = amqp_literal_bytes("float");
293293
entries[12].value.kind = AMQP_FIELD_KIND_F32;
294294
entries[12].value.value.f32 = (float)M_PI;
295295

296-
entries[13].key = amqp_cstring_bytes("double");
296+
entries[13].key = amqp_literal_bytes("double");
297297
entries[13].value.kind = AMQP_FIELD_KIND_F64;
298298
entries[13].value.value.f64 = M_PI;
299299

0 commit comments

Comments
 (0)