diff --git a/test/test_ipc.cpp b/test/test_ipc.cpp index 16c076c..428cbd1 100755 --- a/test/test_ipc.cpp +++ b/test/test_ipc.cpp @@ -109,10 +109,10 @@ void test_sr(char const * name, int s_cnt, int r_cnt) { for (int k = 0; k < s_cnt; ++k) { ipc_ut::sender() << [name, &sw, r_cnt, k] { Que que { name, ipc::sender }; - EXPECT_TRUE(que.wait_for_recv(r_cnt)); + ASSERT_TRUE(que.wait_for_recv(r_cnt)); sw.start(); for (int i = 0; i < (int)data_set__.get().size(); ++i) { - EXPECT_TRUE(que.send(data_set__.get()[i])); + ASSERT_TRUE(que.send(data_set__.get()[i])); } }; } @@ -132,7 +132,7 @@ void test_sr(char const * name, int s_cnt, int r_cnt) { if (data_set != got) { printf("data_set__.get()[%d] != got, size = %zd/%zd\n", i, data_set.size(), got.size()); - EXPECT_TRUE(false); + ASSERT_TRUE(false); } } }; @@ -140,7 +140,7 @@ void test_sr(char const * name, int s_cnt, int r_cnt) { ipc_ut::sender().wait_for_done(); Que que { name }; - EXPECT_TRUE(que.wait_for_recv(r_cnt)); + ASSERT_TRUE(que.wait_for_recv(r_cnt)); for (int k = 0; k < r_cnt; ++k) { que.send(rand_buf{msg_head{-1}}); } diff --git a/test/test_queue.cpp b/test/test_queue.cpp index a59b3a7..e85d39f 100755 --- a/test/test_queue.cpp +++ b/test/test_queue.cpp @@ -103,7 +103,7 @@ void test_sr(elems_t && elems, int s_cnt, int r_cnt, char const * me queue_t que { &elems }; ASSERT_TRUE(que.connect()); while (pop(que).pid_ >= 0) ; - EXPECT_TRUE(que.disconnect()); + ASSERT_TRUE(que.disconnect()); }; } @@ -133,7 +133,7 @@ TEST(Queue, el_connection) { elems_t el; EXPECT_TRUE(el.connect_sender()); for (std::size_t i = 0; i < 10000; ++i) { - EXPECT_FALSE(el.connect_sender()); + ASSERT_FALSE(el.connect_sender()); } el.disconnect_sender(); EXPECT_TRUE(el.connect_sender()); @@ -141,7 +141,7 @@ TEST(Queue, el_connection) { { elems_t el; for (std::size_t i = 0; i < 10000; ++i) { - EXPECT_TRUE(el.connect_sender()); + ASSERT_TRUE(el.connect_sender()); } } { @@ -149,7 +149,7 @@ TEST(Queue, el_connection) { auto cc = el.connect_receiver(); EXPECT_NE(cc, 0); for (std::size_t i = 0; i < 10000; ++i) { - EXPECT_EQ(el.connect_receiver(), 0); + ASSERT_EQ(el.connect_receiver(), 0); } EXPECT_EQ(el.disconnect_receiver(cc), 0); EXPECT_EQ(el.connect_receiver(), cc); @@ -157,10 +157,10 @@ TEST(Queue, el_connection) { { elems_t el; for (std::size_t i = 0; i < (sizeof(ipc::circ::cc_t) * CHAR_BIT); ++i) { - EXPECT_NE(el.connect_receiver(), 0); + ASSERT_NE(el.connect_receiver(), 0); } for (std::size_t i = 0; i < 10000; ++i) { - EXPECT_EQ(el.connect_receiver(), 0); + ASSERT_EQ(el.connect_receiver(), 0); } } } @@ -171,11 +171,11 @@ TEST(Queue, connection) { queue_t que{&el}; // sending for (std::size_t i = 0; i < 10000; ++i) { - EXPECT_TRUE(que.ready_sending()); + ASSERT_TRUE(que.ready_sending()); } for (std::size_t i = 0; i < 10000; ++i) { queue_t que{&el}; - EXPECT_FALSE(que.ready_sending()); + ASSERT_FALSE(que.ready_sending()); } for (std::size_t i = 0; i < 10000; ++i) { que.shut_sending(); @@ -186,15 +186,15 @@ TEST(Queue, connection) { } // receiving for (std::size_t i = 0; i < 10000; ++i) { - EXPECT_TRUE(que.connect()); + ASSERT_TRUE(que.connect()); } for (std::size_t i = 0; i < 10000; ++i) { queue_t que{&el}; - EXPECT_FALSE(que.connect()); + ASSERT_FALSE(que.connect()); } EXPECT_TRUE(que.disconnect()); for (std::size_t i = 0; i < 10000; ++i) { - EXPECT_FALSE(que.disconnect()); + ASSERT_FALSE(que.disconnect()); } { queue_t que{&el}; @@ -202,7 +202,7 @@ TEST(Queue, connection) { } for (std::size_t i = 0; i < 10000; ++i) { queue_t que{&el}; - EXPECT_FALSE(que.connect()); + ASSERT_FALSE(que.connect()); } } { @@ -210,42 +210,42 @@ TEST(Queue, connection) { queue_t que{&el}; // sending for (std::size_t i = 0; i < 10000; ++i) { - EXPECT_TRUE(que.ready_sending()); + ASSERT_TRUE(que.ready_sending()); } for (std::size_t i = 0; i < 10000; ++i) { queue_t que{&el}; - EXPECT_TRUE(que.ready_sending()); + ASSERT_TRUE(que.ready_sending()); } for (std::size_t i = 0; i < 10000; ++i) { que.shut_sending(); } for (std::size_t i = 0; i < 10000; ++i) { queue_t que{&el}; - EXPECT_TRUE(que.ready_sending()); + ASSERT_TRUE(que.ready_sending()); } // receiving for (std::size_t i = 0; i < 10000; ++i) { - EXPECT_TRUE(que.connect()); + ASSERT_TRUE(que.connect()); } for (std::size_t i = 1; i < (sizeof(ipc::circ::cc_t) * CHAR_BIT); ++i) { queue_t que{&el}; - EXPECT_TRUE(que.connect()); + ASSERT_TRUE(que.connect()); } for (std::size_t i = 0; i < 10000; ++i) { queue_t que{&el}; - EXPECT_FALSE(que.connect()); + ASSERT_FALSE(que.connect()); } - EXPECT_TRUE(que.disconnect()); + ASSERT_TRUE(que.disconnect()); for (std::size_t i = 0; i < 10000; ++i) { - EXPECT_FALSE(que.disconnect()); + ASSERT_FALSE(que.disconnect()); } { queue_t que{&el}; - EXPECT_TRUE(que.connect()); + ASSERT_TRUE(que.connect()); } for (std::size_t i = 0; i < 10000; ++i) { queue_t que{&el}; - EXPECT_FALSE(que.connect()); + ASSERT_FALSE(que.connect()); } } }