| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/extensions/extension_prefs_unittest.h" | 5 #include "chrome/browser/extensions/extension_prefs_unittest.h" |
| 6 #include "chrome/browser/extensions/extension_sorting.h" | 6 #include "chrome/browser/extensions/extension_sorting.h" |
| 7 #include "chrome/common/extensions/extension_constants.h" | 7 #include "chrome/common/extensions/extension_constants.h" |
| 8 #include "testing/gtest/include/gtest/gtest.h" | 8 #include "testing/gtest/include/gtest/gtest.h" |
| 9 | 9 |
| 10 namespace keys = extension_manifest_keys; | 10 namespace keys = extension_manifest_keys; |
| (...skipping 502 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 513 EXPECT_TRUE(extension_sorting->GetPageOrdinal(ext4_->id()).Equal( | 513 EXPECT_TRUE(extension_sorting->GetPageOrdinal(ext4_->id()).Equal( |
| 514 first_ordinal_)); | 514 first_ordinal_)); |
| 515 } | 515 } |
| 516 | 516 |
| 517 private: | 517 private: |
| 518 StringOrdinal first_ordinal_; | 518 StringOrdinal first_ordinal_; |
| 519 }; | 519 }; |
| 520 TEST_F(ExtensionSortingFixNTPCollisionsTwoCollisions, | 520 TEST_F(ExtensionSortingFixNTPCollisionsTwoCollisions, |
| 521 ExtensionSortingFixNTPCollisionsTwoCollisions) {} | 521 ExtensionSortingFixNTPCollisionsTwoCollisions) {} |
| 522 | 522 |
| 523 class ExtensionSortingEnsureValidOrdinals : |
| 524 public ExtensionPrefsPrepopulatedTest { |
| 525 public : |
| 526 ExtensionSortingEnsureValidOrdinals() {} |
| 527 ~ExtensionSortingEnsureValidOrdinals() {} |
| 528 |
| 529 virtual void Initialize() {} |
| 530 virtual void Verify() { |
| 531 ExtensionSorting* extension_sorting = prefs()->extension_sorting(); |
| 532 |
| 533 // Give ext1 invalid ordinals and then check that EnsureValidOridnals fixes |
| 534 // them. |
| 535 extension_sorting->SetAppLaunchOrdinal(ext1_->id(), StringOrdinal()); |
| 536 extension_sorting->SetPageOrdinal(ext1_->id(), StringOrdinal()); |
| 537 |
| 538 extension_sorting->EnsureValidOrdinals(ext1_->id()); |
| 539 |
| 540 EXPECT_TRUE(extension_sorting->GetAppLaunchOrdinal(ext1_->id()).IsValid()); |
| 541 EXPECT_TRUE(extension_sorting->GetPageOrdinal(ext1_->id()).IsValid()); |
| 542 } |
| 543 }; |
| 544 TEST_F(ExtensionSortingEnsureValidOrdinals, |
| 545 ExtensionSortingEnsureValidOrdinals) {} |
| 546 |
| 523 class ExtensionSortingPageOrdinalMapping : | 547 class ExtensionSortingPageOrdinalMapping : |
| 524 public ExtensionPrefsPrepopulatedTest { | 548 public ExtensionPrefsPrepopulatedTest { |
| 525 public: | 549 public: |
| 526 ExtensionSortingPageOrdinalMapping() {} | 550 ExtensionSortingPageOrdinalMapping() {} |
| 527 virtual ~ExtensionSortingPageOrdinalMapping() {} | 551 virtual ~ExtensionSortingPageOrdinalMapping() {} |
| 552 |
| 528 virtual void Initialize() {} | 553 virtual void Initialize() {} |
| 529 | |
| 530 virtual void Verify() { | 554 virtual void Verify() { |
| 531 std::string ext_1 = "ext_1"; | 555 std::string ext_1 = "ext_1"; |
| 532 std::string ext_2 = "ext_2"; | 556 std::string ext_2 = "ext_2"; |
| 533 | 557 |
| 534 ExtensionSorting* extension_sorting = prefs()->extension_sorting(); | 558 ExtensionSorting* extension_sorting = prefs()->extension_sorting(); |
| 535 StringOrdinal first_ordinal = StringOrdinal::CreateInitialOrdinal(); | 559 StringOrdinal first_ordinal = StringOrdinal::CreateInitialOrdinal(); |
| 536 | 560 |
| 537 // Ensure attempting to removing a mapping with an invalid page doesn't | 561 // Ensure attempting to removing a mapping with an invalid page doesn't |
| 538 // modify the map. | 562 // modify the map. |
| 539 EXPECT_TRUE(extension_sorting->ntp_ordinal_map_.empty()); | 563 EXPECT_TRUE(extension_sorting->ntp_ordinal_map_.empty()); |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 694 EXPECT_EQ(2, extension_sorting->PageStringOrdinalAsInteger(last_page_)); | 718 EXPECT_EQ(2, extension_sorting->PageStringOrdinalAsInteger(last_page_)); |
| 695 EXPECT_TRUE( | 719 EXPECT_TRUE( |
| 696 last_page_.Equal(extension_sorting->PageIntegerAsStringOrdinal(2))); | 720 last_page_.Equal(extension_sorting->PageIntegerAsStringOrdinal(2))); |
| 697 } | 721 } |
| 698 | 722 |
| 699 private: | 723 private: |
| 700 StringOrdinal last_page_; | 724 StringOrdinal last_page_; |
| 701 }; | 725 }; |
| 702 TEST_F(ExtensionSortingKeepEmptyStringOrdinalPages, | 726 TEST_F(ExtensionSortingKeepEmptyStringOrdinalPages, |
| 703 ExtensionSortingKeepEmptyStringOrdinalPages) {} | 727 ExtensionSortingKeepEmptyStringOrdinalPages) {} |
| OLD | NEW |