Improve container detection testing by adding additional containers

media/base/container_names_unittest.cc

 // Copyright (c) 2013 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 "base/file_util.h"
 #include "media/base/container_names.h"
 #include "media/base/test_data_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
@@ skipping 93 matching lines @@
   if (file_util::GetFileSize(filename, &actual_size) && actual_size < read_size)
     read_size = actual_size;
   int read = file_util::ReadFile(filename, buffer, read_size);
 
   // Now verify the type.
   EXPECT_EQ(expected,
             DetermineContainer(reinterpret_cast<const uint8*>(buffer), read))
       << "Failure with file " << filename.value();
 }
 
 // Test several OGG files to ensure that the container is detected properly.

[xhwang, 2013/05/29 18:43:22]

These comments don't add much value as the tests themselves are pretty clear
about what we are doing. Remove?

[jrummell, 2013/05/29 20:46:39]

Done.

 TEST(ContainerNamesTest, FileCheckOGG) {
   TestFile(CONTAINER_OGG, GetTestDataFilePath("bear.ogv"));
   TestFile(CONTAINER_OGG, GetTestDataFilePath("9ch.ogg"));
 }
 
 // Test several WAV files to ensure that the container is detected properly.
 TEST(ContainerNamesTest, FileCheckWAV) {
   TestFile(CONTAINER_WAV, GetTestDataFilePath("4ch.wav"));
   TestFile(CONTAINER_WAV, GetTestDataFilePath("sfx_f32le.wav"));
   TestFile(CONTAINER_WAV, GetTestDataFilePath("sfx_s16le.wav"));
@@ skipping 11 matching lines @@
   TestFile(CONTAINER_WEBM, GetTestDataFilePath("no_streams.webm"));
   TestFile(CONTAINER_WEBM, GetTestDataFilePath("webm_ebml_element"));
 }
 
 // Test several MP3 files to ensure that the container is detected properly.
 TEST(ContainerNamesTest, FileCheckMP3) {
   TestFile(CONTAINER_MP3, GetTestDataFilePath("id3_test.mp3"));
   TestFile(CONTAINER_MP3, GetTestDataFilePath("sfx.mp3"));
 }
 
+// Test AC3 files to ensure that the container is detected properly.
+TEST(ContainerNamesTest, FileCheckAC3) {
+  TestFile(CONTAINER_AC3, GetTestDataFilePath("bear.ac3"));
+}
+
+// Test AAC files to ensure that the container is detected properly.
+TEST(ContainerNamesTest, FileCheckAAC) {
+  TestFile(CONTAINER_AAC, GetTestDataFilePath("bear.adts"));
+}
+
+// Test AIFF files to ensure that the container is detected properly.
+TEST(ContainerNamesTest, FileCheckAIFF) {
+  TestFile(CONTAINER_AIFF, GetTestDataFilePath("bear.aiff"));
+}
+
+// Test ASF files to ensure that the container is detected properly.
+TEST(ContainerNamesTest, FileCheckASF) {
+  TestFile(CONTAINER_ASF, GetTestDataFilePath("bear.asf"));
+}
+
+// Test AVI files to ensure that the container is detected properly.
+TEST(ContainerNamesTest, FileCheckAVI) {
+  TestFile(CONTAINER_AVI, GetTestDataFilePath("bear.avi"));
+}
+
+// Test EAC3 files to ensure that the container is detected properly.
+TEST(ContainerNamesTest, FileCheckEAC3) {
+  TestFile(CONTAINER_EAC3, GetTestDataFilePath("bear.eac3"));
+}
+
+// Test FLAC files to ensure that the container is detected properly.
+TEST(ContainerNamesTest, FileCheckFLAC) {
+  TestFile(CONTAINER_FLAC, GetTestDataFilePath("bear.flac"));
+}
+
+// Test FLV files to ensure that the container is detected properly.
+TEST(ContainerNamesTest, FileCheckFLV) {
+  TestFile(CONTAINER_FLV, GetTestDataFilePath("bear.flv"));
+}
+
+// Test H261 files to ensure that the container is detected properly.
+TEST(ContainerNamesTest, FileCheckH261) {
+  TestFile(CONTAINER_H261, GetTestDataFilePath("bear.h261"));
+}
+
+// Test H263 files to ensure that the container is detected properly.
+TEST(ContainerNamesTest, FileCheckH263) {
+  TestFile(CONTAINER_H263, GetTestDataFilePath("bear.h263"));
+}
+
+// Test MJPEG files to ensure that the container is detected properly.
+TEST(ContainerNamesTest, FileCheckMJPEG) {
+  TestFile(CONTAINER_MJPEG, GetTestDataFilePath("bear.mjpeg"));
+}
+
+// Test MPEG2PS files to ensure that the container is detected properly.
+TEST(ContainerNamesTest, FileCheckMPEG2PS) {
+  TestFile(CONTAINER_MPEG2PS, GetTestDataFilePath("bear.mpeg"));
+}
+
+// Test MPEG2TS files to ensure that the container is detected properly.
+TEST(ContainerNamesTest, FileCheckMPEG2TS) {
+  TestFile(CONTAINER_MPEG2TS, GetTestDataFilePath("bear.m2ts"));
+}
+
+// Test RM files to ensure that the container is detected properly.
+TEST(ContainerNamesTest, FileCheckRM) {
+  TestFile(CONTAINER_RM, GetTestDataFilePath("bear.rm"));
+}
+
+// Test SWF files to ensure that the container is detected properly.
+TEST(ContainerNamesTest, FileCheckSWF) {
+  TestFile(CONTAINER_SWF, GetTestDataFilePath("bear.swf"));
+}
+
 // Try a few non containers.
 TEST(ContainerNamesTest, FileCheckUNKNOWN) {
   TestFile(CONTAINER_UNKNOWN, GetTestDataFilePath("ten_byte_file"));
   TestFile(CONTAINER_UNKNOWN, GetTestDataFilePath("README"));
   TestFile(CONTAINER_UNKNOWN, GetTestDataFilePath("bali_640x360_P422.yuv"));
   TestFile(CONTAINER_UNKNOWN, GetTestDataFilePath("bali_640x360_RGB24.rgb"));
   TestFile(CONTAINER_UNKNOWN, GetTestDataFilePath("webm_vp8_track_entry"));
 }
 
 }  // namespace container_names
 
 }  // namespace media