Bug 1570549 - P2 - refactor unit tests - r=bwc

Differential Revision: https://phabricator.services.mozilla.com/D52324
mozilla-spidermonkey · Nov 23, 2019 · 83eb70f · 83eb70f
1 parent c021695
commit 83eb70f
Show file tree

Hide file tree

Showing 3 changed files with 564 additions and 531 deletions.
diff --git a/media/webrtc/signaling/fuzztest/sdp_parser_libfuzz.cpp b/media/webrtc/signaling/fuzztest/sdp_parser_libfuzz.cpp
@@ -14,7 +14,7 @@
 
 using namespace mozilla;
 
-static mozilla::UniquePtr<Sdp> sdpPtr;
+static mozilla::UniquePtr<SdpParser::Results> sdpPtr;
 static SipccSdpParser mParser;
 
 int FuzzingInitSdpParser(int* argc, char*** argv) { return 0; }

diff --git a/media/webrtc/signaling/gtest/jsep_session_unittest.cpp b/media/webrtc/signaling/gtest/jsep_session_unittest.cpp
@@ -1151,11 +1151,12 @@ class JsepSessionTest : public JsepSessionTestBase,
   };
 
   // For streaming parse errors
-  std::string GetParseErrors(const SipccSdpParser& parser) const {
+  std::string GetParseErrors(
+      const UniquePtr<SdpParser::Results>& results) const {
     std::stringstream output;
-    for (auto e = parser.GetParseErrors().begin();
-         e != parser.GetParseErrors().end(); ++e) {
-      output << e->first << ": " << e->second << std::endl;
+    auto errors = std::move(results->Errors());
+    for (auto error : errors) {
+      output << error.first << ": " << error.second << std::endl;
     }
     return output.str();
   }
@@ -1349,9 +1350,10 @@ class JsepSessionTest : public JsepSessionTestBase,
 
   UniquePtr<Sdp> Parse(const std::string& sdp) const {
     SipccSdpParser parser;
-    UniquePtr<Sdp> parsed = parser.Parse(sdp);
+    auto results = parser.Parse(sdp);
+    UniquePtr<Sdp> parsed = std::move(results->Sdp());
     EXPECT_TRUE(parsed.get()) << "Should have valid SDP" << std::endl
-                              << "Errors were: " << GetParseErrors(parser);
+                              << "Errors were: " << GetParseErrors(results);
     return parsed;
   }
 
@@ -4850,8 +4852,8 @@ TEST_P(JsepSessionTest, TestBalancedBundle) {
   mSessionOff->SetBundlePolicy(kBundleBalanced);
 
   std::string offer = CreateOffer();
-  SipccSdpParser parser;
-  UniquePtr<Sdp> parsedOffer = parser.Parse(offer);
+  UniquePtr<Sdp> parsedOffer = std::move(SipccSdpParser().Parse(offer)->Sdp());
+
   ASSERT_TRUE(parsedOffer.get());
 
   std::map<SdpMediaSection::MediaType, SdpMediaSection*> firstByType;
@@ -4886,8 +4888,7 @@ TEST_P(JsepSessionTest, TestMaxBundle) {
   OfferAnswer();
 
   std::string offer = mSessionOff->GetLocalDescription(kJsepDescriptionCurrent);
-  SipccSdpParser parser;
-  UniquePtr<Sdp> parsedOffer = parser.Parse(offer);
+  UniquePtr<Sdp> parsedOffer = std::move(SipccSdpParser().Parse(offer)->Sdp());
   ASSERT_TRUE(parsedOffer.get());
 
   ASSERT_FALSE(parsedOffer->GetMediaSection(0).GetAttributeList().HasAttribute(