FileWrapper[Impl] modifications and actually remove the "Impl" class.

webrtc/modules/audio_processing/transient/file_utils_unittest.cc

 /*
  *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 145 matching lines @@
 #if defined(WEBRTC_IOS)
 #define MAYBE_ReadInt16BufferFromFile DISABLED_ReadInt16BufferFromFile
 #else
 #define MAYBE_ReadInt16BufferFromFile ReadInt16BufferFromFile
 #endif
 TEST_F(TransientFileUtilsTest, MAYBE_ReadInt16BufferFromFile) {
   std::string test_filename = kTestFileName;
 
   std::unique_ptr<FileWrapper> file(FileWrapper::Create());
 
-  file->OpenFile(test_filename.c_str(),
-                 true,    // Read only.
-                 true,    // Loop.
-                 false);  // No text.
-  ASSERT_TRUE(file->Open()) << "File could not be opened:\n"
-      << kTestFileName.c_str();
+  file->OpenFile(test_filename.c_str(), true);  // Read only.
+  ASSERT_TRUE(file->is_open()) << "File could not be opened:\n"
+                               << kTestFileName.c_str();
 
   const size_t kBufferLength = 12;
   std::unique_ptr<int16_t[]> buffer(new int16_t[kBufferLength]);
 
   EXPECT_EQ(kBufferLength, ReadInt16BufferFromFile(file.get(),
                                                    kBufferLength,
                                                    buffer.get()));
   EXPECT_EQ(22377, buffer[4]);
   EXPECT_EQ(16389, buffer[7]);
   EXPECT_EQ(17631, buffer[kBufferLength - 1]);
@@ skipping 18 matching lines @@
 #define MAYBE_ReadInt16FromFileToFloatBuffer \
   DISABLED_ReadInt16FromFileToFloatBuffer
 #else
 #define MAYBE_ReadInt16FromFileToFloatBuffer ReadInt16FromFileToFloatBuffer
 #endif
 TEST_F(TransientFileUtilsTest, MAYBE_ReadInt16FromFileToFloatBuffer) {
   std::string test_filename = kTestFileName;
 
   std::unique_ptr<FileWrapper> file(FileWrapper::Create());
 
-  file->OpenFile(test_filename.c_str(),
-                 true,    // Read only.
-                 true,    // Loop.
-                 false);  // No text.
-  ASSERT_TRUE(file->Open()) << "File could not be opened:\n"
-      << kTestFileName.c_str();
+  file->OpenFile(test_filename.c_str(), true);  // Read only.
+  ASSERT_TRUE(file->is_open()) << "File could not be opened:\n"
+                               << kTestFileName.c_str();
 
   const size_t kBufferLength = 12;
   std::unique_ptr<float[]> buffer(new float[kBufferLength]);
 
   EXPECT_EQ(kBufferLength, ReadInt16FromFileToFloatBuffer(file.get(),
                                                           kBufferLength,
                                                           buffer.get()));
 
   EXPECT_DOUBLE_EQ(11544, buffer[0]);
   EXPECT_DOUBLE_EQ(22377, buffer[4]);
@@ skipping 21 matching lines @@
 #define MAYBE_ReadInt16FromFileToDoubleBuffer \
   DISABLED_ReadInt16FromFileToDoubleBuffer
 #else
 #define MAYBE_ReadInt16FromFileToDoubleBuffer ReadInt16FromFileToDoubleBuffer
 #endif
 TEST_F(TransientFileUtilsTest, MAYBE_ReadInt16FromFileToDoubleBuffer) {
   std::string test_filename = kTestFileName;
 
   std::unique_ptr<FileWrapper> file(FileWrapper::Create());
 
-  file->OpenFile(test_filename.c_str(),
-                 true,    // Read only.
-                 true,    // Loop.
-                 false);  // No text.
-  ASSERT_TRUE(file->Open()) << "File could not be opened:\n"
-      << kTestFileName.c_str();
+  file->OpenFile(test_filename.c_str(), true);  // Read only.
+  ASSERT_TRUE(file->is_open()) << "File could not be opened:\n"
+                               << kTestFileName.c_str();
 
   const size_t kBufferLength = 12;
   std::unique_ptr<double[]> buffer(new double[kBufferLength]);
 
   EXPECT_EQ(kBufferLength, ReadInt16FromFileToDoubleBuffer(file.get(),
                                                            kBufferLength,
                                                            buffer.get()));
   EXPECT_DOUBLE_EQ(11544, buffer[0]);
   EXPECT_DOUBLE_EQ(22377, buffer[4]);
   EXPECT_DOUBLE_EQ(16389, buffer[7]);
@@ skipping 19 matching lines @@
 #if defined(WEBRTC_IOS)
 #define MAYBE_ReadFloatBufferFromFile DISABLED_ReadFloatBufferFromFile
 #else
 #define MAYBE_ReadFloatBufferFromFile ReadFloatBufferFromFile
 #endif
 TEST_F(TransientFileUtilsTest, MAYBE_ReadFloatBufferFromFile) {
   std::string test_filename = kTestFileNamef;
 
   std::unique_ptr<FileWrapper> file(FileWrapper::Create());
 
-  file->OpenFile(test_filename.c_str(),
-                 true,    // Read only.
-                 true,    // Loop.
-                 false);  // No text.
-  ASSERT_TRUE(file->Open()) << "File could not be opened:\n"
-      << kTestFileNamef.c_str();
+  file->OpenFile(test_filename.c_str(), true);  // Read only.
+  ASSERT_TRUE(file->is_open()) << "File could not be opened:\n"
+                               << kTestFileNamef.c_str();
 
   const size_t kBufferLength = 3;
   std::unique_ptr<float[]> buffer(new float[kBufferLength]);
 
   EXPECT_EQ(kBufferLength, ReadFloatBufferFromFile(file.get(),
                                                    kBufferLength,
                                                    buffer.get()));
   EXPECT_FLOAT_EQ(kPi, buffer[0]);
   EXPECT_FLOAT_EQ(kE, buffer[1]);
   EXPECT_FLOAT_EQ(kAvogadro, buffer[2]);
@@ skipping 16 matching lines @@
 #if defined(WEBRTC_IOS)
 #define MAYBE_ReadDoubleBufferFromFile DISABLED_ReadDoubleBufferFromFile
 #else
 #define MAYBE_ReadDoubleBufferFromFile ReadDoubleBufferFromFile
 #endif
 TEST_F(TransientFileUtilsTest, MAYBE_ReadDoubleBufferFromFile) {
   std::string test_filename = kTestFileName;
 
   std::unique_ptr<FileWrapper> file(FileWrapper::Create());
 
-  file->OpenFile(test_filename.c_str(),
-                 true,    // Read only.
-                 true,    // Loop.
-                 false);  // No text.
-  ASSERT_TRUE(file->Open()) << "File could not be opened:\n"
-      << kTestFileName.c_str();
+  file->OpenFile(test_filename.c_str(), true);  // Read only.
+  ASSERT_TRUE(file->is_open()) << "File could not be opened:\n"
+                               << kTestFileName.c_str();
 
   const size_t kBufferLength = 3;
   std::unique_ptr<double[]> buffer(new double[kBufferLength]);
 
   EXPECT_EQ(kBufferLength, ReadDoubleBufferFromFile(file.get(),
                                                     kBufferLength,
                                                     buffer.get()));
   EXPECT_DOUBLE_EQ(kPi, buffer[0]);
   EXPECT_DOUBLE_EQ(kE, buffer[1]);
   EXPECT_DOUBLE_EQ(kAvogadro, buffer[2]);
@@ skipping 17 matching lines @@
 #define MAYBE_WriteInt16BufferToFile DISABLED_WriteInt16BufferToFile
 #else
 #define MAYBE_WriteInt16BufferToFile WriteInt16BufferToFile
 #endif
 TEST_F(TransientFileUtilsTest, MAYBE_WriteInt16BufferToFile) {
   std::unique_ptr<FileWrapper> file(FileWrapper::Create());
 
   std::string kOutFileName = CreateTempFilename(test::OutputPath(),
                                                 "utils_test");
 
-  file->OpenFile(kOutFileName.c_str(),
-                 false,   // Write mode.
-                 false,   // No loop.
-                 false);  // No text.
-  ASSERT_TRUE(file->Open()) << "File could not be opened:\n"
-      << kOutFileName.c_str();
+  file->OpenFile(kOutFileName.c_str(), false);  // Write mode.
+  ASSERT_TRUE(file->is_open()) << "File could not be opened:\n"
+                               << kOutFileName.c_str();
 
   const size_t kBufferLength = 3;
   std::unique_ptr<int16_t[]> written_buffer(new int16_t[kBufferLength]);
   std::unique_ptr<int16_t[]> read_buffer(new int16_t[kBufferLength]);
 
   written_buffer[0] = 1;
   written_buffer[1] = 2;
   written_buffer[2] = 3;
 
   EXPECT_EQ(kBufferLength, WriteInt16BufferToFile(file.get(),
                                                   kBufferLength,
                                                   written_buffer.get()));
 
   file->CloseFile();
 
-  file->OpenFile(kOutFileName.c_str(),
-                 true,    // Read only.
-                 false,   // No loop.
-                 false);  // No text.
-  ASSERT_TRUE(file->Open()) << "File could not be opened:\n"
-      << kOutFileName.c_str();
+  file->OpenFile(kOutFileName.c_str(), true);  // Read only.
+  ASSERT_TRUE(file->is_open()) << "File could not be opened:\n"
+                               << kOutFileName.c_str();
 
   EXPECT_EQ(kBufferLength, ReadInt16BufferFromFile(file.get(),
                                                    kBufferLength,
                                                    read_buffer.get()));
   EXPECT_EQ(0, memcmp(written_buffer.get(),
                       read_buffer.get(),
                       kBufferLength * sizeof(written_buffer[0])));
 }
 
 #if defined(WEBRTC_IOS)
 #define MAYBE_WriteFloatBufferToFile DISABLED_WriteFloatBufferToFile
 #else
 #define MAYBE_WriteFloatBufferToFile WriteFloatBufferToFile
 #endif
 TEST_F(TransientFileUtilsTest, MAYBE_WriteFloatBufferToFile) {
   std::unique_ptr<FileWrapper> file(FileWrapper::Create());
 
   std::string kOutFileName = CreateTempFilename(test::OutputPath(),
                                                 "utils_test");
 
-  file->OpenFile(kOutFileName.c_str(),
-                 false,   // Write mode.
-                 false,   // No loop.
-                 false);  // No text.
-  ASSERT_TRUE(file->Open()) << "File could not be opened:\n"
-      << kOutFileName.c_str();
+  file->OpenFile(kOutFileName.c_str(), false);  // Write mode.
+  ASSERT_TRUE(file->is_open()) << "File could not be opened:\n"
+                               << kOutFileName.c_str();
 
   const size_t kBufferLength = 3;
   std::unique_ptr<float[]> written_buffer(new float[kBufferLength]);
   std::unique_ptr<float[]> read_buffer(new float[kBufferLength]);
 
   written_buffer[0] = static_cast<float>(kPi);
   written_buffer[1] = static_cast<float>(kE);
   written_buffer[2] = static_cast<float>(kAvogadro);
 
   EXPECT_EQ(kBufferLength, WriteFloatBufferToFile(file.get(),
                                                   kBufferLength,
                                                   written_buffer.get()));
 
   file->CloseFile();
 
-  file->OpenFile(kOutFileName.c_str(),
-                 true,    // Read only.
-                 false,   // No loop.
-                 false);  // No text.
-  ASSERT_TRUE(file->Open()) << "File could not be opened:\n"
-      << kOutFileName.c_str();
+  file->OpenFile(kOutFileName.c_str(), true);  // Read only.
+  ASSERT_TRUE(file->is_open()) << "File could not be opened:\n"
+                               << kOutFileName.c_str();
 
   EXPECT_EQ(kBufferLength, ReadFloatBufferFromFile(file.get(),
                                                    kBufferLength,
                                                    read_buffer.get()));
   EXPECT_EQ(0, memcmp(written_buffer.get(),
                       read_buffer.get(),
                       kBufferLength * sizeof(written_buffer[0])));
 }
 
 #if defined(WEBRTC_IOS)
 #define MAYBE_WriteDoubleBufferToFile DISABLED_WriteDoubleBufferToFile
 #else
 #define MAYBE_WriteDoubleBufferToFile WriteDoubleBufferToFile
 #endif
 TEST_F(TransientFileUtilsTest, MAYBE_WriteDoubleBufferToFile) {
   std::unique_ptr<FileWrapper> file(FileWrapper::Create());
 
   std::string kOutFileName = CreateTempFilename(test::OutputPath(),
                                                 "utils_test");
 
-  file->OpenFile(kOutFileName.c_str(),
-                 false,   // Write mode.
-                 false,   // No loop.
-                 false);  // No text.
-  ASSERT_TRUE(file->Open()) << "File could not be opened:\n"
-      << kOutFileName.c_str();
+  file->OpenFile(kOutFileName.c_str(), false);  // Write mode.
+  ASSERT_TRUE(file->is_open()) << "File could not be opened:\n"
+                               << kOutFileName.c_str();
 
   const size_t kBufferLength = 3;
   std::unique_ptr<double[]> written_buffer(new double[kBufferLength]);
   std::unique_ptr<double[]> read_buffer(new double[kBufferLength]);
 
   written_buffer[0] = kPi;
   written_buffer[1] = kE;
   written_buffer[2] = kAvogadro;
 
   EXPECT_EQ(kBufferLength, WriteDoubleBufferToFile(file.get(),
                                                    kBufferLength,
                                                    written_buffer.get()));
 
   file->CloseFile();
 
-  file->OpenFile(kOutFileName.c_str(),
-                 true,    // Read only.
-                 false,   // No loop.
-                 false);  // No text.
-  ASSERT_TRUE(file->Open()) << "File could not be opened:\n"
-      << kOutFileName.c_str();
+  file->OpenFile(kOutFileName.c_str(), true);  // Read only.
+  ASSERT_TRUE(file->is_open()) << "File could not be opened:\n"
+                               << kOutFileName.c_str();
 
   EXPECT_EQ(kBufferLength, ReadDoubleBufferFromFile(file.get(),
                                                     kBufferLength,
                                                     read_buffer.get()));
   EXPECT_EQ(0, memcmp(written_buffer.get(),
                       read_buffer.get(),
                       kBufferLength * sizeof(written_buffer[0])));
 }
 
 #if defined(WEBRTC_IOS)
@@ skipping 16 matching lines @@
 
   // Tests with file not opened.
   EXPECT_EQ(0u, ReadInt16BufferFromFile(file.get(), 1, int16_buffer.get()));
   EXPECT_EQ(0u, ReadInt16FromFileToDoubleBuffer(file.get(),
                                                 1,
                                                 double_buffer.get()));
   EXPECT_EQ(0u, ReadDoubleBufferFromFile(file.get(), 1, double_buffer.get()));
   EXPECT_EQ(0u, WriteInt16BufferToFile(file.get(), 1, int16_buffer.get()));
   EXPECT_EQ(0u, WriteDoubleBufferToFile(file.get(), 1, double_buffer.get()));
 
-  file->OpenFile(test_filename.c_str(),
-                 true,    // Read only.
-                 true,    // Loop.
-                 false);  // No text.
-  ASSERT_TRUE(file->Open()) << "File could not be opened:\n"
-      << kTestFileName.c_str();
+  file->OpenFile(test_filename.c_str(), true);  // Read only.
+  ASSERT_TRUE(file->is_open()) << "File could not be opened:\n"
+                               << kTestFileName.c_str();
 
   EXPECT_EQ(0u, ReadInt16BufferFromFile(NULL, 1, int16_buffer.get()));
   EXPECT_EQ(0u, ReadInt16BufferFromFile(file.get(), 1, NULL));
   EXPECT_EQ(0u, ReadInt16BufferFromFile(file.get(), 0, int16_buffer.get()));
 
   EXPECT_EQ(0u, ReadInt16FromFileToDoubleBuffer(NULL, 1, double_buffer.get()));
   EXPECT_EQ(0u, ReadInt16FromFileToDoubleBuffer(file.get(), 1, NULL));
   EXPECT_EQ(0u, ReadInt16FromFileToDoubleBuffer(file.get(),
                                                 0,
                                                 double_buffer.get()));
 
   EXPECT_EQ(0u, ReadDoubleBufferFromFile(NULL, 1, double_buffer.get()));
   EXPECT_EQ(0u, ReadDoubleBufferFromFile(file.get(), 1, NULL));
   EXPECT_EQ(0u, ReadDoubleBufferFromFile(file.get(), 0, double_buffer.get()));
 
   EXPECT_EQ(0u, WriteInt16BufferToFile(NULL, 1, int16_buffer.get()));
   EXPECT_EQ(0u, WriteInt16BufferToFile(file.get(), 1, NULL));
   EXPECT_EQ(0u, WriteInt16BufferToFile(file.get(), 0, int16_buffer.get()));
 
   EXPECT_EQ(0u, WriteDoubleBufferToFile(NULL, 1, double_buffer.get()));
   EXPECT_EQ(0u, WriteDoubleBufferToFile(file.get(), 1, NULL));
   EXPECT_EQ(0u, WriteDoubleBufferToFile(file.get(), 0, double_buffer.get()));
 }
 
 }  // namespace webrtc