mirror of https://github.com/cutefishos/calamares
Merge branch 'release-3.2.3'
- Pull in CHANGES and release-numbering modifications - Pull in locale fixes - Bump version again, to 3.2.4-RC1 in mastermain
Adriaan de Groot
7 years ago
commit
44211ee19a
@ -0,0 +1,80 @@
|
|||||||
|
/* === This file is part of Calamares - <http://github.com/calamares> ===
|
||||||
|
*
|
||||||
|
* Copyright 2019, Adriaan de Groot <groot@kde.org>
|
||||||
|
*
|
||||||
|
* Calamares 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 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* Calamares is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
#include "Tests.h"
|
||||||
|
#include "LocaleConfiguration.h"
|
||||||
|
|
||||||
|
#include <QtTest/QtTest>
|
||||||
|
|
||||||
|
QTEST_GUILESS_MAIN( LocaleTests )
|
||||||
|
|
||||||
|
|
||||||
|
LocaleTests::LocaleTests()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
LocaleTests::~LocaleTests()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
void LocaleTests::initTestCase()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
void LocaleTests::testEmptyLocaleConfiguration()
|
||||||
|
{
|
||||||
|
LocaleConfiguration lc;
|
||||||
|
|
||||||
|
QVERIFY( lc.isEmpty() );
|
||||||
|
QCOMPARE( lc.toBcp47(), QString() );
|
||||||
|
}
|
||||||
|
|
||||||
|
void LocaleTests::testDefaultLocaleConfiguration()
|
||||||
|
{
|
||||||
|
LocaleConfiguration lc( "en_US.UTF-8" );
|
||||||
|
QVERIFY( !lc.isEmpty() );
|
||||||
|
QCOMPARE( lc.language(), "en_US.UTF-8" );
|
||||||
|
QCOMPARE( lc.toBcp47(), "en" );
|
||||||
|
|
||||||
|
LocaleConfiguration lc2( "de_DE.UTF-8" );
|
||||||
|
QVERIFY( !lc2.isEmpty() );
|
||||||
|
QCOMPARE( lc2.language(), "de_DE.UTF-8" );
|
||||||
|
QCOMPARE( lc2.toBcp47(), "de" );
|
||||||
|
}
|
||||||
|
|
||||||
|
void LocaleTests::testSplitLocaleConfiguration()
|
||||||
|
{
|
||||||
|
LocaleConfiguration lc( "en_US.UTF-8", "de_DE.UTF-8" );
|
||||||
|
QVERIFY( !lc.isEmpty() );
|
||||||
|
QCOMPARE( lc.language(), "en_US.UTF-8" );
|
||||||
|
QCOMPARE( lc.toBcp47(), "en" );
|
||||||
|
QCOMPARE( lc.lc_numeric, QStringLiteral( "de_DE.UTF-8" ) );
|
||||||
|
|
||||||
|
LocaleConfiguration lc2( "de_DE.UTF-8", "da_DK.UTF-8" );
|
||||||
|
QVERIFY( !lc2.isEmpty() );
|
||||||
|
QCOMPARE( lc2.language(), "de_DE.UTF-8" );
|
||||||
|
QCOMPARE( lc2.toBcp47(), "de" );
|
||||||
|
QCOMPARE( lc2.lc_numeric, "da_DK.UTF-8" );
|
||||||
|
|
||||||
|
LocaleConfiguration lc3( "da_DK.UTF-8", "de_DE.UTF-8" );
|
||||||
|
QVERIFY( !lc3.isEmpty() );
|
||||||
|
QCOMPARE( lc3.toBcp47(), "da" );
|
||||||
|
QCOMPARE( lc3.lc_numeric, "de_DE.UTF-8" );
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,40 @@
|
|||||||
|
/* === This file is part of Calamares - <http://github.com/calamares> ===
|
||||||
|
*
|
||||||
|
* Copyright 2019, Adriaan de Groot <groot@kde.org>
|
||||||
|
*
|
||||||
|
* Calamares 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 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* Calamares is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
#ifndef TESTS_H
|
||||||
|
#define TESTS_H
|
||||||
|
|
||||||
|
#include <QObject>
|
||||||
|
|
||||||
|
class LocaleTests : public QObject
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
public:
|
||||||
|
LocaleTests();
|
||||||
|
~LocaleTests() override;
|
||||||
|
|
||||||
|
private Q_SLOTS:
|
||||||
|
void initTestCase();
|
||||||
|
// Check the sample config file is processed correctly
|
||||||
|
void testEmptyLocaleConfiguration();
|
||||||
|
void testDefaultLocaleConfiguration();
|
||||||
|
void testSplitLocaleConfiguration();
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif
|
||||||
Loading…
Reference in New Issue