summaryrefslogtreecommitdiffstats
path: root/rbutil/rbutilqt/test
diff options
context:
space:
mode:
Diffstat (limited to 'rbutil/rbutilqt/test')
-rw-r--r--rbutil/rbutilqt/test/stubs/stubs-serverinfo.cpp23
-rw-r--r--rbutil/rbutilqt/test/test-serverinfo.cpp4
2 files changed, 9 insertions, 18 deletions
diff --git a/rbutil/rbutilqt/test/stubs/stubs-serverinfo.cpp b/rbutil/rbutilqt/test/stubs/stubs-serverinfo.cpp
index 38336a7a6f..f0fcaf6613 100644
--- a/rbutil/rbutilqt/test/stubs/stubs-serverinfo.cpp
+++ b/rbutil/rbutilqt/test/stubs/stubs-serverinfo.cpp
@@ -38,27 +38,22 @@ QVariant SystemInfo::platformValue(SystemInfo::PlatformInfo info, QString platfo
return QString();
}
-QVariant SystemInfo::value(SystemInfo::SystemInfos info)
+QVariant SystemInfo::value(SystemInfo::SystemInfos info, SystemInfo::BuildType type)
{
- switch(info) {
- case SystemInfo::ManualUrl:
- return QString("https://unittest/manual/rockbox-%MODEL%%FORMAT%");
- break;
- case SystemInfo::BleedingUrl:
+ (void)info; // test is currently only using BuildUrl.
+ switch(type) {
+ case SystemInfo::BuildCurrent:
return QString("https://unittest/dev/rockbox-%MODEL%.zip");
- break;
- case SystemInfo::DailyUrl:
+ case SystemInfo::BuildDaily:
return QString("https://unittest/daily/rockbox-%MODEL%-%RELVERSION%.zip");
- break;
- case SystemInfo::ReleaseUrl:
+ case SystemInfo::BuildRelease:
return QString("https://unittest/release/%RELVERSION%/rockbox-%MODEL%-%RELVERSION%.zip");
- break;
- case SystemInfo::CandidateUrl:
+ case SystemInfo::BuildCandidate:
return QString("https://unittest/rc/%RELVERSION%/rockbox-%MODEL%-%RELVERSION%.zip");
- break;
default:
- return QString();
+ break;
}
+ return QString();
}
QStringList SystemInfo::platforms(SystemInfo::PlatformType type, QString variant)
diff --git a/rbutil/rbutilqt/test/test-serverinfo.cpp b/rbutil/rbutilqt/test/test-serverinfo.cpp
index bc6024e843..b999624c78 100644
--- a/rbutil/rbutilqt/test/test-serverinfo.cpp
+++ b/rbutil/rbutilqt/test/test-serverinfo.cpp
@@ -93,10 +93,6 @@ const struct testvector testdata[] =
{ "iaudiox5.v", ServerInfo::BleedingRevision, "be1be79" },
{ "iaudiox5.v", ServerInfo::BleedingDate, "2020-11-14T10:57:23" },
{ "iaudiox5.v", ServerInfo::CurDevelUrl, "https://unittest/dev/rockbox-iaudiox5.zip" },
- { "iaudiox5.v", ServerInfo::ManualPdfUrl, "https://unittest/manual/rockbox-iaudiox5.pdf" },
- { "ipodmini2g", ServerInfo::ManualPdfUrl, "https://unittest/manual/rockbox-ipodmini1g.pdf" },
- { "iriverh100", ServerInfo::ManualHtmlUrl, "https://unittest/manual/rockbox-iriverh100/rockbox-build.html" },
- { "iriverh120", ServerInfo::ManualZipUrl, "https://unittest/manual/rockbox-iriverh100-html.zip" },
};