aboutsummaryrefslogtreecommitdiffstats
path: root/src/test/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/test/core')
-rw-r--r--src/test/core/GpgCoreTestBasicOpera.cpp29
-rw-r--r--src/test/core/GpgCoreTestFileBasicOpera.cpp45
-rw-r--r--src/test/core/GpgCoreTestKeyManagement.cpp64
-rw-r--r--src/test/core/GpgCoreTestKeyOpera.cpp20
-rw-r--r--src/test/core/GpgCoreTestKeyUIDOpera.cpp28
-rw-r--r--src/test/core/GpgCoreTestKeygen.cpp104
-rw-r--r--src/test/core/GpgCoreTestSubkeygen.cpp36
7 files changed, 169 insertions, 157 deletions
diff --git a/src/test/core/GpgCoreTestBasicOpera.cpp b/src/test/core/GpgCoreTestBasicOpera.cpp
index a7bdfead..3e188478 100644
--- a/src/test/core/GpgCoreTestBasicOpera.cpp
+++ b/src/test/core/GpgCoreTestBasicOpera.cpp
@@ -40,9 +40,9 @@
namespace GpgFrontend::Test {
TEST_F(GpgCoreTest, CoreEncryptDecrTest) {
- auto encrypt_key = GpgKeyGetter::GetInstance().GetPubkey(
+ auto encrypt_key = GpgKeyGetter::GetInstance().GetPubkeyPtr(
"E87C6A2D8D95C818DE93B3AE6A2764F8298DEB29");
- ASSERT_TRUE(encrypt_key.IsGood());
+ ASSERT_TRUE(encrypt_key != nullptr);
auto buffer = GFBuffer(QString("Hello GpgFrontend!"));
@@ -152,9 +152,9 @@ TEST_F(GpgCoreTest, CoreEncryptDecrTest_KeyNotFound_ResultAnalyse) {
}
TEST_F(GpgCoreTest, CoreSignVerifyNormalTest) {
- auto sign_key = GpgKeyGetter::GetInstance().GetPubkey(
+ auto sign_key = GpgKeyGetter::GetInstance().GetPubkeyPtr(
"467F14220CE8DCF780CF4BAD8465C55B25C9B7D1");
- ASSERT_TRUE(sign_key.IsGood());
+ ASSERT_TRUE(sign_key != nullptr);
auto sign_text = GFBuffer(QString("Hello GpgFrontend!"));
@@ -179,10 +179,9 @@ TEST_F(GpgCoreTest, CoreSignVerifyNormalTest) {
}
TEST_F(GpgCoreTest, CoreSignVerifyDetachTest) {
- auto sign_key = GpgKeyGetter::GetInstance().GetPubkey(
+ auto sign_key = GpgKeyGetter::GetInstance().GetPubkeyPtr(
"467F14220CE8DCF780CF4BAD8465C55B25C9B7D1");
- ASSERT_TRUE(sign_key.IsGood());
-
+ ASSERT_TRUE(sign_key != nullptr);
auto sign_text = GFBuffer(QString("Hello GpgFrontend!"));
auto [err, data_object] = GpgBasicOperator::GetInstance().SignSync(
@@ -206,9 +205,9 @@ TEST_F(GpgCoreTest, CoreSignVerifyDetachTest) {
}
TEST_F(GpgCoreTest, CoreSignVerifyClearTest) {
- auto sign_key = GpgKeyGetter::GetInstance().GetPubkey(
+ auto sign_key = GpgKeyGetter::GetInstance().GetPubkeyPtr(
"467F14220CE8DCF780CF4BAD8465C55B25C9B7D1");
- ASSERT_TRUE(sign_key.IsGood());
+ ASSERT_TRUE(sign_key != nullptr);
auto sign_text = GFBuffer(QString("Hello GpgFrontend!"));
@@ -232,16 +231,16 @@ TEST_F(GpgCoreTest, CoreSignVerifyClearTest) {
}
TEST_F(GpgCoreTest, CoreEncryptSignDecrVerifyTest) {
- auto encrypt_key = GpgKeyGetter::GetInstance().GetPubkey(
+ auto encrypt_key = GpgKeyGetter::GetInstance().GetPubkeyPtr(
"467F14220CE8DCF780CF4BAD8465C55B25C9B7D1");
- ASSERT_TRUE(encrypt_key.IsGood());
- auto sign_key = GpgKeyGetter::GetInstance().GetKey(
+ ASSERT_TRUE(encrypt_key != nullptr);
+ auto sign_key = GpgKeyGetter::GetInstance().GetKeyPtr(
"8933EB283A18995F45D61DAC021D89771B680FFB");
- ASSERT_TRUE(sign_key.IsGood());
+ ASSERT_TRUE(sign_key != nullptr);
auto encrypt_text = GFBuffer(QString("Hello GpgFrontend!"));
- ASSERT_TRUE(sign_key.IsPrivateKey());
- ASSERT_TRUE(sign_key.IsHasActualSignCap());
+ ASSERT_TRUE(sign_key->IsPrivateKey());
+ ASSERT_TRUE(sign_key->IsHasActualSignCap());
auto [err, data_object] = GpgBasicOperator::GetInstance().EncryptSignSync(
{encrypt_key}, {sign_key}, encrypt_text, true);
diff --git a/src/test/core/GpgCoreTestFileBasicOpera.cpp b/src/test/core/GpgCoreTestFileBasicOpera.cpp
index bb108499..b753636e 100644
--- a/src/test/core/GpgCoreTestFileBasicOpera.cpp
+++ b/src/test/core/GpgCoreTestFileBasicOpera.cpp
@@ -27,9 +27,9 @@
*/
#include "GpgCoreTest.h"
-#include "core/GpgModel.h"
#include "core/function/gpg/GpgFileOpera.h"
#include "core/function/gpg/GpgKeyGetter.h"
+#include "core/model/DataObject.h"
#include "core/model/GpgDecryptResult.h"
#include "core/model/GpgEncryptResult.h"
#include "core/model/GpgSignResult.h"
@@ -40,9 +40,9 @@
namespace GpgFrontend::Test {
TEST_F(GpgCoreTest, CoreFileEncryptDecrTest) {
- auto encrypt_key = GpgKeyGetter::GetInstance().GetPubkey(
+ auto encrypt_key = GpgKeyGetter::GetInstance().GetPubkeyPtr(
"E87C6A2D8D95C818DE93B3AE6A2764F8298DEB29");
- ASSERT_TRUE(encrypt_key.IsGood());
+ ASSERT_TRUE(encrypt_key != nullptr);
auto buffer = GFBuffer(QString("Hello GpgFrontend!"));
auto input_file = CreateTempFileAndWriteData(buffer);
@@ -72,9 +72,9 @@ TEST_F(GpgCoreTest, CoreFileEncryptDecrTest) {
}
TEST_F(GpgCoreTest, CoreFileEncryptDecrBinaryTest) {
- auto encrypt_key = GpgKeyGetter::GetInstance().GetPubkey(
+ auto encrypt_key = GpgKeyGetter::GetInstance().GetPubkeyPtr(
"E87C6A2D8D95C818DE93B3AE6A2764F8298DEB29");
- ASSERT_TRUE(encrypt_key.IsGood());
+ ASSERT_TRUE(encrypt_key != nullptr);
auto buffer = GFBuffer(QString("Hello GpgFrontend!"));
auto input_file = CreateTempFileAndWriteData(buffer);
@@ -165,9 +165,9 @@ TEST_F(GpgCoreTest, CoreFileEncryptSymmetricDecrBinaryTest) {
}
TEST_F(GpgCoreTest, CoreFileSignVerifyNormalTest) {
- auto sign_key = GpgKeyGetter::GetInstance().GetPubkey(
+ auto sign_key = GpgKeyGetter::GetInstance().GetPubkeyPtr(
"467F14220CE8DCF780CF4BAD8465C55B25C9B7D1");
- ASSERT_TRUE(sign_key.IsGood());
+ ASSERT_TRUE(sign_key != nullptr);
auto input_file = CreateTempFileAndWriteData("Hello GpgFrontend!");
auto output_file = GetTempFilePath();
@@ -192,9 +192,12 @@ TEST_F(GpgCoreTest, CoreFileSignVerifyNormalTest) {
}
TEST_F(GpgCoreTest, CoreFileSignVerifyNormalBinaryTest) {
- auto sign_key = GpgKeyGetter::GetInstance().GetPubkey(
+ auto sign_key = GpgKeyGetter::GetInstance().GetKeyPtr(
"467F14220CE8DCF780CF4BAD8465C55B25C9B7D1");
- ASSERT_TRUE(sign_key.IsGood());
+ ASSERT_TRUE(sign_key != nullptr);
+
+ ASSERT_TRUE(sign_key->IsPrivateKey());
+ ASSERT_TRUE(sign_key->IsHasActualSignCap());
auto input_file = CreateTempFileAndWriteData("Hello GpgFrontend!");
auto output_file = GetTempFilePath();
@@ -219,20 +222,20 @@ TEST_F(GpgCoreTest, CoreFileSignVerifyNormalBinaryTest) {
}
TEST_F(GpgCoreTest, CoreFileEncryptSignDecrVerifyTest) {
- auto encrypt_key = GpgKeyGetter::GetInstance().GetPubkey(
+ auto encrypt_key = GpgKeyGetter::GetInstance().GetPubkeyPtr(
"467F14220CE8DCF780CF4BAD8465C55B25C9B7D1");
- ASSERT_TRUE(encrypt_key.IsGood());
+ ASSERT_TRUE(encrypt_key != nullptr);
- auto sign_key = GpgKeyGetter::GetInstance().GetKey(
+ auto sign_key = GpgKeyGetter::GetInstance().GetKeyPtr(
"8933EB283A18995F45D61DAC021D89771B680FFB");
- ASSERT_TRUE(sign_key.IsGood());
+ ASSERT_TRUE(sign_key != nullptr);
auto buffer = GFBuffer(QString("Hello GpgFrontend!"));
auto input_file = CreateTempFileAndWriteData(buffer);
auto output_file = GetTempFilePath();
- ASSERT_TRUE(sign_key.IsPrivateKey());
- ASSERT_TRUE(sign_key.IsHasActualSignCap());
+ ASSERT_TRUE(sign_key->IsPrivateKey());
+ ASSERT_TRUE(sign_key->IsHasActualSignCap());
auto [err, data_object] = GpgFileOpera::GetInstance().EncryptSignFileSync(
{encrypt_key}, {sign_key}, input_file, true, output_file);
@@ -267,19 +270,19 @@ TEST_F(GpgCoreTest, CoreFileEncryptSignDecrVerifyTest) {
}
TEST_F(GpgCoreTest, CoreFileEncryptSignDecrVerifyBinaryTest) {
- auto encrypt_key = GpgKeyGetter::GetInstance().GetPubkey(
+ auto encrypt_key = GpgKeyGetter::GetInstance().GetPubkeyPtr(
"467F14220CE8DCF780CF4BAD8465C55B25C9B7D1");
- ASSERT_TRUE(encrypt_key.IsGood());
- auto sign_key = GpgKeyGetter::GetInstance().GetKey(
+ ASSERT_TRUE(encrypt_key != nullptr);
+ auto sign_key = GpgKeyGetter::GetInstance().GetKeyPtr(
"8933EB283A18995F45D61DAC021D89771B680FFB");
- ASSERT_TRUE(sign_key.IsGood());
+ ASSERT_TRUE(sign_key != nullptr);
auto buffer = GFBuffer(QString("Hello GpgFrontend!"));
auto input_file = CreateTempFileAndWriteData(buffer);
auto output_file = GetTempFilePath();
- ASSERT_TRUE(sign_key.IsPrivateKey());
- ASSERT_TRUE(sign_key.IsHasActualSignCap());
+ ASSERT_TRUE(sign_key->IsPrivateKey());
+ ASSERT_TRUE(sign_key->IsHasActualSignCap());
auto [err, data_object] = GpgFileOpera::GetInstance().EncryptSignFileSync(
{encrypt_key}, {sign_key}, input_file, false, output_file);
diff --git a/src/test/core/GpgCoreTestKeyManagement.cpp b/src/test/core/GpgCoreTestKeyManagement.cpp
index 6ba24b80..3410e97e 100644
--- a/src/test/core/GpgCoreTestKeyManagement.cpp
+++ b/src/test/core/GpgCoreTestKeyManagement.cpp
@@ -116,10 +116,10 @@ TEST_F(GpgCoreTest, CoreDeleteSubkeyTestA) {
ASSERT_EQ(info->imported, 1);
auto key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel)
- .GetKey("822D7E13F5B85D7D");
- ASSERT_TRUE(key.IsGood());
+ .GetKeyPtr("822D7E13F5B85D7D");
+ ASSERT_TRUE(key != nullptr);
- auto s_key = key.SubKeys();
+ auto s_key = key->SubKeys();
ASSERT_EQ(s_key.size(), 5);
ASSERT_EQ(s_key[2].ID(), "2D1F9FC59B568A8C");
@@ -130,15 +130,15 @@ TEST_F(GpgCoreTest, CoreDeleteSubkeyTestA) {
GpgKeyGetter::GetInstance().FlushKeyCache();
key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel)
- .GetKey("822D7E13F5B85D7D");
- ASSERT_TRUE(key.IsGood());
+ .GetKeyPtr("822D7E13F5B85D7D");
+ ASSERT_TRUE(key != nullptr);
- s_key = key.SubKeys();
+ s_key = key->SubKeys();
ASSERT_EQ(s_key.size(), 4);
ASSERT_EQ(s_key[2].ID(), "CE038203C4D03C3D");
- GpgKeyOpera::GetInstance().DeleteKey(key.ID());
+ GpgKeyOpera::GetInstance().DeleteKey(key);
}
TEST_F(GpgCoreTest, CoreSetOwnerTrustA) {
@@ -149,59 +149,59 @@ TEST_F(GpgCoreTest, CoreSetOwnerTrustA) {
ASSERT_EQ(info->imported, 1);
auto key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel)
- .GetKey("822D7E13F5B85D7D");
- ASSERT_TRUE(key.IsGood());
+ .GetKeyPtr("822D7E13F5B85D7D");
+ ASSERT_TRUE(key != nullptr);
auto res = GpgKeyManager::GetInstance().SetOwnerTrustLevel(key, 1);
ASSERT_TRUE(res);
GpgKeyGetter::GetInstance().FlushKeyCache();
key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel)
- .GetKey("822D7E13F5B85D7D");
- ASSERT_TRUE(key.IsGood());
+ .GetKeyPtr("822D7E13F5B85D7D");
+ ASSERT_TRUE(key != nullptr);
// why?
- ASSERT_EQ(key.OwnerTrustLevel(), 0);
+ ASSERT_EQ(key->OwnerTrustLevel(), 0);
res = GpgKeyManager::GetInstance().SetOwnerTrustLevel(key, 2);
ASSERT_TRUE(res);
GpgKeyGetter::GetInstance().FlushKeyCache();
key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel)
- .GetKey("822D7E13F5B85D7D");
- ASSERT_TRUE(key.IsGood());
+ .GetKeyPtr("822D7E13F5B85D7D");
+ ASSERT_TRUE(key != nullptr);
- ASSERT_EQ(key.OwnerTrustLevel(), 2);
+ ASSERT_EQ(key->OwnerTrustLevel(), 2);
res = GpgKeyManager::GetInstance().SetOwnerTrustLevel(key, 3);
ASSERT_TRUE(res);
GpgKeyGetter::GetInstance().FlushKeyCache();
key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel)
- .GetKey("822D7E13F5B85D7D");
- ASSERT_TRUE(key.IsGood());
+ .GetKeyPtr("822D7E13F5B85D7D");
+ ASSERT_TRUE(key != nullptr);
- ASSERT_EQ(key.OwnerTrustLevel(), 3);
+ ASSERT_EQ(key->OwnerTrustLevel(), 3);
res = GpgKeyManager::GetInstance().SetOwnerTrustLevel(key, 4);
ASSERT_TRUE(res);
GpgKeyGetter::GetInstance().FlushKeyCache();
key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel)
- .GetKey("822D7E13F5B85D7D");
- ASSERT_TRUE(key.IsGood());
+ .GetKeyPtr("822D7E13F5B85D7D");
+ ASSERT_TRUE(key != nullptr);
- ASSERT_EQ(key.OwnerTrustLevel(), 4);
+ ASSERT_EQ(key->OwnerTrustLevel(), 4);
res = GpgKeyManager::GetInstance().SetOwnerTrustLevel(key, 5);
ASSERT_TRUE(res);
GpgKeyGetter::GetInstance().FlushKeyCache();
key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel)
- .GetKey("822D7E13F5B85D7D");
- ASSERT_TRUE(key.IsGood());
+ .GetKeyPtr("822D7E13F5B85D7D");
+ ASSERT_TRUE(key->IsGood());
- ASSERT_EQ(key.OwnerTrustLevel(), 5);
+ ASSERT_EQ(key->OwnerTrustLevel(), 5);
res = GpgKeyManager::GetInstance().SetOwnerTrustLevel(key, 0);
ASSERT_FALSE(res);
@@ -212,7 +212,7 @@ TEST_F(GpgCoreTest, CoreSetOwnerTrustA) {
res = GpgKeyManager::GetInstance().SetOwnerTrustLevel(key, 6);
ASSERT_FALSE(res);
- GpgKeyOpera::GetInstance().DeleteKey(key.ID());
+ GpgKeyOpera::GetInstance().DeleteKey(key);
}
TEST_F(GpgCoreTest, CoreRevokeSubkeyTestA) {
@@ -223,10 +223,10 @@ TEST_F(GpgCoreTest, CoreRevokeSubkeyTestA) {
ASSERT_EQ(info->imported, 1);
auto key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel)
- .GetKey("822D7E13F5B85D7D");
- ASSERT_TRUE(key.IsGood());
+ .GetKeyPtr("822D7E13F5B85D7D");
+ ASSERT_TRUE(key != nullptr);
- auto s_key = key.SubKeys();
+ auto s_key = key->SubKeys();
ASSERT_EQ(s_key.size(), 5);
ASSERT_EQ(s_key[2].ID(), "2D1F9FC59B568A8C");
@@ -238,17 +238,17 @@ TEST_F(GpgCoreTest, CoreRevokeSubkeyTestA) {
GpgKeyGetter::GetInstance().FlushKeyCache();
key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel)
- .GetKey("822D7E13F5B85D7D");
- ASSERT_TRUE(key.IsGood());
+ .GetKeyPtr("822D7E13F5B85D7D");
+ ASSERT_TRUE(key != nullptr);
- s_key = key.SubKeys();
+ s_key = key->SubKeys();
ASSERT_EQ(s_key.size(), 5);
ASSERT_EQ(s_key[2].ID(), "2D1F9FC59B568A8C");
ASSERT_TRUE(s_key[2].IsRevoked());
- GpgKeyOpera::GetInstance().DeleteKey(key.ID());
+ GpgKeyOpera::GetInstance().DeleteKey(key);
}
} // namespace GpgFrontend::Test \ No newline at end of file
diff --git a/src/test/core/GpgCoreTestKeyOpera.cpp b/src/test/core/GpgCoreTestKeyOpera.cpp
index 84aa29f9..ef2d1124 100644
--- a/src/test/core/GpgCoreTestKeyOpera.cpp
+++ b/src/test/core/GpgCoreTestKeyOpera.cpp
@@ -77,10 +77,10 @@ TEST_F(GpgCoreTest, CoreAddADSKTestA) {
ASSERT_EQ(info->imported, 1);
auto key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel)
- .GetKey("5C4D80546EB6E52F");
- ASSERT_TRUE(key.IsGood());
- ASSERT_TRUE(key.IsPrivateKey());
- ASSERT_TRUE(key.IsHasMasterKey());
+ .GetKeyPtr("5C4D80546EB6E52F");
+ ASSERT_TRUE(key->IsGood());
+ ASSERT_TRUE(key->IsPrivateKey());
+ ASSERT_TRUE(key->IsHasMasterKey());
auto key_b = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel)
.GetKey("467F14220CE8DCF780CF4BAD8465C55B25C9B7D1");
@@ -103,16 +103,16 @@ TEST_F(GpgCoreTest, CoreAddADSKTestA) {
GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel).FlushKeyCache();
key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel)
- .GetKey("5C4D80546EB6E52F");
- ASSERT_TRUE(key.IsGood());
- ASSERT_TRUE(key.IsPrivateKey());
- ASSERT_TRUE(key.IsHasMasterKey());
+ .GetKeyPtr("5C4D80546EB6E52F");
+ ASSERT_TRUE(key->IsGood());
+ ASSERT_TRUE(key->IsPrivateKey());
+ ASSERT_TRUE(key->IsHasMasterKey());
- auto s_keys = key.SubKeys();
+ auto s_keys = key->SubKeys();
ASSERT_EQ(s_keys.size(), 2);
ASSERT_EQ(s_keys.last().ID(), "F89C95A05088CC93");
ASSERT_EQ(s_keys.last().IsADSK(), true);
- GpgKeyOpera::GetInstance().DeleteKey(key.ID());
+ GpgKeyOpera::GetInstance().DeleteKey(key);
}
}; // namespace GpgFrontend::Test \ No newline at end of file
diff --git a/src/test/core/GpgCoreTestKeyUIDOpera.cpp b/src/test/core/GpgCoreTestKeyUIDOpera.cpp
index 7b141670..41196d35 100644
--- a/src/test/core/GpgCoreTestKeyUIDOpera.cpp
+++ b/src/test/core/GpgCoreTestKeyUIDOpera.cpp
@@ -70,10 +70,10 @@ TEST_F(GpgCoreTest, CoreDeleteUIDTestA) {
ASSERT_EQ(info->imported, 1);
auto key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel)
- .GetKey("F2D8DFA5F109DE47");
- ASSERT_TRUE(key.IsGood());
+ .GetKeyPtr("F2D8DFA5F109DE47");
+ ASSERT_TRUE(key->IsGood());
- auto uids = key.UIDs();
+ auto uids = key->UIDs();
ASSERT_EQ(uids.size(), 4);
ASSERT_EQ(uids[2].GetUID(), "gggggg(ggggg)<[email protected]>");
@@ -84,15 +84,15 @@ TEST_F(GpgCoreTest, CoreDeleteUIDTestA) {
GpgKeyGetter::GetInstance().FlushKeyCache();
key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel)
- .GetKey("F2D8DFA5F109DE47");
- ASSERT_TRUE(key.IsGood());
+ .GetKeyPtr("F2D8DFA5F109DE47");
+ ASSERT_TRUE(key != nullptr);
- uids = key.UIDs();
+ uids = key->UIDs();
ASSERT_EQ(uids.size(), 3);
ASSERT_EQ(uids[2].GetUID(), "hhhhhh(hhhhhhh)<[email protected]>");
- GpgKeyOpera::GetInstance().DeleteKey(key.ID());
+ GpgKeyOpera::GetInstance().DeleteKey(key);
GpgKeyGetter::GetInstance().FlushKeyCache();
}
@@ -105,10 +105,10 @@ TEST_F(GpgCoreTest, CoreRevokeUIDTestA) {
ASSERT_EQ(info->imported, 1);
auto key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel)
- .GetKey("F2D8DFA5F109DE47");
- ASSERT_TRUE(key.IsGood());
+ .GetKeyPtr("F2D8DFA5F109DE47");
+ ASSERT_TRUE(key != nullptr);
- auto uids = key.UIDs();
+ auto uids = key->UIDs();
ASSERT_EQ(uids.size(), 4);
ASSERT_EQ(uids[2].GetUID(), "gggggg(ggggg)<[email protected]>");
@@ -120,16 +120,16 @@ TEST_F(GpgCoreTest, CoreRevokeUIDTestA) {
GpgKeyGetter::GetInstance().FlushKeyCache();
key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel)
- .GetKey("F2D8DFA5F109DE47");
- ASSERT_TRUE(key.IsGood());
+ .GetKeyPtr("F2D8DFA5F109DE47");
+ ASSERT_TRUE(key != nullptr);
- uids = key.UIDs();
+ uids = key->UIDs();
ASSERT_EQ(uids.size(), 4);
ASSERT_EQ(uids[2].GetUID(), "gggggg(ggggg)<[email protected]>");
ASSERT_TRUE(uids[2].GetRevoked());
- GpgKeyOpera::GetInstance().DeleteKey(key.ID());
+ GpgKeyOpera::GetInstance().DeleteKey(key);
GpgKeyGetter::GetInstance().FlushKeyCache();
}
diff --git a/src/test/core/GpgCoreTestKeygen.cpp b/src/test/core/GpgCoreTestKeygen.cpp
index a8ad7005..73f293c7 100644
--- a/src/test/core/GpgCoreTestKeygen.cpp
+++ b/src/test/core/GpgCoreTestKeygen.cpp
@@ -80,9 +80,10 @@ TEST_F(GpgCoreTest, GenerateKeyRSA2048Test) {
auto result = ExtractParams<GpgGenerateKeyResult>(data_object, 0);
ASSERT_TRUE(result.IsGood());
ASSERT_FALSE(result.GetFingerprint().isEmpty());
- auto key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel)
- .GetKey(result.GetFingerprint());
- ASSERT_TRUE(key.IsGood());
+ auto p_key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel)
+ .GetKeyPtr(result.GetFingerprint());
+ ASSERT_TRUE(p_key != nullptr);
+ auto& key = *p_key;
ASSERT_EQ(key.Name(), "foo_0");
ASSERT_EQ(key.Email(), "[email protected]");
@@ -102,8 +103,7 @@ TEST_F(GpgCoreTest, GenerateKeyRSA2048Test) {
ASSERT_TRUE(key.IsHasActualEncrCap());
ASSERT_TRUE(key.IsHasActualSignCap());
- GpgKeyOpera::GetInstance(kGpgFrontendDefaultChannel)
- .DeleteKey(result.GetFingerprint());
+ GpgKeyOpera::GetInstance(kGpgFrontendDefaultChannel).DeleteKey(p_key);
}
TEST_F(GpgCoreTest, GenerateKeyRSA4096Test) {
@@ -137,12 +137,11 @@ TEST_F(GpgCoreTest, GenerateKeyRSA4096Test) {
ASSERT_FALSE(result.GetFingerprint().isEmpty());
auto key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel)
- .GetKey(result.GetFingerprint());
- ASSERT_TRUE(key.IsGood());
- ASSERT_EQ(key.ExpirationTime().date(), expire_time.date());
+ .GetKeyPtr(result.GetFingerprint());
+ ASSERT_TRUE(key != nullptr);
+ ASSERT_EQ(key->ExpirationTime().date(), expire_time.date());
- GpgKeyOpera::GetInstance(kGpgFrontendDefaultChannel)
- .DeleteKey(result.GetFingerprint());
+ GpgKeyOpera::GetInstance(kGpgFrontendDefaultChannel).DeleteKey(key);
}
TEST_F(GpgCoreTest, GenerateKeyDSA2048Test) {
@@ -174,8 +173,11 @@ TEST_F(GpgCoreTest, GenerateKeyDSA2048Test) {
ASSERT_TRUE(result.IsGood());
ASSERT_FALSE(result.GetFingerprint().isEmpty());
- auto key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel)
- .GetKey(result.GetFingerprint());
+ auto p_key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel)
+ .GetKeyPtr(result.GetFingerprint());
+ ASSERT_TRUE(p_key != nullptr);
+ auto& key = *p_key;
+
ASSERT_TRUE(key.IsGood());
ASSERT_EQ(key.Name(), "foo_1");
ASSERT_EQ(key.Email(), "[email protected]");
@@ -195,8 +197,7 @@ TEST_F(GpgCoreTest, GenerateKeyDSA2048Test) {
ASSERT_FALSE(key.IsHasActualEncrCap());
ASSERT_TRUE(key.IsHasActualSignCap());
- GpgKeyOpera::GetInstance(kGpgFrontendDefaultChannel)
- .DeleteKey(result.GetFingerprint());
+ GpgKeyOpera::GetInstance(kGpgFrontendDefaultChannel).DeleteKey(p_key);
}
TEST_F(GpgCoreTest, GenerateKeyED25519Test) {
@@ -228,8 +229,11 @@ TEST_F(GpgCoreTest, GenerateKeyED25519Test) {
ASSERT_TRUE(result.IsGood());
ASSERT_FALSE(result.GetFingerprint().isEmpty());
- auto key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel)
- .GetKey(result.GetFingerprint());
+ auto p_key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel)
+ .GetKeyPtr(result.GetFingerprint());
+ ASSERT_TRUE(p_key != nullptr);
+ auto& key = *p_key;
+
ASSERT_TRUE(key.IsGood());
ASSERT_EQ(key.Name(), "foo_4");
ASSERT_EQ(key.Email(), "[email protected]");
@@ -249,8 +253,7 @@ TEST_F(GpgCoreTest, GenerateKeyED25519Test) {
ASSERT_FALSE(key.IsHasActualEncrCap());
ASSERT_TRUE(key.IsHasActualSignCap());
- GpgKeyOpera::GetInstance(kGpgFrontendDefaultChannel)
- .DeleteKey(result.GetFingerprint());
+ GpgKeyOpera::GetInstance(kGpgFrontendDefaultChannel).DeleteKey(p_key);
}
TEST_F(GpgCoreTest, GenerateKeyED25519CV25519Test) {
@@ -285,11 +288,12 @@ TEST_F(GpgCoreTest, GenerateKeyED25519CV25519Test) {
(data_object->Check<GpgGenerateKeyResult, GpgGenerateKeyResult>()));
auto result = ExtractParams<GpgGenerateKeyResult>(data_object, 0);
ASSERT_TRUE(result.IsGood());
- auto fpr = result.GetFingerprint();
- ASSERT_FALSE(fpr.isEmpty());
+ ASSERT_FALSE(result.GetFingerprint().isEmpty());
- auto key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel).GetKey(fpr);
- ASSERT_TRUE(key.IsGood());
+ auto p_key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel)
+ .GetKeyPtr(result.GetFingerprint());
+ ASSERT_TRUE(p_key != nullptr);
+ auto& key = *p_key;
ASSERT_EQ(key.Name(), "foo_ec");
ASSERT_EQ(key.Email(), "[email protected]");
@@ -325,7 +329,7 @@ TEST_F(GpgCoreTest, GenerateKeyED25519CV25519Test) {
ASSERT_TRUE(key.IsHasActualEncrCap());
ASSERT_TRUE(key.IsHasActualSignCap());
- GpgKeyOpera::GetInstance(kGpgFrontendDefaultChannel).DeleteKey(fpr);
+ GpgKeyOpera::GetInstance(kGpgFrontendDefaultChannel).DeleteKey(p_key);
}
TEST_F(GpgCoreTest, GenerateKeyED25519NISTP256Test) {
@@ -360,11 +364,12 @@ TEST_F(GpgCoreTest, GenerateKeyED25519NISTP256Test) {
(data_object->Check<GpgGenerateKeyResult, GpgGenerateKeyResult>()));
auto result = ExtractParams<GpgGenerateKeyResult>(data_object, 0);
ASSERT_TRUE(result.IsGood());
- auto fpr = result.GetFingerprint();
- ASSERT_FALSE(fpr.isEmpty());
+ ASSERT_FALSE(result.GetFingerprint().isEmpty());
- auto key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel).GetKey(fpr);
- ASSERT_TRUE(key.IsGood());
+ auto p_key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel)
+ .GetKeyPtr(result.GetFingerprint());
+ ASSERT_TRUE(p_key != nullptr);
+ auto& key = *p_key;
ASSERT_EQ(key.Name(), "foo_ec2");
ASSERT_EQ(key.Email(), "[email protected]");
@@ -400,7 +405,7 @@ TEST_F(GpgCoreTest, GenerateKeyED25519NISTP256Test) {
ASSERT_TRUE(key.IsHasActualEncrCap());
ASSERT_TRUE(key.IsHasActualSignCap());
- GpgKeyOpera::GetInstance(kGpgFrontendDefaultChannel).DeleteKey(fpr);
+ GpgKeyOpera::GetInstance(kGpgFrontendDefaultChannel).DeleteKey(p_key);
}
TEST_F(GpgCoreTest, GenerateKeyED25519BRAINPOOLP256R1Test) {
@@ -435,11 +440,12 @@ TEST_F(GpgCoreTest, GenerateKeyED25519BRAINPOOLP256R1Test) {
(data_object->Check<GpgGenerateKeyResult, GpgGenerateKeyResult>()));
auto result = ExtractParams<GpgGenerateKeyResult>(data_object, 0);
ASSERT_TRUE(result.IsGood());
- auto fpr = result.GetFingerprint();
- ASSERT_FALSE(fpr.isEmpty());
+ ASSERT_FALSE(result.GetFingerprint().isEmpty());
- auto key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel).GetKey(fpr);
- ASSERT_TRUE(key.IsGood());
+ auto p_key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel)
+ .GetKeyPtr(result.GetFingerprint());
+ ASSERT_TRUE(p_key != nullptr);
+ auto& key = *p_key;
ASSERT_EQ(key.Name(), "foo_ec3");
ASSERT_EQ(key.Email(), "[email protected]");
@@ -475,7 +481,7 @@ TEST_F(GpgCoreTest, GenerateKeyED25519BRAINPOOLP256R1Test) {
ASSERT_TRUE(key.IsHasActualEncrCap());
ASSERT_TRUE(key.IsHasActualSignCap());
- GpgKeyOpera::GetInstance(kGpgFrontendDefaultChannel).DeleteKey(fpr);
+ GpgKeyOpera::GetInstance(kGpgFrontendDefaultChannel).DeleteKey(p_key);
}
TEST_F(GpgCoreTest, GenerateKeyNISTP256Test) {
@@ -507,9 +513,11 @@ TEST_F(GpgCoreTest, GenerateKeyNISTP256Test) {
ASSERT_TRUE(result.IsGood());
ASSERT_FALSE(result.GetFingerprint().isEmpty());
- auto key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel)
- .GetKey(result.GetFingerprint());
- ASSERT_TRUE(key.IsGood());
+ auto p_key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel)
+ .GetKeyPtr(result.GetFingerprint());
+ ASSERT_TRUE(p_key != nullptr);
+ auto& key = *p_key;
+
ASSERT_EQ(key.Name(), "foo_4");
ASSERT_EQ(key.Email(), "[email protected]");
ASSERT_EQ(key.Comment(), "hello gpgfrontend");
@@ -529,8 +537,7 @@ TEST_F(GpgCoreTest, GenerateKeyNISTP256Test) {
ASSERT_FALSE(key.IsHasActualEncrCap());
ASSERT_TRUE(key.IsHasActualSignCap());
- GpgKeyOpera::GetInstance(kGpgFrontendDefaultChannel)
- .DeleteKey(result.GetFingerprint());
+ GpgKeyOpera::GetInstance(kGpgFrontendDefaultChannel).DeleteKey(p_key);
}
TEST_F(GpgCoreTest, GenerateKeyED448Test) {
@@ -562,8 +569,11 @@ TEST_F(GpgCoreTest, GenerateKeyED448Test) {
ASSERT_TRUE(result.IsGood());
ASSERT_FALSE(result.GetFingerprint().isEmpty());
- auto key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel)
- .GetKey(result.GetFingerprint());
+ auto p_key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel)
+ .GetKeyPtr(result.GetFingerprint());
+ ASSERT_TRUE(p_key != nullptr);
+ auto& key = *p_key;
+
ASSERT_TRUE(key.IsGood());
ASSERT_EQ(key.Name(), "foo_4");
ASSERT_EQ(key.Email(), "[email protected]");
@@ -584,8 +594,7 @@ TEST_F(GpgCoreTest, GenerateKeyED448Test) {
ASSERT_FALSE(key.IsHasActualEncrCap());
ASSERT_TRUE(key.IsHasActualSignCap());
- GpgKeyOpera::GetInstance(kGpgFrontendDefaultChannel)
- .DeleteKey(result.GetFingerprint());
+ GpgKeyOpera::GetInstance(kGpgFrontendDefaultChannel).DeleteKey(p_key);
}
TEST_F(GpgCoreTest, GenerateKeySECP256K1Test) {
@@ -617,9 +626,11 @@ TEST_F(GpgCoreTest, GenerateKeySECP256K1Test) {
ASSERT_TRUE(result.IsGood());
ASSERT_FALSE(result.GetFingerprint().isEmpty());
- auto key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel)
- .GetKey(result.GetFingerprint());
- ASSERT_TRUE(key.IsGood());
+ auto p_key = GpgKeyGetter::GetInstance(kGpgFrontendDefaultChannel)
+ .GetKeyPtr(result.GetFingerprint());
+ ASSERT_TRUE(p_key != nullptr);
+ auto& key = *p_key;
+
ASSERT_EQ(key.Name(), "foo_4");
ASSERT_EQ(key.Email(), "[email protected]");
ASSERT_EQ(key.Comment(), "hello gpgfrontend");
@@ -639,8 +650,7 @@ TEST_F(GpgCoreTest, GenerateKeySECP256K1Test) {
ASSERT_FALSE(key.IsHasActualEncrCap());
ASSERT_TRUE(key.IsHasActualSignCap());
- GpgKeyOpera::GetInstance(kGpgFrontendDefaultChannel)
- .DeleteKey(result.GetFingerprint());
+ GpgKeyOpera::GetInstance(kGpgFrontendDefaultChannel).DeleteKey(p_key);
}
} // namespace GpgFrontend::Test
diff --git a/src/test/core/GpgCoreTestSubkeygen.cpp b/src/test/core/GpgCoreTestSubkeygen.cpp
index 09c47903..ad742a1f 100644
--- a/src/test/core/GpgCoreTestSubkeygen.cpp
+++ b/src/test/core/GpgCoreTestSubkeygen.cpp
@@ -38,9 +38,9 @@
namespace GpgFrontend::Test {
TEST_F(GpgCoreTest, GenerateSubkeyRSA2048Test) {
- auto p_key = GpgKeyGetter::GetInstance().GetKey(
+ auto p_key = GpgKeyGetter::GetInstance().GetKeyPtr(
"E87C6A2D8D95C818DE93B3AE6A2764F8298DEB29");
- ASSERT_TRUE(p_key.IsGood());
+ ASSERT_TRUE(p_key != nullptr);
auto s_info = QSharedPointer<KeyGenerateInfo>::create(true);
@@ -81,9 +81,9 @@ TEST_F(GpgCoreTest, GenerateSubkeyRSA2048Test) {
}
TEST_F(GpgCoreTest, GenerateSubkeyDSA2048Test) {
- auto p_key = GpgKeyGetter::GetInstance().GetKey(
+ auto p_key = GpgKeyGetter::GetInstance().GetKeyPtr(
"E87C6A2D8D95C818DE93B3AE6A2764F8298DEB29");
- ASSERT_TRUE(p_key.IsGood());
+ ASSERT_TRUE(p_key != nullptr);
auto s_info = QSharedPointer<KeyGenerateInfo>::create(true);
@@ -124,9 +124,9 @@ TEST_F(GpgCoreTest, GenerateSubkeyDSA2048Test) {
}
TEST_F(GpgCoreTest, GenerateSubkeyELG2048Test) {
- auto p_key = GpgKeyGetter::GetInstance().GetKey(
+ auto p_key = GpgKeyGetter::GetInstance().GetKeyPtr(
"E87C6A2D8D95C818DE93B3AE6A2764F8298DEB29");
- ASSERT_TRUE(p_key.IsGood());
+ ASSERT_TRUE(p_key != nullptr);
auto s_info = QSharedPointer<KeyGenerateInfo>::create(true);
@@ -167,9 +167,9 @@ TEST_F(GpgCoreTest, GenerateSubkeyELG2048Test) {
}
TEST_F(GpgCoreTest, GenerateSubkeyED25519Test) {
- auto p_key = GpgKeyGetter::GetInstance().GetKey(
+ auto p_key = GpgKeyGetter::GetInstance().GetKeyPtr(
"E87C6A2D8D95C818DE93B3AE6A2764F8298DEB29");
- ASSERT_TRUE(p_key.IsGood());
+ ASSERT_TRUE(p_key != nullptr);
auto s_info = QSharedPointer<KeyGenerateInfo>::create(true);
@@ -210,9 +210,9 @@ TEST_F(GpgCoreTest, GenerateSubkeyED25519Test) {
}
TEST_F(GpgCoreTest, GenerateSubkeyCV25519Test) {
- auto p_key = GpgKeyGetter::GetInstance().GetKey(
+ auto p_key = GpgKeyGetter::GetInstance().GetKeyPtr(
"E87C6A2D8D95C818DE93B3AE6A2764F8298DEB29");
- ASSERT_TRUE(p_key.IsGood());
+ ASSERT_TRUE(p_key != nullptr);
auto s_info = QSharedPointer<KeyGenerateInfo>::create(true);
@@ -253,9 +253,9 @@ TEST_F(GpgCoreTest, GenerateSubkeyCV25519Test) {
}
TEST_F(GpgCoreTest, GenerateSubkeyNISTP256Test) {
- auto p_key = GpgKeyGetter::GetInstance().GetKey(
+ auto p_key = GpgKeyGetter::GetInstance().GetKeyPtr(
"E87C6A2D8D95C818DE93B3AE6A2764F8298DEB29");
- ASSERT_TRUE(p_key.IsGood());
+ ASSERT_TRUE(p_key != nullptr);
auto s_info = QSharedPointer<KeyGenerateInfo>::create(true);
@@ -295,9 +295,9 @@ TEST_F(GpgCoreTest, GenerateSubkeyNISTP256Test) {
}
TEST_F(GpgCoreTest, GenerateSubkeyBRAINPOOLP256R1Test) {
- auto p_key = GpgKeyGetter::GetInstance().GetKey(
+ auto p_key = GpgKeyGetter::GetInstance().GetKeyPtr(
"E87C6A2D8D95C818DE93B3AE6A2764F8298DEB29");
- ASSERT_TRUE(p_key.IsGood());
+ ASSERT_TRUE(p_key != nullptr);
auto s_info = QSharedPointer<KeyGenerateInfo>::create(true);
@@ -337,9 +337,9 @@ TEST_F(GpgCoreTest, GenerateSubkeyBRAINPOOLP256R1Test) {
}
TEST_F(GpgCoreTest, GenerateSubkeyX448Test) {
- auto p_key = GpgKeyGetter::GetInstance().GetKey(
+ auto p_key = GpgKeyGetter::GetInstance().GetKeyPtr(
"E87C6A2D8D95C818DE93B3AE6A2764F8298DEB29");
- ASSERT_TRUE(p_key.IsGood());
+ ASSERT_TRUE(p_key != nullptr);
auto s_info = QSharedPointer<KeyGenerateInfo>::create(true);
@@ -379,9 +379,9 @@ TEST_F(GpgCoreTest, GenerateSubkeyX448Test) {
}
TEST_F(GpgCoreTest, GenerateSubkeySECP256K1Test) {
- auto p_key = GpgKeyGetter::GetInstance().GetKey(
+ auto p_key = GpgKeyGetter::GetInstance().GetKeyPtr(
"E87C6A2D8D95C818DE93B3AE6A2764F8298DEB29");
- ASSERT_TRUE(p_key.IsGood());
+ ASSERT_TRUE(p_key != nullptr);
auto s_info = QSharedPointer<KeyGenerateInfo>::create(true);
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-27 05:08:04 +0000