diff options
| author | Xavi Garcia Mena <xavi.garcia.mena@canonical.com> | 2015-10-22 10:55:13 +0200 |
|---|---|---|
| committer | Xavi Garcia Mena <xavi.garcia.mena@canonical.com> | 2015-10-22 10:55:13 +0200 |
| commit | 3460b9c8d18a52bb859f143f0428e0325d699a3f (patch) | |
| tree | 424222e6b8d51965049eac83c6c38fd328a7dcc8 | |
| parent | 5a294ce7bba694a5cd61246c0e46febeb9b30339 (diff) | |
| download | ayatana-indicator-sound-3460b9c8d18a52bb859f143f0428e0325d699a3f.tar.gz ayatana-indicator-sound-3460b9c8d18a52bb859f143f0428e0325d699a3f.tar.bz2 ayatana-indicator-sound-3460b9c8d18a52bb859f143f0428e0325d699a3f.zip | |
Update unit test
| -rw-r--r-- | tests/integration/indicator-sound-test-base.h | 9 | ||||
| -rw-r--r-- | tests/integration/test-indicator.cpp | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/tests/integration/indicator-sound-test-base.h b/tests/integration/indicator-sound-test-base.h index 6879bcb..f9df9bb 100644 --- a/tests/integration/indicator-sound-test-base.h +++ b/tests/integration/indicator-sound-test-base.h @@ -42,6 +42,15 @@ class QSignalSpy; ASSERT_EQ(signalsExpected, signalSpy.size());\ } +#define WAIT_AT_LEAST_SIGNALS(signalSpy, signalsExpected)\ +{\ + while (signalSpy.size() < signalsExpected)\ + {\ + ASSERT_TRUE(signalSpy.wait());\ + }\ + ASSERT_TRUE(signalsExpected <= signalSpy.size());\ +} + class IndicatorSoundTestBase: public testing::Test { public: diff --git a/tests/integration/test-indicator.cpp b/tests/integration/test-indicator.cpp index 86d73b1..3cc24e8 100644 --- a/tests/integration/test-indicator.cpp +++ b/tests/integration/test-indicator.cpp @@ -56,7 +56,7 @@ TEST_F(TestIndicator, PhoneChangeRoleVolume) // set an initial volume to the alert role userAccountsSpy.clear(); setStreamRestoreVolume("alert", 1.0); - WAIT_FOR_SIGNALS(userAccountsSpy, 2); + WAIT_AT_LEAST_SIGNALS(userAccountsSpy, 1); userAccountsSpy.clear(); // play a test sound, it should change the role in the indicator |