summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhilip Rauwolf <rauwolf@itestra.de>2013-10-30 10:19:46 +0100
committerPhilip Rauwolf <rauwolf@itestra.de>2013-10-30 10:19:46 +0100
commit5db81377a5b88464c29dfb37ec2483549a57bf98 (patch)
treecf3234ae4d074eb12d0149752eb6fd31285168c8 /src
parentdf112482a09ad91e8a2028c4cf691969a2365ff1 (diff)
downloadgenivi-common-api-dbus-runtime-5db81377a5b88464c29dfb37ec2483549a57bf98.tar.gz
Removed merging relics
Diffstat (limited to 'src')
-rw-r--r--src/test/commonapi/tests/DerivedTypeCollection.cpp24
-rw-r--r--src/test/commonapi/tests/DerivedTypeCollection.h23
-rw-r--r--src/test/commonapi/tests/TestInterfaceDBusStubAdapter.cpp3
-rw-r--r--src/test/test-derived-types.fidl2
4 files changed, 1 insertions, 51 deletions
diff --git a/src/test/commonapi/tests/DerivedTypeCollection.cpp b/src/test/commonapi/tests/DerivedTypeCollection.cpp
index a6e80fb..99ba25f 100644
--- a/src/test/commonapi/tests/DerivedTypeCollection.cpp
+++ b/src/test/commonapi/tests/DerivedTypeCollection.cpp
@@ -77,29 +77,6 @@ void TestStruct::writeToOutputStream(CommonAPI::OutputStream& outputStream) cons
outputStream << uintValue;
}
-<<<<<<< Upstream, based on origin/master
-TestStructEnumMap::TestStructEnumMap(const TestEnumMap& testMapValue):
- testMap(testMapValue)
-{
-}
-
-
-bool operator==(const TestStructEnumMap& lhs, const TestStructEnumMap& rhs) {
- if (&lhs == &rhs)
- return true;
-
- return
- lhs.testMap == rhs.testMap
- ;
-}
-
-void TestStructEnumMap::readFromInputStream(CommonAPI::InputStream& inputStream) {
- inputStream >> testMap;
-}
-
-void TestStructEnumMap::writeToOutputStream(CommonAPI::OutputStream& outputStream) const {
- outputStream << testMap;
-=======
TestPolymorphicStruct::TestPolymorphicStruct(const PredefinedTypeCollection::TestString& testStringValue, const uint16_t& uintValueValue):
testString(testStringValue),
uintValue(uintValueValue)
@@ -219,7 +196,6 @@ void StructWithPolymorphicMember::readFromInputStream(CommonAPI::InputStream& in
void StructWithPolymorphicMember::writeToOutputStream(CommonAPI::OutputStream& outputStream) const {
outputStream << numberValue;
outputStream << polymorphicMember;
->>>>>>> 3439751 Fixed (de-)serialization of polymorphic structs. Added unit test for polymorphic structs.
}
} // namespace DerivedTypeCollection
diff --git a/src/test/commonapi/tests/DerivedTypeCollection.h b/src/test/commonapi/tests/DerivedTypeCollection.h
index 195b155..f967f47 100644
--- a/src/test/commonapi/tests/DerivedTypeCollection.h
+++ b/src/test/commonapi/tests/DerivedTypeCollection.h
@@ -138,23 +138,6 @@ namespace DerivedTypeCollection {
// Definition of a comparator still is necessary for GCC 4.4.1, topic is fixed since 4.5.1
struct TestEnumMissingValueComparator;
typedef std::vector<uint64_t> TestArrayUInt64;
-<<<<<<< Upstream, based on origin/master
- struct TestStructEnumMap: CommonAPI::SerializableStruct {
- TestEnumMap testMap;
-
- TestStructEnumMap() = default;
- TestStructEnumMap(const TestEnumMap& testMap);
-
-
- virtual void readFromInputStream(CommonAPI::InputStream& inputStream);
- virtual void writeToOutputStream(CommonAPI::OutputStream& outputStream) const;
-
- static inline void writeToTypeOutputStream(CommonAPI::TypeOutputStream& typeOutputStream) {
- typeOutputStream.beginWriteMapType();
- typeOutputStream.writeInt32Type();
- typeOutputStream.writeStringType();
- typeOutputStream.endWriteMapType();
-=======
struct TestPolymorphicStruct: CommonAPI::SerializablePolymorphicStruct {
/**
* the name of the property
@@ -222,7 +205,6 @@ namespace DerivedTypeCollection {
typeOutputStream.beginWriteStructType();
typeOutputStream.writeStringType();typeOutputStream.writeUInt16Type();
typeOutputStream.endWriteStructType();
->>>>>>> 3439751 Fixed (de-)serialization of polymorphic structs. Added unit test for polymorphic structs.
}
};
@@ -329,10 +311,6 @@ bool operator==(const TestStruct& lhs, const TestStruct& rhs);
inline bool operator!=(const TestStruct& lhs, const TestStruct& rhs) {
return !(lhs == rhs);
}
-<<<<<<< Upstream, based on origin/master
-bool operator==(const TestStructEnumMap& lhs, const TestStructEnumMap& rhs);
-inline bool operator!=(const TestStructEnumMap& lhs, const TestStructEnumMap& rhs) {
-=======
bool operator==(const TestPolymorphicStruct& lhs, const TestPolymorphicStruct& rhs);
inline bool operator!=(const TestPolymorphicStruct& lhs, const TestPolymorphicStruct& rhs) {
return !(lhs == rhs);
@@ -343,7 +321,6 @@ inline bool operator!=(const TestExtendedPolymorphicStruct& lhs, const TestExten
}
bool operator==(const StructWithPolymorphicMember& lhs, const StructWithPolymorphicMember& rhs);
inline bool operator!=(const StructWithPolymorphicMember& lhs, const StructWithPolymorphicMember& rhs) {
->>>>>>> 3439751 Fixed (de-)serialization of polymorphic structs. Added unit test for polymorphic structs.
return !(lhs == rhs);
}
diff --git a/src/test/commonapi/tests/TestInterfaceDBusStubAdapter.cpp b/src/test/commonapi/tests/TestInterfaceDBusStubAdapter.cpp
index 0b6231b..bd41183 100644
--- a/src/test/commonapi/tests/TestInterfaceDBusStubAdapter.cpp
+++ b/src/test/commonapi/tests/TestInterfaceDBusStubAdapter.cpp
@@ -117,8 +117,6 @@ const char* TestInterfaceDBusStubAdapter::getMethodsDBusIntrospectionXmlData() c
"<arg name=\"testEnumExtended2OutValue\" type=\"i\" direction=\"out\" />\n"
"<arg name=\"testMapOutValue\" type=\"a{ua(sq)}\" direction=\"out\" />\n"
"</method>\n"
-<<<<<<< Upstream, based on origin/master
-=======
"<method name=\"TestArrayOfPolymorphicStructMethod\">\n"
"<arg name=\"inArray\" type=\"a(uv)\" direction=\"in\" />\n"
"</method>\n"
@@ -131,7 +129,6 @@ const char* TestInterfaceDBusStubAdapter::getMethodsDBusIntrospectionXmlData() c
"<method name=\"TestStructWithPolymorphicMemberMethod\">\n"
"<arg name=\"inStruct\" type=\"(u(uv))\" direction=\"in\" />\n"
"</method>\n"
->>>>>>> 3439751 Fixed (de-)serialization of polymorphic structs. Added unit test for polymorphic structs.
;
return introspectionData;
diff --git a/src/test/test-derived-types.fidl b/src/test/test-derived-types.fidl
index b309b2b..07d3873 100644
--- a/src/test/test-derived-types.fidl
+++ b/src/test/test-derived-types.fidl
@@ -8,7 +8,7 @@ import commonapi.tests.* from "test-predefined-types.fidl"
typeCollection DerivedTypeCollection {
map TestMap { UInt32 to TestArrayTestStruct }
-
+
struct TestStructExtended extends TestStruct {
TestEnumExtended2 testEnumExtended2
}