From bb20b5c6bf8159cc2d0e3570660e1f770e1fffed Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Fri, 9 May 2025 08:37:37 -0400 Subject: [PATCH] rbutil: Don't stub out PlayerBuildInfo in tests Change-Id: I75667bc291828c1d4c548ab8f92c43a7a7fb892e --- utils/rbutilqt/CMakeLists.txt | 3 ++- utils/rbutilqt/base/playerbuildinfo.h | 1 + .../test/stubs/stubs-talkgenerator.cpp | 19 ------------------- 3 files changed, 3 insertions(+), 20 deletions(-) diff --git a/utils/rbutilqt/CMakeLists.txt b/utils/rbutilqt/CMakeLists.txt index 3aa9f6fe64..4addc8d54c 100644 --- a/utils/rbutilqt/CMakeLists.txt +++ b/utils/rbutilqt/CMakeLists.txt @@ -431,6 +431,8 @@ add_executable(test_talkgenerator base/talkgenerator.h base/encttssettings.cpp base/encttssettings.h + base/playerbuildinfo.h + base/playerbuildinfo.cpp base/ttsbase.h test/stubs/stubs-talkgenerator.cpp test/test-talkgenerator.qrc @@ -443,4 +445,3 @@ target_compile_definitions(test_talkgenerator PRIVATE UNICODE) qtest_discover_tests(test_talkgenerator) set_property(TARGET test_talkgenerator PROPERTY AUTOMOC ON) set_property(TARGET test_talkgenerator PROPERTY AUTORCC ON) - diff --git a/utils/rbutilqt/base/playerbuildinfo.h b/utils/rbutilqt/base/playerbuildinfo.h index 7997efcd5a..4dadf95067 100644 --- a/utils/rbutilqt/base/playerbuildinfo.h +++ b/utils/rbutilqt/base/playerbuildinfo.h @@ -31,6 +31,7 @@ class PlayerBuildInfo : public QObject { Q_OBJECT + public: enum BuildType { diff --git a/utils/rbutilqt/test/stubs/stubs-talkgenerator.cpp b/utils/rbutilqt/test/stubs/stubs-talkgenerator.cpp index a67600a0ae..50d10ad991 100644 --- a/utils/rbutilqt/test/stubs/stubs-talkgenerator.cpp +++ b/utils/rbutilqt/test/stubs/stubs-talkgenerator.cpp @@ -82,23 +82,4 @@ EncoderBase* EncoderBase::getEncoder(QObject*, QString) return nullptr; } -QVariant PlayerBuildInfo::value(PlayerBuildInfo::DeviceInfo /*item*/, QString /*target*/) -{ - return QVariant(); -} - -PlayerBuildInfo* PlayerBuildInfo::infoInstance = nullptr; - -PlayerBuildInfo::PlayerBuildInfo() -{ -} - -PlayerBuildInfo* PlayerBuildInfo::instance() -{ - if (infoInstance == nullptr) { - infoInstance = new PlayerBuildInfo(); - } - return infoInstance; -} - #include "stubs-talkgenerator.moc"