gdata: Trigger delta feed when search results contained unknown entries.

chrome/browser/chromeos/gdata/gdata_file_system_unittest.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 <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 2403 matching lines @@
 
   EXPECT_CALL(*mock_doc_service_, GetDocuments(Eq(GURL()), _, "foo", _, _))
       .Times(1);
 
   const SearchResultPair expected_results[] = {
     { "drive/Directory 1/SubDirectory File 1.txt", false },
     { "drive/Directory 1", true }
   };
 
   SearchCallback callback = base::Bind(&DriveSearchCallback,
       &message_loop_, expected_results, 2u);

[satorux1, 2012/07/31 20:48:52]

while you are at it, could you also fix this? see below

[kinaba, 2012/08/01 05:34:09]

Done.

 
   file_system_->Search("foo", callback);
   message_loop_.Run();  // Wait to get our result.
 }
 
+TEST_F(GDataFileSystemTest, ContentSearchWithNewEntry) {
+  LoadRootFeedDocument("root_feed.json");
+
+  // Search result returning two entries "Directory 1/" and
+  // "Directory 1/SubDirectory Newly Added File.txt". The latter is not
+  // contained in the root feed.
+  mock_doc_service_->set_search_result(
+      "search_result_with_new_entry_feed.json");
+
+  EXPECT_CALL(*mock_doc_service_, GetDocuments(Eq(GURL()), _, "foo", _, _))
+      .Times(1);
+
+  // Only entries in the current file system snapshot should be returned.

[satorux1, 2012/07/31 20:48:52]

I'm confused. I thought we wanted to include the newly added file in the search
result?

[satorux1, 2012/07/31 20:50:23]

Looking at the patch description, we don't need to include the new added file
here, as the arrival of the delta feed lets the file manager to do search again?
If so, LGTM. Please add some comment here, as it's a bit tricky.

[kinaba, 2012/08/01 05:34:09]

Done.

+  const SearchResultPair expected_results[] = {

[satorux1, 2012/07/31 20:48:52]

nit: kExpectedResults

[kinaba, 2012/08/01 05:34:09]

Done.

+    { "drive/Directory 1", true }
+  };
+
+  // Unknown entry should trigger delta feed request.
+  EXPECT_CALL(*mock_doc_service_, GetAccountMetadata(_)).Times(1);
+  EXPECT_CALL(*mock_doc_service_, GetDocuments(Eq(GURL()), _, "", _, _))
+      .Times(1);
+  EXPECT_CALL(*mock_webapps_registry_, UpdateFromFeed(NotNull())).Times(1);
+
+  SearchCallback callback = base::Bind(&DriveSearchCallback,
+      &message_loop_, expected_results, 1u);

[satorux1, 2012/07/31 20:48:52]

1u -> ARRAYSIZE_UNSAFE(kExpectedResults)

[kinaba, 2012/08/01 05:34:09]

Done.

+
+  file_system_->Search("foo", callback);
+  message_loop_.Run();  // Wait to get our result.
+}
+
 TEST_F(GDataFileSystemTest, ContentSearchEmptyResult) {
   LoadRootFeedDocument("root_feed.json");
 
   mock_doc_service_->set_search_result("empty_feed.json");
 
   EXPECT_CALL(*mock_doc_service_, GetDocuments(Eq(GURL()), _, "foo", _, _))
       .Times(1);
 
   const SearchResultPair* expected_results = NULL;
 
@@ skipping 116 matching lines @@
 
   // Try to close the same file twice.
   file_system_->CloseFile(kFileInRoot, close_file_callback);
   message_loop_.Run();
 
   // It must fail.
   EXPECT_EQ(GDATA_FILE_ERROR_NOT_FOUND, callback_helper_->last_error_);
 }
 
 }   // namespace gdata