From 5fb0f8b0fc46d2413dbcde3f118570245e2ee154 Mon Sep 17 00:00:00 2001 From: Saturneric Date: Mon, 20 Dec 2021 16:17:34 +0800 Subject: Update Test Code & Added Standlone Support --- test/GpgCoreTestKeyModel.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'test/GpgCoreTestKeyModel.cpp') diff --git a/test/GpgCoreTestKeyModel.cpp b/test/GpgCoreTestKeyModel.cpp index 4e85a8cf..194eeed2 100644 --- a/test/GpgCoreTestKeyModel.cpp +++ b/test/GpgCoreTestKeyModel.cpp @@ -75,18 +75,19 @@ TEST_F(GpgCoreTest, GpgKeyTest) { ASSERT_EQ(key.email(), "gpgfrontend@gpgfrontend.pub"); ASSERT_EQ(key.id(), "81704859182661FB"); ASSERT_EQ(key.fpr(), "9490795B78F8AFE9F93BD09281704859182661FB"); - ASSERT_EQ(key.expires(), boost::gregorian::from_simple_string("2023-09-05")); + ASSERT_EQ(key.expires(), + boost::posix_time::from_iso_string("20230905T040000")); ASSERT_EQ(key.pubkey_algo(), "RSA"); ASSERT_EQ(key.length(), 3072); ASSERT_EQ(key.last_update(), - boost::gregorian::from_simple_string("1970-01-01")); + boost::posix_time::from_iso_string("19700101T000000")); ASSERT_EQ(key.create_time(), - boost::gregorian::from_simple_string("2021-09-05")); + boost::posix_time::from_iso_string("20210905T060153")); ASSERT_EQ(key.owner_trust(), "Unknown"); using namespace boost::posix_time; - ASSERT_EQ(key.expired(), key.expires() < second_clock::local_time().date()); + ASSERT_EQ(key.expired(), key.expires() < second_clock::local_time()); } TEST_F(GpgCoreTest, GpgSubKeyTest) { @@ -100,7 +101,7 @@ TEST_F(GpgCoreTest, GpgSubKeyTest) { ASSERT_FALSE(sub_key.revoked()); ASSERT_FALSE(sub_key.disabled()); ASSERT_EQ(sub_key.timestamp(), - boost::gregorian::from_simple_string("2021-09-05")); + boost::posix_time::from_iso_string("20210905T060153")); ASSERT_FALSE(sub_key.is_cardkey()); ASSERT_TRUE(sub_key.is_private_key()); @@ -112,11 +113,11 @@ TEST_F(GpgCoreTest, GpgSubKeyTest) { ASSERT_FALSE(sub_key.can_authenticate()); ASSERT_FALSE(sub_key.can_sign()); ASSERT_TRUE(sub_key.can_encrypt()); - ASSERT_EQ(key.expires(), boost::gregorian::from_simple_string("2023-09-05")); + ASSERT_EQ(key.expires(), + boost::posix_time::from_iso_string("20230905T040000")); using namespace boost::posix_time; - ASSERT_EQ(sub_key.expired(), - sub_key.expires() < second_clock::local_time().date()); + ASSERT_EQ(sub_key.expired(), sub_key.expires() < second_clock::local_time()); } TEST_F(GpgCoreTest, GpgUIDTest) { -- cgit v1.2.3 From b5cd5eac82b6bbd8a00fb39c045d473d6517b5f4 Mon Sep 17 00:00:00 2001 From: Saturneric Date: Sat, 25 Dec 2021 09:54:57 +0800 Subject: (core, test): core improved and test gpg alone mode 1. let modules known their channels. 2. let factory create a channel. 3. reduce dumplicate code. 4. add type check for function object. 5. test gpg alone mode. 6. remove some asserts. 7. rename importexportor to importexporter. 8. move args in gpg context constructor to a struct. --- test/GpgCoreTestKeyModel.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'test/GpgCoreTestKeyModel.cpp') diff --git a/test/GpgCoreTestKeyModel.cpp b/test/GpgCoreTestKeyModel.cpp index 194eeed2..79cd7dcd 100644 --- a/test/GpgCoreTestKeyModel.cpp +++ b/test/GpgCoreTestKeyModel.cpp @@ -25,15 +25,11 @@ #include "GpgFrontendTest.h" #include "gpg/function/GpgKeyGetter.h" -// Should be used once and once-only -INITIALIZE_EASYLOGGINGPP - TEST_F(GpgCoreTest, CoreInitTest) { auto& ctx = GpgFrontend::GpgContext::GetInstance(default_channel); auto& ctx_default = GpgFrontend::GpgContext::GetInstance(); ASSERT_TRUE(ctx.good()); ASSERT_TRUE(ctx_default.good()); - ASSERT_EQ(ctx_default.GetInfo().DatabasePath, "default"); } TEST_F(GpgCoreTest, GpgDataTest) { -- cgit v1.2.3