Add unit test for connection dialog

Author: uglide

src/app/dialogs/connect.cpp

@@ -44,8 +44,8 @@ void ConnectionWindow::loadValuesFromConfig(const RedisClient::ConnectionConfig&
     ui.portSpinBox->setValue(config.port());
     ui.authEdit->setText(config.auth());
     ui.namespaceSeparator->setText(config.param<QString>("namespace_separator"));
-    ui.connectionTimeout->setValue(config.connectionTimeout());
-    ui.executionTimeout->setValue(config.executeTimeout());
+    ui.connectionTimeout->setValue(config.connectionTimeout()/1000);
+    ui.executionTimeout->setValue(config.executeTimeout()/1000);
 
     if (!config.keysPattern().isEmpty()) {
         ui.keysPattern->setText(config.keysPattern());

src/app/dialogs/connect.h

@@ -14,6 +14,7 @@ class ConnectionWindow : public QDialog
 public:
     ConnectionWindow(QWeakPointer<ConnectionsManager> manager, QWidget *parent = nullptr);
     void setConnectionConfig(const RedisClient::ConnectionConfig& config);
+    RedisClient::ConnectionConfig getConectionConfigFromFormData();
 
 private:
     Ui::connectionDialog ui;        
@@ -26,7 +27,7 @@ class ConnectionWindow : public QDialog
     bool isSshSettingsValid();
     bool isAdvancedSettingsValid();
     bool isSshTunnelUsed();
-    RedisClient::ConnectionConfig getConectionConfigFromFormData();
+
     void loadValuesFromConfig(const RedisClient::ConnectionConfig& config);
 
     void markFieldInvalid(QWidget *w);

src/modules/redisclient/connectionconfig.cpp

@@ -58,6 +58,11 @@ bool RedisClient::ConnectionConfig::isSshPasswordUsed()
     return !param<QString>("ssh_password").isEmpty();
 }
 
+QVariantHash RedisClient::ConnectionConfig::getInternalParameters()
+{
+    return m_parameters;
+}
+
 void RedisClient::ConnectionConfig::setSshTunnelSettings(QString host, QString user, QString pass, int port, QString privateKey)
 {
     m_parameters.insert("ssh_host", host);

src/modules/redisclient/connectionconfig.h

@@ -25,13 +25,14 @@ class ConnectionConfig
     int executeTimeout() const;
     int connectionTimeout() const;
 
-
     bool isNull() const;
     bool useSshTunnel() const;
     bool useAuth() const;
     bool isValid() const;
     bool isSshPasswordUsed();
 
+    QVariantHash getInternalParameters();
+
     template <class T> inline T param(const QString& p) const
     {
        if (m_parameters.contains(p)) return m_parameters[p].value<T>();

tests/unit_tests/main.cpp

@@ -10,6 +10,7 @@ _INITIALIZE_EASYLOGGINGPP
 #include "testcases/app/test_treeoperations.h"
 #include "testcases/app/test_abstractkey.h"
 #include "testcases/app/test_keymodels.h"
+#include "testcases/app/test_dialogs.h"
 #include "testcases/redisclient/test_command.h"
 #include "testcases/redisclient/test_response.h"
 #include "testcases/redisclient/test_connection.h"
@@ -45,6 +46,7 @@ int main(int argc, char *argv[])
             + QTest::qExec(new TestTreeOperations, argc, argv)
             + QTest::qExec(new TestKeyModels, argc, argv)
             + QTest::qExec(new TestAbstractKey, argc, argv)
+            + QTest::qExec(new TestDialogs, argc, argv)
 
             // value-editor module
             + QTest::qExec(new TestView, argc, argv)

tests/unit_tests/testcases/app/app-tests.pri

@@ -15,7 +15,8 @@ HEADERS  += \
     $$APP_SRC_DIR/models/key-models/sortedsetkey.h \
     $$APP_SRC_DIR/models/key-models/hashkey.h \
     $$APP_SRC_DIR/models/consoleoperations.h \
-    $$APP_SRC_DIR/widgets/consoletabs.h \
+    $$APP_SRC_DIR/widgets/consoletabs.h \    
+    $$APP_SRC_DIR/dialogs/connect.h \
 
 SOURCES += \
     $$PWD/test_*.cpp \
@@ -30,7 +31,11 @@ SOURCES += \
     $$APP_SRC_DIR/models/key-models/hashkey.cpp \
     $$APP_SRC_DIR/models/consoleoperations.cpp \
     $$APP_SRC_DIR/widgets/consoletabs.cpp \
+    $$APP_SRC_DIR/dialogs/connect.cpp \
 
 OTHER_FILES += \
     connections.xml
 
+FORMS += \
+    $$APP_SRC_DIR/forms/connection.ui \
+

tests/unit_tests/testcases/app/test_abstractkey.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <QObject>
+#include "basetestcase.h"
 
-class TestAbstractKey : public QObject
+class TestAbstractKey : public BaseTestCase
 {
     Q_OBJECT
 

tests/unit_tests/testcases/app/test_connectionsmanager.h

@@ -1,15 +1,11 @@
-#ifndef TEST_REDISCONNECTIONSMANAGER_H
-#define TEST_REDISCONNECTIONSMANAGER_H
+#pragma once
+#include "basetestcase.h"
 
-#include <QObject>
-
-class TestConnectionsManager : public QObject
+class TestConnectionsManager : public BaseTestCase
 {
 	Q_OBJECT
 
 private slots:
 	void LoadConnectionsConfigFromFile();
 
 };
-
-#endif // TEST_REDISCONNECTIONSMANAGER_H

tests/unit_tests/testcases/app/test_dialogs.cpp

@@ -0,0 +1,28 @@
+#include "test_dialogs.h"
+#include "app/dialogs/connect.h"
+#include "models/connectionsmanager.h"
+#include "app/widgets/consoletabs.h"
+
+namespace ValueEditor {
+    class ViewModel;
+}
+
+void TestDialogs::testConnectionDialog()
+{
+    //given
+    QString configTestFile = "connections.xml";
+    ConsoleTabs tabsWidget;
+    QSharedPointer<ConnectionsManager> testManager(new ConnectionsManager(configTestFile, tabsWidget,
+                                   QSharedPointer<ValueEditor::ViewModel>()));
+
+    ConnectionWindow window(testManager.toWeakRef());
+    RedisClient::ConnectionConfig conf("fake_host", "fake_name");
+    conf.setSshTunnelSettings("fake_ssh_host", "fake_ssh_user", "fake_ssh_pass");
+
+    //when
+    window.setConnectionConfig(conf);
+    RedisClient::ConnectionConfig actualResult = window.getConectionConfigFromFormData();
+
+    //then
+    QCOMPARE(actualResult.getInternalParameters(), conf.getInternalParameters());
+}

tests/unit_tests/testcases/app/test_dialogs.h

@@ -0,0 +1,11 @@
+#pragma once
+#include "basetestcase.h"
+
+class TestDialogs : public BaseTestCase
+{
+    Q_OBJECT
+
+private slots:
+    void testConnectionDialog();
+
+};