Skip to content
This repository was archived by the owner on Jul 18, 2023. It is now read-only.

Fixed isolation test. Increased async connect duration #267

Merged
wsobel merged 2 commits into from
May 3, 2023
Merged

Fixed isolation test. Increased async connect duration #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37589ad
Fixed isolation test. Increased async connect duration
wsobel May 3, 2023
aa28600
Increased timout for connection tests for sink tests
wsobel May 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 5 additions & 40 deletions test/mqtt_isolated_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,33 +247,6 @@ TEST_F(MqttIsolatedUnitTest, mqtt_tcp_client_should_receive_loopback_publication
});
client->set_close_handler([] { std::cout << "closed" << std::endl; });

client->set_suback_handler(
[&client, &pid_sub1](std::uint16_t packet_id, std::vector<mqtt::suback_return_code> results) {
std::cout << "suback received. packet_id: " << packet_id << std::endl;
for (auto const &e : results)
{
std::cout << "subscribe result: " << e << std::endl;
}

if (packet_id == pid_sub1)
{
client->async_publish("mqtt_tcp_client_cpp/topic1", "test1", MQTT_NS::qos::at_most_once,
//[optional] checking async_publish completion code
[](MQTT_NS::error_code ec) {
EXPECT_FALSE(ec);

std::cout << "async_tcp_publish callback: " << ec.message()
<< std::endl;
EXPECT_EQ(ec.message(), "Success");
});
return true;
}

return true;
});

client->set_close_handler([] { std::cout << "closed" << std::endl; });

client->set_suback_handler(
[&client, &pid_sub1](std::uint16_t packet_id, std::vector<mqtt::suback_return_code> results) {
std::cout << "suback received. packet_id: " << packet_id << std::endl;
Expand Down Expand Up @@ -318,12 +291,8 @@ TEST_F(MqttIsolatedUnitTest, mqtt_tcp_client_should_receive_loopback_publication
return true;
});

client->async_connect();

m_agentTestHelper->m_ioContext.removeGuard();
m_agentTestHelper->m_ioContext.run_for(2s);

ASSERT_TRUE(received);
client->async_connect([](mqtt::error_code ec) { ASSERT_FALSE(ec) << "CAnnot connect"; });
ASSERT_TRUE(waitFor(5s, [&received]() { return received; }));
}

TEST_F(MqttIsolatedUnitTest, should_connect_using_tls)
Expand Down Expand Up @@ -446,7 +415,7 @@ TEST_F(MqttIsolatedUnitTest, mqtt_tcp_client_authentication)
ASSERT_NE(0, m_port);

std::uint16_t pid_sub1;

auto client = mqtt::make_async_client(m_agentTestHelper->m_ioContext.get(), "localhost", m_port);

client->set_client_id("cliendId1");
Expand Down Expand Up @@ -544,10 +513,6 @@ TEST_F(MqttIsolatedUnitTest, mqtt_tcp_client_authentication)
return true;
});

client->async_connect();

m_agentTestHelper->m_ioContext.removeGuard();
m_agentTestHelper->m_ioContext.run_for(2s);

ASSERT_TRUE(received);
client->async_connect([](mqtt::error_code ec) { ASSERT_FALSE(ec) << "CAnnot connect"; });
ASSERT_TRUE(waitFor(5s, [&received]() { return received; }));
}
2 changes: 1 addition & 1 deletion test/mqtt_sink_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ TEST_F(MqttSinkTest, mqtt_sink_should_connect_to_broker)
createAgent();
auto service = m_agentTestHelper->getMqttService();

ASSERT_TRUE(waitFor(1s, [&service]() { return service->isConnected(); }));
ASSERT_TRUE(waitFor(5s, [&service]() { return service->isConnected(); }));
}

TEST_F(MqttSinkTest, mqtt_sink_should_connect_to_broker_with_UserNameandPassword)
Expand Down