Fix map tests for windows compatibility

tests/test_protobuf/deserializationtest.cpp

@@ -739,7 +739,7 @@ TEST_F(DeserializationTest, SimpleStringStringMapDeserializeTest)
 TEST_F(DeserializationTest, SimpleFixed32ComplexMapDeserializeTest)
 {
     SimpleFixed32ComplexMessageMapMessage test;
-    test.deserialize(serializer.get(), QByteArray::fromHex("3a180d0a0000001211120d320b74656e207369787465656e08103a230d2a000000121c12183216666f757274792074776f2074656e207369787465656e080a3a110d13000100120a120632045755543f080a"));
+    test.deserialize(serializer.get(), QByteArray::fromHex("3a180d0a00000012110810120d320b74656e207369787465656e3a230d2a000000121c080a12183216666f757274792074776f2074656e207369787465656e3a110d13000100120a080a120632045755543f"));
     ASSERT_TRUE(*test.mapField()[10].data() == ComplexMessage({16, {"ten sixteen"}}));
     ASSERT_TRUE(*test.mapField()[42].data() == ComplexMessage({10, {"fourty two ten sixteen"}}));
     ASSERT_TRUE(*test.mapField()[65555].data() == ComplexMessage({10, {"WUT?"}}));

tests/test_protobuf/serializationcomplexmessagemap.cpp

@@ -50,8 +50,10 @@ TEST_F(SerializationTest, SimpleFixed32ComplexMapSerializeTest)
     test.setMapField({{10, QSharedPointer<ComplexMessage>(new ComplexMessage{16, {"ten sixteen"}})}, {42, QSharedPointer<ComplexMessage>(new ComplexMessage{10, {"fourty two ten sixteen"}})}, {65555, QSharedPointer<ComplexMessage>(new ComplexMessage{10, {"WUT?"}})}});
     QByteArray result = test.serialize(serializer.get());
 
-    ASSERT_STREQ(result.toHex().toStdString().c_str(),
-                "3a180d0a0000001211120d320b74656e207369787465656e08103a230d2a000000121c12183216666f757274792074776f2074656e207369787465656e080a3a110d13000100120a120632045755543f080a");
+    ASSERT_TRUE(result ==
+                QByteArray::fromHex("3a180d0a0000001211120d320b74656e207369787465656e08103a230d2a000000121c12183216666f757274792074776f2074656e207369787465656e080a3a110d13000100120a120632045755543f080a")
+                || result ==
+                QByteArray::fromHex("3a180d0a00000012110810120d320b74656e207369787465656e3a230d2a000000121c080a12183216666f757274792074776f2074656e207369787465656e3a110d13000100120a080a120632045755543f"));
 }
 
 TEST_F(SerializationTest, SimpleSFixed32ComplexMapSerializeTest)
@@ -60,8 +62,10 @@ TEST_F(SerializationTest, SimpleSFixed32ComplexMapSerializeTest)
     test.setMapField({{10, QSharedPointer<ComplexMessage>(new ComplexMessage{16 , {"ten sixteen"}})}, {-42, QSharedPointer<ComplexMessage>(new ComplexMessage{10 , {"minus fourty two ten sixteen"}})}, {65555, QSharedPointer<ComplexMessage>(new ComplexMessage{10 , {"WUT?"}})}});
     QByteArray result = test.serialize(serializer.get());
 
-    ASSERT_STREQ(result.toHex().toStdString().c_str(),
-                "4a290dd6ffffff1222121e321c6d696e757320666f757274792074776f2074656e207369787465656e080a4a180d0a0000001211120d320b74656e207369787465656e08104a110d13000100120a120632045755543f080a");
+    ASSERT_TRUE(result ==
+                QByteArray::fromHex("4a290dd6ffffff1222121e321c6d696e757320666f757274792074776f2074656e207369787465656e080a4a180d0a0000001211120d320b74656e207369787465656e08104a110d13000100120a120632045755543f080a")
+                || result ==
+                QByteArray::fromHex("4a290dd6ffffff1222080a121e321c6d696e757320666f757274792074776f2074656e207369787465656e4a180d0a00000012110810120d320b74656e207369787465656e4a110d13000100120a080a120632045755543f"));
 }
 
 TEST_F(SerializationTest, SimpleInt32ComplexMapSerializeTest)
@@ -70,8 +74,10 @@ TEST_F(SerializationTest, SimpleInt32ComplexMapSerializeTest)
     test.setMapField({{10, QSharedPointer<ComplexMessage>(new ComplexMessage{16 , {"ten sixteen"}})}, {-42, QSharedPointer<ComplexMessage>(new ComplexMessage{10 , {"minus fourty two ten sixteen"}})}, {65555, QSharedPointer<ComplexMessage>(new ComplexMessage{10 , {"WUT?"}})}});
     QByteArray result = test.serialize(serializer.get());
 
-    ASSERT_STREQ(result.toHex().toStdString().c_str(),
-                "1a2a08d6ffffff0f1222121e321c6d696e757320666f757274792074776f2074656e207369787465656e080a1a15080a1211120d320b74656e207369787465656e08101a1008938004120a120632045755543f080a");
+    ASSERT_TRUE(result ==
+                QByteArray::fromHex("1a2a08d6ffffff0f1222121e321c6d696e757320666f757274792074776f2074656e207369787465656e080a1a15080a1211120d320b74656e207369787465656e08101a1008938004120a120632045755543f080a")
+                || result ==
+                QByteArray::fromHex("1a2a08d6ffffff0f1222080a121e321c6d696e757320666f757274792074776f2074656e207369787465656e1a15080a12110810120d320b74656e207369787465656e1a1008938004120a080a120632045755543f"));
 }
 
 TEST_F(SerializationTest, SimpleSInt32ComplexMapSerializeTest)
@@ -80,8 +86,10 @@ TEST_F(SerializationTest, SimpleSInt32ComplexMapSerializeTest)
     test.setMapField({{10, QSharedPointer<ComplexMessage>(new ComplexMessage{16 , {"ten sixteen"}})}, {42, QSharedPointer<ComplexMessage>(new ComplexMessage{10 , {"fourty two ten sixteen"}})}, {-65555, QSharedPointer<ComplexMessage>(new ComplexMessage{10 , {"minus WUT?"}})}});
     QByteArray result = test.serialize(serializer.get());
 
-    ASSERT_STREQ(result.toHex().toStdString().c_str(),
-                "0a1608a580081210120c320a6d696e7573205755543f080a0a1508141211120d320b74656e207369787465656e08100a200854121c12183216666f757274792074776f2074656e207369787465656e080a");
+    ASSERT_TRUE(result ==
+                QByteArray::fromHex("0a1608a580081210120c320a6d696e7573205755543f080a0a1508141211120d320b74656e207369787465656e08100a200854121c12183216666f757274792074776f2074656e207369787465656e080a")
+                || result ==
+                QByteArray::fromHex("0a1608a580081210080a120c320a6d696e7573205755543f0a15081412110810120d320b74656e207369787465656e0a200854121c080a12183216666f757274792074776f2074656e207369787465656e"));
 }
 
 TEST_F(SerializationTest, SimpleUInt32ComplexMapSerializeTest)
@@ -90,8 +98,10 @@ TEST_F(SerializationTest, SimpleUInt32ComplexMapSerializeTest)
     test.setMapField({{10, QSharedPointer<ComplexMessage>(new ComplexMessage{16 , {"ten sixteen"}})}, {42, QSharedPointer<ComplexMessage>(new ComplexMessage{10 , {"fourty two ten sixteen"}})}, {65555, QSharedPointer<ComplexMessage>(new ComplexMessage{10 , {"WUT?"}})}});
     QByteArray result = test.serialize(serializer.get());
 
-    ASSERT_STREQ(result.toHex().toStdString().c_str(),
-                "2a15080a1211120d320b74656e207369787465656e08102a20082a121c12183216666f757274792074776f2074656e207369787465656e080a2a1008938004120a120632045755543f080a");
+    ASSERT_TRUE(result ==
+                QByteArray::fromHex("2a15080a1211120d320b74656e207369787465656e08102a20082a121c12183216666f757274792074776f2074656e207369787465656e080a2a1008938004120a120632045755543f080a")
+                || result ==
+                QByteArray::fromHex("2a15080a12110810120d320b74656e207369787465656e2a20082a121c080a12183216666f757274792074776f2074656e207369787465656e2a1008938004120a080a120632045755543f"));
 }
 
 TEST_F(SerializationTest, SimpleFixed64ComplexMapSerializeTest)
@@ -100,8 +110,10 @@ TEST_F(SerializationTest, SimpleFixed64ComplexMapSerializeTest)
     test.setMapField({{10, QSharedPointer<ComplexMessage>(new ComplexMessage{16 , {"ten sixteen"}})}, {UINT64_MAX, QSharedPointer<ComplexMessage>(new ComplexMessage{42 , {"minus fourty two ten MAAAX"}})}, {65555, QSharedPointer<ComplexMessage>(new ComplexMessage{10 , {"WUT?"}})}});
     QByteArray result = test.serialize(serializer.get());
 
-    ASSERT_STREQ(result.toHex().toStdString().c_str(),
-                "421c090a000000000000001211120d320b74656e207369787465656e08104215091300010000000000120a120632045755543f080a422b09ffffffffffffffff1220121c321a6d696e757320666f757274792074776f2074656e204d41414158082a");
+    ASSERT_TRUE(result ==
+                QByteArray::fromHex("421c090a000000000000001211120d320b74656e207369787465656e08104215091300010000000000120a120632045755543f080a422b09ffffffffffffffff1220121c321a6d696e757320666f757274792074776f2074656e204d41414158082a")
+                || result ==
+                QByteArray::fromHex("421c090a0000000000000012110810120d320b74656e207369787465656e4215091300010000000000120a080a120632045755543f422b09ffffffffffffffff1220082a121c321a6d696e757320666f757274792074776f2074656e204d41414158"));
 }
 
 TEST_F(SerializationTest, SimpleSFixed64ComplexMapSerializeTest)
@@ -110,8 +122,10 @@ TEST_F(SerializationTest, SimpleSFixed64ComplexMapSerializeTest)
     test.setMapField({{10, QSharedPointer<ComplexMessage>(new ComplexMessage{16 , {"ten sixteen"}})}, {-42, QSharedPointer<ComplexMessage>(new ComplexMessage{10 , {"minus fourty two ten sixteen"}})}, {65555, QSharedPointer<ComplexMessage>(new ComplexMessage{10 , {"WUT?"}})}});
     QByteArray result = test.serialize(serializer.get());
 
-    ASSERT_STREQ(result.toHex().toStdString().c_str(),
-                "522d09d6ffffffffffffff1222121e321c6d696e757320666f757274792074776f2074656e207369787465656e080a521c090a000000000000001211120d320b74656e207369787465656e08105215091300010000000000120a120632045755543f080a");
+    ASSERT_TRUE(result ==
+                QByteArray::fromHex("522d09d6ffffffffffffff1222121e321c6d696e757320666f757274792074776f2074656e207369787465656e080a521c090a000000000000001211120d320b74656e207369787465656e08105215091300010000000000120a120632045755543f080a")
+                || result ==
+                QByteArray::fromHex("522d09d6ffffffffffffff1222080a121e321c6d696e757320666f757274792074776f2074656e207369787465656e521c090a0000000000000012110810120d320b74656e207369787465656e5215091300010000000000120a080a120632045755543f"));
 }
 
 TEST_F(SerializationTest, SimpleInt64ComplexMapSerializeTest)
@@ -120,8 +134,10 @@ TEST_F(SerializationTest, SimpleInt64ComplexMapSerializeTest)
     test.setMapField({{10, QSharedPointer<ComplexMessage>(new ComplexMessage{16 , {"ten sixteen"}})}, {-42, QSharedPointer<ComplexMessage>(new ComplexMessage{10 , {"minus fourty two ten sixteen"}})}, {65555, QSharedPointer<ComplexMessage>(new ComplexMessage{10 , {"WUT?"}})}});
     QByteArray result = test.serialize(serializer.get());
 
-    ASSERT_STREQ(result.toHex().toStdString().c_str(),
-                "222f08d6ffffffffffffffff011222121e321c6d696e757320666f757274792074776f2074656e207369787465656e080a2215080a1211120d320b74656e207369787465656e0810221008938004120a120632045755543f080a");
+    ASSERT_TRUE(result ==
+                QByteArray::fromHex("222f08d6ffffffffffffffff011222121e321c6d696e757320666f757274792074776f2074656e207369787465656e080a2215080a1211120d320b74656e207369787465656e0810221008938004120a120632045755543f080a")
+                || result ==
+                QByteArray::fromHex("222f08d6ffffffffffffffff011222080a121e321c6d696e757320666f757274792074776f2074656e207369787465656e2215080a12110810120d320b74656e207369787465656e221008938004120a080a120632045755543f"));
 }
 
 TEST_F(SerializationTest, SimpleSInt64ComplexMapSerializeTest)
@@ -129,8 +145,10 @@ TEST_F(SerializationTest, SimpleSInt64ComplexMapSerializeTest)
     SimpleSInt64ComplexMessageMapMessage test;
     test.setMapField({{10, QSharedPointer<ComplexMessage>(new ComplexMessage{16 , {"ten sixteen"}})}, {-42, QSharedPointer<ComplexMessage>(new ComplexMessage{10 , {"minus fourty two ten sixteen"}})}, {65555, QSharedPointer<ComplexMessage>(new ComplexMessage{10 , {"WUT?"}})}});
     QByteArray result = test.serialize(serializer.get());
-    ASSERT_STREQ(result.toHex().toStdString().c_str(),
-                "122608531222121e321c6d696e757320666f757274792074776f2074656e207369787465656e080a121508141211120d320b74656e207369787465656e0810121008a68008120a120632045755543f080a");
+    ASSERT_TRUE(result ==
+                QByteArray::fromHex("122608531222121e321c6d696e757320666f757274792074776f2074656e207369787465656e080a121508141211120d320b74656e207369787465656e0810121008a68008120a120632045755543f080a")
+                || result ==
+                QByteArray::fromHex("122608531222080a121e321c6d696e757320666f757274792074776f2074656e207369787465656e1215081412110810120d320b74656e207369787465656e121008a68008120a080a120632045755543f"));
 }
 
 TEST_F(SerializationTest, SimpleUInt64ComplexMapSerializeTest)
@@ -139,8 +157,10 @@ TEST_F(SerializationTest, SimpleUInt64ComplexMapSerializeTest)
     test.setMapField({{10, QSharedPointer<ComplexMessage>(new ComplexMessage{11 , {"ten eleven"}})}, {42, QSharedPointer<ComplexMessage>(new ComplexMessage{10 , {"fourty two ten sixteen"}})}, {65555, QSharedPointer<ComplexMessage>(new ComplexMessage{10 , {"WUT?"}})}});
     QByteArray result = test.serialize(serializer.get());
 
-    ASSERT_STREQ(result.toHex().toStdString().c_str(),
-                "3214080a1210120c320a74656e20656c6576656e080b3220082a121c12183216666f757274792074776f2074656e207369787465656e080a321008938004120a120632045755543f080a");
+    ASSERT_TRUE(result ==
+                QByteArray::fromHex("3214080a1210120c320a74656e20656c6576656e080b3220082a121c12183216666f757274792074776f2074656e207369787465656e080a321008938004120a120632045755543f080a")
+                || result ==
+                QByteArray::fromHex("3214080a1210080b120c320a74656e20656c6576656e3220082a121c080a12183216666f757274792074776f2074656e207369787465656e321008938004120a080a120632045755543f"));
 }
 
 TEST_F(SerializationTest, SimpleStringComplexMapSerializeTest)
@@ -149,6 +169,8 @@ TEST_F(SerializationTest, SimpleStringComplexMapSerializeTest)
     test.setMapField({{"ben", QSharedPointer<ComplexMessage>(new ComplexMessage{11 , {"ten eleven"}})}, {"where is my car dude?", QSharedPointer<ComplexMessage>(new ComplexMessage{10 , {"fourty two ten sixteen"}})}, {"WUT??", QSharedPointer<ComplexMessage>(new ComplexMessage{10 , {"?WUT?"}})}});
     QByteArray result = test.serialize(serializer.get());
 
-    ASSERT_STREQ(result.toHex().toStdString().c_str(),
-                "6a140a055755543f3f120b120732053f5755543f080a6a170a0362656e1210120c320a74656e20656c6576656e080b6a350a157768657265206973206d792063617220647564653f121c12183216666f757274792074776f2074656e207369787465656e080a");
+    ASSERT_TRUE(result ==
+                QByteArray::fromHex("6a140a055755543f3f120b120732053f5755543f080a6a170a0362656e1210120c320a74656e20656c6576656e080b6a350a157768657265206973206d792063617220647564653f121c12183216666f757274792074776f2074656e207369787465656e080a")
+                || result ==
+                QByteArray::fromHex("6a140a055755543f3f120b080a120732053f5755543f6a170a0362656e1210080b120c320a74656e20656c6576656e6a350a157768657265206973206d792063617220647564653f121c080a12183216666f757274792074776f2074656e207369787465656e"));
 }