update engine: 32- and 64-bit compile

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 75 matching lines @@
 class ActionTraits<OutputObjectCollectorAction> {
  public:
   // Does not take an object for input
   typedef UpdateCheckResponse InputObjectType;
   // On success, puts the output path on output
   typedef NoneType OutputObjectType;
 };
 
 class OutputObjectCollectorAction : public Action<OutputObjectCollectorAction> {
  public:
+  OutputObjectCollectorAction() : has_input_object_(false) {}
   void PerformAction() {
     // copy input object
     has_input_object_ = HasInputObject();
     if (has_input_object_)
       update_check_response_ = GetInputObject();
     processor_->ActionComplete(this, true);
   }
   // Should never be called
   void TerminateProcessing() {
     CHECK(false);
@@ skipping 136 matching lines @@
   UpdateCheckParams params("machine_id",
                            "user_id",
                            UpdateCheckParams::kOsPlatform,
                            UpdateCheckParams::kOsVersion,
                            "service_pack",
                            UpdateCheckParams::kAppId,
                            "0.1.0.0",
                            "en-US",
                            "unittest_track");
   UpdateCheckResponse response;
-  ASSERT_TRUE(
+  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");
   UpdateCheckResponse response;
-  ASSERT_TRUE(TestUpdateCheckAction(
+  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");
   UpdateCheckResponse response;
-  ASSERT_TRUE(TestUpdateCheckAction(
+  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");
   UpdateCheckResponse response;
-  ASSERT_TRUE(TestUpdateCheckAction(
+  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);
 }
@@ skipping 99 matching lines @@
   UpdateCheckParams params("testthemachine<id",
                            "testtheuser_id&lt;",
                            UpdateCheckParams::kOsPlatform,
                            UpdateCheckParams::kOsVersion,
                            "testtheservice_pack>",
                            UpdateCheckParams::kAppId,
                            "0.1.0.0",
                            "en-US",
                            "unittest_track");
   UpdateCheckResponse response;
-  ASSERT_TRUE(
+  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);
@@ skipping 54 matching lines @@
                                               // overflows int32:
                                               "123123123123123"),  // size
                             true,
                             &response,
                             NULL));
 
   EXPECT_EQ(response.size, 123123123123123ll);
 }
 
 }  // namespace chromeos_update_engine