Initial Catch2 integration

CMakeLists.txt

@@ -617,6 +617,7 @@ add_subdirectory(src)
 add_subdirectory(share)
 if(WITH_TESTS)
     add_subdirectory(tests)
+    add_subdirectory(tests2)
 endif(WITH_TESTS)
 
 if(WITH_XC_DOCS)

src/core/PassphraseGenerator.cpp

@@ -145,9 +145,5 @@ QString PassphraseGenerator::generatePassphrase() const
 
 bool PassphraseGenerator::isValid() const
 {
-    if (m_wordCount == 0) {
-        return false;
-    }
-
     return m_wordlist.size() >= 1000;
 }

src/core/Totp.cpp

@@ -259,15 +259,6 @@ QString Totp::generateTotp(const QSharedPointer<Totp::Settings>& settings, const
     return retval;
 }
 
-QList<QPair<QString, QString>> Totp::supportedEncoders()
-{
-    QList<QPair<QString, QString>> encoders;
-    for (auto& encoder : totpEncoders) {
-        encoders << QPair<QString, QString>(encoder.name, encoder.shortName);
-    }
-    return encoders;
-}
-
 QList<QPair<QString, Totp::Algorithm>> Totp::supportedAlgorithms()
 {
     QList<QPair<QString, Algorithm>> algorithms;

src/gui/MainWindow.cpp

@@ -678,6 +678,10 @@ MainWindow::~MainWindow()
 #ifdef WITH_XC_SSHAGENT
     sshAgent()->removeAllIdentities();
 #endif
+
+#if defined(WITH_XC_KEESHARE)
+    KeeShare::destroy();
+#endif
 }
 
 /**

src/gui/PasswordWidget.cpp

@@ -67,6 +67,7 @@ PasswordWidget::PasswordWidget(QWidget* parent)
         icons()->onOffIcon("password-show", false),
         tr("Toggle Password (%1)").arg(QKeySequence(modifier + Qt::Key_H).toString(QKeySequence::NativeText)),
         this);
+    m_toggleVisibleAction->setObjectName(QString("passwordToggleVisibleAction"));
     m_toggleVisibleAction->setCheckable(true);
     m_toggleVisibleAction->setShortcut(modifier + Qt::Key_H);
     m_toggleVisibleAction->setShortcutContext(Qt::WidgetShortcut);

src/keeshare/KeeShare.cpp

@@ -51,6 +51,12 @@ void KeeShare::init(QObject* parent)
     m_instance = new KeeShare(parent);
 }
 
+void KeeShare::destroy()
+{
+    delete m_instance;
+    m_instance = nullptr;
+}
+
 KeeShareSettings::Own KeeShare::own()
 {
     // Read existing own certificate or generate a new one if none available

src/keeshare/KeeShare.h

@@ -44,6 +44,7 @@ class KeeShare : public QObject
 public:
     static KeeShare* instance();
     static void init(QObject* parent);
+    static void destroy();
 
     static QString indicatorSuffix(const Group* group, const QString& text);
     static QPixmap indicatorBadge(const Group* group, QPixmap pixmap);

tests/CMakeLists.txt

@@ -179,15 +179,9 @@ add_unit_test(NAME testpasswordgenerator SOURCES TestPasswordGenerator.cpp
 add_unit_test(NAME testpasswordhealth SOURCES TestPasswordHealth.cpp
         LIBS ${TEST_LIBRARIES})
 
-add_unit_test(NAME testpassphrasegenerator SOURCES TestPassphraseGenerator.cpp
-        LIBS ${TEST_LIBRARIES})
-
 add_unit_test(NAME testhibp SOURCES TestHibp.cpp
         LIBS ${TEST_LIBRARIES})
 
-add_unit_test(NAME testtotp SOURCES TestTotp.cpp
-        LIBS ${TEST_LIBRARIES})
-
 add_unit_test(NAME testbase32 SOURCES TestBase32.cpp
         LIBS ${TEST_LIBRARIES})