Revert "Revert "Debugging test initialization.""

This reverts commit 844f991
Olli781 · Aug 28, 2020 · d6d6dbc · d6d6dbc
1 parent 844f991
commit d6d6dbc
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 234 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
diff --git a/Tests/kstars_ui/CMakeLists.txt b/Tests/kstars_ui/CMakeLists.txt
@@ -21,12 +21,9 @@ INCLUDE_DIRECTORIES(${INDI_INCLUDE_DIR})
 SET(KSTARS_UI_EKOS_SRC ${KSTARS_UI_TESTS_SRC} test_ekos_wizard.cpp)
 SET(KSTARS_UI_EKOS_LIBS ${TEST_LIBRARIES} ${CFITSIO_LIBRARIES} ${INDI_CLIENT_LIBRARIES} ${NOVA_LIBRARIES} z)
 
-# FIXME: this particular test crashes when done on the EGLFS platform
-# Disabling until we find the reason, other tests do cover this scenario
-
-# ADD_EXECUTABLE(test_ekos ${KSTARS_UI_EKOS_SRC} test_ekos.cpp)
-# TARGET_LINK_LIBRARIES(test_ekos ${KSTARS_UI_EKOS_LIBS})
-# ADD_TEST(NAME TestEkosProfiles COMMAND test_ekos)
+ADD_EXECUTABLE(test_ekos ${KSTARS_UI_EKOS_SRC} test_ekos.cpp)
+TARGET_LINK_LIBRARIES(test_ekos ${KSTARS_UI_EKOS_LIBS})
+ADD_TEST(NAME TestEkosProfiles COMMAND test_ekos)
 
 ADD_EXECUTABLE(test_ekos_simulator ${KSTARS_UI_EKOS_SRC} test_ekos_simulator.cpp)
 TARGET_LINK_LIBRARIES(test_ekos_simulator ${KSTARS_UI_EKOS_LIBS})

diff --git a/Tests/kstars_ui/kstars_ui_tests.cpp b/Tests/kstars_ui/kstars_ui_tests.cpp
@@ -90,9 +90,6 @@ int run_wizards(int argc, char *argv[])
     }
 #endif
 
-    Q_UNUSED(argc);
-    Q_UNUSED(argv);
-
     return failure;
 }
 
@@ -113,6 +110,42 @@ void execute_tests()
     }
 }
 
-#if !defined(HAVE_INDI)
-QTEST_KSTARS_MAIN(KStarsUiTests)
+#if 1
+//QTEST_KSTARS_MAIN(KStarsUiTests)
+#else
+// This weak main function serves when only the KStars tests are run, and nothing else.
+// It serves as an expanded example to what happens when running tests with KSTARS_UI_TEST.
+int __attribute__((weak)) main(int argc, char * argv[])
+{
+    // We create our application
+    QApplication app(argc, argv);
+
+    // We configure our application environment
+    prepare_tests();
+
+    int failure = 0;
+
+    // We delay the tests with a timer because we need to run tests in an initialized UI
+    QTimer::singleShot(1000, QApplication::instance(), [&] {
+
+        qDebug("Starting tests...");
+
+        // Run KStars wizard
+        failure |= run_wizards(argc, argv);
+
+        // Run example tests - we'd better test our documentation :)
+        KStarsUiTests tc;
+        failure |= QTest::qExec(&tc, argc, argv);
+
+        qDebug("Tests are done.");
+
+        QApplication::instance()->quit();
+    });
+
+    // We launch the UI application, and let delayed tests do their job asynchronously
+    execute_tests();
+
+    // And we return the result
+    return failure;
+}
 #endif
diff --git a/datahandlers/catalogdb.cpp b/datahandlers/catalogdb.cpp
@@ -34,13 +34,7 @@
 
 bool CatalogDB::Initialize()
 {
-    skydb_ = QSqlDatabase::addDatabase("QSQLITE", "skydb");
-    if (!skydb_.isValid())
-    {
-        qCCritical(KSTARS_CATALOG()) << "Unable to prepare database of type sqlite!";
-        return false;
-    }
-
+    skydb_         = QSqlDatabase::addDatabase("QSQLITE", "skydb");
     QString dbfile = KSPaths::locate(QStandardPaths::GenericDataLocation, QString("skycomponents.sqlite"));
     if (dbfile.isEmpty())
         dbfile = KSPaths::writableLocation(QStandardPaths::GenericDataLocation) + QString("skycomponents.sqlite");
@@ -123,7 +117,6 @@ void CatalogDB::FirstRun()
             qCWarning(KSTARS_CATALOG) << query.lastError();
         }
     }
-    qCWarning(KSTARS_CATALOG) << "Additional Sky Catalog Database rebuilt.";
 }
 
 CatalogDB::~CatalogDB()

diff --git a/docker/Dockerfile b/docker/Dockerfile
diff --git a/kstars/kstarsdata.cpp b/kstars/kstarsdata.cpp
@@ -49,7 +49,6 @@ namespace
 // Calls QApplication::exit
 void fatalErrorMessage(QString fname)
 {
-    qCCritical(KSTARS) << i18n("Critical File not Found: %1", fname);
     KSNotification::sorry(i18n("The file  %1 could not be found. "
                                "KStars cannot run properly without this file. "
                                "KStars searches for this file in following locations:\n\n\t"
@@ -58,6 +57,7 @@ void fatalErrorMessage(QString fname)
                                fname, QStandardPaths::standardLocations(QStandardPaths::DataLocation).join("\n\t")),
                           i18n("Critical File Not Found: %1", fname)); // FIXME: Must list locations depending on file type
 
+    qDebug() << i18n("Critical File Not Found: %1", fname);
     qApp->exit(1);
 }
 
@@ -66,7 +66,6 @@ void fatalErrorMessage(QString fname)
 // Calls QApplication::exit if he don't
 bool nonFatalErrorMessage(QString fname)
 {
-    qCWarning(KSTARS) << i18n( "Non-Critical File Not Found: %1", fname );
 #ifdef KSTARS_LITE
     Q_UNUSED(fname);
     return true;