Enhance audio player tests.

components/copresence/mediums/audio/audio_player_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/copresence/mediums/audio/audio_player.h"
 
 #include "base/bind.h"
 #include "base/memory/weak_ptr.h"
 #include "components/copresence/mediums/audio/audio_player_impl.h"
 #include "components/copresence/public/copresence_constants.h"
@@ skipping 86 matching lines @@
     player_ = nullptr;
   }
 
   void PlayAndVerifySamples(
       const scoped_refptr<media::AudioBusRefCounted>& samples) {
     buffer_ = media::AudioBus::Create(1, kMaxFrameCount);
     player_->Play(samples);
     player_->FlushAudioLoopForTesting();
 
     int differences = 0;
-    for (int i = 0; i < samples->frames(); ++i)
-      differences += (buffer_->channel(0)[i] != samples->channel(0)[i]);
+    for (int i = 0; i < kMaxFrameCount; ++i) {
+      differences += (buffer_->channel(0)[i] !=
+                      samples->channel(0)[i % samples->frames()]);
+    }
     ASSERT_EQ(0, differences);
 
     buffer_.reset();
   }
 
   void GatherSamples(scoped_ptr<media::AudioBus> bus, int frames) {
     if (!buffer_.get())
       return;
     bus->CopyPartialFramesTo(0, frames, buffer_index_, buffer_.get());
     buffer_index_ += frames;
   }
 
  protected:
   bool IsPlaying() {
     player_->FlushAudioLoopForTesting();
     return player_->is_playing_;
   }
 
   static const int kDefaultFrameCount = 1024;
-  static const int kMaxFrameCount = 1024 * 10;
+  static const int kMaxFrameCount = 1024 * 100;
 
   scoped_ptr<media::AudioBus> buffer_;
   int buffer_index_;
 
   // Deleted by calling Finalize() on the object.
   AudioPlayerImpl* player_;
   base::MessageLoop message_loop_;
 };
 
 TEST_F(AudioPlayerTest, BasicPlayAndStop) {
@@ skipping 34 matching lines @@
   EXPECT_TRUE(IsPlaying());
 
   player_->Stop();
   player_->Stop();
   EXPECT_FALSE(IsPlaying());
 
   DeletePlayer();
 }
 
 TEST_F(AudioPlayerTest, PlayingEndToEnd) {
-  const int kNumSamples = kDefaultFrameCount * 10;
+  // Ensure that kNumsamples is never over kMaxFrameCount.

[Charlie, 2015/01/29 17:35:03]

This and the additional instance below should be DCHECKs.

[rkc, 2015/01/29 17:42:42]

Added the DCHECK to PlayAndVerifySamples instead, since we send modified values
of kNumSamples in the new patch.

+  const int kNumSamples = kDefaultFrameCount * 32;
   CreatePlayer();
 
   PlayAndVerifySamples(CreateRandomAudioRefCounted(0x1337, 1, kNumSamples));
+
+  DeletePlayer();
+}
+
+TEST_F(AudioPlayerTest, PlayingEndToEndOddSizes) {
+  // Ensure that kNumsamples is never over kMaxFrameCount.
+  const int kNumSamples = kDefaultFrameCount * 7 + 321;
+  CreatePlayer();
+
+  PlayAndVerifySamples(CreateRandomAudioRefCounted(0x1337, 1, kNumSamples));
 
   DeletePlayer();
 }
 
 }  // namespace copresence