[git] GPGME - branch, master, updated. gpgme-1.8.0-33-g8aba08d
by Andre Heinecke
cvs at cvs.gnupg.org
Mon Jan 16 14:14:06 CET 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG Made Easy".
The branch, master has been updated
via 8aba08d1d0871f439fb7193adc4a2f43a81ee216 (commit)
from 92543da94cbf8e807b1b33070d273f995cdd5c62 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 8aba08d1d0871f439fb7193adc4a2f43a81ee216
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Dec 21 10:32:25 2016 +0100
qt: Add test for CryptoConfig
* lang/qt/tests/t-config.cpp: New.
* lang/qt/tests/Makefile.am: Update accordingly.
diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am
index aba7be8..e3aa3be 100644
--- a/lang/qt/tests/Makefile.am
+++ b/lang/qt/tests/Makefile.am
@@ -25,11 +25,11 @@ TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir)
EXTRA_DIST = initial.test
TESTS = initial.test t-keylist t-keylocate t-ownertrust t-tofuinfo \
- t-encrypt t-verify t-various
+ t-encrypt t-verify t-various t-config
moc_files = t-keylist.moc t-keylocate.moc t-ownertrust.moc t-tofuinfo.moc \
t-encrypt.moc t-support.hmoc t-wkspublish.moc t-verify.moc \
- t-various.moc
+ t-various.moc t-config.moc
AM_LDFLAGS = -no-install
@@ -59,6 +59,7 @@ t_encrypt_SOURCES = t-encrypt.cpp $(support_src)
t_wkspublish_SOURCES = t-wkspublish.cpp $(support_src)
t_verify_SOURCES = t-verify.cpp $(support_src)
t_various_SOURCES = t-various.cpp $(support_src)
+t_config_SOURCES = t-config.cpp $(support_src)
run_keyformailboxjob_SOURCES = run-keyformailboxjob.cpp
nodist_t_keylist_SOURCES = $(moc_files)
@@ -66,7 +67,7 @@ nodist_t_keylist_SOURCES = $(moc_files)
BUILT_SOURCES = $(moc_files)
noinst_PROGRAMS = t-keylist t-keylocate t-ownertrust t-tofuinfo t-encrypt \
- run-keyformailboxjob t-wkspublish t-verify t-various
+ run-keyformailboxjob t-wkspublish t-verify t-various t-config
CLEANFILES = secring.gpg pubring.gpg pubring.kbx trustdb.gpg dirmngr.conf \
gpg-agent.conf pubring.kbx~ S.gpg-agent gpg.conf pubring.gpg~ \
diff --git a/lang/qt/tests/t-config.cpp b/lang/qt/tests/t-config.cpp
new file mode 100644
index 0000000..046147c
--- /dev/null
+++ b/lang/qt/tests/t-config.cpp
@@ -0,0 +1,94 @@
+/* t-config.cpp
+
+ This file is part of qgpgme, the Qt API binding for gpgme
+ Copyright (c) 2016 Intevation GmbH
+
+ QGpgME is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ QGpgME is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ In addition, as a special exception, the copyright holders give
+ permission to link the code of this program with any edition of
+ the Qt library by Trolltech AS, Norway (or with modified versions
+ of Qt that use the same license as Qt), and distribute linked
+ combinations including the two. You must obey the GNU General
+ Public License in all respects for all of the code used other than
+ Qt. If you modify this file, you may extend this exception to
+ your version of the file, but you are not obligated to do so. If
+ you do not wish to do so, delete this exception statement from
+ your version.
+*/
+#ifdef HAVE_CONFIG_H
+ #include "config.h"
+#endif
+
+#include <QDebug>
+#include <QTest>
+#include <QTemporaryDir>
+#include "t-support.h"
+#include "protocol.h"
+#include "cryptoconfig.h"
+#include <unistd.h>
+
+using namespace QGpgME;
+
+class CryptoConfigTest: public QGpgMETest
+{
+ Q_OBJECT
+
+private Q_SLOTS:
+ void testKeyserver()
+ {
+ // Repeatedly set a config value and clear it
+ // this war broken at some point so it gets a
+ // unit test.
+ for (int i = 0; i < 10; i++) {
+ auto conf = cryptoConfig();
+ Q_ASSERT (conf);
+ auto entry = conf->entry(QStringLiteral("gpg"),
+ QStringLiteral("Keyserver"),
+ QStringLiteral("keyserver"));
+ Q_ASSERT(entry);
+ const QString url(QStringLiteral("hkp://foo.bar.baz"));
+ entry->setStringValue(url);
+ conf->sync(false);
+ conf->clear();
+ entry = conf->entry(QStringLiteral("gpg"),
+ QStringLiteral("Keyserver"),
+ QStringLiteral("keyserver"));
+ QCOMPARE (entry->stringValue(), url);
+ entry->setStringValue(QString());
+ conf->sync(false);
+ conf->clear();
+ entry = conf->entry(QStringLiteral("gpg"),
+ QStringLiteral("Keyserver"),
+ QStringLiteral("keyserver"));
+ QCOMPARE (entry->stringValue(), QString());
+ }
+ }
+
+ void initTestCase()
+ {
+ QGpgMETest::initTestCase();
+ const QString gpgHome = qgetenv("GNUPGHOME");
+ qputenv("GNUPGHOME", mDir.path().toUtf8());
+ Q_ASSERT(mDir.isValid());
+ }
+private:
+ QTemporaryDir mDir;
+
+};
+
+QTEST_MAIN(CryptoConfigTest)
+
+#include "t-config.moc"
-----------------------------------------------------------------------
Summary of changes:
lang/qt/tests/Makefile.am | 7 ++-
lang/qt/tests/{t-verify.cpp => t-config.cpp} | 91 ++++++++++++++--------------
2 files changed, 50 insertions(+), 48 deletions(-)
copy lang/qt/tests/{t-verify.cpp => t-config.cpp} (51%)
hooks/post-receive
--
GnuPG Made Easy
http://git.gnupg.org
More information about the Gnupg-commits
mailing list