[libcalamares] Introduce a failing test for the number of regions

src/libcalamares/locale/Tests.cpp

@@ -47,6 +47,7 @@ private Q_SLOTS:
     void testInterlingue();
 
     // TimeZone testing
+    void testRegions();
     void testSimpleZones();
     void testComplexZones();
 };
@@ -244,18 +245,25 @@ LocaleTests::testTranslatableConfig2()
     QCOMPARE( ts3.count(), 1 );  // The empty string
 }
 
+void
+LocaleTests::testRegions()
+{
+    CalamaresUtils::Locale::RegionsModel regions;
+
+    QVERIFY( regions.rowCount( QModelIndex() ) > 3 );  // Africa, America, Asia
+}
+
+
 void
 LocaleTests::testSimpleZones()
 {
     using namespace CalamaresUtils::Locale;
-
 }
 
 void
 LocaleTests::testComplexZones()
 {
     using namespace CalamaresUtils::Locale;
-
 }
 
 QTEST_GUILESS_MAIN( LocaleTests )

src/libcalamares/locale/TimeZone.cpp

@@ -92,36 +92,37 @@ namespace CalamaresUtils
 namespace Locale
 {
 
-struct Private {
+struct Private
+{
 };
 
-static Private* privateInstance()
+static Private*
+privateInstance()
 {
     static Private* s_p = new Private;
     return s_p;
 }
 
-RegionsModel::RegionsModel()
+RegionsModel::RegionsModel( QObject* parent )
-: QAbstractListModel()
+    : QAbstractListModel( parent )
-, m_private( privateInstance() )
+    , m_private( privateInstance() )
 {
 }
 
-RegionsModel::~RegionsModel()
+RegionsModel::~RegionsModel() {}
-{
-}
 
-int RegionsModel::rowCount(const QModelIndex& parent) const
+int
+RegionsModel::rowCount( const QModelIndex& parent ) const
 {
     return 0;
 }
 
-QVariant RegionsModel::data(const QModelIndex& index, int role) const
+QVariant
+RegionsModel::data( const QModelIndex& index, int role ) const
 {
     return QVariant();
 }
 
 
-
 }  // namespace Locale
 }  // namespace CalamaresUtils

src/libcalamares/locale/TimeZone.h

@@ -43,17 +43,16 @@ class DLLEXPORT RegionsModel : public QAbstractListModel
 {
     Q_OBJECT
 
-    RegionsModel();
 
 public:
+    RegionsModel( QObject* parent = nullptr );
     virtual ~RegionsModel() override;
-    static RegionsModel* instance();
 
     int rowCount( const QModelIndex& parent ) const override;
     QVariant data( const QModelIndex& index, int role ) const override;
 
 private:
-    Private *m_private;
+    Private* m_private;
 };
 
 }  // namespace Locale