commit 84c763cffce6778711792944387fadb760c55c8d
author Darin Petkov <petkov@chromium.org> Thu Jul 29 16:27:58 2010 -0700
committer Darin Petkov <petkov@chromium.org> Thu Jul 29 16:27:58 2010 -0700
tree 86e4e3c87fcef5db78d247b2e2f2eb7bd2531a0a
parent 1cbd78ffe68039a5781c3434816e03e64033dc0b

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

Also add a unit test to make sure we are not sending machineid or userid
attributes.

BUG=1439
TEST=unit tests, gmerged on device, checked for update, looked at logs

Review URL: http://codereview.chromium.org/2808082

omaha_request_action_unittest.cc

diff --git a/omaha_request_action_unittest.cc b/omaha_request_action_unittest.cc
index 5ac0811..f4dcd1e 100755
--- a/omaha_request_action_unittest.cc
+++ b/omaha_request_action_unittest.cc
@@ -35,8 +35,6 @@
 
 namespace {
 const OmahaRequestParams kDefaultTestParams(
-    "machine_id",
-    "user_id",
     OmahaRequestParams::kOsPlatform,
     OmahaRequestParams::kOsVersion,
     "service_pack",
@@ -406,9 +404,7 @@
   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",
@@ -576,9 +572,7 @@
     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",
@@ -738,7 +732,7 @@
 
 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 =
@@ -799,4 +793,18 @@
                       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