Add a hardware_class attribute (for HWID, HWQual ID) to the Omaha request.

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 25 matching lines @@
 namespace {
 const OmahaRequestParams kDefaultTestParams(
     OmahaRequestParams::kOsPlatform,
     OmahaRequestParams::kOsVersion,
     "service_pack",
     "x86-generic",
     OmahaRequestParams::kAppId,
     "0.1.0.0",
     "en-US",
     "unittest",
+    "OEM MODEL 09235 7471",
     false,  // delta okay
     "http://url");
 
 string GetNoUpdateResponse(const string& app_id) {
   return string(
       "<?xml version=\"1.0\" encoding=\"UTF-8\"?><gupdate "
       "xmlns=\"http://www.google.com/update2/response\" protocol=\"2.0\"><app "
       "appid=\"") + app_id + "\" status=\"ok\"><ping "
       "status=\"ok\"/><updatecheck status=\"noupdate\"/></app></gupdate>";
 }
@@ skipping 349 matching lines @@
 
   // Make sure XML Encode is being called on the params
   OmahaRequestParams params(OmahaRequestParams::kOsPlatform,
                             OmahaRequestParams::kOsVersion,
                             "testtheservice_pack>",
                             "x86 generic<id",
                             OmahaRequestParams::kAppId,
                             "0.1.0.0",
                             "en-US",
                             "unittest_track&lt;",
+                            "<OEM MODEL>",
                             false,  // delta okay
                             "http://url");
   OmahaResponse response;
   ASSERT_FALSE(
       TestUpdateCheck(NULL,  // prefs
                       params,
                       "invalid xml>",
                       kActionCodeError,
                       &response,
                       &post_data));
   // convert post_data to string
   string post_str(&post_data[0], post_data.size());
   EXPECT_NE(post_str.find("testtheservice_pack&gt;"), string::npos);
   EXPECT_EQ(post_str.find("testtheservice_pack>"), string::npos);
   EXPECT_NE(post_str.find("x86 generic&lt;id"), string::npos);
   EXPECT_EQ(post_str.find("x86 generic<id"), string::npos);
   EXPECT_NE(post_str.find("unittest_track&amp;lt;"), string::npos);
   EXPECT_EQ(post_str.find("unittest_track&lt;"), string::npos);
+  EXPECT_NE(post_str.find("&lt;OEM MODEL&gt;"), string::npos);
+  EXPECT_EQ(post_str.find("<OEM MODEL>"), string::npos);
 }
 
 TEST(OmahaRequestActionTest, XmlDecodeTest) {
   OmahaResponse response;
   ASSERT_TRUE(
       TestUpdateCheck(NULL,  // prefs
                       kDefaultTestParams,
                       GetUpdateResponse(OmahaRequestParams::kAppId,
                                         "1.2.3.4",  // version
                                         "testthe&lt;url",  // more info
@@ skipping 37 matching lines @@
                                kDefaultTestParams,
                                "invalid xml>",
                                kActionCodeError,
                                NULL,  // response
                                &post_data));
   // convert post_data to string
   string post_str(&post_data[0], post_data.size());
   EXPECT_NE(post_str.find("        <o:ping a=\"-1\" r=\"-1\"></o:ping>\n"
                           "        <o:updatecheck></o:updatecheck>\n"),
             string::npos);
+  EXPECT_NE(post_str.find("hardware_class=\"OEM MODEL 09235 7471\""),
+            string::npos);
   EXPECT_EQ(post_str.find("o:event"), string::npos);
 }
 
 TEST(OmahaRequestActionTest, FormatSuccessEventOutputTest) {
   vector<char> post_data;
   TestEvent(kDefaultTestParams,
             new OmahaEvent(OmahaEvent::kTypeUpdateDownloadStarted),
             "invalid xml>",
             &post_data);
   // convert post_data to string
@@ skipping 73 matching lines @@
     const char* delta_okay_str = delta_okay ? "true" : "false";
     vector<char> post_data;
     OmahaRequestParams params(OmahaRequestParams::kOsPlatform,
                               OmahaRequestParams::kOsVersion,
                               "service_pack",
                               "x86-generic",
                               OmahaRequestParams::kAppId,
                               "0.1.0.0",
                               "en-US",
                               "unittest_track",
+                              "OEM MODEL REV 1234",
                               delta_okay,
                               "http://url");
     ASSERT_FALSE(TestUpdateCheck(NULL,  // prefs
                                  params,
                                  "invalid xml>",
                                  kActionCodeError,
                                  NULL,
                                  &post_data));
     // convert post_data to string
     string post_str(&post_data[0], post_data.size());
@@ skipping 208 matching lines @@
                                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