diff --git a/tests/integrationtests/DBusMethodsTests.cpp b/tests/integrationtests/DBusMethodsTests.cpp index c1362db..cecc83b 100644 --- a/tests/integrationtests/DBusMethodsTests.cpp +++ b/tests/integrationtests/DBusMethodsTests.cpp @@ -135,7 +135,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/TestAdaptor.cpp b/tests/integrationtests/TestAdaptor.cpp index b66c963..4b89bfb 100644 --- a/tests/integrationtests/TestAdaptor.cpp +++ b/tests/integrationtests/TestAdaptor.cpp @@ -146,7 +146,7 @@ sdbus::Signature TestAdaptor::getSignature() { return SIGNATURE_VALUE; } -sdbus::ObjectPath TestAdaptor::getObjectPath() +sdbus::ObjectPath TestAdaptor::getObjPath() { return OBJECT_PATH_VALUE; } @@ -333,7 +333,7 @@ R"delimiter( #endif R"delimiter( - + diff --git a/tests/integrationtests/TestAdaptor.h b/tests/integrationtests/TestAdaptor.h index 89b738b..c578216 100644 --- a/tests/integrationtests/TestAdaptor.h +++ b/tests/integrationtests/TestAdaptor.h @@ -58,7 +58,7 @@ protected: uint32_t doOperation(const uint32_t& arg0) override; void doOperationAsync(sdbus::Result&& result, uint32_t arg0) override; sdbus::Signature getSignature() override; - sdbus::ObjectPath getObjectPath() override; + sdbus::ObjectPath getObjPath() override; sdbus::UnixFd getUnixFd() override; std::map>>>, sdbus::Signature, std::string>> getComplex() override; void throwError() override; diff --git a/tests/integrationtests/integrationtests-adaptor.h b/tests/integrationtests/integrationtests-adaptor.h index ecd13e4..fb2cfce 100644 --- a/tests/integrationtests/integrationtests-adaptor.h +++ b/tests/integrationtests/integrationtests-adaptor.h @@ -37,7 +37,7 @@ protected: object_.registerMethod("doOperation").onInterface(INTERFACE_NAME).withInputParamNames("arg0").withOutputParamNames("arg0").implementedAs([this](const uint32_t& arg0){ return this->doOperation(arg0); }); object_.registerMethod("doOperationAsync").onInterface(INTERFACE_NAME).withInputParamNames("arg0").withOutputParamNames("arg0").implementedAs([this](sdbus::Result&& result, uint32_t arg0){ this->doOperationAsync(std::move(result), std::move(arg0)); }); object_.registerMethod("getSignature").onInterface(INTERFACE_NAME).withOutputParamNames("arg0").implementedAs([this](){ return this->getSignature(); }); - object_.registerMethod("getObjectPath").onInterface(INTERFACE_NAME).withOutputParamNames("arg0").implementedAs([this](){ return this->getObjectPath(); }); + object_.registerMethod("getObjPath").onInterface(INTERFACE_NAME).withOutputParamNames("arg0").implementedAs([this](){ return this->getObjPath(); }); object_.registerMethod("getUnixFd").onInterface(INTERFACE_NAME).withOutputParamNames("arg0").implementedAs([this](){ return this->getUnixFd(); }); object_.registerMethod("getComplex").onInterface(INTERFACE_NAME).withOutputParamNames("arg0").implementedAs([this](){ return this->getComplex(); }).markAsDeprecated(); object_.registerMethod("throwError").onInterface(INTERFACE_NAME).implementedAs([this](){ return this->throwError(); }); @@ -85,7 +85,7 @@ private: virtual uint32_t doOperation(const uint32_t& arg0) = 0; virtual void doOperationAsync(sdbus::Result&& result, uint32_t arg0) = 0; virtual sdbus::Signature getSignature() = 0; - virtual sdbus::ObjectPath getObjectPath() = 0; + virtual sdbus::ObjectPath getObjPath() = 0; virtual sdbus::UnixFd getUnixFd() = 0; virtual std::map>>>, sdbus::Signature, std::string>> getComplex() = 0; virtual void throwError() = 0; diff --git a/tests/integrationtests/integrationtests-proxy.h b/tests/integrationtests/integrationtests-proxy.h index 5c98722..ecd11bf 100644 --- a/tests/integrationtests/integrationtests-proxy.h +++ b/tests/integrationtests/integrationtests-proxy.h @@ -128,10 +128,10 @@ public: return result; } - sdbus::ObjectPath getObjectPath() + sdbus::ObjectPath getObjPath() { sdbus::ObjectPath result; - proxy_.callMethod("getObjectPath").onInterface(INTERFACE_NAME).storeResultsTo(result); + proxy_.callMethod("getObjPath").onInterface(INTERFACE_NAME).storeResultsTo(result); return result; } diff --git a/tests/integrationtests/org.sdbuscpp.integrationtests.xml b/tests/integrationtests/org.sdbuscpp.integrationtests.xml index 6b504cb..e658382 100644 --- a/tests/integrationtests/org.sdbuscpp.integrationtests.xml +++ b/tests/integrationtests/org.sdbuscpp.integrationtests.xml @@ -62,7 +62,7 @@ - +