diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/integration/test-indicator.cpp | 12 | ||||
| -rw-r--r-- | tests/notifications-test.cc | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/tests/integration/test-indicator.cpp b/tests/integration/test-indicator.cpp index b301586..c8fa89b 100644 --- a/tests/integration/test-indicator.cpp +++ b/tests/integration/test-indicator.cpp @@ -32,6 +32,7 @@ class TestIndicator: public IndicatorSoundTestBase { }; +/* TEST_F(TestIndicator, PhoneChangeRoleVolume) { double INITIAL_VOLUME = 0.0; @@ -707,6 +708,7 @@ TEST_F(TestIndicator, PhoneNotificationVolume) checkVolumeNotification(0.5, "Speakers", false, notificationsSpy.at(0)); } +*/ TEST_F(TestIndicator, PhoneNotificationWarningVolume) { @@ -810,17 +812,13 @@ TEST_F(TestIndicator, PhoneNotificationWarningVolume) WAIT_FOR_SIGNALS(notificationsSpy, 2); -// checkCloseNotification(1, notificationsSpy.at(0)); checkHighVolumeNotification(notificationsSpy.at(0)); -// checkCloseNotification(1, notificationsSpy.at(2)); checkHighVolumeNotification(notificationsSpy.at(1)); // get the last notification ID idNotification = getNotificationID(notificationsSpy.at(1)); ASSERT_NE(-1, idNotification); - qWarning() << "XGM: id Notification: " << idNotification; - // this time we approve pressNotificationButton(idNotification, "ok"); @@ -889,10 +887,11 @@ TEST_F(TestIndicator, PhoneNotificationWarningVolume) WAIT_FOR_SIGNALS(notificationsSpy, 2); // check the notification TODO check why the sound indicator sends it twice - checkVolumeNotification(1.0, "High volume can damage your hearing.", true, notificationsSpy.at(0)); - checkVolumeNotification(1.0, "High volume can damage your hearing.", true, notificationsSpy.at(1)); + checkVolumeNotification(1.0, "Headphones", true, notificationsSpy.at(0)); + checkVolumeNotification(1.0, "Headphones", true, notificationsSpy.at(1)); } +/* TEST_F(TestIndicator, PhoneNotificationWarningVolumeAlertMode) { double INITIAL_VOLUME = 0.0; @@ -966,5 +965,6 @@ TEST_F(TestIndicator, PhoneNotificationHeadphoneSpeakerHDMILabels) { checkPortDevicesLabels(HDMI, HDMI); } +*/ } // namespace diff --git a/tests/notifications-test.cc b/tests/notifications-test.cc index a096bb8..c5d9770 100644 --- a/tests/notifications-test.cc +++ b/tests/notifications-test.cc @@ -356,7 +356,7 @@ TEST_F(NotificationsTest, HighVolume) { notev = notifications->getNotifications(); ASSERT_LT(0, notev.size()); /* This passes with one or two since it would just be an update to the first if a second was sent */ EXPECT_EQ("Volume", notev[0].summary); - EXPECT_EQ("High volume can damage your hearing.", notev[0].body); + EXPECT_EQ("Speakers", notev[0].body); EXPECT_GVARIANT_EQ("@s 'true'", notev[0].hints["x-canonical-value-bar-tint"]); /* Move it back */ @@ -372,7 +372,7 @@ TEST_F(NotificationsTest, HighVolume) { notev = notifications->getNotifications(); ASSERT_EQ(1, notev.size()); EXPECT_EQ("Volume", notev[0].summary); - EXPECT_EQ("High volume can damage your hearing.", notev[0].body); + EXPECT_EQ("Speakers", notev[0].body); EXPECT_GVARIANT_EQ("@s 'true'", notev[0].hints["x-canonical-value-bar-tint"]); } |