hunyadi-dev commented on a change in pull request #773:
URL: https://github.com/apache/nifi-minifi-cpp/pull/773#discussion_r416560064
##########
File path: libminifi/test/unit/MinifiConcurrentQueueTests.cpp
##########
@@ -123,37 +234,79 @@ TEST_CASE("TestConqurrentQueue::testQueueWithReAdd",
"[TestQueueWithReAdd]") {
}
/* The same test as above, but covering the ConditionConcurrentQueue */
-TEST_CASE("TestConditionConqurrentQueue::testQueueWithReAdd",
"[TestConditionQueueWithReAdd]") {
+TEST_CASE("TestConditionConqurrentQueue::testConditionQueueWithReAdd",
"[TestConditionQueueWithInfReAdd]") {
+ using namespace MinifiConcurrentQueueTestProducersConsumers;
utils::ConditionConcurrentQueue<std::string> queue(true);
std::set<std::string> results;
- std::thread producer([&queue]() {
- queue.enqueue("ba");
- std::this_thread::sleep_for(std::chrono::milliseconds(3));
- queue.enqueue("dum");
- std::this_thread::sleep_for(std::chrono::milliseconds(3));
- queue.enqueue("tss");
- });
+ std::thread producer{ getSimpleProducerThread(queue) };
+ std::thread consumer{ getInfiniteReaddingDequeueConsumerThread(queue,
results) };
+ producer.join();
+ std::this_thread::sleep_for(std::chrono::milliseconds(10));
+ queue.stop();
+ consumer.join();
+ REQUIRE(utils::StringUtils::join("-", results) == "ba-dum-tss");
+}
- std::thread consumer([&queue, &results]() {
- std::string s;
- while (queue.dequeueWait(s)) {
- results.insert(s);
- queue.enqueue(std::move(s));
- }
- });
+TEST_CASE("TestConditionConqurrentQueue::testConditionQueueDequeueWaitForWithSignal",
"[testConditionQueueDequeueWaitForWithSignal]") {
+ using namespace MinifiConcurrentQueueTestProducersConsumers;
+ utils::ConditionConcurrentQueue<std::string> queue(true);
+ std::set<std::string> results;
+
+ std::thread producer{ getSimpleProducerThread(queue) };
+ std::thread consumer{ getDequeueWaitForConsumerThread(queue, results) };
producer.join();
+ consumer.join();
- std::this_thread::sleep_for(std::chrono::milliseconds(10));
+ REQUIRE(utils::StringUtils::join("-", results) == "ba-dum-tss");
+}
- queue.stop();
+TEST_CASE("TestConditionConqurrentQueue::testConditionQueueDequeueApplyWaitForWithSignal",
"[testConditionQueueDequeueApplyWaitForWithSignal]") {
+ using namespace MinifiConcurrentQueueTestProducersConsumers;
+ utils::ConditionConcurrentQueue<std::string> queue(true);
+ std::set<std::string> results;
+ std::thread producer{ getSimpleProducerThread(queue) };
+ std::thread consumer{ getDequeueWaitForConsumerThread(queue, results) };
+ producer.join();
consumer.join();
REQUIRE(utils::StringUtils::join("-", results) == "ba-dum-tss");
}
+TEST_CASE("TestConditionConqurrentQueue::testConditionQueueDequeueWaitForNoSignal",
"[testConditionQueueDequeueWaitForNoSignal]") {
+ using namespace MinifiConcurrentQueueTestProducersConsumers;
+ utils::ConditionConcurrentQueue<std::string> queue(true);
+ std::set<std::string> results;
+ std::mutex mutex;
+ std::unique_lock<std::mutex> lock(mutex);
+
+ std::thread producer{ getBlockedProducerThread(queue, mutex) };
+ std::thread consumer{ getDequeueWaitForConsumerThread(queue, results) };
+ consumer.join();
+ lock.unlock();
+ producer.join();
+
+ REQUIRE(0 == results.size());
+}
+
+TEST_CASE("TestConditionConqurrentQueue::testConditionQueueDequeueApplyWaitForNoSignal",
"[testConditionQueueDequeueApplyWaitForNoSignal]") {
+ using namespace MinifiConcurrentQueueTestProducersConsumers;
+ utils::ConditionConcurrentQueue<std::string> queue(true);
+ std::set<std::string> results;
+ std::mutex mutex;
+ std::unique_lock<std::mutex> lock(mutex);
+
+ std::thread producer{ getBlockedProducerThread(queue, mutex) };
+ std::thread consumer{ getDequeueWaitForConsumerThread(queue, results) };
Review comment:
Replaced duplicate tests and fixed typos.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
