oxen-io/lokinet
1
1
Fork 0
mirror of https://github.com/oxen-io/lokinet synced 2023-12-14 06:53:00 +01:00
Code Issues Projects Releases Wiki Activity

Change ConfigParser too

Browse source
This commit is contained in:
Michael 2019-07-17 09:48:13 +01:00
parent 8fd4ceb55b
commit 91c1ba87cc
No known key found for this signature in database
GPG key ID: 2D51757B47E2434C
4 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
llarp/config/config.cpp
View file

@ -418,7 +418,7 @@ namespace llarp
Config::LoadFromStr(string_view str)
{
ConfigParser parser;
if(!parser.LoadString(str))
if(!parser.LoadFromStr(str))
{
return false;
}

6
llarp/config/ini.cpp
View file

@ -6,10 +6,6 @@
#include <list>
#include <iostream>
#ifdef LoadString
#undef LoadString
#endif
namespace llarp
{
bool
@ -32,7 +28,7 @@ namespace llarp
}
bool
ConfigParser::LoadString(string_view str)
ConfigParser::LoadFromStr(string_view str)
{
m_Data.resize(str.size());
std::copy(str.begin(), str.end(), m_Data.begin());

2
llarp/config/ini.hpp
View file

@ -31,7 +31,7 @@ namespace llarp
/// return true on success
/// return false on error
bool
LoadString(string_view str);
LoadFromStr(string_view str);
/// iterate all sections and thier values
void

12
test/config/test_llarp_config_ini.cpp
View file

@ -15,7 +15,7 @@ struct TestINIParser : public ::testing::Test
TEST_F(TestINIParser, TestParseEmpty)
{
ASSERT_TRUE(parser.LoadString(""));
ASSERT_TRUE(parser.LoadFromStr(""));
}
TEST_F(TestINIParser, TestParseOneSection)
@ -26,7 +26,7 @@ TEST_F(TestINIParser, TestParseOneSection)
sect = section;
return true;
};
ASSERT_TRUE(parser.LoadString("[test]\nkey=val \n"));
ASSERT_TRUE(parser.LoadFromStr("[test]\nkey=val \n"));
ASSERT_TRUE(parser.VisitSection("test", assertVisit));
auto itr = sect.find("notfound");
ASSERT_EQ(itr, sect.end());
@ -41,7 +41,7 @@ TEST_F(TestINIParser, TestParseOneSection)
TEST_F(TestINIParser, TestParseSectionDuplicateKeys)
{
ASSERT_TRUE(parser.LoadString("[test]\nkey1=val1\nkey1=val2"));
ASSERT_TRUE(parser.LoadFromStr("[test]\nkey1=val1\nkey1=val2"));
size_t num = 0;
auto visit = [&num](const auto& section) -> bool {
num = section.count("key1");
@ -53,12 +53,12 @@ TEST_F(TestINIParser, TestParseSectionDuplicateKeys)
TEST_F(TestINIParser, TestNoKey)
{
ASSERT_FALSE(parser.LoadString("[test]\n=1090\n"));
ASSERT_FALSE(parser.LoadFromStr("[test]\n=1090\n"));
}
TEST_F(TestINIParser, TestParseInvalid)
{
ASSERT_FALSE(
parser.LoadString("srged5ghe5\nf34wtge5\nw34tgfs4ygsd5yg=4;\n#"
"g4syhgd5\n"));
parser.LoadFromStr("srged5ghe5\nf34wtge5\nw34tgfs4ygsd5yg=4;\n#"
"g4syhgd5\n"));
}