[NaCl SDK] nacl_io: big refactor to return error value (errno).

native_client_sdk/src/libraries/nacl_io_test/mount_http_test.cc

 /* Copyright (c) 2012 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 <fcntl.h>
 #include <gmock/gmock.h>
 #include <ppapi/c/ppb_file_io.h>
 #include <ppapi/c/pp_errors.h>
 #include <ppapi/c/pp_instance.h>
@@ skipping 11 matching lines @@
 using ::testing::DoAll;
 using ::testing::Mock;
 using ::testing::Return;
 using ::testing::SetArgPointee;
 using ::testing::StrEq;
 
 
 class MountHttpMock : public MountHttp {
  public:
   MountHttpMock(StringMap_t map, PepperInterfaceMock* ppapi) {
-    EXPECT_TRUE(Init(1, map, ppapi));
+    EXPECT_EQ(0, Init(1, map, ppapi));
   }
 
   ~MountHttpMock() {
     Destroy();
   }
 
   NodeMap_t& GetMap() { return node_cache_; }
 
   using MountHttp::ParseManifest;
   using MountHttp::FindOrCreateDir;
@@ skipping 21 matching lines @@
 }
 
 
 TEST_F(MountHttpTest, MountEmpty) {
   StringMap_t args;
   mnt_ = new MountHttpMock(args, &ppapi_);
 }
 
 TEST_F(MountHttpTest, ParseManifest) {
   StringMap_t args;
+  size_t result_size = 0;
+
   mnt_ = new MountHttpMock(args, &ppapi_);
 
   char manifest[] = "-r-- 123 /mydir/foo\n-rw- 234 /thatdir/bar\n";
-  EXPECT_TRUE(mnt_->ParseManifest(manifest));
+  EXPECT_EQ(0, mnt_->ParseManifest(manifest));
 
-  MountNodeDir* root = mnt_->FindOrCreateDir(Path("/"));
+  MountNodeDir* root = NULL;
+  EXPECT_EQ(0, mnt_->FindOrCreateDir(Path("/"), &root));
+  ASSERT_NE((MountNode*)NULL, root);
   EXPECT_EQ(2, root->ChildCount());
 
-  MountNodeDir* dir = mnt_->FindOrCreateDir(Path("/mydir"));
+  MountNodeDir* dir = NULL;
+  EXPECT_EQ(0, mnt_->FindOrCreateDir(Path("/mydir"), &dir));
+  ASSERT_NE((MountNode*)NULL, dir);
   EXPECT_EQ(1, dir->ChildCount());
 
   MountNode* node = mnt_->GetMap()["/mydir/foo"];
-  EXPECT_TRUE(node);
-  EXPECT_EQ(123, node->GetSize());
+  EXPECT_NE((MountNode*)NULL, node);
+  EXPECT_EQ(0, node->GetSize(&result_size));
+  EXPECT_EQ(123, result_size);
 
   // Since these files are cached thanks to the manifest, we can open them
   // without accessing the PPAPI URL API.
-  MountNode* foo = mnt_->Open(Path("/mydir/foo"), O_RDONLY);
-  MountNode* bar = mnt_->Open(Path("/thatdir/bar"), O_RDWR);
+  MountNode* foo = NULL;
+  EXPECT_EQ(0, mnt_->Open(Path("/mydir/foo"), O_RDONLY, &foo));
+  MountNode* bar = NULL;
+  EXPECT_EQ(0, mnt_->Open(Path("/thatdir/bar"), O_RDWR, &bar));
 
   struct stat sfoo;
   struct stat sbar;
 
   EXPECT_FALSE(foo->GetStat(&sfoo));
   EXPECT_FALSE(bar->GetStat(&sbar));
 
   EXPECT_EQ(123, sfoo.st_size);
   EXPECT_EQ(S_IFREG | S_IREAD, sfoo.st_mode);
 
@@ skipping 138 matching lines @@
 }
 
 void MountHttpNodeTest::SetResponseBody(const char* body) {
   response_body_offset_ = 0;
   EXPECT_CALL(*loader_, ReadResponseBody(loader_resource_, _, _, _))
       .WillRepeatedly(ReadResponseBodyAction(
             &response_body_offset_, body, strlen(body)));
 }
 
 void MountHttpNodeTest::OpenNode() {
-  node_ = mnt_->Open(Path(path_), O_RDONLY);
+  ASSERT_EQ(0, mnt_->Open(Path(path_), O_RDONLY, &node_));
   ASSERT_NE((MountNode*)NULL, node_);
 }
 
 void MountHttpNodeTest::ResetMocks() {
   Mock::VerifyAndClearExpectations(&ppapi_);
   Mock::VerifyAndClearExpectations(loader_);
   Mock::VerifyAndClearExpectations(request_);
   Mock::VerifyAndClearExpectations(response_);
   Mock::VerifyAndClearExpectations(var_);
 }
 
 void MountHttpNodeTest::TearDown() {
   if (node_)
     mnt_->ReleaseNode(node_);
   delete mnt_;
 }
 
-TEST_F(MountHttpNodeTest, OpenAndClose) {
+TEST_F(MountHttpNodeTest, OpenAndCloseNoCache) {
+  StringMap_t smap;
+  smap["cache_content"] = "false";
   SetMountArgs(StringMap_t());
   ExpectOpen("HEAD");
   ExpectHeaders("");
   SetResponse(200, "");
   OpenNode();
 }
 
 TEST_F(MountHttpNodeTest, ReadCached) {
+  size_t result_size = 0;
+  int result_bytes = 0;
+
   SetMountArgs(StringMap_t());
   ExpectOpen("HEAD");
   ExpectHeaders("");
   SetResponse(200, "Content-Length: 42\n");
   OpenNode();
   ResetMocks();
 
-  EXPECT_EQ(42, node_->GetSize());
+  EXPECT_EQ(0, node_->GetSize(&result_size));
+  EXPECT_EQ(42, result_size);
 
   char buf[10];
   memset(&buf[0], 0, sizeof(buf));
 
   ExpectOpen("GET");
   ExpectHeaders("");
   SetResponse(200, "Content-Length: 42\n");
   SetResponseBody("Here is some response text. And some more.");
-  node_->Read(0, buf, sizeof(buf) - 1);
+  EXPECT_EQ(0, node_->Read(0, buf, sizeof(buf) - 1, &result_bytes));
   EXPECT_STREQ("Here is s", &buf[0]);
   ResetMocks();
 
   // Further reads should be cached.
-  node_->Read(0, buf, sizeof(buf) - 1);
+  EXPECT_EQ(0, node_->Read(0, buf, sizeof(buf) - 1, &result_bytes));
   EXPECT_STREQ("Here is s", &buf[0]);
-  node_->Read(10, buf, sizeof(buf) - 1);
+  EXPECT_EQ(0, node_->Read(10, buf, sizeof(buf) - 1, &result_bytes));
   EXPECT_STREQ("me respon", &buf[0]);
 
-  EXPECT_EQ(42, node_->GetSize());
+  EXPECT_EQ(0, node_->GetSize(&result_size));
+  EXPECT_EQ(42, result_size);
 }
 
 TEST_F(MountHttpNodeTest, ReadCachedNoContentLength) {
+  size_t result_size = 0;
+  int result_bytes = 0;
+
   SetMountArgs(StringMap_t());
   ExpectOpen("HEAD");
   ExpectHeaders("");
   SetResponse(200, "");
   OpenNode();
   ResetMocks();
 
   ExpectOpen("GET");
   ExpectHeaders("");
   SetResponse(200, "");  // No Content-Length response here.
   SetResponseBody("Here is some response text. And some more.");
 
   // GetSize will Read() because it didn't get the content length from the HEAD
   // request.
-  EXPECT_EQ(42, node_->GetSize());
+  EXPECT_EQ(0, node_->GetSize(&result_size));
+  EXPECT_EQ(42, result_size);
 
   char buf[10];
   memset(&buf[0], 0, sizeof(buf));
 
-  node_->Read(0, buf, sizeof(buf) - 1);
+  EXPECT_EQ(0, node_->Read(0, buf, sizeof(buf) - 1, &result_bytes));
   EXPECT_STREQ("Here is s", &buf[0]);
   ResetMocks();
 
   // Further reads should be cached.
-  node_->Read(0, buf, sizeof(buf) - 1);
+  EXPECT_EQ(0, node_->Read(0, buf, sizeof(buf) - 1, &result_bytes));
   EXPECT_STREQ("Here is s", &buf[0]);
-  node_->Read(10, buf, sizeof(buf) - 1);
+  EXPECT_EQ(0, node_->Read(10, buf, sizeof(buf) - 1, &result_bytes));
   EXPECT_STREQ("me respon", &buf[0]);
 
-  EXPECT_EQ(42, node_->GetSize());
+  EXPECT_EQ(0, node_->GetSize(&result_size));
+  EXPECT_EQ(42, result_size);
 }
 
 TEST_F(MountHttpNodeTest, ReadCachedUnderrun) {
+  size_t result_size = 0;
+  int result_bytes = 0;
+
   SetMountArgs(StringMap_t());
   ExpectOpen("HEAD");
   ExpectHeaders("");
   SetResponse(200, "Content-Length: 100\n");
   OpenNode();
   ResetMocks();
 
-  EXPECT_EQ(100, node_->GetSize());
+  EXPECT_EQ(0, node_->GetSize(&result_size));
+  EXPECT_EQ(100, result_size);
 
   char buf[10];
   memset(&buf[0], 0, sizeof(buf));
 
   ExpectOpen("GET");
   ExpectHeaders("");
   SetResponse(200, "Content-Length: 100\n");
   SetResponseBody("abcdefghijklmnopqrstuvwxyz");
-  node_->Read(0, buf, sizeof(buf) - 1);
+  EXPECT_EQ(0, node_->Read(0, buf, sizeof(buf) - 1, &result_bytes));

[noelallen1, 2013/06/07 21:48:43]

Set but not compared?

[binji, 2013/06/07 23:23:11]

Done.

   EXPECT_STREQ("abcdefghi", &buf[0]);
   ResetMocks();
 
-  EXPECT_EQ(26, node_->GetSize());
+  EXPECT_EQ(0, node_->GetSize(&result_size));
+  EXPECT_EQ(26, result_size);
 }
 
 TEST_F(MountHttpNodeTest, ReadCachedOverrun) {
+  size_t result_size = 0;
+  int result_bytes = 0;
+
   SetMountArgs(StringMap_t());
   ExpectOpen("HEAD");
   ExpectHeaders("");
   SetResponse(200, "Content-Length: 15\n");
   OpenNode();
   ResetMocks();
 
-  EXPECT_EQ(15, node_->GetSize());
+  EXPECT_EQ(0, node_->GetSize(&result_size));
+  EXPECT_EQ(15, result_size);
 
   char buf[10];
   memset(&buf[0], 0, sizeof(buf));
 
   ExpectOpen("GET");
   ExpectHeaders("");
   SetResponse(200, "Content-Length: 15\n");
   SetResponseBody("01234567890123456789");
-  node_->Read(10, buf, sizeof(buf) - 1);
+  EXPECT_EQ(0, node_->Read(10, buf, sizeof(buf) - 1, &result_bytes));

[noelallen1, 2013/06/07 21:48:43]

result_butes set but not compared?

[binji, 2013/06/07 23:23:11]

Done.

   EXPECT_STREQ("01234", &buf[0]);
   ResetMocks();
 
-  EXPECT_EQ(15, node_->GetSize());
+  EXPECT_EQ(0, node_->GetSize(&result_size));
+  EXPECT_EQ(15, result_size);
 }
 
 TEST_F(MountHttpNodeTest, ReadPartial) {
+  size_t result_size = 0;

[noelallen1, 2013/06/07 21:48:43]

unused?

[binji, 2013/06/07 23:23:11]

Done.

+  int result_bytes = 0;
+
   StringMap_t args;
   args["cache_content"] = "false";
   SetMountArgs(args);
   ExpectOpen("HEAD");
   ExpectHeaders("");
   SetResponse(200, "");
   OpenNode();
   ResetMocks();
 
   char buf[10];
   memset(&buf[0], 0, sizeof(buf));
 
   ExpectOpen("GET");
   ExpectHeaders("Range: bytes=0-8\n");
   SetResponse(206, "Content-Length: 9\nContent-Range: bytes=0-8\n");
   SetResponseBody("012345678");
-  node_->Read(0, buf, sizeof(buf) - 1);
+  EXPECT_EQ(0, node_->Read(0, buf, sizeof(buf) - 1, &result_bytes));
   EXPECT_STREQ("012345678", &buf[0]);
   ResetMocks();
 
   // Another read is another request.
   ExpectOpen("GET");
   ExpectHeaders("Range: bytes=10-18\n");
   SetResponse(206, "Content-Length: 9\nContent-Range: bytes=10-18\n");
   SetResponseBody("abcdefghi");
-  node_->Read(10, buf, sizeof(buf) - 1);
+  EXPECT_EQ(0, node_->Read(10, buf, sizeof(buf) - 1, &result_bytes));
   EXPECT_STREQ("abcdefghi", &buf[0]);
 }
 
 TEST_F(MountHttpNodeTest, ReadPartialNoServerSupport) {
+  size_t result_size = 0;

[noelallen1, 2013/06/07 21:48:43]

unused?

[binji, 2013/06/07 23:23:11]

Done.

+  int result_bytes = 0;
+
   StringMap_t args;
   args["cache_content"] = "false";
   SetMountArgs(args);
   ExpectOpen("HEAD");
   ExpectHeaders("");
   SetResponse(200, "");
   OpenNode();
   ResetMocks();
 
   char buf[10];
   memset(&buf[0], 0, sizeof(buf));
 
   ExpectOpen("GET");
   ExpectHeaders("Range: bytes=10-18\n");
   SetResponse(200, "Content-Length: 20\n");
   SetResponseBody("0123456789abcdefghij");
-  node_->Read(10, buf, sizeof(buf) - 1);
+  EXPECT_EQ(0, node_->Read(10, buf, sizeof(buf) - 1, &result_bytes));
   EXPECT_STREQ("abcdefghi", &buf[0]);
 }