diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2020-11-15 14:16:52 +0100 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2020-11-15 14:22:57 +0100 |
commit | 687edc1866bc605d793ad57f8a6aaaeb63fa4fae (patch) | |
tree | 1680c0263098df697cd73602fd3a5ef6ce668b8e | |
parent | cb71e2154c082ad4b401968f04f89c35d8364da3 (diff) | |
download | rockbox-687edc1866bc605d793ad57f8a6aaaeb63fa4fae.tar.gz rockbox-687edc1866bc605d793ad57f8a6aaaeb63fa4fae.zip |
rbutil: Extend test for ServerInfo.
- Further extend stubs, pull in less non-stubbed implementations.
- Change some test URLs to make sure the code actually uses the correct
ones.
Change-Id: Iac1d683748b5834e61aa4974d1b893b77f90b517
-rw-r--r-- | rbutil/rbutilqt/test/stubs/stubs-serverinfo.cpp | 71 | ||||
-rw-r--r-- | rbutil/rbutilqt/test/test-serverinfo.cpp | 14 | ||||
-rw-r--r-- | rbutil/rbutilqt/test/test-serverinfo.pro | 1 |
3 files changed, 78 insertions, 8 deletions
diff --git a/rbutil/rbutilqt/test/stubs/stubs-serverinfo.cpp b/rbutil/rbutilqt/test/stubs/stubs-serverinfo.cpp index eb1ba6157b..c223dee555 100644 --- a/rbutil/rbutilqt/test/stubs/stubs-serverinfo.cpp +++ b/rbutil/rbutilqt/test/stubs/stubs-serverinfo.cpp | |||
@@ -23,6 +23,77 @@ | |||
23 | #include "rbsettings.h" | 23 | #include "rbsettings.h" |
24 | #include "systeminfo.h" | 24 | #include "systeminfo.h" |
25 | 25 | ||
26 | QVariant SystemInfo::platformValue(SystemInfo::PlatformInfo info, QString platform) | ||
27 | { | ||
28 | switch(info) { | ||
29 | case SystemInfo::Manual: | ||
30 | if (platform == "iriverh120") return "iriverh100"; | ||
31 | if (platform == "ipodmini2g") return "ipodmini1g"; | ||
32 | break; | ||
33 | case SystemInfo::BuildserverModel: | ||
34 | return platform.split('.').at(0); | ||
35 | default: | ||
36 | return QString(); | ||
37 | } | ||
38 | return QString(); | ||
39 | } | ||
40 | |||
41 | QVariant SystemInfo::value(SystemInfo::SystemInfos info) | ||
42 | { | ||
43 | switch(info) { | ||
44 | case SystemInfo::ManualUrl: | ||
45 | //return QString("https://unittest/manual/rockbox-%MODEL%%FORMAT%"); | ||
46 | return QString("https://unittest/manual/%MANUALBASENAME%.%EXTENSION%"); | ||
47 | break; | ||
48 | case SystemInfo::BleedingUrl: | ||
49 | return QString("https://unittest/dev/rockbox-%MODEL%.zip"); | ||
50 | break; | ||
51 | case SystemInfo::DailyUrl: | ||
52 | return QString("https://unittest/daily/rockbox-%MODEL%-%RELVERSION%.zip"); | ||
53 | break; | ||
54 | case SystemInfo::ReleaseUrl: | ||
55 | return QString("https://unittest/release/%RELVERSION%/rockbox-%MODEL%-%RELVERSION%.zip"); | ||
56 | break; | ||
57 | default: | ||
58 | return QString(); | ||
59 | } | ||
60 | } | ||
61 | |||
62 | QStringList SystemInfo::platforms(SystemInfo::PlatformType type, QString variant) | ||
63 | { | ||
64 | // stub implementation: we have a fixed list of players, and only iaudiox5 | ||
65 | // has variant iaudiox5.v | ||
66 | QStringList result; | ||
67 | result << "iriverh100" << "iriverh120" << "iriverh300" | ||
68 | << "ipodmini2g" << "archosrecorder" << "archosfmrecorder" | ||
69 | << "gigabeatfx" << "iaudiom3" << "sansae200" << "iriverh10"; | ||
70 | switch (type) | ||
71 | { | ||
72 | case SystemInfo::PlatformBaseDisabled: | ||
73 | // return base platforms only, i.e. return iaudiox5 for iaudiox5.v | ||
74 | result << "iaudiox5"; | ||
75 | break; | ||
76 | case SystemInfo::PlatformVariantDisabled: | ||
77 | // return variants for the passed variant | ||
78 | if (variant == "iaudiox5") { | ||
79 | result.clear(); | ||
80 | result << "iaudiox5" << "iaudiox5.v"; | ||
81 | } | ||
82 | else { | ||
83 | result.clear(); | ||
84 | result << variant; | ||
85 | } | ||
86 | break; | ||
87 | case SystemInfo::PlatformAllDisabled: | ||
88 | // return all, both with and without variant. | ||
89 | result << "iaudiox5" << "iaudiox5.v"; | ||
90 | break; | ||
91 | default: | ||
92 | break; | ||
93 | } | ||
94 | return result; | ||
95 | } | ||
96 | |||
26 | 97 | ||
27 | QVariant RbSettings::value(UserSettings setting) | 98 | QVariant RbSettings::value(UserSettings setting) |
28 | { | 99 | { |
diff --git a/rbutil/rbutilqt/test/test-serverinfo.cpp b/rbutil/rbutilqt/test/test-serverinfo.cpp index 925973f466..46d9637150 100644 --- a/rbutil/rbutilqt/test/test-serverinfo.cpp +++ b/rbutil/rbutilqt/test/test-serverinfo.cpp | |||
@@ -69,11 +69,11 @@ const struct testvector testdata[] = | |||
69 | { "iaudiom3", ServerInfo::CurReleaseVersion, "3.11.2" }, | 69 | { "iaudiom3", ServerInfo::CurReleaseVersion, "3.11.2" }, |
70 | { "iaudiom3", ServerInfo::CurReleaseUrl, "http://dl.rockbox.org/release/3.11.2/rockbox-iaudiom5-3.11.2.zip" }, | 70 | { "iaudiom3", ServerInfo::CurReleaseUrl, "http://dl.rockbox.org/release/3.11.2/rockbox-iaudiom5-3.11.2.zip" }, |
71 | { "sansae200", ServerInfo::CurReleaseVersion, "3.11.2" }, | 71 | { "sansae200", ServerInfo::CurReleaseVersion, "3.11.2" }, |
72 | { "sansae200", ServerInfo::CurReleaseUrl, "http://download.rockbox.org/release/3.11.2/rockbox-sansae200-3.11.2.zip" }, | 72 | { "sansae200", ServerInfo::CurReleaseUrl, "https://unittest/release/3.11.2/rockbox-sansae200-3.11.2.zip" }, |
73 | { "iriverh100", ServerInfo::CurReleaseVersion, "3.11.2" }, | 73 | { "iriverh100", ServerInfo::CurReleaseVersion, "3.11.2" }, |
74 | { "iriverh100", ServerInfo::CurReleaseUrl, "http://dl.rockbox.org/release/3.11.2/rockbox-iriverh100-3.11.2.zip" }, | 74 | { "iriverh100", ServerInfo::CurReleaseUrl, "http://dl.rockbox.org/release/3.11.2/rockbox-iriverh100-3.11.2.zip" }, |
75 | { "iriverh100", ServerInfo::CurStatus, "Unstable" }, | 75 | { "iriverh100", ServerInfo::CurStatus, "Unstable" }, |
76 | { "iriverh100", ServerInfo::CurDevelUrl, "http://build.rockbox.org/data/rockbox-iriverh100.zip" }, | 76 | { "iriverh100", ServerInfo::CurDevelUrl, "https://unittest/dev/rockbox-iriverh100.zip" }, |
77 | { "iriverh300", ServerInfo::CurReleaseVersion, "" }, | 77 | { "iriverh300", ServerInfo::CurReleaseVersion, "" }, |
78 | { "iriverh300", ServerInfo::CurReleaseUrl, "" }, | 78 | { "iriverh300", ServerInfo::CurReleaseUrl, "" }, |
79 | { "iriverh300", ServerInfo::CurStatus, "Unusable" }, | 79 | { "iriverh300", ServerInfo::CurStatus, "Unusable" }, |
@@ -92,11 +92,11 @@ const struct testvector testdata[] = | |||
92 | { "iaudiox5.v", ServerInfo::RelCandidateUrl, "http://dl.rockbox.org/rc/f9dce96/rockbox-iaudiox5.zip" }, | 92 | { "iaudiox5.v", ServerInfo::RelCandidateUrl, "http://dl.rockbox.org/rc/f9dce96/rockbox-iaudiox5.zip" }, |
93 | { "iaudiox5.v", ServerInfo::BleedingRevision, "be1be79" }, | 93 | { "iaudiox5.v", ServerInfo::BleedingRevision, "be1be79" }, |
94 | { "iaudiox5.v", ServerInfo::BleedingDate, "2020-11-14T10:57:23" }, | 94 | { "iaudiox5.v", ServerInfo::BleedingDate, "2020-11-14T10:57:23" }, |
95 | { "iaudiox5.v", ServerInfo::CurDevelUrl, "http://build.rockbox.org/data/rockbox-iaudiox5.zip" }, | 95 | { "iaudiox5.v", ServerInfo::CurDevelUrl, "https://unittest/dev/rockbox-iaudiox5.zip" }, |
96 | { "iaudiox5.v", ServerInfo::ManualPdfUrl, "http://download.rockbox.org/manual/rockbox-iaudiox5.pdf" }, | 96 | { "iaudiox5.v", ServerInfo::ManualPdfUrl, "https://unittest/manual/rockbox-iaudiox5.pdf" }, |
97 | { "ipodmini2g", ServerInfo::ManualPdfUrl, "http://download.rockbox.org/manual/rockbox-ipodmini1g.pdf" }, | 97 | { "ipodmini2g", ServerInfo::ManualPdfUrl, "https://unittest/manual/rockbox-ipodmini1g.pdf" }, |
98 | { "iriverh100", ServerInfo::ManualHtmlUrl, "http://download.rockbox.org/manual/rockbox-iriverh100/rockbox-build.html" }, | 98 | { "iriverh100", ServerInfo::ManualHtmlUrl, "https://unittest/manual/rockbox-iriverh100/rockbox-build.html" }, |
99 | { "iriverh120", ServerInfo::ManualZipUrl, "http://download.rockbox.org/manual/rockbox-iriverh100-html.zip" }, | 99 | { "iriverh120", ServerInfo::ManualZipUrl, "https://unittest/manual/rockbox-iriverh100-html.zip" }, |
100 | }; | 100 | }; |
101 | 101 | ||
102 | 102 | ||
diff --git a/rbutil/rbutilqt/test/test-serverinfo.pro b/rbutil/rbutilqt/test/test-serverinfo.pro index 627077fd58..903d5a6b07 100644 --- a/rbutil/rbutilqt/test/test-serverinfo.pro +++ b/rbutil/rbutilqt/test/test-serverinfo.pro | |||
@@ -25,7 +25,6 @@ INCLUDEPATH += . ../base stubs | |||
25 | SOURCES += \ | 25 | SOURCES += \ |
26 | test-serverinfo.cpp \ | 26 | test-serverinfo.cpp \ |
27 | stubs/stubs-serverinfo.cpp \ | 27 | stubs/stubs-serverinfo.cpp \ |
28 | ../base/systeminfo.cpp \ | ||
29 | ../base/serverinfo.cpp | 28 | ../base/serverinfo.cpp |
30 | 29 | ||
31 | HEADERS += \ | 30 | HEADERS += \ |