diff options
author | saturneric <[email protected]> | 2024-01-15 17:02:40 +0000 |
---|---|---|
committer | saturneric <[email protected]> | 2024-01-15 17:02:40 +0000 |
commit | d54f52ce70cba15f5199e93d3c6fb122143b0526 (patch) | |
tree | f75224f8d020c4c7498bd1ffb97c834e12ec8a2c /src/test/GpgFrontendTest.cpp | |
parent | fix: clean up useless code and make life easier (diff) | |
download | GpgFrontend-d54f52ce70cba15f5199e93d3c6fb122143b0526.tar.gz GpgFrontend-d54f52ce70cba15f5199e93d3c6fb122143b0526.zip |
refactor: remove libconfig++ form project
Diffstat (limited to 'src/test/GpgFrontendTest.cpp')
-rw-r--r-- | src/test/GpgFrontendTest.cpp | 41 |
1 files changed, 17 insertions, 24 deletions
diff --git a/src/test/GpgFrontendTest.cpp b/src/test/GpgFrontendTest.cpp index 34698863..2aac1450 100644 --- a/src/test/GpgFrontendTest.cpp +++ b/src/test/GpgFrontendTest.cpp @@ -74,43 +74,36 @@ void ConfigureGpgContext() { }); } -void ImportPrivateKeys(const QString& data_path, - const libconfig::Setting& config) { - if (config.exists("load_keys.private_keys")) { - auto& private_keys = config.lookup("load_keys.private_keys"); - for (auto& private_key : private_keys) { - if (private_key.exists("filename")) { - std::string filename; - private_key.lookupValue("filename", filename); - auto data_file_path = - data_path + "/" + QString::fromStdString(filename); - - auto [success, gf_buffer] = ReadFileGFBuffer(data_file_path); - if (success) { - GpgKeyImportExporter::GetInstance(kGpgFrontendDefaultChannel) - .ImportKey(gf_buffer); - } else { - GF_TEST_LOG_ERROR("read from file faild: {}", data_file_path); - } +void ImportPrivateKeys(const QString& data_path, QSettings settings) { + if (settings.contains("load_keys/private_keys")) { + int size = settings.beginReadArray("load_keys/private_keys"); + for (int i = 0; i < size; ++i) { + settings.setArrayIndex(i); + auto key_filename = settings.value("filename").toString(); + auto target_file_path = data_path + "/" + key_filename; + auto [success, gf_buffer] = ReadFileGFBuffer(target_file_path); + if (success) { + GpgKeyImportExporter::GetInstance(kGpgFrontendDefaultChannel) + .ImportKey(gf_buffer); + } else { + GF_TEST_LOG_ERROR("read from file faild: {}", target_file_path); } } + settings.endArray(); } } void SetupGlobalTestEnv() { auto app_path = GlobalSettingStation::GetInstance().GetAppDir(); auto test_path = app_path + "/test"; - auto test_config_path = test_path + "/conf/test.cfg"; + auto test_config_path = test_path + "/conf/test.ini"; auto test_data_path = test_path + "/data"; GF_TEST_LOG_INFO("test config file path: {}", test_config_path); GF_TEST_LOG_INFO("test data file path: {}", test_data_path); - libconfig::Config cfg; - ASSERT_NO_THROW(cfg.readFile(test_config_path.toUtf8())); - - auto& root = cfg.getRoot(); - ImportPrivateKeys(test_data_path, root); + ImportPrivateKeys(test_data_path, + QSettings(test_config_path, QSettings::IniFormat)); } auto ExecuteAllTestCase(GpgFrontendContext args) -> int { |