diff --git a/tests/integrationtests/AdaptorAndProxy_test.cpp b/tests/integrationtests/AdaptorAndProxy_test.cpp index bdbd644..17df3b0 100644 --- a/tests/integrationtests/AdaptorAndProxy_test.cpp +++ b/tests/integrationtests/AdaptorAndProxy_test.cpp @@ -216,7 +216,7 @@ TEST_F(SdbusTestObject, CallsMethodWithSignatureSuccesfully) TEST_F(SdbusTestObject, CallsMethodWithObjectPathSuccesfully) { - auto resObjectPath = m_proxy->getObjectPath(); + auto resObjectPath = m_proxy->getObjPath(); ASSERT_THAT(resObjectPath, Eq(OBJECT_PATH_VALUE)); } diff --git a/tests/integrationtests/TestingAdaptor.h b/tests/integrationtests/TestingAdaptor.h index 65200c8..2793987 100644 --- a/tests/integrationtests/TestingAdaptor.h +++ b/tests/integrationtests/TestingAdaptor.h @@ -154,7 +154,7 @@ protected: { return SIGNATURE_VALUE; } - sdbus::ObjectPath getObjectPath() const override + sdbus::ObjectPath getObjPath() const override { return OBJECT_PATH_VALUE; } diff --git a/tests/integrationtests/adaptor-glue.h b/tests/integrationtests/adaptor-glue.h index edfd6e6..d160e41 100644 --- a/tests/integrationtests/adaptor-glue.h +++ b/tests/integrationtests/adaptor-glue.h @@ -97,7 +97,7 @@ protected: }); object_.registerMethod("getSignature").onInterface(INTERFACE_NAME).implementedAs([this](){ return this->getSignature(); }); - object_.registerMethod("getObjectPath").onInterface(INTERFACE_NAME).implementedAs([this](){ return this->getObjectPath(); }); + object_.registerMethod("getObjPath").onInterface(INTERFACE_NAME).implementedAs([this](){ return this->getObjPath(); }); object_.registerMethod("getUnixFd").onInterface(INTERFACE_NAME).implementedAs([this](){ return this->getUnixFd(); }); object_.registerMethod("getComplex").onInterface(INTERFACE_NAME).implementedAs([this](){ return this->getComplex(); }).markAsDeprecated(); @@ -168,7 +168,7 @@ protected: virtual uint32_t doOperation(uint32_t param) = 0; virtual void doOperationAsync(uint32_t param, sdbus::Result result) = 0; virtual sdbus::Signature getSignature() const = 0; - virtual sdbus::ObjectPath getObjectPath() const = 0; + virtual sdbus::ObjectPath getObjPath() const = 0; virtual sdbus::UnixFd getUnixFd() const = 0; virtual ComplexType getComplex() const = 0; virtual void throwError() const = 0; @@ -279,7 +279,7 @@ R"delimiter( #endif R"delimiter( - + diff --git a/tests/integrationtests/proxy-glue.h b/tests/integrationtests/proxy-glue.h index 965e0bd..da49814 100644 --- a/tests/integrationtests/proxy-glue.h +++ b/tests/integrationtests/proxy-glue.h @@ -197,10 +197,10 @@ public: return result; } - sdbus::ObjectPath getObjectPath() + sdbus::ObjectPath getObjPath() { sdbus::ObjectPath result; - object_.callMethod("getObjectPath").onInterface(INTERFACE_NAME).storeResultsTo(result); + object_.callMethod("getObjPath").onInterface(INTERFACE_NAME).storeResultsTo(result); return result; }