TestSwitcherModel: Initialize model just once, update for new API

(bzr r4027.5.4)

1 files changed, 14 insertions, 31 deletions

diff --git a/tests/test_switcher_model.cpp b/tests/test_switcher_model.cpp
index a9cd37443..c02e9dcee 100644
--- a/tests/test_switcher_model.cpp
+++ b/tests/test_switcher_model.cpp
@@ -43,7 +43,7 @@ class MockLauncherIcon2 : public unity::launcher::MockLauncherIcon
 public:
 MockLauncherIcon2(int id)
 : id_(id)
- { }
+ {}
 
 int id_;
 };
@@ -61,20 +61,19 @@ public:
 TestSwitcherModel()
 {
 for (int i = 0; i < 4; ++i)
- {
 icons_.push_back(AbstractLauncherIcon::Ptr(new MockLauncherIcon2(i)));
- }
+
+ model = std::make_shared<SwitcherModel>(icons_, false);
 }
 
 protected:
 std::vector<AbstractLauncherIcon::Ptr> icons_;
+ SwitcherModel::Ptr model;
 };
 
 
 TEST_F(TestSwitcherModel, TestConstructor)
 {
- SwitcherModel::Ptr model(new SwitcherModel(icons_));
-
 EXPECT_EQ(model->Size(), icons_.size());
 EXPECT_EQ(model->Selection(), icons_.front());
 EXPECT_EQ(model->LastSelection(), icons_.front());
@@ -86,8 +85,6 @@ TEST_F(TestSwitcherModel, TestConstructor)
 
 TEST_F(TestSwitcherModel, TestSelection)
 {
- SwitcherModel::Ptr model(new SwitcherModel(icons_));
-
 EXPECT_EQ(IdentityOf(model->Selection()), 0);
 
 model->Next();
@@ -126,12 +123,12 @@ TEST_F(TestSwitcherModel, TestSelection)
 TEST_F(TestSwitcherModel, TestActiveDetailWindowSort)
 {
 // Create a base case for the null hypothesis.
- SwitcherModel::Ptr model_detail(new SwitcherModel(icons_));
+ auto model_detail = std::make_shared<SwitcherModel>(icons_, false);
 model_detail->detail_selection = true;
 
 // Create a test case with an active detail window.
 icons_.front()->SetQuirk(AbstractLauncherIcon::Quirk::ACTIVE, true);
- SwitcherModel::Ptr model_detail_active(new SwitcherModel(icons_));
+ auto model_detail_active = std::make_shared<SwitcherModel>(icons_, false);
 model_detail_active->detail_selection = true;
 
 EXPECT_TRUE(model_detail_active->DetailXids().size() > 2);
@@ -150,19 +147,17 @@ TEST_F(TestSwitcherModel, TestActiveDetailWindowSort)
 
 TEST_F(TestSwitcherModel, SelectionIsActive)
 {
- SwitcherModel model(icons_);
+ model->Selection()->SetQuirk(AbstractLauncherIcon::Quirk::ACTIVE, false);
+ EXPECT_FALSE(model->SelectionIsActive());
 
- model.Selection()->SetQuirk(AbstractLauncherIcon::Quirk::ACTIVE, false);
- EXPECT_FALSE(model.SelectionIsActive());
-
- model.Selection()->SetQuirk(AbstractLauncherIcon::Quirk::ACTIVE, true);
- EXPECT_TRUE(model.SelectionIsActive());
+ model->Selection()->SetQuirk(AbstractLauncherIcon::Quirk::ACTIVE, true);
+ EXPECT_TRUE(model->SelectionIsActive());
 }
 
 TEST_F(TestSwitcherModel, TestWebAppActive)
 {
 // Create a base case
- SwitcherModel::Ptr base_model(new SwitcherModel(icons_));
+ auto base_model = std::make_shared<SwitcherModel>(icons_, false);
 
 // Set the first icon as Active to simulate Firefox being active
 icons_.front()->SetQuirk(AbstractLauncherIcon::Quirk::ACTIVE, true);
@@ -170,18 +165,16 @@ TEST_F(TestSwitcherModel, TestWebAppActive)
 // Set the last icon as Active to simulate that it is a WebApp
 icons_.back()->SetQuirk(AbstractLauncherIcon::Quirk::ACTIVE, true);
 
- SwitcherModel::Ptr model(new SwitcherModel(icons_));
-
- model->DetailXids();
+ auto new_model = std::make_shared<SwitcherModel>(icons_, false);
+ new_model->DetailXids();
 
 // model's front Window should be different than the base case due to the
 // re-sorting in DetailXids().
- EXPECT_NE(model->DetailXids().front(), base_model->DetailXids().front());
+ EXPECT_NE(new_model->DetailXids().front(), base_model->DetailXids().front());
 }
 
 TEST_F(TestSwitcherModel, TestHasNextDetailRow)
 {
- SwitcherModel::Ptr model(new SwitcherModel(icons_));
 model->detail_selection = true;
 model->SetRowSizes({2,2});
 
@@ -190,7 +183,6 @@ TEST_F(TestSwitcherModel, TestHasNextDetailRow)
 
 TEST_F(TestSwitcherModel, TestHasNextDetailRowStopsAtTheEnd)
 {
- SwitcherModel::Ptr model(new SwitcherModel(icons_));
 model->detail_selection = true;
 for (unsigned int i = 0; i < model->DetailXids().size() - 1 &&
 model->HasNextDetailRow(); i++)
@@ -203,7 +195,6 @@ TEST_F(TestSwitcherModel, TestHasNextDetailRowStopsAtTheEnd)
 
 TEST_F(TestSwitcherModel, TestHasPrevDetailRow)
 {
- SwitcherModel::Ptr model(new SwitcherModel(icons_));
 model->detail_selection = true;
 model->SetRowSizes({2,2});
 
@@ -216,7 +207,6 @@ TEST_F(TestSwitcherModel, TestHasPrevDetailRow)
 
 TEST_F(TestSwitcherModel, TestHasNextThenPrevDetailRow)
 {
- SwitcherModel::Ptr model(new SwitcherModel(icons_));
 model->detail_selection = true;
 model->SetRowSizes({2,2});
 
@@ -231,7 +221,6 @@ TEST_F(TestSwitcherModel, TestHasNextThenPrevDetailRow)
 
 TEST_F(TestSwitcherModel, TestNextDetailRow)
 {
- SwitcherModel::Ptr model(new SwitcherModel(icons_));
 model->detail_selection = true;
 model->SetRowSizes({2,2});
 
@@ -245,7 +234,6 @@ TEST_F(TestSwitcherModel, TestNextDetailRow)
 
 TEST_F(TestSwitcherModel, TestNextDetailThenNextDetailRow)
 {
- SwitcherModel::Ptr model(new SwitcherModel(icons_));
 model->detail_selection = true;
 model->SetRowSizes({2,2});
 
@@ -260,7 +248,6 @@ TEST_F(TestSwitcherModel, TestNextDetailThenNextDetailRow)
 
 TEST_F(TestSwitcherModel, TestPrevDetailRow)
 {
- SwitcherModel::Ptr model(new SwitcherModel(icons_));
 model->detail_selection = true;
 model->SetRowSizes({2,2});
 
@@ -275,7 +262,6 @@ TEST_F(TestSwitcherModel, TestPrevDetailRow)
 
 TEST_F(TestSwitcherModel, TestNextDetailThenPrevDetailRow)
 {
- SwitcherModel::Ptr model(new SwitcherModel(icons_));
 model->detail_selection = true;
 model->SetRowSizes({2,2});
 
@@ -292,7 +278,6 @@ TEST_F(TestSwitcherModel, TestNextDetailThenPrevDetailRow)
 
 TEST_F(TestSwitcherModel, TestUnEvenNextDetailRow)
 {
- SwitcherModel::Ptr model(new SwitcherModel(icons_));
 model->detail_selection = true;
 model->SetRowSizes({3,2});
 
@@ -306,7 +291,6 @@ TEST_F(TestSwitcherModel, TestUnEvenNextDetailRow)
 
 TEST_F(TestSwitcherModel, TestUnEvenPrevDetailRow)
 {
- SwitcherModel::Ptr model(new SwitcherModel(icons_));
 model->detail_selection = true;
 model->SetRowSizes({3,2});
 
@@ -321,7 +305,6 @@ TEST_F(TestSwitcherModel, TestUnEvenPrevDetailRow)
 
 TEST_F(TestSwitcherModel, TestNextPrevDetailRowMovesLeftInTopRow)
 {
- SwitcherModel::Ptr model(new SwitcherModel(icons_));
 model->detail_selection = true;
 model->SetRowSizes({3,2});