Cleanup unit tests

Author: uglide

.travis.yml

@@ -4,9 +4,12 @@
 #
 #-------------------------------------------------
 
-DEFINES += ENABLE_EXTERNAL_FORMATTERS
-HEADERS += $$_PRO_FILE_PWD_/modules/value-editor/externalformattersmanager.h
-SOURCES += $$_PRO_FILE_PWD_/modules/value-editor/externalformattersmanager.cpp
+exists( $$_PRO_FILE_PWD_/modules/value-editor/externalformattersmanager.h) {
+    message("External formatters was enabled")
+    DEFINES += ENABLE_EXTERNAL_FORMATTERS
+    HEADERS += $$_PRO_FILE_PWD_/modules/value-editor/externalformattersmanager.h
+    SOURCES += $$_PRO_FILE_PWD_/modules/value-editor/externalformattersmanager.cpp
+}
 
 # qredisclient
 if(win32*):exists( $$PWD/qredisclient/qredisclient.lib ) {

3rdparty/3rdparty.pri

@@ -7,15 +7,11 @@
 [Known issues](http://docs.rdm.dev/en/latest/known-issues/) |
 [**Telegram Chat**](https://t.me/RedisDesktopManager)
 
-[![Travis Build Status](https://travis-ci.org/uglide/RedisDesktopManager.svg?branch=2019)](https://travis-ci.org/uglide/RedisDesktopManager) 
-[![Appveyor Build status](https://ci.appveyor.com/api/projects/status/3pwtjfl9yioyom9t?svg=true)](https://ci.appveyor.com/project/uglide/redisdesktopmanager/branch/2019)
-[![Coverage Status](https://coveralls.io/repos/uglide/RedisDesktopManager/badge.svg?branch=2019)](https://coveralls.io/r/uglide/RedisDesktopManager?branch=2019)
-[![Snap Status](https://build.snapcraft.io/badge/RedisDesktop/redisdesktopmanager-snap.svg)](https://build.snapcraft.io/user/RedisDesktop/redisdesktopmanager-snap)
 [![Documentation Status](https://readthedocs.org/projects/redisdesktopmanager/badge/?version=latest)](http://docs.rdm.dev/en/latest/?badge=latest)
 
 Open source cross-platform Desktop Manager for Redis ® based on Qt 5
 
-![RDM screenshot](http://rdm.dev/static/img/features/all.png?v2020)
+![RDM screenshot](http://rdm.dev/static/img/features/all.png?v2021)
 
 
 **Officially Supported platforms**:

README.md

@@ -59,7 +59,6 @@ class ServerConfig : public RedisClient::ConnectionConfig
     QString namespaceSeparator() const;
     void setNamespaceSeparator(QString);
 
-    bool luaKeysLoading() const;
     void setLuaKeysLoading(bool);
 
     uint databaseScanLimit() const;

src/app/models/connectionconf.h

@@ -11,6 +11,7 @@
 #include "configmanager.h"
 #include "modules/bulk-operations/bulkoperationsmanager.h"
 #include "modules/connections-tree/items/serveritem.h"
+#include "modules/connections-tree/items/servergroup.h"
 #include "modules/value-editor/tabsmodel.h"
 
 ConnectionsManager::ConnectionsManager(const QString& configPath,

src/app/models/connectionsmanager.cpp

@@ -5,7 +5,6 @@
 #include <functional>
 
 #include "app/models/connectionconf.h"
-#include "connections-tree/items/servergroup.h"
 #include "bulk-operations/connections.h"
 #include "connections-tree/model.h"
 #include "treeoperations.h"
@@ -15,6 +14,10 @@ namespace ValueEditor {
 class TabsModel;
 }
 
+namespace ConnectionsTree {
+class ServerGroup;
+}
+
 class Events;
 
 class ConnectionsManager : public ConnectionsTree::Model,

src/app/models/connectionsmanager.h

@@ -1,18 +1,23 @@
 import QtQuick 2.3
+import QtQml.Models 2.13
 import QtTest 1.0
 
-import "./../../src/qml/value-editor/editors/formatters/formatters.js" as Formatters
+import "./../../src/qml/value-editor/editors/formatters/"
 
 TestCase {
     name: "FormatterTests"
 
+    ValueFormatters {
+        id: valueFormatters
+    }
+
     function test_plain() {
         // given
-        var plain = Formatters.plain
+        var plain = valueFormatters.get(0)
         var testValue = "plain_text!"
 
         // checks
-        verify(plain.title.length !== 0, "title")
+        verify(plain.name.length !== 0, "title")
 
         plain.getFormatted(testValue, function (error, formatted, readOnly, format){
             compare(formatted, testValue)

tests/qml_tests/tst_formatters.qml

@@ -1,4 +1,3 @@
 TEMPLATE = subdirs
 SUBDIRS = unit_tests \
           qml_tests \
-          py_tests \

tests/tests.pro

@@ -12,7 +12,6 @@
 #include "testcases/connections-tree/test_databaseitem.h"
 #include "testcases/connections-tree/test_model.h"
 #include "testcases/connections-tree/test_serveritem.h"
-#include "testcases/console/test_console.h"
 #include "testcases/console/test_consolemodel.h"
 
 int main(int argc, char *argv[]) {
@@ -27,14 +26,13 @@ int main(int argc, char *argv[]) {
                        QTest::qExec(new TestModel, argc, argv)
 
                        // console module
-                       + QTest::qExec(new TestConsole, argc, argv)
+                       + QTest::qExec(new TestConsoleOperations, argc, argv)
 
                        // app
                        + QTest::qExec(new TestConnectionsManager, argc, argv) +
                        QTest::qExec(new TestConfigManager, argc, argv) +
-                       QTest::qExec(new TestConsoleOperations, argc, argv) +
-                       QTest::qExec(new TestTreeOperations, argc, argv) +
                        QTest::qExec(new TestKeyModels, argc, argv) +
+                       QTest::qExec(new TestTreeOperations, argc, argv) +
                        QTest::qExec(new TestAbstractKey, argc, argv);
 
   if (allTestsResult == 0)

tests/unit_tests/main.cpp

@@ -10,6 +10,7 @@ HEADERS  += \
     $$APP_SRC_DIR/models/connectionsmanager.h \
     $$APP_SRC_DIR/models/configmanager.h \
     $$APP_SRC_DIR/models/connectionconf.h \
+    $$APP_SRC_DIR/models/connectiongroup.h \
     $$APP_SRC_DIR/models/treeoperations.h \
     $$APP_SRC_DIR/models/key-models/keyfactory.h \
     $$APP_SRC_DIR/models/key-models/abstractkey.h \
@@ -29,6 +30,7 @@ SOURCES += \
     $$APP_SRC_DIR/apputils.cpp \
     $$APP_SRC_DIR/models/connectionsmanager.cpp \
     $$APP_SRC_DIR/models/configmanager.cpp \
+    $$APP_SRC_DIR/models/connectiongroup.cpp \
     $$APP_SRC_DIR/models/connectionconf.cpp \
     $$APP_SRC_DIR/models/treeoperations.cpp \
     $$APP_SRC_DIR/models/key-models/keyfactory.cpp \