Add AttachmentDownloader interface, change signature of AttachmentStore::Read

sync/internal_api/attachments/fake_attachment_store_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 "sync/internal_api/public/attachments/fake_attachment_store.h"
 
 #include "base/bind.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "sync/api/attachments/attachment.h"
 #include "sync/protocol/sync.pb.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncer {
 
 const char kTestData1[] = "test data 1";
 const char kTestData2[] = "test data 2";
 
 class FakeAttachmentStoreTest : public testing::Test {
  protected:
   base::MessageLoop message_loop;
   FakeAttachmentStore store;
   AttachmentStore::Result result;
   scoped_ptr<AttachmentMap> attachments;
+  scoped_ptr<AttachmentIdList> failed_attachment_ids;
 
   AttachmentStore::ReadCallback read_callback;
   AttachmentStore::WriteCallback write_callback;
   AttachmentStore::DropCallback drop_callback;
 
   scoped_refptr<base::RefCountedString> some_data1;
   scoped_refptr<base::RefCountedString> some_data2;
 
   FakeAttachmentStoreTest() : store(base::MessageLoopProxy::current()) {}
 
   virtual void SetUp() {
     Clear();
     read_callback = base::Bind(&FakeAttachmentStoreTest::CopyResultAttachments,
                                base::Unretained(this),
                                &result,
-                               &attachments);
+                               &attachments,
+                               &failed_attachment_ids);
     write_callback = base::Bind(
         &FakeAttachmentStoreTest::CopyResult, base::Unretained(this), &result);
     drop_callback = write_callback;
 
     some_data1 = new base::RefCountedString;
     some_data1->data() = kTestData1;
 
     some_data2 = new base::RefCountedString;
     some_data2->data() = kTestData2;
   }
 
   virtual void ClearAndPumpLoop() {
     Clear();
     message_loop.RunUntilIdle();
   }
 
  private:
   void Clear() {
     result = AttachmentStore::UNSPECIFIED_ERROR;
     attachments.reset();

[maniscalco, 2014/05/22 20:28:09]

This would be a natural place to .clear() failed_attachment_ids.

[pavely, 2014/05/22 21:13:33]

Done.

   }
 
   void CopyResult(AttachmentStore::Result* destination_result,
                   const AttachmentStore::Result& source_result) {
     *destination_result = source_result;
   }
 
-  void CopyResultAttachments(AttachmentStore::Result* destination_result,
-                             scoped_ptr<AttachmentMap>* destination_attachments,
-                             const AttachmentStore::Result& source_result,
-                             scoped_ptr<AttachmentMap> source_attachments) {
+  void CopyResultAttachments(
+      AttachmentStore::Result* destination_result,
+      scoped_ptr<AttachmentMap>* destination_attachments,
+      scoped_ptr<AttachmentIdList>* destination_failed_attachment_ids,
+      const AttachmentStore::Result& source_result,
+      scoped_ptr<AttachmentMap> source_attachments,
+      scoped_ptr<AttachmentIdList> source_failed_attachment_ids) {
     CopyResult(destination_result, source_result);
     *destination_attachments = source_attachments.Pass();
+    *destination_failed_attachment_ids = source_failed_attachment_ids.Pass();
   }
 };
 
 // Verify that we do not overwrite existing attachments and that we do not treat
 // it as an error.
 TEST_F(FakeAttachmentStoreTest, Write_NoOverwriteNoError) {
   // Create two attachments with the same id but different data.
   Attachment attachment1 = Attachment::Create(some_data1);
   Attachment attachment2 =
       Attachment::CreateWithId(attachment1.GetId(), some_data2);
@@ skipping 11 matching lines @@
   store.Write(some_attachments, write_callback);
   ClearAndPumpLoop();
   EXPECT_EQ(result, AttachmentStore::SUCCESS);
 
   // Read it back and see that it was not overwritten.
   AttachmentIdList some_attachment_ids;
   some_attachment_ids.push_back(attachment1.GetId());
   store.Read(some_attachment_ids, read_callback);
   ClearAndPumpLoop();
   EXPECT_EQ(result, AttachmentStore::SUCCESS);
   EXPECT_EQ(attachments->size(), 1U);

[maniscalco, 2014/05/22 20:28:09]

Good place to EXPECT failed_attachment_ids is empty.

[pavely, 2014/05/22 21:13:33]

Done.

   AttachmentMap::const_iterator a1 = attachments->find(attachment1.GetId());
   EXPECT_TRUE(a1 != attachments->end());
   EXPECT_TRUE(attachment1.GetData()->Equals(a1->second.GetData()));
 }
 
 // Verify that we can write some attachments and read them back.
 TEST_F(FakeAttachmentStoreTest, Write_RoundTrip) {
   Attachment attachment1 = Attachment::Create(some_data1);
   Attachment attachment2 = Attachment::Create(some_data2);
   AttachmentList some_attachments;
   some_attachments.push_back(attachment1);
   some_attachments.push_back(attachment2);
 
   store.Write(some_attachments, write_callback);
   ClearAndPumpLoop();
   EXPECT_EQ(result, AttachmentStore::SUCCESS);
 
   AttachmentIdList some_attachment_ids;
   some_attachment_ids.push_back(attachment1.GetId());
   some_attachment_ids.push_back(attachment2.GetId());
   store.Read(some_attachment_ids, read_callback);
   ClearAndPumpLoop();
   EXPECT_EQ(result, AttachmentStore::SUCCESS);
   EXPECT_EQ(attachments->size(), 2U);

[maniscalco, 2014/05/22 20:28:09]

Good place to EXPECT failed_attachment_ids is empty.

[pavely, 2014/05/22 21:13:33]

Done.

 
   AttachmentMap::const_iterator a1 = attachments->find(attachment1.GetId());
   EXPECT_TRUE(a1 != attachments->end());
   EXPECT_TRUE(attachment1.GetData()->Equals(a1->second.GetData()));
 
   AttachmentMap::const_iterator a2 = attachments->find(attachment2.GetId());
   EXPECT_TRUE(a2 != attachments->end());
   EXPECT_TRUE(attachment2.GetData()->Equals(a2->second.GetData()));
 }
 
@@ skipping 12 matching lines @@
   // Try to read both attachment1 and attachment2.
   AttachmentIdList ids;
   ids.push_back(attachment1.GetId());
   ids.push_back(attachment2.GetId());
   store.Read(ids, read_callback);
   ClearAndPumpLoop();
 
   // See that only attachment1 was read.
   EXPECT_EQ(result, AttachmentStore::UNSPECIFIED_ERROR);
   EXPECT_EQ(attachments->size(), 1U);
+  EXPECT_EQ(failed_attachment_ids->size(), 1U);
 }
 
 // Try to drop two attachments when only one exists. Verify that no error occurs
 // and that the existing attachment was dropped.
 TEST_F(FakeAttachmentStoreTest, Drop_DropTwoButOnlyOneExists) {
   // First, create two attachments.
   Attachment attachment1 = Attachment::Create(some_data1);
   Attachment attachment2 = Attachment::Create(some_data2);
   AttachmentList some_attachments;
   some_attachments.push_back(attachment1);
   some_attachments.push_back(attachment2);
   store.Write(some_attachments, write_callback);
   ClearAndPumpLoop();
   EXPECT_EQ(result, AttachmentStore::SUCCESS);
 
   // Drop attachment1 only.
   AttachmentIdList ids;
   ids.push_back(attachment1.GetId());
   store.Drop(ids, drop_callback);
   ClearAndPumpLoop();
   EXPECT_EQ(result, AttachmentStore::SUCCESS);
 
   // See that attachment1 is gone.
   store.Read(ids, read_callback);
   ClearAndPumpLoop();
   EXPECT_EQ(result, AttachmentStore::UNSPECIFIED_ERROR);
   EXPECT_EQ(attachments->size(), 0U);

[maniscalco, 2014/05/22 20:28:09]

Good place to EXPECT failed_attachment_ids to contain the ids from "ids".

 
   // Drop both attachment1 and attachment2.
   ids.clear();
   ids.push_back(attachment1.GetId());
   ids.push_back(attachment2.GetId());
   store.Drop(ids, drop_callback);
   ClearAndPumpLoop();
   EXPECT_EQ(result, AttachmentStore::SUCCESS);
 
   // See that attachment2 is now gone.
   ids.clear();
   ids.push_back(attachment2.GetId());
   store.Read(ids, read_callback);
   ClearAndPumpLoop();
   EXPECT_EQ(result, AttachmentStore::UNSPECIFIED_ERROR);
   EXPECT_EQ(attachments->size(), 0U);

[maniscalco, 2014/05/22 20:28:09]

Good place to EXPECT failed_attachment_ids to contain the ids from "ids".

 }
 
 // Verify that attempting to drop an attachment that does not exist is not an
 // error.
 TEST_F(FakeAttachmentStoreTest, Drop_DoesNotExist) {
   Attachment attachment1 = Attachment::Create(some_data1);
   AttachmentList some_attachments;
   some_attachments.push_back(attachment1);
   store.Write(some_attachments, write_callback);
   ClearAndPumpLoop();
   EXPECT_EQ(result, AttachmentStore::SUCCESS);
 
   // Drop the attachment.
   AttachmentIdList ids;
   ids.push_back(attachment1.GetId());
   store.Drop(ids, drop_callback);
   ClearAndPumpLoop();
   EXPECT_EQ(result, AttachmentStore::SUCCESS);
 
   // See that it's gone.
   store.Read(ids, read_callback);
   ClearAndPumpLoop();
   EXPECT_EQ(result, AttachmentStore::UNSPECIFIED_ERROR);
   EXPECT_EQ(attachments->size(), 0U);

[maniscalco, 2014/05/22 20:28:09]

Good place to EXPECT failed_attachment_ids to contain the ids from "ids".

 
   // Drop again, see that no error occurs.
   ids.clear();
   ids.push_back(attachment1.GetId());
   store.Drop(ids, drop_callback);
   ClearAndPumpLoop();
   EXPECT_EQ(result, AttachmentStore::SUCCESS);
 }
 
 }  // namespace syncer