diff options
Diffstat (limited to 'utils/rbutilqt/test/test-playerbuildinfo.cpp')
-rw-r--r-- | utils/rbutilqt/test/test-playerbuildinfo.cpp | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/utils/rbutilqt/test/test-playerbuildinfo.cpp b/utils/rbutilqt/test/test-playerbuildinfo.cpp index a250e37979..4dd5773576 100644 --- a/utils/rbutilqt/test/test-playerbuildinfo.cpp +++ b/utils/rbutilqt/test/test-playerbuildinfo.cpp | |||
@@ -82,10 +82,10 @@ Q_DECLARE_METATYPE(PlayerBuildInfo::BuildType); | |||
82 | Q_DECLARE_METATYPE(PlayerBuildInfo::DeviceInfo); | 82 | Q_DECLARE_METATYPE(PlayerBuildInfo::DeviceInfo); |
83 | 83 | ||
84 | struct { | 84 | struct { |
85 | QString target; | 85 | const char* target; |
86 | PlayerBuildInfo::BuildInfo item; | 86 | PlayerBuildInfo::BuildInfo item; |
87 | PlayerBuildInfo::BuildType type; | 87 | PlayerBuildInfo::BuildType type; |
88 | QString expected; | 88 | const char* expected; |
89 | } testdataBuild[] = | 89 | } testdataBuild[] = |
90 | { | 90 | { |
91 | // release builds | 91 | // release builds |
@@ -132,9 +132,9 @@ struct { | |||
132 | }; | 132 | }; |
133 | 133 | ||
134 | struct { | 134 | struct { |
135 | QString target; | 135 | const char* target; |
136 | PlayerBuildInfo::DeviceInfo item; | 136 | PlayerBuildInfo::DeviceInfo item; |
137 | QString expected; | 137 | const char* expected; |
138 | } testdataPlayer[] = | 138 | } testdataPlayer[] = |
139 | { | 139 | { |
140 | { "archosfmrecorder", PlayerBuildInfo::BuildStatus, "3" }, | 140 | { "archosfmrecorder", PlayerBuildInfo::BuildStatus, "3" }, |
@@ -166,8 +166,13 @@ void TestPlayerBuildInfo::testBuildInfo_data() | |||
166 | QTest::addColumn<PlayerBuildInfo::BuildType>("type"); | 166 | QTest::addColumn<PlayerBuildInfo::BuildType>("type"); |
167 | QTest::addColumn<QString>("expected"); | 167 | QTest::addColumn<QString>("expected"); |
168 | for (size_t i = 0; i < sizeof(testdataBuild) / sizeof(testdataBuild[0]); i++) | 168 | for (size_t i = 0; i < sizeof(testdataBuild) / sizeof(testdataBuild[0]); i++) |
169 | QTest::newRow("") << testdataBuild[i].target << testdataBuild[i].item | 169 | { |
170 | << testdataBuild[i].type << testdataBuild[i].expected; | 170 | char tag[30]; |
171 | snprintf(tag, sizeof(tag), "%s-%i-%i", | ||
172 | testdataBuild[i].target, testdataBuild[i].item, testdataBuild[i].type); | ||
173 | QTest::newRow(tag) << testdataBuild[i].target << testdataBuild[i].item | ||
174 | << testdataBuild[i].type << testdataBuild[i].expected; | ||
175 | } | ||
171 | } | 176 | } |
172 | 177 | ||
173 | 178 | ||
@@ -204,8 +209,13 @@ void TestPlayerBuildInfo::testPlayerInfo_data() | |||
204 | QTest::addColumn<PlayerBuildInfo::DeviceInfo>("item"); | 209 | QTest::addColumn<PlayerBuildInfo::DeviceInfo>("item"); |
205 | QTest::addColumn<QString>("expected"); | 210 | QTest::addColumn<QString>("expected"); |
206 | for (size_t i = 0; i < sizeof(testdataPlayer) / sizeof(testdataPlayer[0]); i++) | 211 | for (size_t i = 0; i < sizeof(testdataPlayer) / sizeof(testdataPlayer[0]); i++) |
207 | QTest::newRow("") << testdataPlayer[i].target << testdataPlayer[i].item | 212 | { |
208 | << testdataPlayer[i].expected; | 213 | char tag[30]; |
214 | snprintf(tag, sizeof(tag), "%s-%i", | ||
215 | testdataPlayer[i].target, testdataPlayer[i].item); | ||
216 | QTest::newRow(tag) << testdataPlayer[i].target << testdataPlayer[i].item | ||
217 | << testdataPlayer[i].expected; | ||
218 | } | ||
209 | } | 219 | } |
210 | 220 | ||
211 | void TestPlayerBuildInfo::testPlayerInfo() | 221 | void TestPlayerBuildInfo::testPlayerInfo() |