feedc0de/sdbus-cpp
1
0
Fork 0
forked from Kistler-Group/sdbus-cpp
Code Pull Requests Activity

Fix GetObjectPath() in integration tests

Browse Source
This commit is contained in:
sangelovic
2020-07-18 20:30:51 +02:00
parent bded067496
commit cc8d88cc64
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/integrationtests/DBusMethodsTests.cpp
View File

@ -135,7 +135,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));
} }

4
tests/integrationtests/TestAdaptor.cpp
View File

@ -146,7 +146,7 @@ sdbus::Signature TestAdaptor::getSignature()
{ {
return SIGNATURE_VALUE; return SIGNATURE_VALUE;
} }
sdbus::ObjectPath TestAdaptor::getObjectPath() sdbus::ObjectPath TestAdaptor::getObjPath()
{ {
return OBJECT_PATH_VALUE; return OBJECT_PATH_VALUE;
} }
@ -333,7 +333,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">

2
tests/integrationtests/TestAdaptor.h
View File

@ -58,7 +58,7 @@ protected:
uint32_t doOperation(const uint32_t& arg0) override; uint32_t doOperation(const uint32_t& arg0) override;
void doOperationAsync(sdbus::Result<uint32_t>&& result, uint32_t arg0) override; void doOperationAsync(sdbus::Result<uint32_t>&& result, uint32_t arg0) override;
sdbus::Signature getSignature() override; sdbus::Signature getSignature() override;
sdbus::ObjectPath getObjectPath() override; sdbus::ObjectPath getObjPath() override;
sdbus::UnixFd getUnixFd() override; sdbus::UnixFd getUnixFd() override;
std::map<uint64_t, sdbus::Struct<std::map<uint8_t, std::vector<sdbus::Struct<sdbus::ObjectPath, bool, sdbus::Variant, std::map<int32_t, std::string>>>>, sdbus::Signature, std::string>> getComplex() override; std::map<uint64_t, sdbus::Struct<std::map<uint8_t, std::vector<sdbus::Struct<sdbus::ObjectPath, bool, sdbus::Variant, std::map<int32_t, std::string>>>>, sdbus::Signature, std::string>> getComplex() override;
void throwError() override; void throwError() override;

4
tests/integrationtests/integrationtests-adaptor.h
View File

@ -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("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<uint32_t>&& result, uint32_t arg0){ this->doOperationAsync(std::move(result), std::move(arg0)); }); object_.registerMethod("doOperationAsync").onInterface(INTERFACE_NAME).withInputParamNames("arg0").withOutputParamNames("arg0").implementedAs([this](sdbus::Result<uint32_t>&& 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("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("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("getComplex").onInterface(INTERFACE_NAME).withOutputParamNames("arg0").implementedAs([this](){ return this->getComplex(); }).markAsDeprecated();
object_.registerMethod("throwError").onInterface(INTERFACE_NAME).implementedAs([this](){ return this->throwError(); }); 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 uint32_t doOperation(const uint32_t& arg0) = 0;
virtual void doOperationAsync(sdbus::Result<uint32_t>&& result, uint32_t arg0) = 0; virtual void doOperationAsync(sdbus::Result<uint32_t>&& result, uint32_t arg0) = 0;
virtual sdbus::Signature getSignature() = 0; virtual sdbus::Signature getSignature() = 0;
virtual sdbus::ObjectPath getObjectPath() = 0; virtual sdbus::ObjectPath getObjPath() = 0;
virtual sdbus::UnixFd getUnixFd() = 0; virtual sdbus::UnixFd getUnixFd() = 0;
virtual std::map<uint64_t, sdbus::Struct<std::map<uint8_t, std::vector<sdbus::Struct<sdbus::ObjectPath, bool, sdbus::Variant, std::map<int32_t, std::string>>>>, sdbus::Signature, std::string>> getComplex() = 0; virtual std::map<uint64_t, sdbus::Struct<std::map<uint8_t, std::vector<sdbus::Struct<sdbus::ObjectPath, bool, sdbus::Variant, std::map<int32_t, std::string>>>>, sdbus::Signature, std::string>> getComplex() = 0;
virtual void throwError() = 0; virtual void throwError() = 0;

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

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

2
tests/integrationtests/org.sdbuscpp.integrationtests.xml
View File

@ -62,7 +62,7 @@
<method name="getSignature"> <method name="getSignature">
<arg type="g" direction="out" /> <arg type="g" direction="out" />
</method> </method>
<method name="getObjectPath"> <method name="getObjPath">
<arg type="o" direction="out" /> <arg type="o" direction="out" />
</method> </method>
<method name="getUnixFd"> <method name="getUnixFd">