summaryrefslogtreecommitdiff
path: root/tests
diff options
authorMarco Trevisan (Treviño) <mail@3v1n0.net>2015-11-26 01:31:17 +0100
committerMarco Trevisan (Treviño) <mail@3v1n0.net>2015-11-26 01:31:17 +0100
commit6de2c5b056b13ec49b2d36106a7aa4a83e959c6c (patch)
tree7f96b707e2bfd6f9de936dd18bed7d4a5022c522 /tests
parenta3e1cc3fe0c105b7a50a668c56db9bbb0465bd43 (diff)
TestTrashLauncherIcon: use WindowsVisibleOnMonitor
(bzr r4036.11.30)
Diffstat (limited to 'tests')
-rw-r--r--tests/test_trash_launcher_icon.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/test_trash_launcher_icon.cpp b/tests/test_trash_launcher_icon.cpp
index cfeea3cb7..4a2f2b560 100644
--- a/tests/test_trash_launcher_icon.cpp
+++ b/tests/test_trash_launcher_icon.cpp
@@ -135,8 +135,8 @@ TEST_F(TestTrashLauncherIcon, WindowsPerMonitor)
ON_CALL(*fm_, WindowsForLocation(TRASH_URI)).WillByDefault(Return(windows));
fm_->locations_changed.emit();
- EXPECT_EQ(icon.WindowsForMonitor(0).size(), (windows.size() / 2) + (windows.size() % 2));
- EXPECT_EQ(icon.WindowsForMonitor(1).size(), windows.size() / 2);
+ EXPECT_EQ(icon.WindowsVisibleOnMonitor(0), (windows.size() / 2) + (windows.size() % 2));
+ EXPECT_EQ(icon.WindowsVisibleOnMonitor(1), windows.size() / 2);
}
TEST_F(TestTrashLauncherIcon, WindowsOnMonitorChanges)
@@ -145,12 +145,12 @@ TEST_F(TestTrashLauncherIcon, WindowsOnMonitorChanges)
ON_CALL(*fm_, WindowsForLocation(TRASH_URI)).WillByDefault(Return(WindowList({win})));
fm_->locations_changed.emit();
- EXPECT_EQ(icon.WindowsForMonitor(0).size(), 1);
- EXPECT_EQ(icon.WindowsForMonitor(1).size(), 0);
+ EXPECT_EQ(icon.WindowsVisibleOnMonitor(0), 1);
+ EXPECT_EQ(icon.WindowsVisibleOnMonitor(1), 0);
win->SetMonitor(1);
- EXPECT_EQ(icon.WindowsForMonitor(0).size(), 0);
- EXPECT_EQ(icon.WindowsForMonitor(1).size(), 1);
+ EXPECT_EQ(icon.WindowsVisibleOnMonitor(0), 0);
+ EXPECT_EQ(icon.WindowsVisibleOnMonitor(1), 1);
}
TEST_F(TestTrashLauncherIcon, FilemanagerSignalDisconnection)