Initial version of new file wrapper

webrtc/base/file_unittest.cc

+/*
+ *  Copyright 2015 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.
+ */
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#include <string>
+
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/file.h"
+#include "webrtc/test/testsupport/fileutils.h"
+
+namespace rtc {
+
+rtc::PlatformFile OpenFile(const std::string& path) {

[sprang_webrtc, 2016/08/05 14:45:14]

Could this be a static function in the File class instead?
Also, a static method there to get a temp file I think would be great.

[palmkvist, 2016/08/08 11:15:35]

Definitely, but it apparently won't work in chrome, so I didn't put it there.
Should I add it anyway, and make compilation conditional in some way?

+#if defined(WEBRTC_WIN)
+  HANDLE handle =
+      ::CreateFile(path.c_str(), GENERIC_READ | GENERIC_WRITE, 0, NULL,
+                   OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+  return handle;
+#else
+  int fd = ::open(path.c_str(), O_RDWR);
+  return fd;
+#endif
+}
+
+void RemoveFile(const std::string& path) {
+#if defined(WEBRTC_WIN)
+  ::DeleteFile(path.c_str());
+#else
+  ::unlink(path.c_str());
+#endif
+}
+
+bool VerifyBuffer(char* buffer, size_t length, char start_value) {
+  for (size_t i = 0; i < length; ++i) {
+    if (buffer[i] != start_value++)
+      return false;
+  }
+  // Prevent the same buffer from being verified multiple times simply
+  // because some operation that should have written to it failed
+  memset(buffer, 0, length);
+  return true;
+}
+
+class FileTest : public ::testing::Test {
+ protected:
+  std::string path_;
+  void SetUp() {
+    path_ = webrtc::test::TempFilename(webrtc::test::OutputPath(), "test_file");
+  }
+  rtc::PlatformFile OpenTempFile() { return OpenFile(path_); }
+  void TearDown() { RemoveFile(path_); }
+};
+
+TEST_F(FileTest, SimpleReadWrite) {
+  rtc::PlatformFile p_file = OpenTempFile();
+  ASSERT_NE(rtc::kInvalidPlatformFileValue, p_file);
+  File file(p_file);
+
+  char data[100] = {0};
+  char out[100] = {0};
+  for (int i = 0; i < 100; ++i) {
+    data[i] = i;
+  }
+
+  EXPECT_EQ(size_t{10}, file.Write(data, 10));

[sprang_webrtc, 2016/08/05 14:45:14]

I think you can just use 10u instead of a cast.

[palmkvist, 2016/08/08 11:15:35]

Done.

+
+  EXPECT_TRUE(file.Seek(0));
+  EXPECT_EQ(size_t{10}, file.Read(out, 10));
+  EXPECT_TRUE(VerifyBuffer(out, 10, 0));
+
+  EXPECT_TRUE(file.Seek(0));
+  EXPECT_EQ(size_t{100}, file.Write(data, 100));
+
+  EXPECT_TRUE(file.Seek(0));
+  EXPECT_EQ(size_t{100}, file.Read(out, 100));
+  EXPECT_TRUE(VerifyBuffer(out, 100, 0));
+
+  EXPECT_TRUE(file.Seek(1));
+  EXPECT_EQ(size_t{50}, file.Write(data, 50));
+  EXPECT_EQ(size_t{50}, file.Write(data + 50, 50));
+
+  EXPECT_TRUE(file.Seek(1));
+  EXPECT_EQ(size_t{100}, file.Read(out, 100));
+  EXPECT_TRUE(VerifyBuffer(out, 100, 0));
+}
+
+TEST_F(FileTest, ReadWriteClose) {
+  File file(OpenTempFile());
+
+  char data[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
+  char out[10] = {0};
+  EXPECT_EQ(size_t{10}, file.Write(data, 10));
+  EXPECT_TRUE(file.Close());
+
+  File file2(OpenTempFile());
+  EXPECT_EQ(size_t{10}, file2.Read(out, 10));
+  EXPECT_TRUE(VerifyBuffer(out, 10, 0));
+}
+
+TEST_F(FileTest, RandomAccessRead) {
+  File file(OpenTempFile());
+
+  char data[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
+  char out[10] = {0};
+  EXPECT_EQ(size_t{10}, file.Write(data, 10));
+
+  EXPECT_EQ(size_t{4}, file.ReadAt(out, 4, 0));
+  EXPECT_TRUE(VerifyBuffer(out, 4, 0));
+
+  EXPECT_EQ(size_t{4}, file.ReadAt(out, 4, 4));
+  EXPECT_TRUE(VerifyBuffer(out, 4, 4));
+
+  EXPECT_EQ(size_t{5}, file.ReadAt(out, 5, 5));
+  EXPECT_TRUE(VerifyBuffer(out, 5, 5));
+}
+
+TEST_F(FileTest, RandomAccessReadWrite) {
+  File file(OpenTempFile());
+
+  char data[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
+  char out[10] = {0};
+  EXPECT_EQ(size_t{10}, file.Write(data, 10));
+  EXPECT_TRUE(file.Seek(4));
+
+  EXPECT_EQ(size_t{4}, file.WriteAt(data, 4, 4));
+  EXPECT_EQ(size_t{4}, file.Read(out, 4));
+  EXPECT_TRUE(VerifyBuffer(out, 4, 0));
+
+  EXPECT_EQ(size_t{2}, file.WriteAt(data, 2, 8));
+  EXPECT_EQ(size_t{2}, file.ReadAt(out, 2, 8));
+  EXPECT_TRUE(VerifyBuffer(out, 2, 0));
+}
+
+}  // namespace rtc