From b064a6cbb58a0db1a70fbac2e82242ce0c7509b1 Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Sat, 28 Nov 2020 20:47:28 +0100 Subject: rbutil: Rework and merge player and build server info handling. Handling the data for players from rbutil.ini and the build-info data from the server is closely related. Splitting things up into different classes only creates tightly coupling, which is unnecessary, and the need to differentiate between them in the application. Merge both classes into a single one and rework handling so the application doesn't have to deal with two separate classes anymore. Furthermore, change URL templates to use new values from build-info instead of hard coding them. Change-Id: Ica550973ce23d1559110782add52bc214eba552d --- rbutil/rbutilqt/test/test-serverinfo.cpp | 124 ------------------------------- 1 file changed, 124 deletions(-) delete mode 100644 rbutil/rbutilqt/test/test-serverinfo.cpp (limited to 'rbutil/rbutilqt/test/test-serverinfo.cpp') diff --git a/rbutil/rbutilqt/test/test-serverinfo.cpp b/rbutil/rbutilqt/test/test-serverinfo.cpp deleted file mode 100644 index b999624c78..0000000000 --- a/rbutil/rbutilqt/test/test-serverinfo.cpp +++ /dev/null @@ -1,124 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * - * Copyright (C) 2012 Dominik Riebeling - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -#include -#include -#include "serverinfo.h" - -class TestServerInfo : public QObject -{ - Q_OBJECT - private slots: - void testMain(); -}; - -const char* testinfo = - "[release]\n" - "archosfmrecorder=3.11.2\n" - "iaudiom3=3.11.2,http://dl.rockbox.org/release/3.11.2/rockbox-iaudiom5-3.11.2.zip\n" - "sansae200 = 3.11.2\n" - "iriverh100 = 3.11.2, http://dl.rockbox.org/release/3.11.2/rockbox-iriverh100-3.11.2.zip\n" - "iriverh300 = \n" - "[release-candidate]\n" - "gigabeatfx=f9dce96,http://dl.rockbox.org/rc/f9dce96/rockbox-gigabeatfx.zip\n" - "archosfmrecorder=f9dce96\n" - "archosrecorder = f9dce96\n" - "iaudiox5=f9dce96,http://dl.rockbox.org/rc/f9dce96/rockbox-iaudiox5.zip\n" - "[dailies]\n" - "timestamp = 20201113\n" - "rev = 362f7a3\n" - "[bleeding]\n" - "timestamp = 20201114T105723Z\n" - "rev = be1be79\n" - "[status]\n" - "archosfmrecorder=3\n" - "iriverh100=2\n" - "iriverh300=1\n" - "iriverh10=0\n" - ; - - -struct testvector { - const char* target; - ServerInfo::ServerInfos entry; - const char* expected; -}; - - -const struct testvector testdata[] = -{ - { "archosfmrecorder", ServerInfo::CurReleaseVersion, "3.11.2" }, - { "archosfmrecorder", ServerInfo::CurStatus, "3" }, - { "iaudiom3", ServerInfo::CurReleaseVersion, "3.11.2" }, - { "iaudiom3", ServerInfo::CurReleaseUrl, "http://dl.rockbox.org/release/3.11.2/rockbox-iaudiom5-3.11.2.zip" }, - { "sansae200", ServerInfo::CurReleaseVersion, "3.11.2" }, - { "sansae200", ServerInfo::CurReleaseUrl, "https://unittest/release/3.11.2/rockbox-sansae200-3.11.2.zip" }, - { "iriverh100", ServerInfo::CurReleaseVersion, "3.11.2" }, - { "iriverh100", ServerInfo::CurReleaseUrl, "http://dl.rockbox.org/release/3.11.2/rockbox-iriverh100-3.11.2.zip" }, - { "iriverh100", ServerInfo::CurStatus, "2" }, - { "iriverh100", ServerInfo::CurDevelUrl, "https://unittest/dev/rockbox-iriverh100.zip" }, - { "iriverh300", ServerInfo::CurReleaseVersion, "" }, - { "iriverh300", ServerInfo::CurReleaseUrl, "" }, - { "iriverh300", ServerInfo::CurStatus, "1" }, - { "iriverh10", ServerInfo::CurReleaseVersion, "" }, - { "iriverh10", ServerInfo::CurReleaseUrl, "" }, - { "iriverh10", ServerInfo::CurStatus, "0" }, - { "gigabeatfx", ServerInfo::RelCandidateVersion, "f9dce96" }, - { "gigabeatfx", ServerInfo::RelCandidateUrl, "http://dl.rockbox.org/rc/f9dce96/rockbox-gigabeatfx.zip" }, - { "archosfmrecorder", ServerInfo::RelCandidateVersion, "f9dce96" }, - { "archosfmrecorder", ServerInfo::RelCandidateUrl, "https://unittest/rc/f9dce96/rockbox-archosfmrecorder-f9dce96.zip" }, - { "archosrecorder", ServerInfo::RelCandidateVersion, "f9dce96" }, - { "archosrecorder", ServerInfo::RelCandidateUrl, "https://unittest/rc/f9dce96/rockbox-archosrecorder-f9dce96.zip" }, - { "iaudiox5", ServerInfo::RelCandidateVersion, "f9dce96" }, - { "iaudiox5", ServerInfo::RelCandidateUrl, "http://dl.rockbox.org/rc/f9dce96/rockbox-iaudiox5.zip" }, - { "iaudiox5.v", ServerInfo::RelCandidateVersion, "f9dce96" }, - { "iaudiox5.v", ServerInfo::RelCandidateUrl, "http://dl.rockbox.org/rc/f9dce96/rockbox-iaudiox5.zip" }, - { "iaudiox5.v", ServerInfo::BleedingRevision, "be1be79" }, - { "iaudiox5.v", ServerInfo::BleedingDate, "2020-11-14T10:57:23" }, - { "iaudiox5.v", ServerInfo::CurDevelUrl, "https://unittest/dev/rockbox-iaudiox5.zip" }, -}; - - -void TestServerInfo::testMain() -{ - // create a temporary file for test input. Do not use QSettings() to allow - // creating different format variations. - QTemporaryFile tf(this); - tf.open(); - QString filename = tf.fileName(); - tf.write(testinfo); - tf.close(); - - ServerInfo::instance()->readBuildInfo(filename); - - unsigned int i; - for(i = 0; i < sizeof(testdata) / sizeof(struct testvector); i++) { - QString result = ServerInfo::instance()->platformValue(testdata[i].entry, testdata[i].target).toString(); - QCOMPARE(result, QString(testdata[i].expected)); - } -} - - -QTEST_MAIN(TestServerInfo) - -// this include is needed because we don't use a separate header file for the -// test class. It also needs to be at the end. -#include "test-serverinfo.moc" - -- cgit v1.2.3