Manage versioned fields correctly in GlueSerializeTest.

webkit/glue/glue_serialize_unittest.cc

 // Copyright (c) 2012 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 <string>
 
 #include "base/pickle.h"
 #include "base/string_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebHTTPBody.h"
@@ skipping 44 matching lines @@
     item.setURLString(WebString::fromUTF8("urlString"));
     item.setOriginalURLString(WebString::fromUTF8("originalURLString"));
     item.setTarget(WebString::fromUTF8("target"));
     item.setParent(WebString::fromUTF8("parent"));
     item.setTitle(WebString::fromUTF8("title"));
     item.setAlternateTitle(WebString::fromUTF8("alternateTitle"));
     item.setLastVisitedTime(13.37);
     item.setScrollOffset(WebPoint(42, -42));
     item.setIsTargetItem(true);
     item.setVisitCount(42*42);
+    item.setPageScaleFactor(2.0f);
+    item.setItemSequenceNumber(123);
+    item.setDocumentSequenceNumber(456);
 
     WebVector<WebString> document_state(size_t(3));
     document_state[0] = WebString::fromUTF8("state1");
     document_state[1] = WebString::fromUTF8("state2");
     document_state[2] = WebString::fromUTF8("state AWESOME");
     item.setDocumentState(document_state);
-    item.setPageScaleFactor(1.0f);
 
     // Form Data
     if (with_form_data) {
       item.setHTTPBody(MakeFormData());
       item.setHTTPContentType(WebString::fromUTF8("formContentType"));
     }
 
     // Setting the FormInfo causes the referrer to be set, so we set the
     // referrer after setting the form info.
     item.setReferrer(WebString::fromUTF8("referrer"));
 
     // Children
     if (pregnant)
       item.appendToChildren(MakeHistoryItem(false, false));
 
     return item;
   }
 
   WebHistoryItem MakeHistoryItemWithPasswordData(bool pregnant) {
     WebHistoryItem item = MakeHistoryItem(false, pregnant);
     item.setHTTPBody(MakeFormDataWithPasswords());
     item.setHTTPContentType(WebString::fromUTF8("formContentType"));
     return item;
   }
 
   // Checks that a == b.
   void HistoryItemExpectEqual(const WebHistoryItem& a,
-                              const WebHistoryItem& b) {
-    HistoryItemExpectBaseDataEqual(a, b);
+                              const WebHistoryItem& b,
+                              int version) {
+    HistoryItemExpectBaseDataEqual(a, b, version);
     HistoryItemExpectFormDataEqual(a, b);
     HistoryItemExpectChildrenEqual(a, b);
   }
 
   void HistoryItemExpectBaseDataEqual(const WebHistoryItem& a,
-                                      const WebHistoryItem& b) {
+                                      const WebHistoryItem& b,
+                                      int version) {
     EXPECT_EQ(string16(a.urlString()), string16(b.urlString()));
     EXPECT_EQ(string16(a.originalURLString()), string16(b.originalURLString()));
     EXPECT_EQ(string16(a.target()), string16(b.target()));
     EXPECT_EQ(string16(a.parent()), string16(b.parent()));
     EXPECT_EQ(string16(a.title()), string16(b.title()));
     EXPECT_EQ(string16(a.alternateTitle()), string16(b.alternateTitle()));
     EXPECT_EQ(a.lastVisitedTime(), b.lastVisitedTime());
     EXPECT_EQ(a.scrollOffset(), b.scrollOffset());
     EXPECT_EQ(a.isTargetItem(), b.isTargetItem());
     EXPECT_EQ(a.visitCount(), b.visitCount());
     EXPECT_EQ(string16(a.referrer()), string16(b.referrer()));
-    EXPECT_EQ(a.pageScaleFactor(), b.pageScaleFactor());
+    if (version >= 11)
+      EXPECT_EQ(a.pageScaleFactor(), b.pageScaleFactor());
+    if (version >= 9)
+      EXPECT_EQ(a.itemSequenceNumber(), b.itemSequenceNumber());
+    if (version >= 6)
+      EXPECT_EQ(a.documentSequenceNumber(), b.documentSequenceNumber());
 
     const WebVector<WebString>& a_docstate = a.documentState();
     const WebVector<WebString>& b_docstate = b.documentState();
     EXPECT_EQ(a_docstate.size(), b_docstate.size());
     for (size_t i = 0, c = a_docstate.size(); i < c; ++i)
       EXPECT_EQ(string16(a_docstate[i]), string16(b_docstate[i]));
   }
 
   void HistoryItemExpectFormDataEqual(const WebHistoryItem& a,
                                       const WebHistoryItem& b) {
@@ skipping 17 matching lines @@
     }
     EXPECT_EQ(string16(a.httpContentType()), string16(b.httpContentType()));
   }
 
   void HistoryItemExpectChildrenEqual(const WebHistoryItem& a,
                                       const WebHistoryItem& b) {
     const WebVector<WebHistoryItem>& a_children = a.children();
     const WebVector<WebHistoryItem>& b_children = b.children();
     EXPECT_EQ(a_children.size(), b_children.size());
     for (size_t i = 0, c = a_children.size(); i < c; ++i)
-      HistoryItemExpectEqual(a_children[i], b_children[i]);
+      HistoryItemExpectEqual(a_children[i], b_children[i],
+                             webkit_glue::HistoryItemCurrentVersion());
   }
 };
 
 // Test old versions of serialized data to ensure that newer versions of code
 // can still read history items written by previous versions.
 TEST_F(GlueSerializeTest, BackwardsCompatibleTest) {
   const WebHistoryItem& item = MakeHistoryItem(false, false);
 
-  // Make sure version 12 (current version) can read versions 1 through 11.
-  for (int i = 1; i <= 11; i++) {
+  // Make sure current version can read all previous versions.
+  for (int i = 1; i < webkit_glue::HistoryItemCurrentVersion(); i++) {
     std::string serialized_item;
     webkit_glue::HistoryItemToVersionedString(item, i, &serialized_item);
     const WebHistoryItem& deserialized_item =
         webkit_glue::HistoryItemFromString(serialized_item);
     ASSERT_FALSE(item.isNull());
     ASSERT_FALSE(deserialized_item.isNull());
-    HistoryItemExpectEqual(item, deserialized_item);
+    HistoryItemExpectEqual(item, deserialized_item, i);
   }
 }
 
 // Makes sure that a HistoryItem remains intact after being serialized and
 // deserialized.
 TEST_F(GlueSerializeTest, HistoryItemSerializeTest) {
   const WebHistoryItem& item = MakeHistoryItem(true, true);
   const std::string& serialized_item = webkit_glue::HistoryItemToString(item);
   const WebHistoryItem& deserialized_item =
       webkit_glue::HistoryItemFromString(serialized_item);
 
   ASSERT_FALSE(item.isNull());
   ASSERT_FALSE(deserialized_item.isNull());
-  HistoryItemExpectEqual(item, deserialized_item);
+  HistoryItemExpectEqual(item, deserialized_item,
+                         webkit_glue::HistoryItemCurrentVersion());
 }
 
 // Checks that broken messages don't take out our process.
 TEST_F(GlueSerializeTest, BadMessagesTest) {
   {
     Pickle p;
     // Version 1
     p.WriteInt(1);
     // Empty strings.
     for (int i = 0; i < 6; ++i)
@@ skipping 31 matching lines @@
   const WebHistoryItem& item1 = MakeHistoryItem(true, true);
   std::string serialized_item = webkit_glue::HistoryItemToString(item1);
   serialized_item =
       webkit_glue::RemoveFormDataFromHistoryState(serialized_item);
   const WebHistoryItem& item2 =
       webkit_glue::HistoryItemFromString(serialized_item);
 
   ASSERT_FALSE(item1.isNull());
   ASSERT_FALSE(item2.isNull());
 
-  HistoryItemExpectBaseDataEqual(item1, item2);
+  HistoryItemExpectBaseDataEqual(item1, item2,
+                                 webkit_glue::HistoryItemCurrentVersion());
   HistoryItemExpectChildrenEqual(item1, item2);
 
   // Form data was removed, but the identifier was kept.
   const WebHTTPBody& body1 = item1.httpBody();
   const WebHTTPBody& body2 = item2.httpBody();
   EXPECT_FALSE(body1.isNull());
   EXPECT_FALSE(body2.isNull());
   EXPECT_GT(body1.elementCount(), 0U);
   EXPECT_EQ(0U, body2.elementCount());
   EXPECT_EQ(body1.identifier(), body2.identifier());
@@ skipping 22 matching lines @@
 // Makes sure that a HistoryItem containing password data remains intact after
 // being serialized and deserialized.
 TEST_F(GlueSerializeTest, HistoryItemWithPasswordsSerializeTest) {
   const WebHistoryItem& item = MakeHistoryItemWithPasswordData(true);
   const std::string& serialized_item = webkit_glue::HistoryItemToString(item);
   const WebHistoryItem& deserialized_item =
       webkit_glue::HistoryItemFromString(serialized_item);
 
   ASSERT_FALSE(item.isNull());
   ASSERT_FALSE(deserialized_item.isNull());
-  HistoryItemExpectEqual(item, deserialized_item);
+  HistoryItemExpectEqual(item, deserialized_item,
+                         webkit_glue::HistoryItemCurrentVersion());
 }
 
 TEST_F(GlueSerializeTest, RemovePasswordData) {
   const WebHistoryItem& item1 = MakeHistoryItemWithPasswordData(true);
   std::string serialized_item = webkit_glue::HistoryItemToString(item1);
   serialized_item =
       webkit_glue::RemovePasswordDataFromHistoryState(serialized_item);
   const WebHistoryItem& item2 =
       webkit_glue::HistoryItemFromString(serialized_item);
 
   ASSERT_FALSE(item1.isNull());
   ASSERT_FALSE(item2.isNull());
 
-  HistoryItemExpectBaseDataEqual(item1, item2);
+  HistoryItemExpectBaseDataEqual(item1, item2,
+                                 webkit_glue::HistoryItemCurrentVersion());
   HistoryItemExpectChildrenEqual(item1, item2);
 
   // Form data was removed, but the identifier was kept.
   const WebHTTPBody& body1 = item1.httpBody();
   const WebHTTPBody& body2 = item2.httpBody();
   EXPECT_FALSE(body1.isNull());
   EXPECT_FALSE(body2.isNull());
   EXPECT_GT(body1.elementCount(), 0U);
   EXPECT_EQ(0U, body2.elementCount());
   EXPECT_EQ(body1.identifier(), body2.identifier());
 }
 
 TEST_F(GlueSerializeTest, RemovePasswordDataWithNoPasswordData) {
   const WebHistoryItem& item1 = MakeHistoryItem(true, true);
   std::string serialized_item = webkit_glue::HistoryItemToString(item1);
   serialized_item =
       webkit_glue::RemovePasswordDataFromHistoryState(serialized_item);
   const WebHistoryItem& item2 =
       webkit_glue::HistoryItemFromString(serialized_item);
 
   ASSERT_FALSE(item1.isNull());
   ASSERT_FALSE(item2.isNull());
 
   // Form data was not removed.
-  HistoryItemExpectEqual(item1, item2);
+  HistoryItemExpectEqual(item1, item2,
+                         webkit_glue::HistoryItemCurrentVersion());
 }
 
 }  // namespace