Activity Log: allow searching by day

chrome/browser/extensions/activity_log/counting_policy_unittest.cc

 // Copyright 2013 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 "base/cancelable_callback.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/strings/string_split.h"
 #include "base/strings/stringprintf.h"
@@ skipping 52 matching lines @@
   // Wait for the task queue for the specified thread to empty.
   void WaitOnThread(const content::BrowserThread::ID& thread) {
     BrowserThread::PostTaskAndReply(
         thread,
         FROM_HERE,
         base::Bind(&base::DoNothing),
         base::MessageLoop::current()->QuitClosure());
     base::MessageLoop::current()->Run();
   }
 
-  // A helper function to call ReadData on a policy object and wait for the
-  // results to be processed.
+  // A wrapper function for CheckReadFilteredData, so that we don't need to
+  // enter empty string values for parameters we don't care about.
   void CheckReadData(
       ActivityLogPolicy* policy,
       const std::string& extension_id,
       int day,
       const base::Callback<void(scoped_ptr<Action::ActionVector>)>& checker) {
-    // Submit a request to the policy to read back some data, and call the
-    // checker function when results are available.  This will happen on the
-    // database thread.
-    policy->ReadData(
-        extension_id,
-        day,
-        base::Bind(&CountingPolicyTest::CheckWrapper,
-                   checker,
-                   base::MessageLoop::current()->QuitClosure()));
-
-    // Set up a timeout that will trigger after 8 seconds; if we haven't
-    // received any results by then assume that the test is broken.
-    base::CancelableClosure timeout(
-        base::Bind(&CountingPolicyTest::TimeoutCallback));
-    base::MessageLoop::current()->PostDelayedTask(
-        FROM_HERE, timeout.callback(), base::TimeDelta::FromSeconds(8));
-
-    // Wait for results; either the checker or the timeout callbacks should
-    // cause the main loop to exit.
-    base::MessageLoop::current()->Run();
-
-    timeout.Cancel();
+    CheckReadFilteredData(
+        policy, extension_id, Action::ACTION_ANY, "", "", "", day, checker);
   }
 
   // A helper function to call ReadFilteredData on a policy object and wait for
   // the results to be processed.
   void CheckReadFilteredData(
       ActivityLogPolicy* policy,
       const std::string& extension_id,
       const Action::ActionType type,
       const std::string& api_name,
       const std::string& page_url,
       const std::string& arg_url,
+      int day,
       const base::Callback<void(scoped_ptr<Action::ActionVector>)>& checker) {
     // Submit a request to the policy to read back some data, and call the
     // checker function when results are available.  This will happen on the
     // database thread.
     policy->ReadFilteredData(
         extension_id,
         type,
         api_name,
         page_url,
         arg_url,
+        day,
         base::Bind(&CountingPolicyTest::CheckWrapper,
                    checker,
                    base::MessageLoop::current()->QuitClosure()));
 
     // Set up a timeout that will trigger after 8 seconds; if we haven't
     // received any results by then assume that the test is broken.
     base::CancelableClosure timeout(
         base::Bind(&CountingPolicyTest::TimeoutCallback));
     base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE, timeout.callback(), base::TimeDelta::FromSeconds(8));
@@ skipping 66 matching lines @@
   static void Arguments_Stripped(scoped_ptr<Action::ActionVector> i) {
     scoped_refptr<Action> last = i->front();
     CheckAction(*last, "odlameecjipmbmbejkplpemijjgpljce",
                 Action::ACTION_API_CALL, "extension.connect",
                 "[\"hello\",\"world\"]", "", "", "", 1);
   }
 
   static void Arguments_GetTodaysActions(
       scoped_ptr<Action::ActionVector> actions) {
     ASSERT_EQ(3, static_cast<int>(actions->size()));
-    CheckAction(*actions->at(0), "punky", Action::ACTION_DOM_ACCESS, "lets",
+    CheckAction(*actions->at(0), "punky", Action::ACTION_API_CALL, "brewster",
+                "", "", "", "", 2);
+    CheckAction(*actions->at(1), "punky", Action::ACTION_DOM_ACCESS, "lets",
                 "[\"vamoose\"]", "http://www.google.com/", "", "", 1);
-    CheckAction(*actions->at(1), "punky", Action::ACTION_API_CALL,
+    CheckAction(*actions->at(2), "punky", Action::ACTION_API_CALL,
                 "extension.sendMessage", "[\"not\",\"stripped\"]", "", "", "",
                 1);
-    CheckAction(*actions->at(2), "punky", Action::ACTION_API_CALL, "brewster",
-                "", "", "", "", 2);
   }
 
   static void Arguments_GetOlderActions(
       scoped_ptr<Action::ActionVector> actions) {
     ASSERT_EQ(2, static_cast<int>(actions->size()));
     CheckAction(*actions->at(0), "punky", Action::ACTION_DOM_ACCESS, "lets",
                 "[\"vamoose\"]", "http://www.google.com/", "", "", 1);
     CheckAction(*actions->at(1), "punky", Action::ACTION_API_CALL, "brewster",
                 "", "", "", "", 1);
   }
@@ skipping 276 matching lines @@
   action_dom->set_page_url(gurl);
   policy->ProcessAction(action_dom);
 
   CheckReadFilteredData(
       policy,
       extension->id(),
       Action::ACTION_API_CALL,
       "tabs.testMethod",
       "",
       "",
+      -1,
       base::Bind(
           &CountingPolicyTest::RetrieveActions_FetchFilteredActions1));
 
   CheckReadFilteredData(
       policy,
       "",
       Action::ACTION_DOM_ACCESS,
       "",
       "",
       "",
+      -1,
       base::Bind(
           &CountingPolicyTest::RetrieveActions_FetchFilteredActions1));
 
   CheckReadFilteredData(
       policy,
       "",
       Action::ACTION_DOM_ACCESS,
       "",
       "http://www.google.com/",
       "",
+      -1,
       base::Bind(
           &CountingPolicyTest::RetrieveActions_FetchFilteredActions1));
 
   CheckReadFilteredData(
       policy,
       "",
       Action::ACTION_DOM_ACCESS,
       "",
       "http://www.google.com",
       "",
+      -1,
       base::Bind(
           &CountingPolicyTest::RetrieveActions_FetchFilteredActions1));
 
   CheckReadFilteredData(
       policy,
       "",
       Action::ACTION_DOM_ACCESS,
       "",
       "http://www.goo",
       "",
+      -1,
       base::Bind(
           &CountingPolicyTest::RetrieveActions_FetchFilteredActions1));
 
   CheckReadFilteredData(
       policy,
       extension->id(),
       Action::ACTION_ANY,
       "",
       "",
       "",
+      -1,
       base::Bind(
           &CountingPolicyTest::RetrieveActions_FetchFilteredActions2));
 
   policy->Close();
 }
 
 // Check that merging of actions only occurs within the same day, not across
 // days, and that old data can be expired from the database.
 TEST_F(CountingPolicyTest, MergingAndExpiring) {
   CountingPolicy* policy = new CountingPolicy(profile_.get());
@@ skipping 226 matching lines @@
   policy->Flush();
   WaitOnThread(BrowserThread::DB);
 
   CheckReadFilteredData(
       policy,
       "punky",
       Action::ACTION_ANY,
       "",
       "",
       "",
+      -1,
       base::Bind(
           &CountingPolicyTest::RetrieveActions_FetchFilteredActions300));
   policy->Close();
 }
 
 TEST_F(CountingPolicyTest, RemoveAllURLs) {
   ActivityLogPolicy* policy = new CountingPolicy(profile_.get());
 
   // Use a mock clock to ensure that events are not recorded on the wrong day
   // when the test is run close to local midnight.
@@ skipping 85 matching lines @@
   policy->ProcessAction(action);
 
   // This should have neither cleared.
   mock_clock->Advance(base::TimeDelta::FromSeconds(1));
   action = new Action(
       "punky", mock_clock->Now(), Action::ACTION_DOM_ACCESS, "lets");
   action->mutable_args()->AppendString("vamoose");
   action->set_page_url(GURL("http://www.google.com"));
   action->set_page_title("Google");
   action->set_arg_url(GURL("http://www.args-url.com"));
+  action->set_count(5);
   policy->ProcessAction(action);
 
     // Clean some URLs.
   std::vector<GURL> urls;
   urls.push_back(GURL("http://www.google1.com"));
   urls.push_back(GURL("http://www.google2.com"));
   urls.push_back(GURL("http://www.url_not_in_db.com"));
   policy->RemoveURLs(urls);
 
   CheckReadData(
@@ skipping 64 matching lines @@
 
   policy->DeleteDatabase();
 
   CheckReadFilteredData(
       policy,
       "",
       Action::ACTION_ANY,
       "",
       "",
       "",
+      -1,
       base::Bind(
           &CountingPolicyTest::RetrieveActions_FetchFilteredActions0));
 
   policy->Close();
 }
 
 }  // namespace extensions