AU: Many minor cleanup changes

src/platform/update_engine/update_check_action_unittest.cc

 // Copyright (c) 2009 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 <gtest/gtest.h>
 #include "update_engine/action_pipe.h"
 #include "update_engine/update_check_action.h"
@@ skipping 144 matching lines @@
 
 TEST(UpdateCheckActionTest, NoUpdateTest) {
   UpdateCheckParams params("",  // machine_id
                            "",  // user_id
                            UpdateCheckParams::kOsPlatform,
                            UpdateCheckParams::kOsVersion,
                            "",  // os_sp
                            UpdateCheckParams::kAppId,
                            "0.1.0.0",
                            "en-US",
-                           "unittest");
+                           "unittest",
+                           "");  // url
   UpdateCheckResponse response;
   ASSERT_TRUE(
       TestUpdateCheckAction(params,
                             GetNoUpdateResponse(UpdateCheckParams::kAppId),
                             true,
                             &response,
                             NULL));
   EXPECT_FALSE(response.update_exists);
 }
 
 TEST(UpdateCheckActionTest, ValidUpdateTest) {
   UpdateCheckParams params("machine_id",
                            "user_id",
                            UpdateCheckParams::kOsPlatform,
                            UpdateCheckParams::kOsVersion,
                            "service_pack",
                            UpdateCheckParams::kAppId,
                            "0.1.0.0",
                            "en-US",
-                           "unittest_track");
+                           "unittest_track",
+                           "");  // url
   UpdateCheckResponse response;
   ASSERT_TRUE(
       TestUpdateCheckAction(params,
                             GetUpdateResponse(UpdateCheckParams::kAppId,
                                               "1.2.3.4",  // version
                                               "http://more/info",
                                               "true",  // prompt
                                               "http://code/base",  // dl url
                                               "HASH1234=",  // checksum
                                               "false",  // needs admin
@@ skipping 13 matching lines @@
 
 TEST(UpdateCheckActionTest, NoOutputPipeTest) {
   UpdateCheckParams params("",  // machine_id
                            "",  // usr_id
                            UpdateCheckParams::kOsPlatform,
                            UpdateCheckParams::kOsVersion,
                            "",  // os_sp
                            UpdateCheckParams::kAppId,
                            "0.1.0.0",
                            "en-US",
-                           "unittest");
+                           "unittest",
+                           "");  // url
   const string http_response(GetNoUpdateResponse(UpdateCheckParams::kAppId));
 
   GMainLoop *loop = g_main_loop_new(g_main_context_default(), FALSE);
 
   ObjectFeederAction<UpdateCheckParams> feeder_action;
   feeder_action.set_obj(params);
   UpdateCheckAction action(new MockHttpFetcher(http_response.data(),
                                                http_response.size()));
   UpdateCheckActionTestProcessorDelegate delegate;
   delegate.loop_ = loop;
@@ skipping 11 matching lines @@
 
 TEST(UpdateCheckActionTest, InvalidXmlTest) {
   UpdateCheckParams params("machine_id",
                            "user_id",
                            UpdateCheckParams::kOsPlatform,
                            UpdateCheckParams::kOsVersion,
                            "service_pack",
                            UpdateCheckParams::kAppId,
                            "0.1.0.0",
                            "en-US",
-                           "unittest_track");
+                           "unittest_track",
+                           "http://url");
   UpdateCheckResponse response;
   ASSERT_FALSE(
       TestUpdateCheckAction(params,
                             "invalid xml>",
                             false,
                             &response,
                             NULL));
   EXPECT_FALSE(response.update_exists);
 }
 
 TEST(UpdateCheckActionTest, MissingStatusTest) {
   UpdateCheckParams params("machine_id",
                            "user_id",
                            UpdateCheckParams::kOsPlatform,
                            UpdateCheckParams::kOsVersion,
                            "service_pack",
                            UpdateCheckParams::kAppId,
                            "0.1.0.0",
                            "en-US",
-                           "unittest_track");
+                           "unittest_track",
+                           "http://url");
   UpdateCheckResponse response;
   ASSERT_FALSE(TestUpdateCheckAction(
       params,
       "<?xml version=\"1.0\" encoding=\"UTF-8\"?><gupdate "
       "xmlns=\"http://www.google.com/update2/response\" protocol=\"2.0\"><app "
       "appid=\"foo\" status=\"ok\"><ping "
       "status=\"ok\"/><updatecheck/></app></gupdate>",
       false,
       &response,
       NULL));
   EXPECT_FALSE(response.update_exists);
 }
 
 TEST(UpdateCheckActionTest, InvalidStatusTest) {
   UpdateCheckParams params("machine_id",
                            "user_id",
                            UpdateCheckParams::kOsPlatform,
                            UpdateCheckParams::kOsVersion,
                            "service_pack",
                            UpdateCheckParams::kAppId,
                            "0.1.0.0",
                            "en-US",
-                           "unittest_track");
+                           "unittest_track",
+                           "http://url");
   UpdateCheckResponse response;
   ASSERT_FALSE(TestUpdateCheckAction(
       params,
       "<?xml version=\"1.0\" encoding=\"UTF-8\"?><gupdate "
       "xmlns=\"http://www.google.com/update2/response\" protocol=\"2.0\"><app "
       "appid=\"foo\" status=\"ok\"><ping "
       "status=\"ok\"/><updatecheck status=\"foo\"/></app></gupdate>",
       false,
       &response,
       NULL));
   EXPECT_FALSE(response.update_exists);
 }
 
 TEST(UpdateCheckActionTest, MissingNodesetTest) {
   UpdateCheckParams params("machine_id",
                            "user_id",
                            UpdateCheckParams::kOsPlatform,
                            UpdateCheckParams::kOsVersion,
                            "service_pack",
                            UpdateCheckParams::kAppId,
                            "0.1.0.0",
                            "en-US",
-                           "unittest_track");
+                           "unittest_track",
+                           "http://url");
   UpdateCheckResponse response;
   ASSERT_FALSE(TestUpdateCheckAction(
       params,
       "<?xml version=\"1.0\" encoding=\"UTF-8\"?><gupdate "
       "xmlns=\"http://www.google.com/update2/response\" protocol=\"2.0\"><app "
       "appid=\"foo\" status=\"ok\"><ping "
       "status=\"ok\"/></app></gupdate>",
       false,
       &response,
       NULL));
   EXPECT_FALSE(response.update_exists);
 }
 
 TEST(UpdateCheckActionTest, MissingFieldTest) {
   UpdateCheckParams params("machine_id",
                            "user_id",
                            UpdateCheckParams::kOsPlatform,
                            UpdateCheckParams::kOsVersion,
                            "service_pack",
                            UpdateCheckParams::kAppId,
                            "0.1.0.0",
                            "en-US",
-                           "unittest_track");
+                           "unittest_track",
+                           "http://url");
   UpdateCheckResponse response;
   ASSERT_TRUE(TestUpdateCheckAction(params,
                                     string("<?xml version=\"1.0\" "
                                            "encoding=\"UTF-8\"?><gupdate "
                                            "xmlns=\"http://www.google.com/"
                                            "update2/response\" "
                                            "protocol=\"2.0\"><app  appid=\"") +
                                     UpdateCheckParams::kAppId
                                     + "\" status=\"ok\"><ping "
                                     "status=\"ok\"/><updatecheck "
@@ skipping 37 matching lines @@
 
 TEST(UpdateCheckActionTest, TerminateTransferTest) {
   UpdateCheckParams params("",  // machine_id
                            "",  // usr_id
                            UpdateCheckParams::kOsPlatform,
                            UpdateCheckParams::kOsVersion,
                            "",  // os_sp
                            UpdateCheckParams::kAppId,
                            "0.1.0.0",
                            "en-US",
-                           "unittest");
+                           "unittest",
+                           "http://url");
   string http_response("doesn't matter");
   GMainLoop *loop = g_main_loop_new(g_main_context_default(), FALSE);
 
   ObjectFeederAction<UpdateCheckParams> feeder_action;
   feeder_action.set_obj(params);
   UpdateCheckAction action(new MockHttpFetcher(http_response.data(),
                                                http_response.size()));
   TerminateEarlyTestProcessorDelegate delegate;
   delegate.loop_ = loop;
   ActionProcessor processor;
@@ skipping 18 matching lines @@
 
   // Make sure XML Encode is being called on the params
   UpdateCheckParams params("testthemachine<id",
                            "testtheuser_id&lt;",
                            UpdateCheckParams::kOsPlatform,
                            UpdateCheckParams::kOsVersion,
                            "testtheservice_pack>",
                            UpdateCheckParams::kAppId,
                            "0.1.0.0",
                            "en-US",
-                           "unittest_track");
+                           "unittest_track",
+                           "http://url");
   UpdateCheckResponse response;
   ASSERT_FALSE(
       TestUpdateCheckAction(params,
                             "invalid xml>",
                             false,
                             &response,
                             &post_data));
   // convert post_data to string
   string post_str(&post_data[0], post_data.size());
   EXPECT_NE(post_str.find("testthemachine&lt;id"), string::npos);
   EXPECT_EQ(post_str.find("testthemachine<id"), string::npos);
   EXPECT_NE(post_str.find("testtheuser_id&amp;lt;"), string::npos);
   EXPECT_EQ(post_str.find("testtheuser_id&lt;"), string::npos);
   EXPECT_NE(post_str.find("testtheservice_pack&gt;"), string::npos);
   EXPECT_EQ(post_str.find("testtheservice_pack>"), string::npos);
 }
 
 TEST(UpdateCheckActionTest, XmlDecodeTest) {
   UpdateCheckParams params("machine_id",
                            "user_id",
                            UpdateCheckParams::kOsPlatform,
                            UpdateCheckParams::kOsVersion,
                            "service_pack",
                            UpdateCheckParams::kAppId,
                            "0.1.0.0",
                            "en-US",
-                           "unittest_track");
+                           "unittest_track",
+                           "http://url");
   UpdateCheckResponse response;
   ASSERT_TRUE(
       TestUpdateCheckAction(params,
                             GetUpdateResponse(UpdateCheckParams::kAppId,
                                               "1.2.3.4",  // version
                                               "testthe&lt;url",  // more info
                                               "true",  // prompt
                                               "testthe&amp;codebase",  // dl url
                                               "HASH1234=", // checksum
                                               "false",  // needs admin
                                               "123"),  // size
                             true,
                             &response,
                             NULL));
 
   EXPECT_EQ(response.more_info_url, "testthe<url");
   EXPECT_EQ(response.codebase, "testthe&codebase");
 }
 
 TEST(UpdateCheckActionTest, ParseIntTest) {
   UpdateCheckParams params("machine_id",
                            "user_id",
                            UpdateCheckParams::kOsPlatform,
                            UpdateCheckParams::kOsVersion,
                            "service_pack",
                            UpdateCheckParams::kAppId,
                            "0.1.0.0",
                            "en-US",
-                           "unittest_track");
+                           "unittest_track",
+                           "http://url");
   UpdateCheckResponse response;
   ASSERT_TRUE(
       TestUpdateCheckAction(params,
                             GetUpdateResponse(UpdateCheckParams::kAppId,
                                               "1.2.3.4",  // version
                                               "theurl",  // more info
                                               "true",  // prompt
                                               "thecodebase",  // dl url
                                               "HASH1234=", // checksum
                                               "false",  // needs admin
                                               // overflows int32:
                                               "123123123123123"),  // size
                             true,
                             &response,
                             NULL));
 
   EXPECT_EQ(response.size, 123123123123123ll);
 }
 
 }  // namespace chromeos_update_engine