diff --git a/test/integrationtests/AdaptorAndProxy_test.cpp b/test/integrationtests/AdaptorAndProxy_test.cpp index 492a852..4b092d5 100644 --- a/test/integrationtests/AdaptorAndProxy_test.cpp +++ b/test/integrationtests/AdaptorAndProxy_test.cpp @@ -314,13 +314,13 @@ TEST_F(SdbusTestObject, FailsCallingMethodOnNonexistentInterface) TEST_F(SdbusTestObject, FailsCallingMethodOnNonexistentDestination) { - TestingProxy proxy("wrongDestination", OBJECT_PATH); + TestingProxy proxy("sdbuscpp.destination.that.does.not.exist", OBJECT_PATH); ASSERT_THROW(proxy.getInt(), sdbus::Error); } TEST_F(SdbusTestObject, FailsCallingMethodOnNonexistentObject) { - TestingProxy proxy(INTERFACE_NAME, "/wrong/path"); + TestingProxy proxy(INTERFACE_NAME, "/sdbuscpp/path/that/does/not/exist"); ASSERT_THROW(proxy.getInt(), sdbus::Error); } @@ -363,11 +363,6 @@ TEST_F(SdbusTestObject, EmitsSignalWithoutRegistrationSuccesfully) ASSERT_THAT(signature["platform"], Eq("av")); } -TEST_F(SdbusTestObject, failsEmitingSignalOnNonexistentInterface) -{ - ASSERT_THROW(m_adaptor->emitSignalOnNonexistentInterface(), sdbus::Error); -} - // Properties TEST_F(SdbusTestObject, ReadsReadPropertySuccesfully) diff --git a/test/integrationtests/Connection_test.cpp b/test/integrationtests/Connection_test.cpp index b8d3c44..d08e9cc 100644 --- a/test/integrationtests/Connection_test.cpp +++ b/test/integrationtests/Connection_test.cpp @@ -60,7 +60,7 @@ TEST(Connection, CanRequestRegisteredDbusName) TEST(Connection, CannotRequestNonregisteredDbusName) { auto connection = sdbus::createConnection(); - ASSERT_THROW(connection->requestName("some_random_not_supported_dbus_name"), sdbus::Error); + ASSERT_THROW(connection->requestName("some.random.not.supported.dbus.name"), sdbus::Error); } TEST(Connection, CanReleasedRequestedName) @@ -74,7 +74,7 @@ TEST(Connection, CanReleasedRequestedName) TEST(Connection, CannotReleaseNonrequestedName) { auto connection = sdbus::createConnection(); - ASSERT_THROW(connection->releaseName("some_random_nonrequested_name"), sdbus::Error); + ASSERT_THROW(connection->releaseName("some.random.nonrequested.name"), sdbus::Error); } TEST(Connection, CanEnterAndLeaveProcessingLoop) diff --git a/test/integrationtests/adaptor-glue.h b/test/integrationtests/adaptor-glue.h index ce66a48..fbb57d2 100644 --- a/test/integrationtests/adaptor-glue.h +++ b/test/integrationtests/adaptor-glue.h @@ -139,7 +139,7 @@ public: void emitSignalOnNonexistentInterface() { - object_.emitSignal("simpleSignal").onInterface("interfaceThatDoesNotExists"); + object_.emitSignal("simpleSignal").onInterface("sdbuscpp.interface.that.does.not.exist"); } private: diff --git a/test/integrationtests/proxy-glue.h b/test/integrationtests/proxy-glue.h index 20cf68e..04dc77d 100644 --- a/test/integrationtests/proxy-glue.h +++ b/test/integrationtests/proxy-glue.h @@ -179,7 +179,7 @@ public: int32_t callMethodOnNonexistentInterface() { int32_t result; - object_.callMethod("someMethod").onInterface("interfaceThatDoesNotExist").storeResultsTo(result); + object_.callMethod("someMethod").onInterface("sdbuscpp.interface.that.does.not.exist").storeResultsTo(result); return result; }