Add extra test messages for map

tests/CMakeLists.txt

@@ -62,73 +62,117 @@ set(EXPECTED_GENERATED_HEADERS
     simpleexternalmessage.h
     simplefileenummessage.h
     simplefixed32complexmessagemapmessage.h
+    simplefixed32int32mapmessage.h
+    simplefixed32int64mapmessage.h
     simplefixed32sint32mapmessage.h
     simplefixed32sint64mapmessage.h
     simplefixed32stringmapmessage.h
     simplefixed32suint32mapmessage.h
+    simplefixed32uint32mapmessage.h
+    simplefixed32uint64mapmessage.h
     simplefixed64complexmessagemapmessage.h
+    simplefixed64int32mapmessage.h
+    simplefixed64int64mapmessage.h
     simplefixed64sint32mapmessage.h
     simplefixed64sint64mapmessage.h
     simplefixed64stringmapmessage.h
     simplefixed64suint32mapmessage.h
+    simplefixed64uint32mapmessage.h
+    simplefixed64uint64mapmessage.h
     simplefixedint32message.h
     simplefixedint64message.h
     simplefloatmessage.h
     simpleint32complexmessagemapmessage.h
+    simpleint32int32mapmessage.h
+    simpleint32int64mapmessage.h
     simpleint32sint32mapmessage.h
     simpleint32sint64mapmessage.h
     simpleint32stringmapmessage.h
     simpleint32suint32mapmessage.h
+    simpleint32uint32mapmessage.h
+    simpleint32uint64mapmessage.h
     simpleint64complexmessagemapmessage.h
+    simpleint64int32mapmessage.h
+    simpleint64int64mapmessage.h
     simpleint64message.h
     simpleint64sint32mapmessage.h
     simpleint64sint64mapmessage.h
     simpleint64stringmapmessage.h
     simpleint64suint32mapmessage.h
+    simpleint64uint32mapmessage.h
+    simpleint64uint64mapmessage.h
     simpleintmessage.h
     simplesfixed32complexmessagemapmessage.h
+    simplesfixed32int32mapmessage.h
+    simplesfixed32int64mapmessage.h
     simplesfixed32sint32mapmessage.h
     simplesfixed32sint64mapmessage.h
     simplesfixed32stringmapmessage.h
     simplesfixed32suint32mapmessage.h
+    simplesfixed32uint32mapmessage.h
+    simplesfixed32uint64mapmessage.h
     simplesfixed64complexmessagemapmessage.h
+    simplesfixed64int32mapmessage.h
+    simplesfixed64int64mapmessage.h
     simplesfixed64sint32mapmessage.h
     simplesfixed64sint64mapmessage.h
     simplesfixed64stringmapmessage.h
     simplesfixed64suint32mapmessage.h
+    simplesfixed64uint32mapmessage.h
+    simplesfixed64uint64mapmessage.h
     simplesfixedint32message.h
     simplesfixedint64message.h
     simplesint32complexmessagemapmessage.h
+    simplesint32int32mapmessage.h
+    simplesint32int64mapmessage.h
     simplesint32mapmessage.h
     simplesint32sint32mapmessage.h
     simplesint32sint64mapmessage.h
     simplesint32stringmapmessage.h
     simplesint32suint32mapmessage.h
+    simplesint32uint32mapmessage.h
+    simplesint32uint64mapmessage.h
     simplesint64complexmessagemapmessage.h
+    simplesint64int32mapmessage.h
+    simplesint64int64mapmessage.h
     simplesint64message.h
     simplesint64sint32mapmessage.h
     simplesint64sint64mapmessage.h
     simplesint64stringmapmessage.h
     simplesint64suint32mapmessage.h
+    simplesint64uint32mapmessage.h
+    simplesint64uint64mapmessage.h
     simplesintmessage.h
     simplestringcomplexmessagemapmessage.h
+    simplestringint32mapmessage.h
+    simplestringint64mapmessage.h
     simplestringmapmessage.h
     simplestringmessage.h
     simplestringsint32mapmessage.h
     simplestringsint64mapmessage.h
     simplestringstringmapmessage.h
     simplestringsuint32mapmessage.h
+    simplestringuint32mapmessage.h
+    simplestringuint64mapmessage.h
     simpleuint32complexmessagemapmessage.h
+    simpleuint32int32mapmessage.h
+    simpleuint32int64mapmessage.h
     simpleuint32sint32mapmessage.h
     simpleuint32sint64mapmessage.h
     simpleuint32stringmapmessage.h
     simpleuint32suint32mapmessage.h
+    simpleuint32uint32mapmessage.h
+    simpleuint32uint64mapmessage.h
     simpleuint64complexmessagemapmessage.h
+    simpleuint64int32mapmessage.h
+    simpleuint64int64mapmessage.h
     simpleuint64message.h
     simpleuint64sint32mapmessage.h
     simpleuint64sint64mapmessage.h
     simpleuint64stringmapmessage.h
     simpleuint64suint32mapmessage.h
+    simpleuint64uint32mapmessage.h
+    simpleuint64uint64mapmessage.h
     simpleuintmessage.h
     stepchildenummessage.h
     testserviceclient.h

tests/proto/simpletest.proto

@@ -170,6 +170,7 @@ message RepeatedSFixedInt64Message {
 }
 
 //MAPS
+//Types to String
 message SimpleSInt32StringMapMessage {
     map<sint32, string> mapField = 1;
 }
@@ -213,7 +214,8 @@ message SimpleSFixed64StringMapMessage {
 message SimpleStringStringMapMessage {
     map<string, string> mapField = 13;
 }
-//
+
+//Types to sint32
 message SimpleSInt32SInt32MapMessage {
     map<sint32, sint32> mapField = 1;
 }
@@ -257,7 +259,8 @@ message SimpleSFixed64SInt32MapMessage {
 message SimpleStringSInt32MapMessage {
     map<string, sint32> mapField = 13;
 }
-//
+
+//Types to sint64
 message SimpleSInt32SInt64MapMessage {
     map<sint32, sint64> mapField = 1;
 }
@@ -301,51 +304,188 @@ message SimpleSFixed64SInt64MapMessage {
 message SimpleStringSInt64MapMessage {
     map<string, sint64> mapField = 13;
 }
-//
-message SimpleSInt32SUInt32MapMessage {
+
+//Types to uint32
+message SimpleSInt32UInt32MapMessage {
     map<sint32, uint32> mapField = 1;
 }
 
-message SimpleSInt64SUInt32MapMessage {
+message SimpleSInt64UInt32MapMessage {
     map<sint64, uint32> mapField = 2;
 }
 
-message SimpleInt32SUInt32MapMessage {
+message SimpleInt32UInt32MapMessage {
     map<int32, uint32> mapField = 3;
 }
 
-message SimpleInt64SUInt32MapMessage {
+message SimpleInt64UInt32MapMessage {
     map<int64, uint32> mapField = 4;
 }
 
-message SimpleUInt32SUInt32MapMessage {
+message SimpleUInt32UInt32MapMessage {
     map<uint32, uint32> mapField = 5;
 }
 
-message SimpleUInt64SUInt32MapMessage {
+message SimpleUInt64UInt32MapMessage {
     map<uint64, uint32> mapField = 6;
 }
 
-message SimpleFixed32SUInt32MapMessage {
+message SimpleFixed32UInt32MapMessage {
     map<fixed32, uint32> mapField = 7;
 }
 
-message SimpleFixed64SUInt32MapMessage {
+message SimpleFixed64UInt32MapMessage {
     map<fixed64, uint32> mapField = 8;
 }
 
-message SimpleSFixed32SUInt32MapMessage {
+message SimpleSFixed32UInt32MapMessage {
     map<sfixed32, uint32> mapField = 9;
 }
 
-message SimpleSFixed64SUInt32MapMessage {
+message SimpleSFixed64UInt32MapMessage {
     map<sfixed64, uint32> mapField = 10;
 }
 
-message SimpleStringSUInt32MapMessage {
+message SimpleStringUInt32MapMessage {
     map<string, uint32> mapField = 13;
 }
-//
+
+//Types to uint64
+message SimpleSInt32UInt64MapMessage {
+    map<sint32, uint64> mapField = 1;
+}
+
+message SimpleSInt64UInt64MapMessage {
+    map<sint64, uint64> mapField = 2;
+}
+
+message SimpleInt32UInt64MapMessage {
+    map<int32, uint64> mapField = 3;
+}
+
+message SimpleInt64UInt64MapMessage {
+    map<int64, uint64> mapField = 4;
+}
+
+message SimpleUInt32UInt64MapMessage {
+    map<uint32, uint64> mapField = 5;
+}
+
+message SimpleUInt64UInt64MapMessage {
+    map<uint64, uint64> mapField = 6;
+}
+
+message SimpleFixed32UInt64MapMessage {
+    map<fixed32, uint64> mapField = 7;
+}
+
+message SimpleFixed64UInt64MapMessage {
+    map<fixed64, uint64> mapField = 8;
+}
+
+message SimpleSFixed32UInt64MapMessage {
+    map<sfixed32, uint64> mapField = 9;
+}
+
+message SimpleSFixed64UInt64MapMessage {
+    map<sfixed64, uint64> mapField = 10;
+}
+
+message SimpleStringUInt64MapMessage {
+    map<string, uint64> mapField = 13;
+}
+
+//Types to int32
+message SimpleSInt32Int32MapMessage {
+    map<sint32, int32> mapField = 1;
+}
+
+message SimpleSInt64Int32MapMessage {
+    map<sint64, int32> mapField = 2;
+}
+
+message SimpleInt32Int32MapMessage {
+    map<int32, int32> mapField = 3;
+}
+
+message SimpleInt64Int32MapMessage {
+    map<int64, int32> mapField = 4;
+}
+
+message SimpleUInt32Int32MapMessage {
+    map<uint32, int32> mapField = 5;
+}
+
+message SimpleUInt64Int32MapMessage {
+    map<uint64, int32> mapField = 6;
+}
+
+message SimpleFixed32Int32MapMessage {
+    map<fixed32, int32> mapField = 7;
+}
+
+message SimpleFixed64Int32MapMessage {
+    map<fixed64, int32> mapField = 8;
+}
+
+message SimpleSFixed32Int32MapMessage {
+    map<sfixed32, int32> mapField = 9;
+}
+
+message SimpleSFixed64Int32MapMessage {
+    map<sfixed64, int32> mapField = 10;
+}
+
+message SimpleStringInt32MapMessage {
+    map<string, int32> mapField = 13;
+}
+
+//Types to int64
+message SimpleSInt32Int64MapMessage {
+    map<sint32, int64> mapField = 1;
+}
+
+message SimpleSInt64Int64MapMessage {
+    map<sint64, int64> mapField = 2;
+}
+
+message SimpleInt32Int64MapMessage {
+    map<int32, int64> mapField = 3;
+}
+
+message SimpleInt64Int64MapMessage {
+    map<int64, int64> mapField = 4;
+}
+
+message SimpleUInt32Int64MapMessage {
+    map<uint32, int64> mapField = 5;
+}
+
+message SimpleUInt64Int64MapMessage {
+    map<uint64, int64> mapField = 6;
+}
+
+message SimpleFixed32Int64MapMessage {
+    map<fixed32, int64> mapField = 7;
+}
+
+message SimpleFixed64Int64MapMessage {
+    map<fixed64, int64> mapField = 8;
+}
+
+message SimpleSFixed32Int64MapMessage {
+    map<sfixed32, int64> mapField = 9;
+}
+
+message SimpleSFixed64Int64MapMessage {
+    map<sfixed64, int64> mapField = 10;
+}
+
+message SimpleStringInt64MapMessage {
+    map<string, int64> mapField = 13;
+}
+
+//Types to ComplexMessage
 message SimpleSInt32ComplexMessageMapMessage {
     map<sint32, ComplexMessage> mapField = 1;
 }
@@ -389,6 +529,7 @@ message SimpleSFixed64ComplexMessageMapMessage {
 message SimpleStringComplexMessageMapMessage {
     map<string, ComplexMessage> mapField = 13;
 }
+
 enum TestEnum {
     TEST_ENUM_VALUE0 = 0;
     TEST_ENUM_VALUE1 = 1;