Merge lp:~xavi-garcia-mena/indicator-sound/bug-1555831-get-root-icon into lp:indicator-sound/15.10

[Xavi Garcia]

Changed to code to get the root icon. Now it does not take into account the source output, as in fact that code was not differentiating between any particular case.
The code was added in the past in the case that we should differentiate between bluetooth, headphones, etc... but it was never used.

Changed to code to get the root icon. Now it does not take into account the source output, as in fact that code was not differentiating between any particular case.
The code was added in the past in the case that we should differentiate between bluetooth, headphones, etc... but it was never used.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:534
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/321/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-wily-amd64-ci/96
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-sound-wily-armhf-ci/97/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-sound-ci/321/rebuild

review: Needs Fixing (continuous-integration)

[Charles Kerr (charlesk)]

Looks very good to me.

Not an issue with this MP, but rather just thinking out loud -- is there anything analogous to the Menu Matcher harness for GActions? Extracting these states out is repetitive and wastes a lot of LOC.

review: Approve

[Xavi Garcia (xavi-garcia-mena)]

Thanks for the review, Charles.

I don't think we have anything like gmenuharness yet (will ask Pete), but I agree: it would be good to have something similar for actions...

[lp:~xavi-garcia-mena/indicator-sound/bug-1555831-get-root-icon]

535. By Xavi Garcia on 2016-03-17

Added volume check to root icon test

[Charles Kerr (charlesk)]

reapproved with r535

review: Approve

=== modified file 'src/service.vala'
--- src/service.vala	2016-03-02 13:50:43 +0000
+++ src/service.vala	2016-03-17 10:07:26 +0000
@@ -290,48 +290,16 @@
 
 	private bool block_info_notifications = false;
 
-	private static unowned string get_volume_root_icon_by_volume (double volume, VolumeControl.ActiveOutput active_output) {
-		switch (active_output) {
-			case VolumeControl.ActiveOutput.SPEAKERS:
-			case VolumeControl.ActiveOutput.HEADPHONES:
-			case VolumeControl.ActiveOutput.BLUETOOTH_HEADPHONES:
-			case VolumeControl.ActiveOutput.BLUETOOTH_SPEAKER:
-			case VolumeControl.ActiveOutput.USB_SPEAKER:
-			case VolumeControl.ActiveOutput.USB_HEADPHONES:
-			case VolumeControl.ActiveOutput.HDMI_SPEAKER:
-			case VolumeControl.ActiveOutput.HDMI_HEADPHONES:
-				if (volume <= 0.0)
-					return "audio-volume-muted-panel";
-				if (volume <= 0.3)
-					return "audio-volume-low-panel";
-				if (volume <= 0.7)
-					return "audio-volume-medium-panel";
-				return "audio-volume-high-panel";
-
-			default:
-				return "";
-		}
-	}
-
 	private unowned string get_volume_root_icon (double volume, bool mute, VolumeControl.ActiveOutput active_output) {
-		switch (active_output) {
-			case VolumeControl.ActiveOutput.SPEAKERS:
-			case VolumeControl.ActiveOutput.HEADPHONES:
-			case VolumeControl.ActiveOutput.BLUETOOTH_HEADPHONES:
-			case VolumeControl.ActiveOutput.BLUETOOTH_SPEAKER:
-			case VolumeControl.ActiveOutput.USB_SPEAKER:
-			case VolumeControl.ActiveOutput.USB_HEADPHONES:
-			case VolumeControl.ActiveOutput.HDMI_SPEAKER:
-			case VolumeControl.ActiveOutput.HDMI_HEADPHONES:
-				if (mute || volume <= 0.0)
-					return this.mute_blocks_sound ? "audio-volume-muted-blocking-panel" : "audio-volume-muted-panel";
-				if (this.accounts_service != null && this.accounts_service.silentMode)
-					return "audio-volume-muted-panel";
-				return get_volume_root_icon_by_volume (volume, active_output);
-
-			default:
-				return "";
-		}
+		if (mute || volume <= 0.0)
+			return this.mute_blocks_sound ? "audio-volume-muted-blocking-panel" : "audio-volume-muted-panel";
+		if (this.accounts_service != null && this.accounts_service.silentMode)
+			return "audio-volume-muted-panel";
+		if (volume <= 0.3)
+			return "audio-volume-low-panel";
+		if (volume <= 0.7)
+			return "audio-volume-medium-panel";
+		return "audio-volume-high-panel";
 	}
 
 	private void update_notification () {

=== modified file 'tests/integration/indicator-sound-test-base.cpp'
--- tests/integration/indicator-sound-test-base.cpp	2016-03-04 15:25:39 +0000
+++ tests/integration/indicator-sound-test-base.cpp	2016-03-17 10:07:26 +0000
@@ -989,6 +989,49 @@
     return QVariantList();
 }
 
+QStringList IndicatorSoundTestBase::getRootIconValue(bool *isValid)
+{
+    QString result = 0;
+
+    QVariantList varList = getActionValue("root");
+    if (isValid != nullptr)
+    {
+        *isValid = false;
+    }
+    if (varList.at(0).canConvert<QDBusArgument>())
+    {
+        const QDBusArgument dbusArg = qvariant_cast<QDBusArgument>(varList.at(0));
+        if (dbusArg.currentType() == QDBusArgument::MapType)
+        {
+            QVariantMap map;
+            dbusArg >> map;
+            QVariantMap::const_iterator iter = map.find("icon");
+            if (iter != map.end())
+            {
+                const QDBusArgument iconArg = qvariant_cast<QDBusArgument>((*iter));
+                if (iconArg.currentType() == QDBusArgument::StructureType)
+                {
+                    QString name;
+                    QVariant iconValue;
+                    iconArg.beginStructure();
+                    iconArg >> name;
+                    iconArg >> iconValue;
+                    if (name == "themed" && iconValue.type() == QVariant::StringList)
+                    {
+                        if (isValid != nullptr)
+                        {
+                            *isValid = true;
+                        }
+                    }
+                    iconArg.endStructure();
+                    return iconValue.toStringList();
+                }
+            }
+        }
+    }
+    return QStringList();
+}
+
 qlonglong IndicatorSoundTestBase::getVolumeSyncValue(bool *isValid)
 {
     qlonglong result = 0;

=== modified file 'tests/integration/indicator-sound-test-base.h'
--- tests/integration/indicator-sound-test-base.h	2016-03-04 15:25:39 +0000
+++ tests/integration/indicator-sound-test-base.h	2016-03-17 10:07:26 +0000
@@ -148,6 +148,8 @@
 
     qlonglong getVolumeSyncValue(bool *isValid = nullptr);
 
+    QStringList getRootIconValue(bool *isValid = nullptr);
+
     float getVolumeValue(bool *isValid = nullptr);
 
     static QVariant waitPropertyChanged(QSignalSpy * signalSpy, QString property);

=== modified file 'tests/integration/test-indicator.cpp'
--- tests/integration/test-indicator.cpp	2016-03-04 15:25:39 +0000
+++ tests/integration/test-indicator.cpp	2016-03-17 10:07:26 +0000
@@ -32,6 +32,68 @@
 {
 };
 
+TEST_F(TestIndicator, PhoneCheckRootIcon)
+{
+    double INITIAL_VOLUME = 0.0;
+
+    ASSERT_NO_THROW(startAccountsService());
+    EXPECT_TRUE(clearGSettingsPlayers());
+    ASSERT_NO_THROW(startPulsePhone());
+
+    // initialize volumes in pulseaudio
+    EXPECT_TRUE(setStreamRestoreVolume("alert", INITIAL_VOLUME));
+
+    // start now the indicator, so it picks the new volumes
+    ASSERT_NO_THROW(startIndicator());
+
+    // check that the volume is set and give
+    // time to the indicator to start
+    EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
+            .item(mh::MenuItemMatcher()
+                .action("indicator.root")
+                .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+                .string_attribute("x-canonical-scroll-action", "indicator.scroll")
+                .string_attribute("x-canonical-secondary-action", "indicator.mute")
+                .string_attribute("submenu-action", "indicator.indicator-shown")
+                .mode(mh::MenuItemMatcher::Mode::all)
+                .submenu()
+                .item(mh::MenuItemMatcher()
+                    .section()
+                    .item(silentModeSwitch(false))
+                    .item(volumeSlider(INITIAL_VOLUME, "Volume"))
+                )
+                .item(mh::MenuItemMatcher()
+                    .label("Sound Settings…")
+                    .action("indicator.phone-settings")
+                )
+            ).match());
+
+    QStringList mutedIcon = {"audio-volume-muted-panel", "audio-volume-muted", "audio-volume", "audio"};
+    EXPECT_EQ(getRootIconValue(), mutedIcon);
+
+    QStringList lowVolumeIcon = {"audio-volume-low-panel", "audio-volume-low", "audio-volume", "audio"};
+    for( double volume = 0.1; volume <= 0.3; volume+=0.1)
+    {
+        EXPECT_TRUE(setStreamRestoreVolume("alert", volume));
+        EXPECT_EQ(getRootIconValue(), lowVolumeIcon);
+    }
+    EXPECT_TRUE(setStreamRestoreVolume("alert", 0.4));
+
+    QStringList mediumVolumeIcon = {"audio-volume-medium-panel", "audio-volume-medium", "audio-volume", "audio"};
+    for( double volume = 0.4; volume <= 0.7; volume+=0.1)
+    {
+        EXPECT_TRUE(setStreamRestoreVolume("alert", volume));
+        EXPECT_EQ(getRootIconValue(), mediumVolumeIcon);
+    }
+
+    QStringList highVolumeIcon = {"audio-volume-high-panel", "audio-volume-high", "audio-volume", "audio"};
+    for( double volume = 0.8; volume <= 1.0; volume+=0.1)
+    {
+        EXPECT_TRUE(setStreamRestoreVolume("alert", volume));
+        EXPECT_EQ(getRootIconValue(), highVolumeIcon);
+    }
+}
+
 TEST_F(TestIndicator, PhoneTestExternalMicInOut)
 {
     double INITIAL_VOLUME = 0.0;