mirror of
https://github.com/XRPLF/clio.git
synced 2026-08-22 21:20:52 +00:00
refactor: Replace all old instances of Config with New Config (#1627)
Fixes #1184 Previous PR's found [here](https://github.com/XRPLF/clio/pull/1593) and [here](https://github.com/XRPLF/clio/pull/1544)
This commit is contained in:
@@ -19,19 +19,26 @@
|
||||
|
||||
#include "util/LoggerFixtures.hpp"
|
||||
#include "util/NameGenerator.hpp"
|
||||
#include "util/config/Config.hpp"
|
||||
#include "util/newconfig/ConfigDefinition.hpp"
|
||||
#include "util/newconfig/ConfigFileJson.hpp"
|
||||
#include "util/newconfig/ConfigValue.hpp"
|
||||
#include "util/newconfig/Types.hpp"
|
||||
#include "web/AdminVerificationStrategy.hpp"
|
||||
|
||||
#include <boost/beast/http/field.hpp>
|
||||
#include <boost/beast/http/message.hpp>
|
||||
#include <boost/beast/http/string_body.hpp>
|
||||
#include <boost/json/parse.hpp>
|
||||
#include <boost/json/value.hpp>
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
#include <iostream>
|
||||
#include <optional>
|
||||
#include <ostream>
|
||||
#include <string>
|
||||
|
||||
namespace http = boost::beast::http;
|
||||
using namespace util::config;
|
||||
|
||||
class IPAdminVerificationStrategyTest : public NoLoggerFixture {
|
||||
protected:
|
||||
@@ -134,9 +141,21 @@ struct MakeAdminVerificationStrategyFromConfigTestParams {
|
||||
struct MakeAdminVerificationStrategyFromConfigTest
|
||||
: public testing::TestWithParam<MakeAdminVerificationStrategyFromConfigTestParams> {};
|
||||
|
||||
inline ClioConfigDefinition
|
||||
generateDefaultAdminConfig()
|
||||
{
|
||||
return ClioConfigDefinition{
|
||||
{{"server.local_admin", ConfigValue{ConfigType::Boolean}.optional()},
|
||||
{"server.admin_password", ConfigValue{ConfigType::String}.optional()}}
|
||||
};
|
||||
}
|
||||
|
||||
TEST_P(MakeAdminVerificationStrategyFromConfigTest, ChecksConfig)
|
||||
{
|
||||
util::Config const serverConfig{boost::json::parse(GetParam().config)};
|
||||
ConfigFileJson const js{boost::json::parse(GetParam().config).as_object()};
|
||||
ClioConfigDefinition serverConfig{generateDefaultAdminConfig()};
|
||||
auto const errors = serverConfig.parse(js);
|
||||
ASSERT_TRUE(!errors.has_value());
|
||||
auto const result = web::make_AdminVerificationStrategy(serverConfig);
|
||||
EXPECT_EQ(not result.has_value(), GetParam().expectedError);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user