summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoergAtGithub <JoergAtGithub@worldwartweb.com>2022-01-03 21:44:09 +0100
committerJoergAtGithub <JoergAtGithub@worldwartweb.com>2022-01-03 21:44:09 +0100
commit6c75296638fe17f6547bfcf5bef7460d2788e425 (patch)
treeecc1f202b8d80592d7b3c04021011c2dd7e5f5cf
parentcbf01790f6856b9ad1f40366fa8a5b17fead9176 (diff)
Removed contradictory .WillOnce(Return()) conditions where the cardinality is specified as .Times(0)
This generated a warning, which was only visible in verbose mode
-rw-r--r--src/test/controlobjectscripttest.cpp12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/test/controlobjectscripttest.cpp b/src/test/controlobjectscripttest.cpp
index b89b7b388b..b1c1b041b6 100644
--- a/src/test/controlobjectscripttest.cpp
+++ b/src/test/controlobjectscripttest.cpp
@@ -96,8 +96,7 @@ class ControlObjectScriptTest : public MixxxTest {
TEST_F(ControlObjectScriptTest, CompressingProxyCompareCount1) {
// Check that slotValueChanged callback is never called for conn2
EXPECT_CALL(*coScript2, slotValueChanged(_, _))
- .Times(0)
- .WillOnce(Return());
+ .Times(0);
// Check that slotValueChanged callback is called only once (independent of the value)
EXPECT_CALL(*coScript1, slotValueChanged(_, _))
.Times(1)
@@ -118,8 +117,7 @@ TEST_F(ControlObjectScriptTest, CompressingProxyCompareValue1) {
TEST_F(ControlObjectScriptTest, CompressingProxyCompareCount2) {
// Check that slotValueChanged callback is never called for conn2
EXPECT_CALL(*coScript2, slotValueChanged(_, _))
- .Times(0)
- .WillOnce(Return());
+ .Times(0);
// Check that slotValueChanged callback for conn1 is called only once (independent of the value)
EXPECT_CALL(*coScript1, slotValueChanged(_, _))
.Times(1)
@@ -142,8 +140,7 @@ TEST_F(ControlObjectScriptTest, CompressingProxyCompareValue2) {
TEST_F(ControlObjectScriptTest, QueuedCompareCount2) {
// Check that slotValueChanged callback is never called for conn4
EXPECT_CALL(*coScript2, slotValueChanged(_, _))
- .Times(0)
- .WillOnce(Return());
+ .Times(0);
// Check that slotValueChanged callback for conn1 is called only twice (independent of the value), because proxy is disabled
EXPECT_CALL(*coScript4, slotValueChanged(_, _))
.Times(2)
@@ -267,8 +264,7 @@ TEST_F(ControlObjectScriptTest, CompressingProxyManyEvents) {
// Event queue should be cleared
application()->processEvents();
EXPECT_CALL(*coScript1, slotValueChanged(_, _))
- .Times(0)
- .WillOnce(Return());
+ .Times(0);
application()->processEvents();
// Verify that compressing proxy works again after clearing event queue