Skip to content

Commit 444d22f

Browse files
committed
msgq: fix tests to follow changes of msgq_new_queue()
This patch fixes tests of msgq to distinguish between msgq_new_queue() funtions of pub/sub.
1 parent 88621bf commit 444d22f

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

msgq/msgq_tests.cc

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ TEST_CASE("msgq_init_subscriber")
4545
{
4646
remove("/dev/shm/test_queue");
4747
msgq_queue_t q;
48-
msgq_new_queue(&q, "test_queue", 1024);
48+
msgq_new_queue_sub(&q, "test_queue", 1024);
4949
REQUIRE(*q.num_readers == 0);
5050

5151
q.reader_id = 1;
@@ -65,7 +65,7 @@ TEST_CASE("msgq_msg_send first message")
6565
{
6666
remove("/dev/shm/test_queue");
6767
msgq_queue_t q;
68-
msgq_new_queue(&q, "test_queue", 1024);
68+
msgq_new_queue_pub(&q, "test_queue", 1024);
6969
msgq_init_publisher(&q);
7070

7171
REQUIRE(*q.write_pointer == 0);
@@ -102,7 +102,7 @@ TEST_CASE("msgq_msg_send test wraparound")
102102
{
103103
remove("/dev/shm/test_queue");
104104
msgq_queue_t q;
105-
msgq_new_queue(&q, "test_queue", 1024);
105+
msgq_new_queue_pub(&q, "test_queue", 1024);
106106
msgq_init_publisher(&q);
107107

108108
REQUIRE((*q.write_pointer & 0xFFFFFFFF) == 0);
@@ -134,8 +134,8 @@ TEST_CASE("msgq_msg_recv test wraparound")
134134
{
135135
remove("/dev/shm/test_queue");
136136
msgq_queue_t q_pub, q_sub;
137-
msgq_new_queue(&q_pub, "test_queue", 1024);
138-
msgq_new_queue(&q_sub, "test_queue", 1024);
137+
msgq_new_queue_pub(&q_pub, "test_queue", 1024);
138+
msgq_new_queue_sub(&q_sub, "test_queue", 1024);
139139

140140
msgq_init_publisher(&q_pub);
141141
msgq_init_subscriber(&q_sub);
@@ -180,8 +180,8 @@ TEST_CASE("msgq_msg_send test invalidation")
180180
{
181181
remove("/dev/shm/test_queue");
182182
msgq_queue_t q_pub, q_sub;
183-
msgq_new_queue(&q_pub, "test_queue", 1024);
184-
msgq_new_queue(&q_sub, "test_queue", 1024);
183+
msgq_new_queue_pub(&q_pub, "test_queue", 1024);
184+
msgq_new_queue_sub(&q_sub, "test_queue", 1024);
185185

186186
msgq_init_publisher(&q_pub);
187187
msgq_init_subscriber(&q_sub);
@@ -216,8 +216,8 @@ TEST_CASE("msgq_init_subscriber init 2 subscribers")
216216
{
217217
remove("/dev/shm/test_queue");
218218
msgq_queue_t q1, q2;
219-
msgq_new_queue(&q1, "test_queue", 1024);
220-
msgq_new_queue(&q2, "test_queue", 1024);
219+
msgq_new_queue_sub(&q1, "test_queue", 1024);
220+
msgq_new_queue_sub(&q2, "test_queue", 1024);
221221

222222
*q1.num_readers = 0;
223223

@@ -241,8 +241,8 @@ TEST_CASE("Write 1 msg, read 1 msg", "[integration]")
241241
const size_t msg_size = 128;
242242
msgq_queue_t writer, reader;
243243

244-
msgq_new_queue(&writer, "test_queue", 1024);
245-
msgq_new_queue(&reader, "test_queue", 1024);
244+
msgq_new_queue_pub(&writer, "test_queue", 1024);
245+
msgq_new_queue_sub(&reader, "test_queue", 1024);
246246

247247
msgq_init_publisher(&writer);
248248
msgq_init_subscriber(&reader);
@@ -277,8 +277,8 @@ TEST_CASE("Write 2 msg, read 2 msg - conflate = false", "[integration]")
277277
const size_t msg_size = 128;
278278
msgq_queue_t writer, reader;
279279

280-
msgq_new_queue(&writer, "test_queue", 1024);
281-
msgq_new_queue(&reader, "test_queue", 1024);
280+
msgq_new_queue_pub(&writer, "test_queue", 1024);
281+
msgq_new_queue_sub(&reader, "test_queue", 1024);
282282

283283
msgq_init_publisher(&writer);
284284
msgq_init_subscriber(&reader);
@@ -314,8 +314,8 @@ TEST_CASE("Write 2 msg, read 2 msg - conflate = true", "[integration]")
314314
const size_t msg_size = 128;
315315
msgq_queue_t writer, reader;
316316

317-
msgq_new_queue(&writer, "test_queue", 1024);
318-
msgq_new_queue(&reader, "test_queue", 1024);
317+
msgq_new_queue_pub(&writer, "test_queue", 1024);
318+
msgq_new_queue_sub(&reader, "test_queue", 1024);
319319

320320
msgq_init_publisher(&writer);
321321
msgq_init_subscriber(&reader);
@@ -351,8 +351,8 @@ TEST_CASE("1 publisher, 1 slow subscriber", "[integration]")
351351
remove("/dev/shm/test_queue");
352352
msgq_queue_t writer, reader;
353353

354-
msgq_new_queue(&writer, "test_queue", 1024);
355-
msgq_new_queue(&reader, "test_queue", 1024);
354+
msgq_new_queue_pub(&writer, "test_queue", 1024);
355+
msgq_new_queue_sub(&reader, "test_queue", 1024);
356356

357357
msgq_init_publisher(&writer);
358358
msgq_init_subscriber(&reader);
@@ -394,9 +394,9 @@ TEST_CASE("1 publisher, 2 subscribers", "[integration]")
394394
remove("/dev/shm/test_queue");
395395
msgq_queue_t writer, reader1, reader2;
396396

397-
msgq_new_queue(&writer, "test_queue", 1024);
398-
msgq_new_queue(&reader1, "test_queue", 1024);
399-
msgq_new_queue(&reader2, "test_queue", 1024);
397+
msgq_new_queue_pub(&writer, "test_queue", 1024);
398+
msgq_new_queue_sub(&reader1, "test_queue", 1024);
399+
msgq_new_queue_sub(&reader2, "test_queue", 1024);
400400

401401
msgq_init_publisher(&writer);
402402
msgq_init_subscriber(&reader1);

0 commit comments

Comments
 (0)