From 452a73fc7034bd7787b86722422a1e6dd9536486 Mon Sep 17 00:00:00 2001
From: Philip Rauwolf <rauwolf@itestra.de>
Date: Tue, 15 Jan 2013 14:33:05 +0100
Subject: [PATCH] Extended tests on variant data types

---
 src/CommonAPI/DBus/DBusOutputStream.h | 134 +++++++++
 src/test/DBusTypeStreamTest.cpp       | 513 ++++++----------------------------
 2 files changed, 218 insertions(+), 429 deletions(-)

diff --git a/src/CommonAPI/DBus/DBusOutputStream.h b/src/CommonAPI/DBus/DBusOutputStream.h
index 9694e6f..03eaf7f 100644
--- a/src/CommonAPI/DBus/DBusOutputStream.h
+++ b/src/CommonAPI/DBus/DBusOutputStream.h
@@ -351,6 +351,140 @@ OutputStream& DBusOutputStream::writeValue(const ByteBuffer& byteBufferValue) {
 	return *this;
 }
 
+
+
+class DBusTypeOutputStream: public TypeOutputStream {
+  public:
+    DBusTypeOutputStream(): signature_(""), temp_(""), tempIndex_(0) {
+
+    }
+    virtual ~DBusTypeOutputStream() {}
+
+
+    inline virtual void writeBoolType() {
+        signature_.append("b");
+    }
+
+    inline virtual void writeInt8Type()  {
+        signature_.append("y");
+    }
+    inline virtual void writeInt16Type()  {
+        signature_.append("n");
+    }
+    inline virtual void writeInt32Type()  {
+        signature_.append("i");
+    }
+    inline virtual void writeInt64Type()  {
+        signature_.append("x");
+    }
+
+    inline virtual void writeUInt8Type()  {
+        signature_.append("y");
+    }
+    inline virtual void writeUInt16Type()  {
+        signature_.append("q");
+    }
+    inline virtual void writeUInt32Type()  {
+        signature_.append("u");
+    }
+    inline virtual void writeUInt64Type()  {
+        signature_.append("t");
+    }
+
+
+    inline virtual void writeInt8EnumType()  {
+        signature_.append("y");
+    }
+    inline virtual void writeInt16EnumType()  {
+        signature_.append("n");
+    }
+    inline virtual void writeInt32EnumType()  {
+        signature_.append("i");
+    }
+    inline virtual void writeInt64EnumType()  {
+        signature_.append("x");
+    }
+
+    inline virtual void writeUInt8EnumType()  {
+        signature_.append("y");
+    }
+    inline virtual void writeUInt16EnumType()  {
+        signature_.append("n");
+    }
+    inline virtual void writeUInt32EnumType()  {
+        signature_.append("u");
+    }
+    inline virtual void writeUInt64EnumType()  {
+        signature_.append("t");
+    }
+
+
+    inline virtual void writeFloatType()  {
+        signature_.append("d");
+    }
+    inline virtual void writeDoubleType()  {
+        signature_.append("d");
+    }
+
+    inline virtual void writeStringType()  {
+        signature_.append("s");
+    }
+    inline virtual void writeByteBufferType()  {
+        signature_.append("ay");
+    }
+    inline virtual void writeVersionType()  {
+        signature_.append("(uu)");
+    }
+
+    inline virtual void beginWriteStructType()  {
+        signature_.append("(");
+    }
+    inline virtual void endWriteStructType() {
+        signature_.append(")");
+    }
+
+    inline virtual void beginWriteMapType()  {
+        signature_.append("a{");
+    }
+    inline virtual void endWriteMapType() {
+        signature_.append("}");
+    }
+
+    inline virtual void beginWriteVectorType()  {
+        signature_.append("a");
+    }
+
+    inline virtual void endWriteVectorType()  {
+    }
+
+    inline virtual void beginWriteVariantType()  {
+        if(tempIndex_ == 0) {
+            signature_.append("v");
+            temp_ = std::move(signature_);
+            signature_ = "";
+        }
+        ++tempIndex_;
+    }
+
+    inline virtual void endWriteVariantType()  {
+        --tempIndex_;
+        if(tempIndex_ == 0) {
+            signature_ = std::move(temp_);
+        }
+    }
+
+    inline virtual std::string retrieveSignature() {
+        return std::move(signature_);
+    }
+
+
+  private:
+    std::string signature_;
+    std::string temp_;
+    uint8_t tempIndex_;
+};
+
+
 } // namespace DBus
 } // namespace CommonAPI
 
diff --git a/src/test/DBusTypeStreamTest.cpp b/src/test/DBusTypeStreamTest.cpp
index 383fc24..d1ad75a 100644
--- a/src/test/DBusTypeStreamTest.cpp
+++ b/src/test/DBusTypeStreamTest.cpp
@@ -12,385 +12,19 @@
 #include <CommonAPI/types.h>
 #include <CommonAPI/ByteBuffer.h>
 
-#include <type_traits>
-
-
-
-class TypeStream {
-  public:
-    virtual ~TypeStream() {}
-
-
-    virtual void writeBoolType() = 0;
-
-    virtual void writeInt8Type() = 0;
-    virtual void writeInt16Type() = 0;
-    virtual void writeInt32Type() = 0;
-    virtual void writeInt64Type() = 0;
-
-    virtual void writeUInt8Type() = 0;
-    virtual void writeUInt16Type() = 0;
-    virtual void writeUInt32Type() = 0;
-    virtual void writeUInt64Type() = 0;
-
-
-    virtual void writeInt8EnumType() = 0;
-    virtual void writeInt16EnumType() = 0;
-    virtual void writeInt32EnumType() = 0;
-    virtual void writeInt64EnumType() = 0;
-
-    virtual void writeUInt8EnumType() = 0;
-    virtual void writeUInt16EnumType() = 0;
-    virtual void writeUInt32EnumType() = 0;
-    virtual void writeUInt64EnumType() = 0;
-
-
-    virtual void writeFloatType() = 0;
-    virtual void writeDoubleType() = 0;
-
-    virtual void writeStringType() = 0;
-    virtual void writeByteBufferType() = 0;
-    virtual void writeVersionType() = 0;
-
-    virtual void writeVectorType() = 0;
-
-    virtual void beginWriteMapType() = 0;
-    virtual void endWriteMapType() = 0;
-
-    virtual void beginWriteStructType() = 0;
-    virtual void endWriteStructType() = 0;
-
-    virtual void writeVariantType() = 0;
-
-    virtual std::string retrieveSignature() = 0;
-};
-
-
-//##############################################################################################################
-
-
-class DBusTypeStream: public TypeStream {
-  public:
-    DBusTypeStream(): signature_("") {
-
-    }
-    virtual ~DBusTypeStream() {}
-
-
-    inline virtual void writeBoolType() {
-        signature_.append("b");
-    }
-
-    inline virtual void writeInt8Type()  {
-        signature_.append("y");
-    }
-    inline virtual void writeInt16Type()  {
-        signature_.append("n");
-    }
-    inline virtual void writeInt32Type()  {
-        signature_.append("i");
-    }
-    inline virtual void writeInt64Type()  {
-        signature_.append("x");
-    }
-
-    inline virtual void writeUInt8Type()  {
-        signature_.append("y");
-    }
-    inline virtual void writeUInt16Type()  {
-        signature_.append("q");
-    }
-    inline virtual void writeUInt32Type()  {
-        signature_.append("u");
-    }
-    inline virtual void writeUInt64Type()  {
-        signature_.append("t");
-    }
-
-
-    inline virtual void writeInt8EnumType()  {
-        signature_.append("y");
-    }
-    inline virtual void writeInt16EnumType()  {
-        signature_.append("n");
-    }
-    inline virtual void writeInt32EnumType()  {
-        signature_.append("i");
-    }
-    inline virtual void writeInt64EnumType()  {
-        signature_.append("x");
-    }
-
-    inline virtual void writeUInt8EnumType()  {
-        signature_.append("y");
-    }
-    inline virtual void writeUInt16EnumType()  {
-        signature_.append("n");
-    }
-    inline virtual void writeUInt32EnumType()  {
-        signature_.append("u");
-    }
-    inline virtual void writeUInt64EnumType()  {
-        signature_.append("t");
-    }
-
-
-    inline virtual void writeFloatType()  {
-        signature_.append("d");
-    }
-    inline virtual void writeDoubleType()  {
-        signature_.append("d");
-    }
-
-    inline virtual void writeStringType()  {
-        signature_.append("s");
-    }
-    inline virtual void writeByteBufferType()  {
-        signature_.append("ay");
-    }
-    inline virtual void writeVersionType()  {
-        signature_.append("(uu)");
-    }
-
-    inline virtual void beginWriteStructType()  {
-        signature_.append("(");
-    }
-    inline virtual void endWriteStructType() {
-        signature_.append(")");
-    }
-
-    inline virtual void beginWriteMapType()  {
-        signature_.append("a{");
-    }
-    inline virtual void endWriteMapType() {
-        signature_.append("}");
-    }
-
-    inline virtual void writeVectorType()  {
-        signature_.append("a");
-    }
-
-    inline virtual void writeVariantType()  {
-        signature_.append("v");
-    }
-
-    inline virtual std::string retrieveSignature() {
-        return std::move(signature_);
-    }
-
-
-  private:
-    std::string signature_;
-};
-
-
-
-//##############################################################################################################
-
-
-
-template<typename _Type>
-struct BasicTypeWriter;
-
-
-template<>
-struct BasicTypeWriter<bool> {
-inline static void writeType(TypeStream& typeStream) {
-    typeStream.writeBoolType();
-}
-};
-
-
-template<>
-struct BasicTypeWriter<int8_t> {
-inline static void writeType (TypeStream& typeStream) {
-    typeStream.writeInt8Type();
-}
-};
-
-template<>
-struct BasicTypeWriter<int16_t> {
-inline static void writeType (TypeStream& typeStream) {
-    typeStream.writeInt16Type();
-}
-};
-
-template<>
-struct BasicTypeWriter<int32_t> {
-inline static void writeType (TypeStream& typeStream) {
-    typeStream.writeInt32Type();
-}
-};
-
-template<>
-struct BasicTypeWriter<int64_t> {
-inline static void writeType (TypeStream& typeStream) {
-    typeStream.writeInt64Type();
-}
-};
-
-
-template<>
-struct BasicTypeWriter<uint8_t> {
-inline static void writeType (TypeStream& typeStream) {
-    typeStream.writeUInt8Type();
-}
-};
-
-template<>
-struct BasicTypeWriter<uint16_t> {
-inline static void writeType (TypeStream& typeStream) {
-    typeStream.writeUInt16Type();
-}
-};
-
-template<>
-struct BasicTypeWriter<uint32_t> {
-inline static void writeType (TypeStream& typeStream) {
-    typeStream.writeUInt32Type();
-}
-};
-
-template<>
-struct BasicTypeWriter<uint64_t> {
-inline static void writeType (TypeStream& typeStream) {
-    typeStream.writeUInt64Type();
-}
-};
-
-
-template<>
-struct BasicTypeWriter<float> {
-inline static void writeType (TypeStream& typeStream) {
-    typeStream.writeFloatType();
-}
-};
-
-template<>
-struct BasicTypeWriter<double> {
-inline static void writeType (TypeStream& typeStream) {
-    typeStream.writeDoubleType();
-}
-};
-
-
-template<>
-struct BasicTypeWriter<std::string> {
-inline static void writeType (TypeStream& typeStream) {
-    typeStream.writeStringType();
-}
-};
-
-template<>
-struct BasicTypeWriter<CommonAPI::ByteBuffer> {
-inline static void writeType (TypeStream& typeStream) {
-    typeStream.writeByteBufferType();
-}
-};
-
-template<>
-struct BasicTypeWriter<CommonAPI::Version> {
-inline static void writeType (TypeStream& typeStream) {
-    typeStream.writeVersionType();
-}
-};
-
-template<>
-struct BasicTypeWriter<CommonAPI::SerializableVariant> {
-inline static void writeType (TypeStream& typeStream) {
-    typeStream.writeVariantType();
-}
-};
-
-
-template<typename _VectorElementType>
-struct BasicTypeWriter<std::vector<_VectorElementType>> {
-inline static void writeType(TypeStream& typeStream) {
-    typeStream.writeVectorType();
-    BasicTypeWriter<_VectorElementType>::writeType(typeStream);
-}
-};
-
-
-template<typename _KeyType, typename _ValueType>
-struct BasicTypeWriter<std::unordered_map<_KeyType, _ValueType>> {
-inline static void writeType(TypeStream& typeStream) {
-    typeStream.beginWriteMapType();
-
-    BasicTypeWriter<_KeyType>::writeType(typeStream);
-    BasicTypeWriter<_ValueType>::writeType(typeStream);
-
-    typeStream.endWriteMapType();
-}
-};
+#include <CommonAPI/DBus/DBusOutputStream.h>
 
+#include <type_traits>
 
 
 
-template<typename _Type, bool _IsStructType>
-struct StructTypeWriter;
-
-
-template<typename _Type>
-struct StructTypeWriter<_Type, true> {
-inline static void writeType(TypeStream& typeStream) {
-    _Type::writeToTypeStream(typeStream);
-}
-};
-
-template<typename _Type>
-struct StructTypeWriter<_Type, false>: public BasicTypeWriter<_Type> {
-};
-
-
-
-
-template<typename _Type, bool _IsVariantType>
-struct VariantTypeWriter;
-
-
-template<typename _Type>
-struct VariantTypeWriter<_Type, true> {
-inline static void writeType(TypeStream& typeStream) {
-    typeStream.writeVariantType();
-}
-};
-
-template<typename _Type>
-struct VariantTypeWriter<_Type, false>: public StructTypeWriter<_Type, std::is_base_of<CommonAPI::SerializableStruct, _Type>::value> {
-};
-
-
-template<typename _Type>
-struct TypeWriter: public VariantTypeWriter<_Type, std::is_base_of<CommonAPI::SerializableVariant, _Type>::value>{};
-
-
-
-//##############################################################################################################
-
-
-
-struct TypeSearchVisitor {
-public:
-    TypeSearchVisitor(TypeStream& typeStream): typeStream_(typeStream) {
-    }
-
-    template<typename _Type>
-    void operator()(const _Type& currentType) const {
-        TypeWriter<_Type>::writeType(typeStream_, currentType);
-    }
-
-private:
-    TypeStream& typeStream_;
-};
-
 
 
 //##############################################################################################################
 
 
 
-class TypeStreamTest: public ::testing::Test {
+class TypeOutputStreamTest: public ::testing::Test {
   protected:
 
     void SetUp() {
@@ -402,129 +36,150 @@ class TypeStreamTest: public ::testing::Test {
 
 
 
-TEST_F(TypeStreamTest, CreatesBoolSignature) {
-    DBusTypeStream typeStream;
-    TypeWriter<bool>::writeType(typeStream);
+TEST_F(TypeOutputStreamTest, CreatesBoolSignature) {
+    CommonAPI::DBus::DBusTypeOutputStream typeStream;
+    CommonAPI::TypeWriter<bool>::writeType(typeStream);
     std::string signature = typeStream.retrieveSignature();
     ASSERT_TRUE(signature.compare("b") == 0);
 }
 
-TEST_F(TypeStreamTest, CreatesInt8Signature) {
-    DBusTypeStream typeStream;
-    TypeWriter<int8_t>::writeType(typeStream);
+TEST_F(TypeOutputStreamTest, CreatesInt8Signature) {
+    CommonAPI::DBus::DBusTypeOutputStream typeStream;
+    CommonAPI::TypeWriter<int8_t>::writeType(typeStream);
     std::string signature = typeStream.retrieveSignature();
     ASSERT_TRUE(signature.compare("y") == 0);
 }
-TEST_F(TypeStreamTest, CreatesInt16Signature) {
-    DBusTypeStream typeStream;
-    TypeWriter<int16_t>::writeType(typeStream);
+TEST_F(TypeOutputStreamTest, CreatesInt16Signature) {
+    CommonAPI::DBus::DBusTypeOutputStream typeStream;
+    CommonAPI::TypeWriter<int16_t>::writeType(typeStream);
     std::string signature = typeStream.retrieveSignature();
     ASSERT_TRUE(signature.compare("n") == 0);
 }
-TEST_F(TypeStreamTest, CreatesInt32Signature) {
-    DBusTypeStream typeStream;
-    TypeWriter<int32_t>::writeType(typeStream);
+TEST_F(TypeOutputStreamTest, CreatesInt32Signature) {
+    CommonAPI::DBus::DBusTypeOutputStream typeStream;
+    CommonAPI::TypeWriter<int32_t>::writeType(typeStream);
     std::string signature = typeStream.retrieveSignature();
     ASSERT_TRUE(signature.compare("i") == 0);
 }
-TEST_F(TypeStreamTest, CreatesInt64Signature) {
-    DBusTypeStream typeStream;
-    TypeWriter<int64_t>::writeType(typeStream);
+TEST_F(TypeOutputStreamTest, CreatesInt64Signature) {
+    CommonAPI::DBus::DBusTypeOutputStream typeStream;
+    CommonAPI::TypeWriter<int64_t>::writeType(typeStream);
     std::string signature = typeStream.retrieveSignature();
     ASSERT_TRUE(signature.compare("x") == 0);
 }
 
-TEST_F(TypeStreamTest, CreatesUInt8Signature) {
-    DBusTypeStream typeStream;
-    TypeWriter<uint8_t>::writeType(typeStream);
+TEST_F(TypeOutputStreamTest, CreatesUInt8Signature) {
+    CommonAPI::DBus::DBusTypeOutputStream typeStream;
+    CommonAPI::TypeWriter<uint8_t>::writeType(typeStream);
     std::string signature = typeStream.retrieveSignature();
     ASSERT_TRUE(signature.compare("y") == 0);
 }
-TEST_F(TypeStreamTest, CreatesUInt16Signature) {
-    DBusTypeStream typeStream;
-    TypeWriter<uint16_t>::writeType(typeStream);
+TEST_F(TypeOutputStreamTest, CreatesUInt16Signature) {
+    CommonAPI::DBus::DBusTypeOutputStream typeStream;
+    CommonAPI::TypeWriter<uint16_t>::writeType(typeStream);
     std::string signature = typeStream.retrieveSignature();
     ASSERT_TRUE(signature.compare("q") == 0);
 }
-TEST_F(TypeStreamTest, CreatesUInt32Signature) {
-    DBusTypeStream typeStream;
-    TypeWriter<uint32_t>::writeType(typeStream);
+TEST_F(TypeOutputStreamTest, CreatesUInt32Signature) {
+    CommonAPI::DBus::DBusTypeOutputStream typeStream;
+    CommonAPI::TypeWriter<uint32_t>::writeType(typeStream);
     std::string signature = typeStream.retrieveSignature();
     ASSERT_TRUE(signature.compare("u") == 0);
 }
-TEST_F(TypeStreamTest, CreatesUInt64Signature) {
-    DBusTypeStream typeStream;
-    TypeWriter<uint64_t>::writeType(typeStream);
+TEST_F(TypeOutputStreamTest, CreatesUInt64Signature) {
+    CommonAPI::DBus::DBusTypeOutputStream typeStream;
+    CommonAPI::TypeWriter<uint64_t>::writeType(typeStream);
     std::string signature = typeStream.retrieveSignature();
     ASSERT_TRUE(signature.compare("t") == 0);
 }
 
-TEST_F(TypeStreamTest, CreatesFloatSignature) {
-    DBusTypeStream typeStream;
-    TypeWriter<float>::writeType(typeStream);
+TEST_F(TypeOutputStreamTest, CreatesFloatSignature) {
+    CommonAPI::DBus::DBusTypeOutputStream typeStream;
+    CommonAPI::TypeWriter<float>::writeType(typeStream);
     std::string signature = typeStream.retrieveSignature();
     ASSERT_TRUE(signature.compare("d") == 0);
 }
-TEST_F(TypeStreamTest, CreatesDoubleSignature) {
-    DBusTypeStream typeStream;
-    TypeWriter<double>::writeType(typeStream);
+TEST_F(TypeOutputStreamTest, CreatesDoubleSignature) {
+    CommonAPI::DBus::DBusTypeOutputStream typeStream;
+    CommonAPI::TypeWriter<double>::writeType(typeStream);
     std::string signature = typeStream.retrieveSignature();
     ASSERT_TRUE(signature.compare("d") == 0);
 }
 
-TEST_F(TypeStreamTest, CreatesStringSignature) {
-    DBusTypeStream typeStream;
-    TypeWriter<std::string>::writeType(typeStream);
+TEST_F(TypeOutputStreamTest, CreatesStringSignature) {
+    CommonAPI::DBus::DBusTypeOutputStream typeStream;
+    CommonAPI::TypeWriter<std::string>::writeType(typeStream);
     std::string signature = typeStream.retrieveSignature();
     ASSERT_TRUE(signature.compare("s") == 0);
 }
 
-TEST_F(TypeStreamTest, CreatesByteBufferSignature) {
-    DBusTypeStream typeStream;
-    TypeWriter<CommonAPI::ByteBuffer>::writeType(typeStream);
+TEST_F(TypeOutputStreamTest, CreatesByteBufferSignature) {
+    CommonAPI::DBus::DBusTypeOutputStream typeStream;
+    CommonAPI::TypeWriter<CommonAPI::ByteBuffer>::writeType(typeStream);
     std::string signature = typeStream.retrieveSignature();
     ASSERT_TRUE(signature.compare("ay") == 0);
 }
-TEST_F(TypeStreamTest, CreatesVersionSignature) {
-    DBusTypeStream typeStream;
-    TypeWriter<CommonAPI::Version>::writeType(typeStream);
+TEST_F(TypeOutputStreamTest, CreatesVersionSignature) {
+    CommonAPI::DBus::DBusTypeOutputStream typeStream;
+    CommonAPI::TypeWriter<CommonAPI::Version>::writeType(typeStream);
     std::string signature = typeStream.retrieveSignature();
     ASSERT_TRUE(signature.compare("(uu)") == 0);
 }
 
-TEST_F(TypeStreamTest, CreatesVectorOfStringsSignature) {
-    DBusTypeStream typeStream;
-    TypeWriter<std::vector<std::string> >::writeType(typeStream);
+TEST_F(TypeOutputStreamTest, CreatesVariantWithBasicTypesSignature) {
+    CommonAPI::DBus::DBusTypeOutputStream typeStream;
+    CommonAPI::TypeWriter<CommonAPI::Variant<int, double, std::string>>::writeType(typeStream);
+    std::string signature = typeStream.retrieveSignature();
+    ASSERT_TRUE(signature.compare("v") == 0);
+}
+
+TEST_F(TypeOutputStreamTest, CreatesVariantWithVariantSignature) {
+    CommonAPI::DBus::DBusTypeOutputStream typeStream;
+    CommonAPI::TypeWriter<CommonAPI::Variant<int, CommonAPI::Variant<int, double, std::string>, CommonAPI::Variant<int, CommonAPI::Variant<int, double, std::string>, std::string>, std::string>>::writeType(typeStream);
+    std::string signature = typeStream.retrieveSignature();
+    ASSERT_TRUE(signature.compare("v") == 0);
+}
+
+TEST_F(TypeOutputStreamTest, CreatesVectorOfStringsSignature) {
+    CommonAPI::DBus::DBusTypeOutputStream typeStream;
+    CommonAPI::TypeWriter<std::vector<std::string> >::writeType(typeStream);
     std::string signature = typeStream.retrieveSignature();
     ASSERT_TRUE(signature.compare("as") == 0);
 }
 
-TEST_F(TypeStreamTest, CreatesVectorOfVersionsSignature) {
-    DBusTypeStream typeStream;
-    TypeWriter<std::vector<CommonAPI::Version> >::writeType(typeStream);
+TEST_F(TypeOutputStreamTest, CreatesVectorOfVersionsSignature) {
+    CommonAPI::DBus::DBusTypeOutputStream typeStream;
+    CommonAPI::TypeWriter<std::vector<CommonAPI::Version> >::writeType(typeStream);
     std::string signature = typeStream.retrieveSignature();
     ASSERT_TRUE(signature.compare("a(uu)") == 0);
 }
 
-TEST_F(TypeStreamTest, CreatesMapOfUInt16ToStringSignature) {
-    DBusTypeStream typeStream;
-    TypeWriter<std::unordered_map<uint16_t, std::string>>::writeType(typeStream);
+TEST_F(TypeOutputStreamTest, CreatesVectorOfVariantsSignature) {
+    CommonAPI::DBus::DBusTypeOutputStream typeStream;
+    CommonAPI::TypeWriter<std::vector<CommonAPI::Variant<int, double, std::string>> >::writeType(typeStream);
     std::string signature = typeStream.retrieveSignature();
-    ASSERT_TRUE(signature.compare("a{qs}") == 0);
+    ASSERT_TRUE(signature.compare("av") == 0);
 }
 
-TEST_F(TypeStreamTest, CreatesBasicVariantSignature) {
-    DBusTypeStream typeStream;
-    TypeWriter<CommonAPI::SerializableVariant>::writeType(typeStream);
+TEST_F(TypeOutputStreamTest, CreatesVectorOfVectorOfStringsSignature) {
+    CommonAPI::DBus::DBusTypeOutputStream typeStream;
+    CommonAPI::TypeWriter<std::vector<std::vector<std::string>> >::writeType(typeStream);
     std::string signature = typeStream.retrieveSignature();
-    ASSERT_TRUE(signature.compare("v") == 0);
+    ASSERT_TRUE(signature.compare("aas") == 0);
 }
 
-TEST_F(TypeStreamTest, CreatesDerivedVariantSignature) {
-    DBusTypeStream typeStream;
-    TypeWriter<CommonAPI::Variant<int, double, std::string>>::writeType(typeStream);
+TEST_F(TypeOutputStreamTest, CreatesMapOfUInt16ToStringSignature) {
+    CommonAPI::DBus::DBusTypeOutputStream typeStream;
+    CommonAPI::TypeWriter<std::unordered_map<uint16_t, std::string>>::writeType(typeStream);
     std::string signature = typeStream.retrieveSignature();
-    ASSERT_TRUE(signature.compare("v") == 0);
+    ASSERT_TRUE(signature.compare("a{qs}") == 0);
+}
+
+TEST_F(TypeOutputStreamTest, CreatesVectorOfMapsOfUInt16ToStringSignature) {
+    CommonAPI::DBus::DBusTypeOutputStream typeStream;
+    CommonAPI::TypeWriter<std::vector<std::unordered_map<uint16_t, std::string>> >::writeType(typeStream);
+    std::string signature = typeStream.retrieveSignature();
+    ASSERT_TRUE(signature.compare("aa{qs}") == 0);
 }
 
 
-- 
2.7.4