Mechanical refactoring of the parser and ActionUpdateCheck

components/update_client/update_response_unittest.cc

 // Copyright 2013 The Chromium 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 "components/update_client/update_response.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace update_client {
 
 const char* kValidXml =
@@ skipping 186 matching lines @@
     " <app appid='12345'>"
     "  <updatecheck status='noupdate'/>"
     " </app>"
     "</response>";
 
 // Includes two <app> tags, one with an error.
 const char* kTwoAppsOneError =
     "<?xml version='1.0' encoding='UTF-8'?>"
     "<response protocol='3.0'>"
     " <app appid='aaaaaaaa' status='error-unknownApplication'>"
-    "  <updatecheck status='error-unknownapplication'/>"
+    "  <updatecheck status='error-internal'/>"
     " </app>"
     " <app appid='bbbbbbbb'>"
     "   <updatecheck status='ok'>"
     "     <urls>"
     "       <url codebase='http://example.com/'/>"
     "     </urls>"
     "     <manifest version='1.2.3.4' prodversionmin='2.0.143.0'>"
     "       <packages>"
     "         <package name='extension_1_2_3_4.crx'/>"
     "       </packages>"
@@ skipping 52 matching lines @@
 
   EXPECT_TRUE(parser.Parse(kInvalidValidXmlMissingManifest));
   EXPECT_TRUE(parser.results().list.empty());
   EXPECT_FALSE(parser.errors().empty());
 
   // Parse some valid XML, and check that all params came out as expected
   EXPECT_TRUE(parser.Parse(kValidXml));
   EXPECT_TRUE(parser.errors().empty());
   EXPECT_EQ(1u, parser.results().list.size());
   const UpdateResponse::Result* firstResult = &parser.results().list[0];
+  EXPECT_STREQ("ok", firstResult->status.c_str());
   EXPECT_EQ(1u, firstResult->crx_urls.size());
   EXPECT_EQ(GURL("http://example.com/"), firstResult->crx_urls[0]);
   EXPECT_EQ(GURL("http://diff.example.com/"), firstResult->crx_diffurls[0]);
   EXPECT_EQ("1.2.3.4", firstResult->manifest.version);
   EXPECT_EQ("2.0.143.0", firstResult->manifest.browser_min_version);
   EXPECT_EQ(1u, firstResult->manifest.packages.size());
   EXPECT_EQ("extension_1_2_3_4.crx", firstResult->manifest.packages[0].name);
 
   // Parse some xml that uses namespace prefixes.
   EXPECT_TRUE(parser.Parse(kUsesNamespacePrefix));
@@ skipping 27 matching lines @@
   EXPECT_TRUE(parser.Parse(kWithDaystart));
   EXPECT_TRUE(parser.errors().empty());
   EXPECT_FALSE(parser.results().list.empty());
   EXPECT_EQ(parser.results().daystart_elapsed_seconds, 456);
 
   // Parse a no-update response.
   EXPECT_TRUE(parser.Parse(kNoUpdate));
   EXPECT_TRUE(parser.errors().empty());
   EXPECT_FALSE(parser.results().list.empty());
   firstResult = &parser.results().list[0];
+  EXPECT_STREQ("noupdate", firstResult->status.c_str());
   EXPECT_EQ(firstResult->extension_id, "12345");
   EXPECT_EQ(firstResult->manifest.version, "");
 
   // Parse xml with one error and one success <app> tag.
   EXPECT_TRUE(parser.Parse(kTwoAppsOneError));
   EXPECT_FALSE(parser.errors().empty());
   EXPECT_EQ(1u, parser.results().list.size());
   firstResult = &parser.results().list[0];
   EXPECT_EQ(firstResult->extension_id, "bbbbbbbb");
+  EXPECT_STREQ("ok", firstResult->status.c_str());
+  EXPECT_EQ("1.2.3.4", firstResult->manifest.version);
 
   // Parse xml with two apps setting the cohort info.
   EXPECT_TRUE(parser.Parse(kTwoAppsSetCohort));
   EXPECT_TRUE(parser.errors().empty());
   EXPECT_EQ(2u, parser.results().list.size());
   firstResult = &parser.results().list[0];
   EXPECT_EQ(firstResult->extension_id, "aaaaaaaa");
   EXPECT_NE(firstResult->cohort_attrs.find("cohort"),
             firstResult->cohort_attrs.end());
   EXPECT_EQ(firstResult->cohort_attrs.find("cohort")->second, "1:2q3/");
   EXPECT_EQ(firstResult->cohort_attrs.find("cohortname"),
             firstResult->cohort_attrs.end());
   EXPECT_EQ(firstResult->cohort_attrs.find("cohorthint"),
             firstResult->cohort_attrs.end());
   const UpdateResponse::Result* secondResult = &parser.results().list[1];
   EXPECT_EQ(secondResult->extension_id, "bbbbbbbb");
   EXPECT_NE(secondResult->cohort_attrs.find("cohort"),
             secondResult->cohort_attrs.end());
   EXPECT_EQ(secondResult->cohort_attrs.find("cohort")->second, "1:33z@0.33");
   EXPECT_NE(secondResult->cohort_attrs.find("cohortname"),
             secondResult->cohort_attrs.end());
   EXPECT_EQ(secondResult->cohort_attrs.find("cohortname")->second, "cname");
   EXPECT_EQ(secondResult->cohort_attrs.find("cohorthint"),
             secondResult->cohort_attrs.end());
 }
 
 }  // namespace update_client