Correct deregistration of services in tests

4 files changed, 18 insertions, 12 deletions

diff --git a/src/test/DBusAddressTranslatorTest.cpp b/src/test/DBusAddressTranslatorTest.cpp
index f8697b9..c9dcca7 100644
--- a/src/test/DBusAddressTranslatorTest.cpp
+++ b/src/test/DBusAddressTranslatorTest.cpp
@@ -179,6 +179,8 @@ TEST_F(AddressTranslatorTest, ServicesUsingPredefinedAddressesCanCommunicate) {
     bool success = stubFactory->registerService(stub, commonApiAddresses[0]);
     ASSERT_TRUE(success);
 
+    sleep(1);
+
     uint32_t v1 = 5;
     std::string v2 = "Hai :)";
     CommonAPI::CallStatus stat;
diff --git a/src/test/DBusCommunicationTest.cpp b/src/test/DBusCommunicationTest.cpp
index 0cd8545..5eeb765 100644
--- a/src/test/DBusCommunicationTest.cpp
+++ b/src/test/DBusCommunicationTest.cpp
@@ -103,7 +103,7 @@ TEST_F(DBusCommunicationTest, RemoteMethodCallSucceeds) {
     CommonAPI::CallStatus stat;
     defaultTestProxy->testVoidPredefinedTypeMethod(v1, v2, stat);
 
-    ASSERT_EQ(stat, CommonAPI::CallStatus::SUCCESS);
+    EXPECT_EQ(stat, CommonAPI::CallStatus::SUCCESS);
 
     stubFactory_->unregisterService(serviceAddress_);
 }
@@ -124,7 +124,7 @@ TEST_F(DBusCommunicationTest, RemoteMethodCallWithNonstandardAddressSucceeds) {
     CommonAPI::CallStatus stat;
     defaultTestProxy->testVoidPredefinedTypeMethod(v1, v2, stat);
 
-    ASSERT_EQ(stat, CommonAPI::CallStatus::SUCCESS);
+    EXPECT_EQ(stat, CommonAPI::CallStatus::SUCCESS);
     stubFactory_->unregisterService(nonstandardAddress_);
 }
 
diff --git a/src/test/DBusProxyTest.cpp b/src/test/DBusProxyTest.cpp
index 32651a3..7efdda9 100644
--- a/src/test/DBusProxyTest.cpp
+++ b/src/test/DBusProxyTest.cpp
@@ -142,15 +142,15 @@ TEST_F(ProxyTest, ServiceRegistry) {
 TEST_F(ProxyTest, DBusProxyStatusEventBeforeServiceIsRegistered) {
     proxyRegisterForAvailabilityStatus();
 
-    ASSERT_NE(proxyAvailabilityStatus_, CommonAPI::AvailabilityStatus::AVAILABLE);
+    EXPECT_NE(proxyAvailabilityStatus_, CommonAPI::AvailabilityStatus::AVAILABLE);
 
     registerTestStub();
 
-    ASSERT_TRUE(proxyWaitForAvailabilityStatus(CommonAPI::AvailabilityStatus::AVAILABLE));
+    EXPECT_TRUE(proxyWaitForAvailabilityStatus(CommonAPI::AvailabilityStatus::AVAILABLE));
 
     stubDBusConnection_->disconnect();
 
-    ASSERT_TRUE(proxyWaitForAvailabilityStatus(CommonAPI::AvailabilityStatus::NOT_AVAILABLE));
+    EXPECT_TRUE(proxyWaitForAvailabilityStatus(CommonAPI::AvailabilityStatus::NOT_AVAILABLE));
 
     deregisterTestStub();
 }
@@ -160,15 +160,15 @@ TEST_F(ProxyTest, DBusProxyStatusEventAfterServiceIsRegistered) {
 
     registerTestStub();
 
-    ASSERT_TRUE(proxyDBusConnection_->connect());
+    EXPECT_TRUE(proxyDBusConnection_->connect());
 
     proxyRegisterForAvailabilityStatus();
 
-    ASSERT_TRUE(proxyWaitForAvailabilityStatus(CommonAPI::AvailabilityStatus::AVAILABLE));
+    EXPECT_TRUE(proxyWaitForAvailabilityStatus(CommonAPI::AvailabilityStatus::AVAILABLE));
 
     stubDBusConnection_->disconnect();
 
-    ASSERT_TRUE(proxyWaitForAvailabilityStatus(CommonAPI::AvailabilityStatus::NOT_AVAILABLE));
+    EXPECT_TRUE(proxyWaitForAvailabilityStatus(CommonAPI::AvailabilityStatus::NOT_AVAILABLE));
 
     deregisterTestStub();
 }
@@ -190,8 +190,8 @@ TEST_F(ProxyTest, ServiceStatus) {
     sleep(1);
 	auto found = std::find(availableDBusServices.begin(), availableDBusServices.end(), commonApiAddress);
 
-	ASSERT_TRUE(availableDBusServices.begin() != availableDBusServices.end());
-	ASSERT_TRUE(found != availableDBusServices.end());
+	EXPECT_TRUE(availableDBusServices.begin() != availableDBusServices.end());
+	EXPECT_TRUE(found != availableDBusServices.end());
 
     deregisterTestStub();
 }
diff --git a/src/test/DBusServiceRegistryTest.cpp b/src/test/DBusServiceRegistryTest.cpp
index 7c9989a..f6ab2a4 100644
--- a/src/test/DBusServiceRegistryTest.cpp
+++ b/src/test/DBusServiceRegistryTest.cpp
@@ -56,22 +56,25 @@ class DBusServiceRegistryTestWithPredefinedRemote: public ::testing::Test {
         auto stub = std::make_shared<commonapi::tests::TestInterfaceStubDefault>();
 
         dbusStubConnection_->requestServiceNameAndBlock("test.instance.name");
-        auto stubAdapter = std::make_shared<commonapi::tests::TestInterfaceDBusStubAdapter>(
+        stubAdapter_ = std::make_shared<commonapi::tests::TestInterfaceDBusStubAdapter>(
                         "local:test.service.name:test.instance.name",
                         "test.service.name",
                         "test.instance.name",
                         "/test/instance/name",
                         dbusStubConnection_,
                         stub);
-        stubAdapter->init();
+        stubAdapter_->init();
     }
 
     virtual void TearDown() {
+    	stubAdapter_->deinit();
     }
 
     std::shared_ptr<CommonAPI::DBus::DBusConnection> dbusConnection_;
     std::shared_ptr<CommonAPI::DBus::DBusConnection> dbusStubConnection_;
     std::shared_ptr<CommonAPI::DBus::DBusServiceRegistry> dbusServiceRegistry_;
+
+    std::shared_ptr<commonapi::tests::TestInterfaceDBusStubAdapter> stubAdapter_;
 };
 
 
@@ -82,6 +85,7 @@ TEST_F(DBusServiceRegistryTestWithPredefinedRemote, RecognizesCommonAPIDBusServi
 
 
 TEST_F(DBusServiceRegistryTestWithPredefinedRemote, FindsCommonAPIDBusServiceInstance) {
+	sleep(1);
     auto availableServices = dbusServiceRegistry_->getAvailableServiceInstances("test.service.name", "local");
     ASSERT_EQ(1, availableServices.size());
     bool serviceFound;