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

Unified Diff: chrome/browser/sync/glue/extension_data_unittest.cc

Issue 6902054: [Sync] Rip out overly-complicated ExtensionData class (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed asargent's comments Created 9 years, 8 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 | « chrome/browser/sync/glue/extension_data.cc ('k') | chrome/browser/sync/glue/extension_model_associator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/glue/extension_data_unittest.cc
diff --git a/chrome/browser/sync/glue/extension_data_unittest.cc b/chrome/browser/sync/glue/extension_data_unittest.cc
deleted file mode 100644
index a5fdddd06af1e2336cb90dcd81aa8a1598ff1d9c..0000000000000000000000000000000000000000
--- a/chrome/browser/sync/glue/extension_data_unittest.cc
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright (c) 2010 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 "chrome/browser/sync/glue/extension_data.h"
-
-#include "chrome/browser/sync/glue/extension_util.h"
-#include "chrome/browser/sync/protocol/extension_specifics.pb.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace browser_sync {
-
-namespace {
-
-class ExtensionDataTest : public testing::Test {
-};
-
-const char kValidId[] = "abcdefghijklmnopabcdefghijklmnop";
-const char kValidUpdateUrl1[] = "http://www.google.com";
-const char kValidUpdateUrl2[] = "http://www.bing.com";
-const char kValidVersion1[] = "1.0.0.0";
-const char kValidVersion2[] = "1.1.0.0";
-
-TEST_F(ExtensionDataTest, FromData) {
- sync_pb::ExtensionSpecifics client_data;
- client_data.set_id(kValidId);
- client_data.set_update_url(kValidUpdateUrl1);
- client_data.set_version(kValidVersion1);
- ExtensionData extension_data =
- ExtensionData::FromData(ExtensionData::CLIENT, client_data);
- EXPECT_FALSE(extension_data.NeedsUpdate(ExtensionData::CLIENT));
- EXPECT_TRUE(extension_data.NeedsUpdate(ExtensionData::SERVER));
- EXPECT_TRUE(AreExtensionSpecificsEqual(
- client_data, extension_data.merged_data()));
-}
-
-TEST_F(ExtensionDataTest, SetData) {
- sync_pb::ExtensionSpecifics client_data;
- client_data.set_id(kValidId);
- client_data.set_update_url(kValidUpdateUrl1);
- client_data.set_version(kValidVersion1);
- ExtensionData extension_data =
- ExtensionData::FromData(ExtensionData::CLIENT, client_data);
-
- {
- sync_pb::ExtensionSpecifics server_data;
- server_data.set_id(kValidId);
- server_data.set_update_url(kValidUpdateUrl2);
- server_data.set_version(kValidVersion2);
- server_data.set_enabled(true);
- extension_data.SetData(ExtensionData::SERVER, false, server_data);
- EXPECT_TRUE(extension_data.NeedsUpdate(ExtensionData::CLIENT));
- EXPECT_TRUE(extension_data.NeedsUpdate(ExtensionData::SERVER));
- }
-
- {
- sync_pb::ExtensionSpecifics server_data;
- server_data.set_id(kValidId);
- server_data.set_update_url(kValidUpdateUrl2);
- server_data.set_version(kValidVersion2);
- server_data.set_enabled(true);
- extension_data.SetData(ExtensionData::SERVER, true, server_data);
- EXPECT_TRUE(extension_data.NeedsUpdate(ExtensionData::CLIENT));
- EXPECT_FALSE(extension_data.NeedsUpdate(ExtensionData::SERVER));
- EXPECT_TRUE(AreExtensionSpecificsEqual(
- server_data, extension_data.merged_data()));
- }
-}
-
-TEST_F(ExtensionDataTest, ResolveData) {
- sync_pb::ExtensionSpecifics client_data;
- client_data.set_id(kValidId);
- client_data.set_update_url(kValidUpdateUrl1);
- client_data.set_version(kValidVersion1);
- ExtensionData extension_data =
- ExtensionData::FromData(ExtensionData::CLIENT, client_data);
-
- sync_pb::ExtensionSpecifics server_data;
- server_data.set_id(kValidId);
- server_data.set_update_url(kValidUpdateUrl2);
- server_data.set_version(kValidVersion2);
- extension_data.SetData(ExtensionData::SERVER, true, server_data);
-
- extension_data.ResolveData(ExtensionData::CLIENT);
- EXPECT_FALSE(extension_data.NeedsUpdate(ExtensionData::CLIENT));
- EXPECT_FALSE(extension_data.NeedsUpdate(ExtensionData::SERVER));
- EXPECT_TRUE(AreExtensionSpecificsEqual(
- server_data, extension_data.merged_data()));
-}
-
-} // namespace
-
-} // namespace browser_sync
« no previous file with comments | « chrome/browser/sync/glue/extension_data.cc ('k') | chrome/browser/sync/glue/extension_model_associator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698