Clean up AddAudioTrack in muxer_tests

Moving AddAudioTrack into a separate function and keeping it
simple so that it can be re-used from other tests that might
require adding an audio track.

Change-Id: Ia60ed63ddbe617764596eb9c5a2bf96108c47cdd

testing/muxer_tests.cc

@@ -75,13 +75,24 @@ class MuxerTest : public testing::Test {
   void AddVideoTrack() {
     const int vid_track =
         segment_.AddVideoTrack(kWidth, kHeight, kVideoTrackNumber);
-    EXPECT_EQ(kVideoTrackNumber, vid_track);
+    ASSERT_EQ(kVideoTrackNumber, vid_track);
     VideoTrack* const video =
         dynamic_cast<VideoTrack*>(segment_.GetTrackByNumber(vid_track));
     ASSERT_TRUE(video != NULL);
     video->set_uid(kVideoTrackNumber);
   }
 
+  void AddAudioTrack() {
+    const int aud_track =
+        segment_.AddAudioTrack(kSampleRate, kChannels, kAudioTrackNumber);
+    ASSERT_EQ(kAudioTrackNumber, aud_track);
+    AudioTrack* const audio =
+        dynamic_cast<AudioTrack*>(segment_.GetTrackByNumber(aud_track));
+    ASSERT_TRUE(audio != NULL);
+    audio->set_uid(kAudioTrackNumber);
+    audio->set_codec_id(kOpusCodecId);
+  }
+
   void CloseWriter() {
     if (is_writer_open_)
       writer_->Close();
@@ -135,11 +146,11 @@ TEST_F(MuxerTest, AddTracks) {
   ASSERT_TRUE(video != NULL);
   EXPECT_EQ(static_cast<mkvmuxer::uint64>(kWidth), video->width());
   EXPECT_EQ(static_cast<mkvmuxer::uint64>(kHeight), video->height());
-  video->set_name("unit_test");
+  video->set_name(kTrackName);
   video->set_display_width(kWidth - 10);
   video->set_display_height(kHeight - 10);
   video->set_frame_rate(0.5);
-  EXPECT_STREQ("unit_test", video->name());
+  EXPECT_STREQ(kTrackName, video->name());
   const mkvmuxer::uint64 kDisplayWidth = kWidth - 10;
   EXPECT_EQ(kDisplayWidth, video->display_width());
   const mkvmuxer::uint64 kDisplayHeight = kHeight - 10;
@@ -156,14 +167,12 @@ TEST_F(MuxerTest, AddTracks) {
   EXPECT_EQ(kSampleRate, audio->sample_rate());
   EXPECT_EQ(static_cast<mkvmuxer::uint64>(kChannels), audio->channels());
   ASSERT_TRUE(audio != NULL);
-  audio->set_name("unit_test");
+  audio->set_name(kTrackName);
-  audio->set_bit_depth(2);
+  audio->set_bit_depth(kBitDepth);
-  audio->set_uid(2);
+  audio->set_uid(kAudioTrackNumber);
-  EXPECT_STREQ("unit_test", audio->name());
+  EXPECT_STREQ(kTrackName, audio->name());
-  const mkvmuxer::uint64 kAudioBitDepth = 2;
+  EXPECT_EQ(static_cast<mkvmuxer::uint64>(kBitDepth), audio->bit_depth());
-  const mkvmuxer::uint64 kAudioUid = 2;
+  EXPECT_EQ(static_cast<mkvmuxer::uint64>(kAudioTrackNumber), audio->uid());
-  EXPECT_EQ(kAudioBitDepth, audio->bit_depth());
-  EXPECT_EQ(kAudioUid, audio->uid());
 
   AddDummyFrameAndFinalize(kVideoTrackNumber);
   CloseWriter();
@@ -562,26 +571,7 @@ TEST_F(MuxerTest, SetCuesTrackNumber) {
 
 TEST_F(MuxerTest, BlockWithDiscardPadding) {
   EXPECT_TRUE(SegmentInit(false));
-
+  AddAudioTrack();
-  // Add an Audio Track
-  const int aud_track =
-      segment_.AddAudioTrack(kSampleRate, kChannels, kAudioTrackNumber);
-  EXPECT_EQ(kAudioTrackNumber, aud_track);
-  AudioTrack* const audio =
-      dynamic_cast<AudioTrack*>(segment_.GetTrackByNumber(aud_track));
-  EXPECT_EQ(kSampleRate, audio->sample_rate());
-  EXPECT_EQ(static_cast<mkvmuxer::uint64>(kChannels), audio->channels());
-  ASSERT_TRUE(audio != NULL);
-  audio->set_name("unit_test");
-  audio->set_bit_depth(2);
-  audio->set_uid(2);
-  audio->set_codec_id(kOpusCodecId);
-  EXPECT_STREQ("unit_test", audio->name());
-  const mkvmuxer::uint64 kAudioBitDepth = 2;
-  const mkvmuxer::uint64 kAudioUid = 2;
-  EXPECT_EQ(kAudioBitDepth, audio->bit_depth());
-  EXPECT_EQ(kAudioUid, audio->uid());
-  EXPECT_STREQ(kOpusCodecId, audio->codec_id());
 
   int timecode = 1000;
   // 12810000 == 0xc37710, should be 0-extended to avoid changing the sign.

testing/parser_tests.cc

@@ -572,7 +572,7 @@ TEST_F(ParserTest, DiscardPadding) {
   const Track* const track = tracks->GetTrackByIndex(0);
   ASSERT_TRUE(track != NULL);
 
-  EXPECT_STREQ("unit_test", track->GetNameAsUTF8());
+  EXPECT_STREQ(NULL, track->GetNameAsUTF8());
   EXPECT_EQ(NULL, track->GetLanguage());
   EXPECT_EQ(kAudioTrackNumber, track->GetNumber());
   EXPECT_TRUE(track->GetLacing());
@@ -581,7 +581,6 @@ TEST_F(ParserTest, DiscardPadding) {
   const AudioTrack* const audio_track = dynamic_cast<const AudioTrack*>(track);
   EXPECT_EQ(30, audio_track->GetSamplingRate());
   EXPECT_EQ(2, audio_track->GetChannels());
-  EXPECT_EQ(2, audio_track->GetBitDepth());
   EXPECT_STREQ(kOpusCodecId, audio_track->GetCodecId());
   EXPECT_EQ(kAudioTrackNumber, static_cast<int>(audio_track->GetUid()));
   const unsigned int kDefaultDuration = 0;