AU: Remove instances of Omaha ID -- machine ID and user ID.

omaha_request_action_unittest.cc

 // Copyright (c) 2010 The Chromium OS 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 <glib.h>
 
 #include "base/string_util.h"
@@ skipping 17 matching lines @@
 using testing::Le;
 using testing::Return;
 using testing::SetArgumentPointee;
 
 namespace chromeos_update_engine {
 
 class OmahaRequestActionTest : public ::testing::Test { };
 
 namespace {
 const OmahaRequestParams kDefaultTestParams(
-    "machine_id",
-    "user_id",
     OmahaRequestParams::kOsPlatform,
     OmahaRequestParams::kOsVersion,
     "service_pack",
     "x86-generic",
     OmahaRequestParams::kAppId,
     "0.1.0.0",
     "en-US",
     "unittest",
     false,  // delta okay
     "http://url");
@@ skipping 349 matching lines @@
 TEST(OmahaRequestActionTest, XmlEncodeTest) {
   EXPECT_EQ("ab", XmlEncode("ab"));
   EXPECT_EQ("a&lt;b", XmlEncode("a<b"));
   EXPECT_EQ("foo-&#x3A9;", XmlEncode("foo-\xce\xa9"));
   EXPECT_EQ("&lt;&amp;&gt;", XmlEncode("<&>"));
   EXPECT_EQ("&amp;lt;&amp;amp;&amp;gt;", XmlEncode("&lt;&amp;&gt;"));
 
   vector<char> post_data;
 
   // Make sure XML Encode is being called on the params
-  OmahaRequestParams params("testthemachine<id",
-                            "testtheuser_id&lt;",
-                            OmahaRequestParams::kOsPlatform,
+  OmahaRequestParams params(OmahaRequestParams::kOsPlatform,
                             OmahaRequestParams::kOsVersion,
                             "testtheservice_pack>",
                             "x86 generic<id",
                             OmahaRequestParams::kAppId,
                             "0.1.0.0",
                             "en-US",
                             "unittest_track&lt;",
                             false,  // delta okay
                             "http://url");
   OmahaResponse response;
@@ skipping 147 matching lines @@
       new MockHttpFetcher(http_response.data(),
                           http_response.size()));
   EXPECT_TRUE(event_action.IsEvent());
 }
 
 TEST(OmahaRequestActionTest, FormatDeltaOkayOutputTest) {
   for (int i = 0; i < 2; i++) {
     bool delta_okay = i == 1;
     const char* delta_okay_str = delta_okay ? "true" : "false";
     vector<char> post_data;
-    OmahaRequestParams params("machine_id",
-                              "user_id",
-                              OmahaRequestParams::kOsPlatform,
+    OmahaRequestParams params(OmahaRequestParams::kOsPlatform,
                               OmahaRequestParams::kOsVersion,
                               "service_pack",
                               "x86-generic",
                               OmahaRequestParams::kAppId,
                               "0.1.0.0",
                               "en-US",
                               "unittest_track",
                               delta_okay,
                               "http://url");
     ASSERT_FALSE(TestUpdateCheck(NULL,  // prefs
@@ skipping 139 matching lines @@
                       "<updatecheck status=\"noupdate\"/></app></gupdate>",
                       kActionCodeSuccess,
                       NULL,
                       &post_data));
   string post_str(&post_data[0], post_data.size());
   EXPECT_EQ(post_str.find("o:ping"), string::npos);
 }
 
 TEST(OmahaRequestActionTest, LastPingDayUpdateTest) {
   // This test checks that the action updates the last ping day to now
-  // minus 200 seconds with a slack for 5 seconds. Therefore, the test
+  // minus 200 seconds with a slack of 5 seconds. Therefore, the test
   // may fail if it runs for longer than 5 seconds. It shouldn't run
   // that long though.
   int64_t midnight =
       (Time::Now() - TimeDelta::FromSeconds(200)).ToInternalValue();
   int64_t midnight_slack =
       (Time::Now() - TimeDelta::FromSeconds(195)).ToInternalValue();
   PrefsMock prefs;
   EXPECT_CALL(prefs, SetInt64(kPrefsLastActivePingDay,
                               AllOf(Ge(midnight), Le(midnight_slack))))
       .WillOnce(Return(true));
@@ skipping 40 matching lines @@
                       "<?xml version=\"1.0\" encoding=\"UTF-8\"?><gupdate "
                       "xmlns=\"http://www.google.com/update2/response\" "
                       "protocol=\"2.0\"><daystart elapsed_seconds=\"x\"/>"
                       "<app appid=\"foo\" status=\"ok\"><ping status=\"ok\"/>"
                       "<updatecheck status=\"noupdate\"/></app></gupdate>",
                       kActionCodeSuccess,
                       NULL,
                       NULL));
 }
 
+TEST(OmahaRequestActionTest, NoUniqueIDTest) {
+  vector<char> post_data;
+  ASSERT_FALSE(TestUpdateCheck(NULL,  // prefs
+                               kDefaultTestParams,
+                               "invalid xml>",
+                               kActionCodeError,
+                               NULL,  // response
+                               &post_data));
+  // convert post_data to string
+  string post_str(&post_data[0], post_data.size());
+  EXPECT_EQ(post_str.find("machineid="), string::npos);
+  EXPECT_EQ(post_str.find("userid="), string::npos);
+}
+
 }  // namespace chromeos_update_engine