feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Clang: Start ConnectionClient asynchronously

Browse Source 
The connection client can block main thread at start up. This patch is
removing the wait functions and using signals instead.

Change-Id: I847c98b095752f6a875c0365bc27361bc5bdd051
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Marco Bubke
2016-07-11 13:44:02 +02:00
committed by Tim Jenssen
parent 2b08faab83
commit cda6e3c15a
4 changed files with 162 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/unit/unittest/clientserveroutsideprocess.cpp
View File

@@ -60,6 +60,7 @@
using namespace ClangBackEnd;
using ::testing::Eq;
using ::testing::SizeIs;
class ClientServerOutsideProcess : public ::testing::Test
{
@@ -77,30 +78,35 @@ protected:
MockClangCodeModelClient ClientServerOutsideProcess::mockClangCodeModelClient;
ClangBackEnd::ConnectionClient ClientServerOutsideProcess::client(&ClientServerOutsideProcess::mockClangCodeModelClient);
TEST_F(ClientServerOutsideProcess, RestartProcess)
TEST_F(ClientServerOutsideProcess, RestartProcessAsynchronously)
{
client.restartProcess();
QSignalSpy clientSpy(&client, &ConnectionClient::connectedToLocalSocket);
client.restartProcessAsynchronously();
ASSERT_TRUE(clientSpy.wait(100000));
ASSERT_TRUE(client.isProcessIsRunning());
ASSERT_TRUE(client.isConnected());
}
TEST_F(ClientServerOutsideProcess, RestartProcessAfterAliveTimeout)
{
QSignalSpy clientSpy(&client, SIGNAL(processRestarted()));
QSignalSpy clientSpy(&client, &ConnectionClient::connectedToLocalSocket);
client.setProcessAliveTimerInterval(1);
ASSERT_TRUE(clientSpy.wait(100000));
ASSERT_THAT(clientSpy, SizeIs(1));
}
TEST_F(ClientServerOutsideProcess, RestartProcessAfterTermination)
{
QSignalSpy clientSpy(&client, SIGNAL(processRestarted()));
QSignalSpy clientSpy(&client, &ConnectionClient::connectedToLocalSocket);
client.processForTestOnly()->kill();
ASSERT_TRUE(clientSpy.wait(100000));
ASSERT_THAT(clientSpy, SizeIs(1));
}
TEST_F(ClientServerOutsideProcess, SendRegisterTranslationUnitForEditorMessage)
@@ -171,9 +177,13 @@ TEST_F(ClientServerOutsideProcess, SendUnregisterProjectPartsForEditorMessage)
void ClientServerOutsideProcess::SetUpTestCase()
{
QSignalSpy clientSpy(&client, &ConnectionClient::connectedToLocalSocket);
client.setProcessPath(Utils::HostOsInfo::withExecutableSuffix(QStringLiteral(ECHOSERVER)));
ASSERT_TRUE(client.connectToServer());
client.startProcessAndConnectToServerAsynchronously();
ASSERT_TRUE(clientSpy.wait(100000));
ASSERT_THAT(clientSpy, SizeIs(1));
}
void ClientServerOutsideProcess::TearDownTestCase()
@@ -189,6 +199,9 @@ void ClientServerOutsideProcess::SetUp()
void ClientServerOutsideProcess::TearDown()
{
client.setProcessAliveTimerInterval(1000000);
client.waitForConnected();
ASSERT_TRUE(client.isProcessIsRunning());
ASSERT_TRUE(client.isConnected());
}