1 files changed, 24 insertions, 21 deletions

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);