rixxc/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-12-04 15:39:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLI: Use stderr for password prompt

Browse Source 
Fixes #3398.

Convert to QTextStream for all CLI IO and greatly improve CLI tests

* Completely overhaul CLI tests to be much more streamlined and easy to read. Removed unnecessary code blocks by using existing functions.

Co-authored-by: Emma Brooks <me@pluvano.com>
This commit is contained in:
Jonathan White
2020-05-11 07:31:29 -04:00
parent 612f8d2e5b
commit 485852c9db
30 changed files with 938 additions and 1407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
tests/TestCli.h
View File

@@ -18,30 +18,33 @@
#ifndef KEEPASSXC_TESTCLI_H
#define KEEPASSXC_TESTCLI_H
#include "core/Database.h"
#include "util/TemporaryFile.h"
#include <QByteArray>
#include <QFile>
#include <QBuffer>
#include <QScopedPointer>
#include <QSharedPointer>
#include <QTemporaryFile>
#include <QStringList>
#include <QTest>
#include <stdio.h>
#include "util/TemporaryFile.h"
class Command;
class Database;
class TestCli : public QObject
{
Q_OBJECT
private:
QSharedPointer<Database> readTestDatabase() const;
QSharedPointer<Database>
readDatabase(const QString& filename = {}, const QString& pw = {}, const QString& keyfile = {});
int execCmd(Command& cmd, const QStringList& args) const;
bool isTotp(const QString& value);
void setInput(const QString& input);
void setInput(const QStringList& input);
private slots:
void initTestCase();
void init();
void cleanup();
void cleanupTestCase();
void testBatchCommands();
void testAdd();
@@ -78,21 +81,16 @@ private slots:
void testYubiKeyOption();
private:
QByteArray m_dbData;
QByteArray m_dbData2;
QByteArray m_xmlData;
QByteArray m_yubiKeyProtectedDbData;
QByteArray m_keyFileProtectedDbData;
QByteArray m_keyFileProtectedNoPasswordDbData;
QScopedPointer<TemporaryFile> m_dbFile;
QScopedPointer<TemporaryFile> m_dbFile2;
QScopedPointer<TemporaryFile> m_xmlFile;
QScopedPointer<TemporaryFile> m_keyFileProtectedDbFile;
QScopedPointer<TemporaryFile> m_keyFileProtectedNoPasswordDbFile;
QScopedPointer<TemporaryFile> m_yubiKeyProtectedDbFile;
QScopedPointer<TemporaryFile> m_stdoutFile;
QScopedPointer<TemporaryFile> m_stderrFile;
QScopedPointer<TemporaryFile> m_stdinFile;
QScopedPointer<QBuffer> m_stdout;
QScopedPointer<QBuffer> m_stderr;
QScopedPointer<QBuffer> m_stdin;
};
#endif // KEEPASSXC_TESTCLI_H