Merge pull request #52 from Nheko-Reborn/fix-voip-tests

Fix voip tests with string version

lib/structs/events/voip.cpp

@@ -13,6 +13,15 @@ version(const json &obj)
         auto v = obj.at("version");
         return v.is_number() ? "0" : v.get<std::string>();
 }
+
+void
+add_version(json &obj, std::string_view version)
+{
+        if (version == "0")
+                obj["version"] = 0;
+        else
+                obj["version"] = version;
+}
 }
 
 namespace mtx::events::msg {
@@ -30,9 +39,9 @@ from_json(const json &obj, CallInvite &content)
 void
 to_json(json &obj, const CallInvite &content)
 {
-        obj["call_id"]  = content.call_id;
-        obj["offer"]    = {{"sdp", content.sdp}, {"type", "offer"}};
-        obj["version"]  = content.version;
+        obj["call_id"] = content.call_id;
+        obj["offer"]   = {{"sdp", content.sdp}, {"type", "offer"}};
+        add_version(obj, content.version);
         obj["lifetime"] = content.lifetime;
 }
 
@@ -66,7 +75,7 @@ to_json(json &obj, const CallCandidates &content)
 {
         obj["call_id"]    = content.call_id;
         obj["candidates"] = content.candidates;
-        obj["version"]    = content.version;
+        add_version(obj, content.version);
 }
 
 // m.call.answer
@@ -83,7 +92,7 @@ to_json(json &obj, const CallAnswer &content)
 {
         obj["call_id"] = content.call_id;
         obj["answer"]  = {{"sdp", content.sdp}, {"type", "answer"}};
-        obj["version"] = content.version;
+        add_version(obj, content.version);
 }
 
 // m.call.hangup
@@ -106,7 +115,7 @@ void
 to_json(json &obj, const CallHangUp &content)
 {
         obj["call_id"] = content.call_id;
-        obj["version"] = content.version;
+        add_version(obj, content.version);
         if (content.reason == CallHangUp::Reason::ICEFailed)
                 obj["reason"] = "ice_failed";
         else if (content.reason == CallHangUp::Reason::InviteTimeOut)

tests/messages.cpp

@@ -801,7 +801,7 @@ TEST(RoomEvents, CallInvite)
         EXPECT_EQ(event.unsigned_data.age, 1234);
         EXPECT_EQ(event.content.call_id, "c1591052749788");
         EXPECT_EQ(event.content.sdp, "v=0\r\no=- 6584580628695956864 2 IN IP4 127.0.0.1[...]");
-        EXPECT_EQ(event.content.version, 0);
+        EXPECT_EQ(event.content.version, "0");
         EXPECT_EQ(event.content.lifetime, 120000);
 
         EXPECT_EQ(data, json(event));
@@ -844,7 +844,7 @@ TEST(RoomEvents, CallCandidates)
         EXPECT_EQ(event.content.candidates[0].sdpMLineIndex, 0);
         EXPECT_EQ(event.content.candidates[0].candidate,
                   "candidate:863018703 1 udp 2122260223 10.9.64.156 43670 typ host generation 0");
-        EXPECT_EQ(event.content.version, 0);
+        EXPECT_EQ(event.content.version, "0");
 
         EXPECT_EQ(data, json(event));
 }
@@ -880,7 +880,7 @@ TEST(RoomEvents, CallAnswer)
         EXPECT_EQ(event.unsigned_data.age, 1234);
         EXPECT_EQ(event.content.call_id, "c1591052749788");
         EXPECT_EQ(event.content.sdp, "v=0\r\no=- 6584580628695956864 2 IN IP4 127.0.0.1[...]");
-        EXPECT_EQ(event.content.version, 0);
+        EXPECT_EQ(event.content.version, "0");
 
         EXPECT_EQ(data, json(event));
 }
@@ -912,7 +912,7 @@ TEST(RoomEvents, CallHangUp)
         EXPECT_EQ(event.type, EventType::CallHangUp);
         EXPECT_EQ(event.unsigned_data.age, 1234);
         EXPECT_EQ(event.content.call_id, "c1591052749788");
-        EXPECT_EQ(event.content.version, 0);
+        EXPECT_EQ(event.content.version, "0");
         EXPECT_EQ(event.content.reason, msg::CallHangUp::Reason::InviteTimeOut);
 
         EXPECT_EQ(data, json(event));