Kistler-Group/sdbus-cpp
1
0
Fork 1
mirror of https://github.com/Kistler-Group/sdbus-cpp.git synced 2025-07-30 18:17:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix integration tests after getObjectPath() introduction failed them

Browse Source
This commit is contained in:
Stanislav Angelovic
2020-06-16 17:25:01 +02:00
parent 0d010440c5
commit a0dadcc6fe
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/integrationtests/AdaptorAndProxy_test.cpp
View File

@ -216,7 +216,7 @@ TEST_F(SdbusTestObject, CallsMethodWithSignatureSuccesfully)
TEST_F(SdbusTestObject, CallsMethodWithObjectPathSuccesfully) TEST_F(SdbusTestObject, CallsMethodWithObjectPathSuccesfully)
{ {
auto resObjectPath = m_proxy->getObjectPath(); auto resObjectPath = m_proxy->getObjPath();
ASSERT_THAT(resObjectPath, Eq(OBJECT_PATH_VALUE)); ASSERT_THAT(resObjectPath, Eq(OBJECT_PATH_VALUE));
} }

2
tests/integrationtests/TestingAdaptor.h
View File

@ -154,7 +154,7 @@ protected:
{ {
return SIGNATURE_VALUE; return SIGNATURE_VALUE;
} }
sdbus::ObjectPath getObjectPath() const override sdbus::ObjectPath getObjPath() const override
{ {
return OBJECT_PATH_VALUE; return OBJECT_PATH_VALUE;
} }

6
tests/integrationtests/adaptor-glue.h
View File

@ -97,7 +97,7 @@ protected:
}); });
object_.registerMethod("getSignature").onInterface(INTERFACE_NAME).implementedAs([this](){ return this->getSignature(); }); 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("getUnixFd").onInterface(INTERFACE_NAME).implementedAs([this](){ return this->getUnixFd(); });
object_.registerMethod("getComplex").onInterface(INTERFACE_NAME).implementedAs([this](){ return this->getComplex(); }).markAsDeprecated(); 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 uint32_t doOperation(uint32_t param) = 0;
virtual void doOperationAsync(uint32_t param, sdbus::Result<uint32_t> result) = 0; virtual void doOperationAsync(uint32_t param, sdbus::Result<uint32_t> result) = 0;
virtual sdbus::Signature getSignature() const = 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 sdbus::UnixFd getUnixFd() const = 0;
virtual ComplexType getComplex() const = 0; virtual ComplexType getComplex() const = 0;
virtual void throwError() const = 0; virtual void throwError() const = 0;
@ -279,7 +279,7 @@ R"delimiter(
#endif #endif
R"delimiter( R"delimiter(
</method> </method>
<method name="getObjectPath"> <method name="getObjPath">
<arg type="o" direction="out"/> <arg type="o" direction="out"/>
</method> </method>
<method name="getSignature"> <method name="getSignature">

4
tests/integrationtests/proxy-glue.h
View File

@ -197,10 +197,10 @@ public:
return result; return result;
} }
sdbus::ObjectPath getObjectPath() sdbus::ObjectPath getObjPath()
{ {
sdbus::ObjectPath result; sdbus::ObjectPath result;
object_.callMethod("getObjectPath").onInterface(INTERFACE_NAME).storeResultsTo(result); object_.callMethod("getObjPath").onInterface(INTERFACE_NAME).storeResultsTo(result);
return result; return result;
} }