3f6f580b25
The parser was having issues in cases where there was both a space following the colon and a comma following the value.
106 lines
2.8 KiB
C++
106 lines
2.8 KiB
C++
#include "gtest/gtest.h"
|
|
#include "cantera/base/stringUtils.h"
|
|
#include "cantera/base/global.h"
|
|
#include "cantera/base/ctexceptions.h"
|
|
|
|
namespace Cantera
|
|
{
|
|
|
|
TEST(parseCompString, space_separated)
|
|
{
|
|
compositionMap c = parseCompString("foo:1.0 bar:2 baz:1e-4");
|
|
ASSERT_EQ((size_t) 3, c.size());
|
|
ASSERT_DOUBLE_EQ(1.0, c["foo"]);
|
|
ASSERT_DOUBLE_EQ(2.0, c["bar"]);
|
|
ASSERT_DOUBLE_EQ(1e-4, c["baz"]);
|
|
}
|
|
|
|
TEST(parseCompString, comma_separated)
|
|
{
|
|
compositionMap c = parseCompString("foo:1.0, bar: 2, baz:1e-4");
|
|
ASSERT_EQ((size_t) 3, c.size());
|
|
ASSERT_DOUBLE_EQ(1.0, c["foo"]);
|
|
ASSERT_DOUBLE_EQ(2.0, c["bar"]);
|
|
ASSERT_DOUBLE_EQ(1e-4, c["baz"]);
|
|
}
|
|
|
|
TEST(parseCompString, extra_spaces)
|
|
{
|
|
compositionMap c = parseCompString("foo: 1.0 bar: 2 baz : 1e-4");
|
|
ASSERT_EQ((size_t) 3, c.size());
|
|
ASSERT_DOUBLE_EQ(1.0, c["foo"]);
|
|
ASSERT_DOUBLE_EQ(2.0, c["bar"]);
|
|
ASSERT_DOUBLE_EQ(1e-4, c["baz"]);
|
|
}
|
|
|
|
TEST(parseCompString, name_with_colon)
|
|
{
|
|
compositionMap c = parseCompString("foo: 1.0 co:lon:2,baz: 1e-4");
|
|
ASSERT_EQ((size_t) 3, c.size());
|
|
ASSERT_DOUBLE_EQ(1.0, c["foo"]);
|
|
ASSERT_DOUBLE_EQ(2.0, c["co:lon"]);
|
|
ASSERT_DOUBLE_EQ(1e-4, c["baz"]);
|
|
}
|
|
|
|
TEST(parseCompString, name_with_final_colon)
|
|
{
|
|
compositionMap c = parseCompString("co:lons::1.0");
|
|
ASSERT_EQ((size_t) 1, c.size());
|
|
ASSERT_DOUBLE_EQ(1.0, c["co:lons:"]);
|
|
}
|
|
|
|
TEST(parseCompString, default_values)
|
|
{
|
|
std::vector<std::string> x = { "foo", "bar", "baz" };
|
|
compositionMap c = parseCompString("foo:1.0 baz:2", x);
|
|
ASSERT_EQ((size_t) 3, c.size());
|
|
ASSERT_FALSE(c.find("bar") == c.end());
|
|
ASSERT_DOUBLE_EQ(0.0, c["bar"]);
|
|
}
|
|
|
|
TEST(parseCompString, delimiters)
|
|
{
|
|
compositionMap c = parseCompString("\nfoo:1.0\tbar:2;baz:1e-4,qux:-1 ");
|
|
ASSERT_EQ((size_t) 4, c.size());
|
|
ASSERT_DOUBLE_EQ(1.0, c["foo"]);
|
|
ASSERT_DOUBLE_EQ(2.0, c["bar"]);
|
|
ASSERT_DOUBLE_EQ(1e-4, c["baz"]);
|
|
ASSERT_DOUBLE_EQ(-1, c["qux"]);
|
|
}
|
|
|
|
TEST(parseCompString, missing_element)
|
|
{
|
|
std::vector<std::string> x = { "foo", "bar" };
|
|
ASSERT_THROW(parseCompString("foo:1.0 bar:2 baz:1e-4", x),
|
|
CanteraError);
|
|
}
|
|
|
|
TEST(parseCompString, not_a_number)
|
|
{
|
|
ASSERT_THROW(parseCompString("foo:1.0 bar:five baz:1e-4"),
|
|
CanteraError);
|
|
}
|
|
|
|
TEST(parseCompString, missing_value)
|
|
{
|
|
ASSERT_THROW(parseCompString("foo:1.0 bar: baz:1e-4"),
|
|
CanteraError);
|
|
}
|
|
|
|
TEST(parseCompString, missing_last_value)
|
|
{
|
|
ASSERT_THROW(parseCompString("foo:1.0 bar"),
|
|
CanteraError);
|
|
}
|
|
|
|
}
|
|
|
|
int main(int argc, char** argv)
|
|
{
|
|
printf("Running main() from string_processing.cpp\n");
|
|
testing::InitGoogleTest(&argc, argv);
|
|
Cantera::make_deprecation_warnings_fatal();
|
|
int result = RUN_ALL_TESTS();
|
|
Cantera::appdelete();
|
|
return result;
|
|
}
|