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

Fix Variant signal test in integration tests

Browse Source
This commit is contained in:
sangelovic
2019-06-04 23:45:45 +02:00
parent 11f0edf7b8
commit b2b0bddf02
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/integrationtests/AdaptorAndProxy_test.cpp
View File

@ -43,6 +43,7 @@
#include <future> #include <future>
using ::testing::Eq; using ::testing::Eq;
using ::testing::DoubleEq;
using ::testing::Gt; using ::testing::Gt;
using ::testing::ElementsAre; using ::testing::ElementsAre;
using ::testing::SizeIs; using ::testing::SizeIs;
@ -382,7 +383,7 @@ TEST_F(SdbusTestObject, EmitsSignalWithVariantSuccesfully)
m_adaptor->emitSignalWithVariant(d); m_adaptor->emitSignalWithVariant(d);
ASSERT_TRUE(waitUntil(m_proxy->m_gotSignalWithVariant)); ASSERT_TRUE(waitUntil(m_proxy->m_gotSignalWithVariant));
ASSERT_THAT(m_proxy->m_variantFromSignal, d); ASSERT_THAT(m_proxy->m_variantFromSignal, DoubleEq(d));
} }
TEST_F(SdbusTestObject, EmitsSignalWithoutRegistrationSuccesfully) TEST_F(SdbusTestObject, EmitsSignalWithoutRegistrationSuccesfully)

4
tests/integrationtests/TestingAdaptor.h
View File

@ -224,9 +224,9 @@ private:
public: // for tests public: // for tests
// For dont-expect-reply method call verifications // For dont-expect-reply method call verifications
mutable std::atomic<bool> m_wasMultiplyCalled{}; mutable std::atomic<bool> m_wasMultiplyCalled{false};
mutable double m_multiplyResult{}; mutable double m_multiplyResult{};
mutable std::atomic<bool> m_wasThrowErrorCalled{}; mutable std::atomic<bool> m_wasThrowErrorCalled{false};
}; };

8
tests/integrationtests/TestingProxy.h
View File

@ -107,12 +107,12 @@ protected:
//private: //private:
public: // for tests public: // for tests
std::atomic<bool> m_gotSimpleSignal; std::atomic<bool> m_gotSimpleSignal{false};
std::atomic<bool> m_gotSignalWithMap; std::atomic<bool> m_gotSignalWithMap{false};
std::map<int32_t, std::string> m_mapFromSignal; std::map<int32_t, std::string> m_mapFromSignal;
std::atomic<bool> m_gotSignalWithVariant; std::atomic<bool> m_gotSignalWithVariant{false};
double m_variantFromSignal; double m_variantFromSignal;
std::atomic<bool> m_gotSignalWithSignature; std::atomic<bool> m_gotSignalWithSignature{false};
std::map<std::string, std::string> m_signatureFromSignal; std::map<std::string, std::string> m_signatureFromSignal;
std::function<void(uint32_t res, const sdbus::Error* err)> m_DoOperationClientSideAsyncReplyHandler; std::function<void(uint32_t res, const sdbus::Error* err)> m_DoOperationClientSideAsyncReplyHandler;