Merge lp:~xavi-garcia-mena/indicator-sound/re-add-integration-tests into lp:indicator-sound/15.10

[Xavi Garcia]

This branch re-adds the integration tests using gmenuharness.

This branch re-adds the integration tests using gmenuharness.

I'm approving myself as it was already approved previously as branch:
lp:~xavi-garcia-mena/indicator-sound/remove-warning-message-in-volume-notification

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:510
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/288/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-wily-amd64-ci/64
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-wily-armhf-ci/64
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-wily-armhf-ci/64/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Xavi Garcia (xavi-garcia-mena)]

review: Approve

[lp:~xavi-garcia-mena/indicator-sound/re-add-integration-tests]

510. By Xavi Garcia on 2015-12-22

Very simple change to make upstart try to respawn the process 30 times (instead of 2).
This is a workaround for the case when dbus session is not ready yet at startup.
Approved by: PS Jenkins bot, Charles Kerr

511. By CI Train Bot Account on 2015-12-22

Releasing 12.10.2+16.04.20151222-0ubuntu1

512. By Xavi Garcia on 2015-12-23

Reverted to release 507

513. By Timo Jyrinki on 2015-12-23

Restore changelog entries for CI Train purposes but note that they should be ignored as they were reverted.

514. By Xavi Garcia on 2015-12-23

restore OSD notifications

515. By Xavi Garcia on 2015-12-23

Conflicts resolved with restored branch

516. By Xavi Garcia on 2016-01-05

removed extra line in debian/changelog

517. By Xavi Garcia on 2016-01-05

sync debian/changelog with pre-requisite branch

518. By Xavi Garcia on 2016-01-05

Rolling back to release 516

519. By Xavi Garcia on 2016-01-05

sync changelog with previous branch

520. By Xavi Garcia on 2016-01-05

re-added new stuff

521. By Xavi Garcia on 2016-01-05

remove changed in debian/changelog

522. By Xavi Garcia on 2016-01-05

[ Xavi Garcia ]
  * Added OSD notifications to show output source when the volume or
    source change (LP: #1382548, LP: #1415480, LP: #1484589)

  * debian/control:
    Added the following build dependencies:
    - cmake-extras (>= 0.4),
    - google-mock (>= 1.6.0+svn437),
    - libqtdbusmock1-dev (>= 0.3),
    - libqtdbustest1-dev,
    - libunity-api-dev,
    - pulseaudio,
    - qt5-default,
    - qtbase5-dev,
    - qtbase5-dev-tools,
    - qtdeclarative5-dev,
    - qtdeclarative5-dev-tools
  * Added gmenuharness library for integration tests support.
    New Files:
    - src/gmenuharness/CMakeLists.txt
    - src/gmenuharness/MatchResult.cpp
    - src/gmenuharness/MatchUtils.cpp
    - src/gmenuharness/MenuItemMatcher.cpp
    - src/gmenuharness/MenuMatcher.cpp
    - include/unity/gmenuharness/MatchResult.h
    - include/unity/gmenuharness/MatchUtils.h
    - include/unity/gmenuharness/MenuItemMatcher.h
    - include/unity/gmenuharness/MenuMatcher.h
  * Added integration tests using gmenuharness
    New Files:
    - tests/dbus-types/CMakeLists.txt
    - tests/dbus-types/com.ubuntu.AccountsService.Sound.xml
    - tests/dbus-types/dbus-types.h
    - tests/dbus-types/org.PulseAudio.Ext.StreamRestore1.xml
    - tests/dbus-types/org.freedesktop.Accounts.xml
    - tests/dbus-types/org.freedesktop.DBus.Properties.xml
    - tests/dbus-types/org.freedesktop.Notifications.xml
    - tests/dbus-types/org.gtk.Actions.xml
    - tests/dbus-types/pulseaudio-volume.cpp
    - tests/dbus-types/pulseaudio-volume.h
    - tests/integration/CMakeLists.txt
    - tests/integration/indicator-sound-test-base.cpp
    - tests/integration/indicator-sound-test-base.h
    - tests/integration/main.cpp
    - tests/integration/test-indicator.cpp
    - tests/integration/touch-stream-restore.table
    - tests/integration/utils/dbus-pulse-volume.cpp
    - tests/integration/utils/dbus-pulse-volume.h
    - tests/integration/utils/get-volume.cpp
    - tests/integration/utils/set-volume.cpp
    - tests/service-mocks/CMakeLists.txt
    - tests/service-mocks/DBusPropertiesNotifier.cpp
    - tests/service-mocks/DBusPropertiesNotifier.h
    - tests/service-mocks/accounts-mock/AccountsDefs.h
    - tests/service-mocks/accounts-mock/AccountsMock.cpp
    - tests/service-mocks/accounts-mock/AccountsMock.h
    - tests/service-mocks/accounts-mock/AccountsServiceSoundMock.cpp
    - tests/service-mocks/accounts-mock/AccountsServiceSoundMock.h
    - tests/service-mocks/accounts-mock/CMakeLists.txt
    - tests/service-mocks/accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml
    - tests/service-mocks/accounts-mock/main.cpp
    - tests/service-mocks/accounts-mock/org.freedesktop.Accounts.Mock.xml
    - tests/service-mocks/media-player-mpris-mock/CMakeLists.txt
    - tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h
    - tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisMock.cpp
    - tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisMock.h
    - tests/service-mocks/media-player-mpris-mock/applications/testplayer1.desktop
    - tests/service-mocks/media-player-mpris-mock/main.cpp
    - tests/service-mocks/media-player-mpris-mock/org.mpris.MediaPlayer2.Player.xml
    - tests/service-mocks/media-player-mpris-mock/org.mpris.MediaPlayer2.xml
    - tests/service-mocks/media-player-mpris-mock/player-update.cpp

Unmerged revisions

=== modified file 'debian/changelog'
--- debian/changelog	2015-11-03 17:47:10 +0000
+++ debian/changelog	2015-11-23 11:30:56 +0000
@@ -9,6 +9,83 @@
 
  -- Xavi Garcia <[e-mail]>  Tue, 03 Nov 2015 17:47:10 +0000
 
+indicator-sound (12.10.2+15.10.20151019-0ubuntu3) UNRELEASED; urgency=medium
+
+  [ Xavi Garcia ]
+  * Added OSD notifications to show output source when the volume or 
+    source change (LP: #1382548, LP: #1415480, LP: #1484589)
+    
+  * debian/control:
+    Added the following build dependencies:
+    - cmake-extras (>= 0.4), 
+    - google-mock (>= 1.6.0+svn437),
+    - libqtdbusmock1-dev (>= 0.3),
+    - libqtdbustest1-dev,
+    - libunity-api-dev,
+    - pulseaudio,
+    - qt5-default,
+    - qtbase5-dev,
+    - qtbase5-dev-tools,
+    - qtdeclarative5-dev,
+    - qtdeclarative5-dev-tools
+  * Added gmenuharness library for integration tests support.
+    New Files: 
+    - src/gmenuharness/CMakeLists.txt
+    - src/gmenuharness/MatchResult.cpp
+    - src/gmenuharness/MatchUtils.cpp
+    - src/gmenuharness/MenuItemMatcher.cpp
+    - src/gmenuharness/MenuMatcher.cpp
+    - include/unity/gmenuharness/MatchResult.h
+    - include/unity/gmenuharness/MatchUtils.h
+    - include/unity/gmenuharness/MenuItemMatcher.h
+    - include/unity/gmenuharness/MenuMatcher.h
+  * Added integration tests using gmenuharness
+    New Files:
+    - tests/dbus-types/CMakeLists.txt
+    - tests/dbus-types/com.ubuntu.AccountsService.Sound.xml
+    - tests/dbus-types/dbus-types.h
+    - tests/dbus-types/org.PulseAudio.Ext.StreamRestore1.xml
+    - tests/dbus-types/org.freedesktop.Accounts.xml
+    - tests/dbus-types/org.freedesktop.DBus.Properties.xml
+    - tests/dbus-types/org.freedesktop.Notifications.xml
+    - tests/dbus-types/org.gtk.Actions.xml
+    - tests/dbus-types/pulseaudio-volume.cpp
+    - tests/dbus-types/pulseaudio-volume.h
+    - tests/integration/CMakeLists.txt
+    - tests/integration/indicator-sound-test-base.cpp
+    - tests/integration/indicator-sound-test-base.h
+    - tests/integration/main.cpp
+    - tests/integration/test-indicator.cpp
+    - tests/integration/touch-stream-restore.table
+    - tests/integration/utils/dbus-pulse-volume.cpp
+    - tests/integration/utils/dbus-pulse-volume.h
+    - tests/integration/utils/get-volume.cpp
+    - tests/integration/utils/set-volume.cpp
+    - tests/service-mocks/CMakeLists.txt
+    - tests/service-mocks/DBusPropertiesNotifier.cpp
+    - tests/service-mocks/DBusPropertiesNotifier.h
+    - tests/service-mocks/accounts-mock/AccountsDefs.h
+    - tests/service-mocks/accounts-mock/AccountsMock.cpp
+    - tests/service-mocks/accounts-mock/AccountsMock.h
+    - tests/service-mocks/accounts-mock/AccountsServiceSoundMock.cpp
+    - tests/service-mocks/accounts-mock/AccountsServiceSoundMock.h
+    - tests/service-mocks/accounts-mock/CMakeLists.txt
+    - tests/service-mocks/accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml
+    - tests/service-mocks/accounts-mock/main.cpp
+    - tests/service-mocks/accounts-mock/org.freedesktop.Accounts.Mock.xml
+    - tests/service-mocks/media-player-mpris-mock/CMakeLists.txt
+    - tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h
+    - tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisMock.cpp
+    - tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisMock.h
+    - tests/service-mocks/media-player-mpris-mock/applications/testplayer1.desktop
+    - tests/service-mocks/media-player-mpris-mock/main.cpp
+    - tests/service-mocks/media-player-mpris-mock/org.mpris.MediaPlayer2.Player.xml
+    - tests/service-mocks/media-player-mpris-mock/org.mpris.MediaPlayer2.xml
+    - tests/service-mocks/media-player-mpris-mock/player-update.cpp   
+
+
+ -- Xavi Garcia <[e-mail]>  Wed, 11 Nov 2015 12:40:10 +0100
+
 indicator-sound (12.10.2+15.10.20151019-0ubuntu1) wily; urgency=medium
 
   [ Xavi Garcia Mena ]
 
=== modified file 'debian/control'
--- debian/control	2015-11-03 16:21:43 +0000
+++ debian/control	2015-11-23 11:30:56 +0000
@@ -5,11 +5,13 @@
 XSBC-Original-Maintainer: Conor Curran <[e-mail]>
 Build-Depends: debhelper (>= 9.0),
                cmake,
+               cmake-extras (>= 0.4),
                dbus,
                dbus-test-runner (>> 14.04.0+14.04.20150120.1),
                dh-translations,
                gir1.2-accountsservice-1.0,
                gnome-common,
+               google-mock (>= 1.6.0+svn437),
                gsettings-ubuntu-schemas,
                autotools-dev,
                valac (>= 0.20),
@@ -18,13 +20,22 @@
                libgirepository1.0-dev,
                libglib2.0-dev (>= 2.22.3),
                libgtest-dev,
+               libqtdbusmock1-dev (>= 0.3),
+               libqtdbustest1-dev,
+               libunity-api-dev,
                liburl-dispatcher1-dev,
                libpulse-dev (>= 1:4.0-0ubuntu21),
                libpulse-mainloop-glib0 (>= 0.9.18),
                libnotify-dev,
                libgee-dev,
                libxml2-dev,
+               pulseaudio,
                python3-dbusmock,
+               qt5-default,
+               qtbase5-dev,
+               qtbase5-dev-tools,
+               qtdeclarative5-dev,
+               qtdeclarative5-dev-tools,
 Standards-Version: 3.9.4
 Homepage: https://launchpad.net/indicator-sound
 # If you aren't a member of ~indicator-applet-developers but need to upload
 
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2015-11-03 16:21:43 +0000
+++ src/CMakeLists.txt	2015-11-23 11:30:56 +0000
@@ -207,5 +207,4 @@
   RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/indicator-sound/
 )
 
-# Disable integration tests
-# add_subdirectory(gmenuharness)
+add_subdirectory(gmenuharness)
 
=== modified file 'src/service.vala'
--- src/service.vala	2015-10-30 13:24:14 +0000
+++ src/service.vala	2015-11-23 11:30:56 +0000
@@ -40,7 +40,7 @@
 		warn_notification.set_hint ("x-canonical-non-shaped-icon", "true");
 		warn_notification.set_hint ("x-canonical-snap-decisions", "true");
 		warn_notification.set_hint ("x-canonical-private-affirmative-tint", "true");
-		warn_notification.closed.connect((n) => { n.clear_actions(); });
+		warn_notification.closed.connect((n) => { n.clear_actions(); waiting_user_approve_warn=false; });
 		BusWatcher.watch_namespace (GLib.BusType.SESSION,
 		                            "org.freedesktop.Notifications",
 		                            () => { debug("Notifications name appeared"); },
@@ -609,7 +609,10 @@
 		var warn = loud
 			&& this.notify_server_supports_actions
 			&& !this.volume_control.high_volume_approved;
-
+		if (waiting_user_approve_warn && volume_control.below_warning_volume) {
+			volume_control.set_warning_volume();
+			close_notification(warn_notification);
+		} 
 		if (warn) {
 			close_notification(info_notification);
 			if (_pre_warn_volume == null) {
 
=== modified file 'src/volume-control-pulse.vala'
--- src/volume-control-pulse.vala	2015-10-15 10:08:07 +0000
+++ src/volume-control-pulse.vala	2015-11-23 11:30:56 +0000
@@ -140,40 +140,45 @@
 		
 		VolumeControl.ActiveOutput ret_output = VolumeControl.ActiveOutput.SPEAKERS;
 		/* Check if the current active port is headset/headphone */
-    	/* There is not easy way to check if the port is a headset/headphone besides
-    	 * checking for the port name. On touch (with the pulseaudio droid element)
-    	 * the headset/headphone port is called 'output-headset' and 'output-headphone'.
-    	 * On the desktop this is usually called 'analog-output-headphones' */
+    		/* There is not easy way to check if the port is a headset/headphone besides
+    		 * checking for the port name. On touch (with the pulseaudio droid element)
+    		 * the headset/headphone port is called 'output-headset' and 'output-headphone'.
+    		 * On the desktop this is usually called 'analog-output-headphones' */
+		
+		// first of all check if we are in call mode
+		if (sink.active_port != null && sink.active_port.name == "output-speaker+wired_headphone") {
+			return VolumeControl.ActiveOutput.CALL_MODE;
+		}
 		// look if it's a headset/headphones
 		if (sink.name == "indicator_sound_test_headphones" ||
 			(sink.active_port != null && 
 			 (sink.active_port.name.contains("headset") ||
-	          sink.active_port.name.contains("headphone")))) {
-	    	_active_port_headphone = true;
-	    	// check if it's a bluetooth device
-	    	var device_bus = sink.proplist.gets ("device.bus");
-	    	if (device_bus != null && device_bus == "bluetooth") {
-				ret_output = VolumeControl.ActiveOutput.BLUETOOTH_HEADPHONES;
-        	} else if (device_bus != null && device_bus == "usb") {
-				ret_output = VolumeControl.ActiveOutput.USB_HEADPHONES;
-			} else if (device_bus != null && device_bus == "hdmi") {
-				ret_output = VolumeControl.ActiveOutput.HDMI_HEADPHONES;
-			} else {
-				ret_output = VolumeControl.ActiveOutput.HEADPHONES;
-        	}
+		          sink.active_port.name.contains("headphone")))) {
+			    	_active_port_headphone = true;
+	    			// check if it's a bluetooth device
+	    			var device_bus = sink.proplist.gets ("device.bus");
+	    			if (device_bus != null && device_bus == "bluetooth") {
+					ret_output = VolumeControl.ActiveOutput.BLUETOOTH_HEADPHONES;
+        			} else if (device_bus != null && device_bus == "usb") {
+					ret_output = VolumeControl.ActiveOutput.USB_HEADPHONES;
+				} else if (device_bus != null && device_bus == "hdmi") {
+					ret_output = VolumeControl.ActiveOutput.HDMI_HEADPHONES;
+				} else {
+					ret_output = VolumeControl.ActiveOutput.HEADPHONES;
+        		}
 		} else {
 			// speaker
 			_active_port_headphone = false;
 			var device_bus = sink.proplist.gets ("device.bus");
-	    	if (device_bus != null && device_bus == "bluetooth") {
-	    	    ret_output = VolumeControl.ActiveOutput.BLUETOOTH_SPEAKER;
-        	} else if (device_bus != null && device_bus == "usb") {
+	    		if (device_bus != null && device_bus == "bluetooth") {
+	    		    ret_output = VolumeControl.ActiveOutput.BLUETOOTH_SPEAKER;
+        		} else if (device_bus != null && device_bus == "usb") {
 				ret_output = VolumeControl.ActiveOutput.USB_SPEAKER;
 			} else if (device_bus != null && device_bus == "hdmi") {
 				ret_output = VolumeControl.ActiveOutput.HDMI_SPEAKER;
 			} else {
 				ret_output = VolumeControl.ActiveOutput.SPEAKERS;
-        	}
+        		}
 		}
 
 		return ret_output;
@@ -253,7 +258,9 @@
 		
 		// check if the output has changed, if so... emit a signal
 		VolumeControl.ActiveOutput active_output_now = active_output;
-		if (active_output_now != active_output_before) {
+		if (active_output_now != active_output_before && 
+			(active_output_now != VolumeControl.ActiveOutput.CALL_MODE &&
+			 active_output_before != VolumeControl.ActiveOutput.CALL_MODE)) {
 			this.active_output_changed (active_output_now);
 			if (active_output_now == VolumeControl.ActiveOutput.SPEAKERS) {
 				_high_volume_approved = false;
@@ -738,6 +745,10 @@
 		get { return this._high_volume; }
 		private set { this._high_volume = value; }
 	}
+        public override bool below_warning_volume {
+		get { return this._volume.volume < this._warning_volume_norms; }
+		private set { }
+	}
 	private void init_high_volume() {
 		_settings.changed["warning-volume-enabled"].connect(() => update_high_volume_cache());
 		_settings.changed["warning-volume-decibels"].connect(() => update_high_volume_cache());
@@ -779,6 +790,14 @@
 		}
 	}
 
+	public override void set_warning_volume() {
+		var vol = new VolumeControl.Volume();
+                vol.volume = _warning_volume_norms;
+                vol.reason = _volume.reason;
+                debug("Setting warning level volume from %f down to %f", _volume.volume, vol.volume);
+                volume = vol;	 
+	}
+
 	/** HIGH VOLUME APPROVED PROPERTY **/
 
 	private bool _high_volume_approved = false;
 
=== modified file 'src/volume-control.vala'
--- src/volume-control.vala	2015-10-05 10:10:49 +0000
+++ src/volume-control.vala	2015-11-23 11:30:56 +0000
@@ -36,7 +36,8 @@
 		USB_SPEAKER,
 		USB_HEADPHONES,
 		HDMI_SPEAKER,
-		HDMI_HEADPHONES
+		HDMI_HEADPHONES,
+		CALL_MODE
 	}
 
 	public class Volume : Object {
@@ -48,6 +49,7 @@
 	public virtual bool ready { get { return false; } set { } }
 	public virtual bool active_mic { get { return false; } set { } }
 	public virtual bool high_volume { get { return false; } protected set { } }
+	public virtual bool below_warning_volume { get { return false; } protected set { } }	
 	public virtual bool mute { get { return false; } }
 	public virtual bool is_playing { get { return false; } }
 	public virtual VolumeControl.ActiveOutput active_output { get { return VolumeControl.ActiveOutput.SPEAKERS; } }
@@ -59,6 +61,7 @@
 	public virtual bool high_volume_approved { get { return false; } protected set { } }
 	public virtual void approve_high_volume() { }
 	public virtual void clamp_to_high_volume() { }
+	public virtual void set_warning_volume() { }
 
 	public abstract void set_mute (bool mute);
 
 
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2015-11-03 16:21:43 +0000
+++ tests/CMakeLists.txt	2015-11-23 11:30:56 +0000
@@ -281,7 +281,6 @@
     indicator-test
 )
 
-# Disable integration tests
-# add_subdirectory(integration)
-# add_subdirectory(dbus-types)
-# add_subdirectory(service-mocks)
+add_subdirectory(integration)
+add_subdirectory(dbus-types)
+add_subdirectory(service-mocks)
 \ No newline at end of file