Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(913)

Unified Diff: components/sessions/session_types_unittest.cc

Issue 1361613002: Move all core files in //components/sessions into core/ subdir (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/sessions/session_types.cc ('k') | components/sessions/sessions_export.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sessions/session_types_unittest.cc
diff --git a/components/sessions/session_types_unittest.cc b/components/sessions/session_types_unittest.cc
deleted file mode 100644
index 5c1a44cc1eccf1e1dbc9fb59bba2dc3ac8fcabb0..0000000000000000000000000000000000000000
--- a/components/sessions/session_types_unittest.cc
+++ /dev/null
@@ -1,123 +0,0 @@
-// Copyright 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 "components/sessions/session_types.h"
-
-#include <cstddef>
-#include <string>
-
-#include "base/basictypes.h"
-#include "base/strings/string_number_conversions.h"
-#include "base/strings/utf_string_conversions.h"
-#include "base/time/time.h"
-#include "components/sessions/serialized_navigation_entry_test_helper.h"
-#include "sync/protocol/session_specifics.pb.h"
-#include "sync/util/time.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/page_transition_types.h"
-#include "url/gurl.h"
-
-namespace {
-
-// Create a typical SessionTab protocol buffer and set an existing
-// SessionTab from it. The data from the protocol buffer should
-// clobber the existing data.
-TEST(SessionTab, FromSyncData) {
- sync_pb::SessionTab sync_data;
- sync_data.set_tab_id(5);
- sync_data.set_window_id(10);
- sync_data.set_tab_visual_index(13);
- sync_data.set_current_navigation_index(3);
- sync_data.set_pinned(true);
- sync_data.set_extension_app_id("app_id");
- for (int i = 0; i < 5; ++i) {
- sync_pb::TabNavigation* navigation = sync_data.add_navigation();
- navigation->set_virtual_url("http://foo/" + base::IntToString(i));
- navigation->set_referrer("referrer");
- navigation->set_title("title");
- navigation->set_page_transition(sync_pb::SyncEnums_PageTransition_TYPED);
- }
- sync_data.add_variation_id(3312238);
- sync_data.add_variation_id(3312242);
-
- sessions::SessionTab tab;
- tab.window_id.set_id(100);
- tab.tab_id.set_id(100);
- tab.tab_visual_index = 100;
- tab.current_navigation_index = 1000;
- tab.pinned = false;
- tab.extension_app_id = "fake";
- tab.user_agent_override = "fake";
- tab.timestamp = base::Time::FromInternalValue(100);
- tab.navigations.resize(100);
- tab.session_storage_persistent_id = "fake";
-
- tab.SetFromSyncData(sync_data, base::Time::FromInternalValue(5u));
- EXPECT_EQ(10, tab.window_id.id());
- EXPECT_EQ(5, tab.tab_id.id());
- EXPECT_EQ(13, tab.tab_visual_index);
- EXPECT_EQ(3, tab.current_navigation_index);
- EXPECT_TRUE(tab.pinned);
- EXPECT_EQ("app_id", tab.extension_app_id);
- EXPECT_TRUE(tab.user_agent_override.empty());
- EXPECT_EQ(5u, tab.timestamp.ToInternalValue());
- ASSERT_EQ(5u, tab.navigations.size());
- for (int i = 0; i < 5; ++i) {
- EXPECT_EQ(i, tab.navigations[i].index());
- EXPECT_EQ(GURL("referrer"), tab.navigations[i].referrer_url());
- EXPECT_EQ(base::ASCIIToUTF16("title"),tab.navigations[i].title());
- EXPECT_EQ(ui::PAGE_TRANSITION_TYPED,
- tab.navigations[i].transition_type());
- EXPECT_EQ(GURL("http://foo/" + base::IntToString(i)),
- tab.navigations[i].virtual_url());
- }
- ASSERT_EQ(2u, tab.variation_ids.size());
- EXPECT_EQ(3312238, tab.variation_ids[0]);
- EXPECT_EQ(3312242, tab.variation_ids[1]);
- EXPECT_TRUE(tab.session_storage_persistent_id.empty());
-}
-
-TEST(SessionTab, ToSyncData) {
- sessions::SessionTab tab;
- tab.window_id.set_id(10);
- tab.tab_id.set_id(5);
- tab.tab_visual_index = 13;
- tab.current_navigation_index = 3;
- tab.pinned = true;
- tab.extension_app_id = "app_id";
- tab.user_agent_override = "fake";
- tab.timestamp = base::Time::FromInternalValue(100);
- for (int i = 0; i < 5; ++i) {
- tab.navigations.push_back(
- sessions::SerializedNavigationEntryTestHelper::CreateNavigation(
- "http://foo/" + base::IntToString(i), "title"));
- }
- tab.session_storage_persistent_id = "fake";
- tab.variation_ids.push_back(3312238);
- tab.variation_ids.push_back(3312242);
-
- const sync_pb::SessionTab& sync_data = tab.ToSyncData();
- EXPECT_EQ(5, sync_data.tab_id());
- EXPECT_EQ(10, sync_data.window_id());
- EXPECT_EQ(13, sync_data.tab_visual_index());
- EXPECT_EQ(3, sync_data.current_navigation_index());
- EXPECT_TRUE(sync_data.pinned());
- EXPECT_EQ("app_id", sync_data.extension_app_id());
- ASSERT_EQ(5, sync_data.navigation_size());
- for (int i = 0; i < 5; ++i) {
- EXPECT_EQ(tab.navigations[i].virtual_url().spec(),
- sync_data.navigation(i).virtual_url());
- EXPECT_EQ(base::UTF16ToUTF8(tab.navigations[i].title()),
- sync_data.navigation(i).title());
- }
- EXPECT_FALSE(sync_data.has_favicon());
- EXPECT_FALSE(sync_data.has_favicon_type());
- EXPECT_FALSE(sync_data.has_favicon_source());
-
- ASSERT_EQ(2, sync_data.variation_id_size());
- EXPECT_EQ(3312238u, sync_data.variation_id(0));
- EXPECT_EQ(3312242u, sync_data.variation_id(1));
-}
-
-} // namespace
« no previous file with comments | « components/sessions/session_types.cc ('k') | components/sessions/sessions_export.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698