Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: If7ac1b743379c4d01ba373985ab53fd77764dc16

1 files changed, 26 insertions, 0 deletions

diff --git a/tests/auto/integration/tst_integration.cpp b/tests/auto/integration/tst_integration.cpp
index 74ec974..0e90f3d 100644
--- a/tests/auto/integration/tst_integration.cpp
+++ b/tests/auto/integration/tst_integration.cpp
@@ -1064,6 +1064,32 @@ private slots:
         QCOMPARE(engine_r2->rpm(), e.rpm());
     }
 
+    // verify that our second replica emits "Changed" signals when initialized
+    void doubleReplicaTest2()
+    {
+        setupHost();
+        Engine e;
+        host->enableRemoting(&e);
+        e.setRpm(3412);
+
+        setupClient();
+
+        const QScopedPointer<EngineReplica> engine_r1(client->acquire< EngineReplica >());
+        QSignalSpy spy_r1(engine_r1.data(), SIGNAL(rpmChanged(int)));
+        engine_r1->waitForSource();
+        QCOMPARE(engine_r1->rpm(), e.rpm());
+        QCOMPARE(spy_r1.count(), 1);
+
+        // NOTE: A second replica will have initialized and notify signals emitted as part of acquire,
+        // which leads to different semantics for first and second replicas. Specifically, there is no
+        // way to hook in to initialized and the initial notify signals. We should consider changing this.
+        const QScopedPointer<EngineReplica> engine_r2(client->acquire< EngineReplica >());
+//        QSignalSpy spy_r2(engine_r2.data(), SIGNAL(rpmChanged(int)));
+//        engine_r2->waitForSource();
+        QCOMPARE(engine_r2->rpm(), e.rpm());
+//        QCOMPARE(spy_r2.count(), 1);
+    }
+
     void twoReplicaTest() {
         setupHost();
         Engine e;