Bug 1317009 - Port jsep_session_unittest and jsep_track_unittest to x…

…ul gtest; r=bwc

MozReview-Commit-ID: spuZSAnSDC

media/webrtc/signaling/test/jsep_session_unittest.cpp → media/webrtc/signaling/gtest/jsep_session_unittest.cpp

@@ -16,11 +16,6 @@
 
 #define GTEST_HAS_RTTI 0
 #include "gtest/gtest.h"
-#include "gtest_utils.h"
-
-#include "FakeMediaStreams.h"
-#include "FakeMediaStreamsImpl.h"
-#include "FakeLogging.h"
 
 #include "signaling/src/sdp/SdpMediaSection.h"
 #include "signaling/src/sdp/SipccSdpParser.h"
@@ -30,19 +25,17 @@
 #include "signaling/src/jsep/JsepSessionImpl.h"
 #include "signaling/src/jsep/JsepTrack.h"
 
-#include "mtransport_test_utils.h"
-
-#include "FakeIPC.h"
-#include "FakeIPC.cpp"
-
-#include "TestHarness.h"
-
 namespace mozilla {
 static std::string kAEqualsCandidate("a=candidate:");
 const static size_t kNumCandidatesPerComponent = 3;
 
 class JsepSessionTestBase : public ::testing::Test
 {
+public:
+  static void SetUpTestCase() {
+    NSS_NoDB_Init(nullptr);
+    NSS_SetDomesticPolicy();
+  }
 };
 
 class FakeUuidGenerator : public mozilla::JsepUuidGenerator
@@ -4220,16 +4213,3 @@ TEST_F(JsepSessionTest, TestNonDefaultProtocol)
 }
 
 } // namespace mozilla
-
-int
-main(int argc, char** argv)
-{
-  // Prevents some log spew
-  ScopedXPCOM xpcom("jsep_session_unittest");
-
-  NSS_NoDB_Init(nullptr);
-  NSS_SetDomesticPolicy();
-
-  ::testing::InitGoogleTest(&argc, argv);
-  return RUN_ALL_TESTS();
-}

media/webrtc/signaling/test/jsep_track_unittest.cpp → media/webrtc/signaling/gtest/jsep_track_unittest.cpp

@@ -6,24 +6,11 @@
 
 #define GTEST_HAS_RTTI 0
 #include "gtest/gtest.h"
-#include "gtest_utils.h"
-
-// Magic linker includes :(
-#include "FakeMediaStreams.h"
-#include "FakeMediaStreamsImpl.h"
-#include "FakeLogging.h"
 
 #include "signaling/src/jsep/JsepTrack.h"
 #include "signaling/src/sdp/SipccSdp.h"
 #include "signaling/src/sdp/SdpHelper.h"
 
-#include "mtransport_test_utils.h"
-
-#include "FakeIPC.h"
-#include "FakeIPC.cpp"
-
-#include "TestHarness.h"
-
 namespace mozilla {
 
 class JsepTrackTest : public ::testing::Test
@@ -1256,14 +1243,3 @@ TEST_F(JsepTrackTest, NonDefaultOpusParameters)
 }
 
 } // namespace mozilla
-
-int
-main(int argc, char** argv)
-{
-  // Prevents some log spew
-  ScopedXPCOM xpcom("jsep_track_unittest");
-
-  ::testing::InitGoogleTest(&argc, argv);
-  return RUN_ALL_TESTS();
-}
-

media/webrtc/signaling/gtest/moz.build

@@ -17,6 +17,8 @@ if CONFIG['OS_TARGET'] != 'WINNT' and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk' and
     ]
 
     SOURCES += [
+        'jsep_session_unittest.cpp',
+        'jsep_track_unittest.cpp',
         'sdp_unittests.cpp',
     ]
 

media/webrtc/signaling/test/moz.build

@@ -7,8 +7,6 @@
 # TODO: bug 1172551 - get these tests working on iOS
 if CONFIG['OS_TARGET'] != 'WINNT' and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk' and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'uikit':
     GeckoCppUnitTests([
-        'jsep_session_unittest',
-        'jsep_track_unittest',
         'mediaconduit_unittests',
         'mediapipeline_unittest',
         'signaling_unittests',

python/mozbuild/mozbuild/frontend/emitter.py

@@ -135,8 +135,6 @@
     ('test_unlock_notify', 'storage/test'),
     ('test_IHistory', 'toolkit/components/places/tests/cpp'),
     ('testcrasher', 'toolkit/crashreporter/test'),
-    ('jsep_session_unittest', 'media/webrtc/signaling/test'),
-    ('jsep_track_unittest', 'media/webrtc/signaling/test'),
     ('mediaconduit_unittests', 'media/webrtc/signaling/test'),
     ('mediapipeline_unittest', 'media/webrtc/signaling/test'),
     ('sdp_file_parser', 'media/webrtc/signaling/fuzztest'),

testing/cppunittest.ini

@@ -68,9 +68,6 @@ skip-if = os == 'b2g' || os == 'android'  # Bug 919646
 [rlogringbuffer_unittest]
 [runnable_utils_unittest]
 [sctp_unittest]
-[jsep_track_unittest]
-[jsep_session_unittest]
-skip-if = os == 'android' # Bug 1147631
 [signaling_unittests]
 [signaling_unittests_standalone]
 [simpletokenbucket_unittest]