Adding unit tests on the new clip --best option

keepassxreboot · Aug 27, 2020 · 29ccefb · 29ccefb
1 parent 07f6f09
commit 29ccefb
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 1 deletion.
diff --git a/src/cli/Clip.cpp b/src/cli/Clip.cpp
@@ -81,7 +81,7 @@ int Clip::executeWithDatabase(QSharedPointer<Database> database, QSharedPointer<
             return EXIT_FAILURE;
         } else {
             bestEntryPath = (results.isEmpty()) ? args.at(1) : results[0];
-            err << QObject::tr("Matching \"%1\" entry used.").arg(bestEntryPath) << endl;
+            out << QObject::tr("Matching \"%1\" entry used.").arg(bestEntryPath) << endl;
         }
     } else {
         bestEntryPath = args.at(1);

diff --git a/tests/TestCli.cpp b/tests/TestCli.cpp
@@ -86,6 +86,9 @@ void TestCli::init()
     m_dbFile2.reset(new TemporaryFile());
     m_dbFile2->copyFromFile(file.arg("NewDatabase2.kdbx"));
 
+    m_dbFileMulti.reset(new TemporaryFile());
+    m_dbFileMulti->copyFromFile(file.arg("NewDatabaseMulti.kdbx"));
+
     m_xmlFile.reset(new TemporaryFile());
     m_xmlFile->copyFromFile(file.arg("NewDatabase.xml"));
 
@@ -115,6 +118,7 @@ void TestCli::cleanup()
 {
     m_dbFile.reset();
     m_dbFile2.reset();
+    m_dbFileMulti.reset();
     m_keyFileProtectedDbFile.reset();
     m_keyFileProtectedNoPasswordDbFile.reset();
     m_yubiKeyProtectedDbFile.reset();
@@ -504,6 +508,17 @@ void TestCli::testClip()
     setInput("a");
     execCmd(clipCmd, {"clip", m_dbFile2->fileName(), "--attribute", "Username", "--totp", "/Sample Entry"});
     QVERIFY(m_stderr->readAll().contains("ERROR: Please specify one of --attribute or --totp, not both.\n"));
+
+    // Best option
+    setInput("a");
+    execCmd(clipCmd, {"clip", m_dbFileMulti->fileName(), "Multi", "-b"});
+    QByteArray errorChoices = m_stderr->readAll();
+    QVERIFY(errorChoices.contains("Multi Entry 1"));
+    QVERIFY(errorChoices.contains("Multi Entry 2"));
+
+    setInput("a");
+    execCmd(clipCmd, {"clip", m_dbFileMulti->fileName(), "Entry 2", "-b"});
+    QTRY_COMPARE(clipboard->text(), QString("Password2"));
 }
 
 void TestCli::testCreate()

diff --git a/tests/TestCli.h b/tests/TestCli.h
@@ -83,6 +83,7 @@ private slots:
 private:
     QScopedPointer<TemporaryFile> m_dbFile;
     QScopedPointer<TemporaryFile> m_dbFile2;
+    QScopedPointer<TemporaryFile> m_dbFileMulti;
     QScopedPointer<TemporaryFile> m_xmlFile;
     QScopedPointer<TemporaryFile> m_keyFileProtectedDbFile;
     QScopedPointer<TemporaryFile> m_keyFileProtectedNoPasswordDbFile;

diff --git a/tests/data/NewDatabaseMulti.kdbx b/tests/data/NewDatabaseMulti.kdbx