lp:~xavi-garcia-mena/indicator-sound/re-add-integration-tests
- Get this branch:
- bzr branch lp:~xavi-garcia-mena/indicator-sound/re-add-integration-tests
Branch merges
- Charles Kerr (community): Approve
- Xavi Garcia: Approve
- PS Jenkins bot (community): Needs Fixing (continuous-integration)
-
Diff: 270 lines (+73/-37)8 files modifiedAUTHORS (+1/-0)
debian/changelog (+7/-6)
debian/control (+11/-0)
src/CMakeLists.txt (+1/-2)
src/service.vala (+5/-2)
src/volume-control-pulse.vala (+41/-22)
src/volume-control.vala (+4/-1)
tests/CMakeLists.txt (+3/-4)
Branch information
Recent revisions
- 522. By Xavi Garcia
-
[ 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/MenuItemMatch er.cpp
- src/gmenuharness/MenuMatcher. cpp
- include/unity/gmenuharn ess/MatchResult .h
- include/unity/gmenuharn ess/MatchUtils. h
- include/unity/gmenuharn ess/MenuItemMat cher.h
- include/unity/gmenuharn ess/MenuMatcher .h
* Added integration tests using gmenuharness
New Files:
- tests/dbus-types/CMakeList s.txt
- tests/dbus-types/com. ubuntu. AccountsService .Sound. xml
- tests/dbus-types/dbus- types.h
- tests/dbus-types/org. PulseAudio. Ext.StreamResto re1.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/pulseaudi o-volume. cpp
- tests/dbus-types/pulseaudi o-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/CMakeList s.txt
- tests/service-mocks/DBusPrope rtiesNotifier. cpp
- tests/service-mocks/DBusPrope rtiesNotifier. h
- tests/service-mocks/accounts- mock/AccountsDe fs.h
- tests/service-mocks/accounts- mock/AccountsMo ck.cpp
- tests/service-mocks/accounts- mock/AccountsMo ck.h
- tests/service-mocks/accounts- mock/AccountsSe rviceSoundMock. cpp
- tests/service-mocks/accounts- mock/AccountsSe rviceSoundMock. 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/ MediaPlayerMpri sDefs.h
- tests/service-mocks/media- player- mpris-mock/ MediaPlayerMpri sMock.cpp
- tests/service-mocks/media- player- mpris-mock/ MediaPlayerMpri sMock.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 - 513. By Timo Jyrinki
-
Restore changelog entries for CI Train purposes but note that they should be ignored as they were reverted.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:indicator-sound/15.10