summaryrefslogtreecommitdiffstats
path: root/tests/auto/integration/tst_integration.cpp
diff options
context:
space:
mode:
authorBogDan Vatra <bogdan.vatra.ford@kdab.com>2016-07-29 11:52:22 +0300
committerBogDan Vatra <bogdan@kdab.com>2016-09-08 14:44:40 +0000
commitc14a857ddb7f53e1cf8bbcc28ad7b1b9ca5db8cc (patch)
tree50d4d9118ef79ca1beea3bcfd518236c9bca0ae2 /tests/auto/integration/tst_integration.cpp
parent18cdd36ab105b0a1b375563812be2b1b08f9f666 (diff)
Generate, send and check class signature for .rep generated classes
If the signature mismatch it will not complete the connection and will signal the error. Change-Id: Idd4a7a5290bb60d7428e16047a1b82db5e52b372 Reviewed-by: Continuous Integration (KDAB) <build@kdab.com> Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
Diffstat (limited to 'tests/auto/integration/tst_integration.cpp')
-rw-r--r--tests/auto/integration/tst_integration.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/integration/tst_integration.cpp b/tests/auto/integration/tst_integration.cpp
index 41331a9..459bc2f 100644
--- a/tests/auto/integration/tst_integration.cpp
+++ b/tests/auto/integration/tst_integration.cpp
@@ -226,7 +226,7 @@ private slots:
instances = client.instances<EngineReplica>();
QCOMPARE(instances, QStringList({"Engine", "Engine2"}));
- QSignalSpy spy(engine_r.data(), SIGNAL(isReplicaValidChanged()));
+ QSignalSpy spy(engine_r.data(), SIGNAL(stateChanged(State,State)));
host.disableRemoting(&e);
spy.wait();
QCOMPARE(spy.count(), 1);
@@ -866,7 +866,7 @@ private slots:
for (int i = 0; i < metaTcpRep1->propertyCount(); ++i)
{
const QMetaProperty propLhs = metaTcpRep1->property(i);
- if (qstrcmp(propLhs.name(), "isReplicaValid") == 0 || qstrcmp(propLhs.name(), "node") == 0) //Ignore properties only on the Replica side
+ if (qstrcmp(propLhs.name(), "isReplicaValid") == 0 || qstrcmp(propLhs.name(), "state") == 0 || qstrcmp(propLhs.name(), "node") == 0) //Ignore properties only on the Replica side
continue;
const QMetaProperty propRhs = metaTcpSource->property(metaTcpSource->indexOfProperty(propLhs.name()));
if (propLhs.notifySignalIndex() == -1)
@@ -880,7 +880,7 @@ private slots:
for (int i = 0; i < metaLocalRep1->propertyCount(); ++i )
{
const QMetaProperty propLhs = metaLocalRep1->property(i);
- if (qstrcmp(propLhs.name(), "isReplicaValid") == 0 || qstrcmp(propLhs.name(), "node") == 0) //Ignore properties only on the Replica side
+ if (qstrcmp(propLhs.name(), "isReplicaValid") == 0 || qstrcmp(propLhs.name(), "state") == 0 || qstrcmp(propLhs.name(), "node") == 0) //Ignore properties only on the Replica side
continue;
const QMetaProperty propRhs = metaLocalSource->property(metaTcpSource->indexOfProperty(propLhs.name()));
if (propLhs.notifySignalIndex() == -1)
@@ -1020,7 +1020,7 @@ private slots:
void localServerConnectionTest()
{
QProcess testServer;
- const QString progName = QStringLiteral("../localsockettestserver/localsockettestserver");
+ const QString progName = QStringLiteral("../../localsockettestserver/localsockettestserver");
//create a fake socket as killing doesn't produce a necessarily unusable socket
QFile fake(QDir::temp().absoluteFilePath(QStringLiteral("crashMe")));
fake.remove();
@@ -1048,7 +1048,7 @@ private slots:
void localServerConnectionTest2()
{
QProcess testServer;
- const QString progName = QStringLiteral("../localsockettestserver/localsockettestserver");
+ const QString progName = QStringLiteral("../../localsockettestserver/localsockettestserver");
testServer.start(progName);
QVERIFY(testServer.waitForStarted());