Merge pull request #2682 from akva2/janitoring

fixed: add missing field initializers
This commit is contained in:
Joakim Hove 2021-09-14 15:52:50 +02:00 committed by GitHub
commit b319647a09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -35,14 +35,14 @@ BOOST_AUTO_TEST_CASE(UniqueKey) {
using Category = Opm::EclIO::SummaryNode::Category;
using Type = Opm::EclIO::SummaryNode::Type;
expect_key( { "KEYW", Category::Well, Type::Rate, "NORA", 1 ,""}, "KEYW:NORA" );
expect_key( { "KEYW", Category::Group, Type::Rate, "NORA", 2 ,""}, "KEYW:NORA" );
expect_key( { "KEYW", Category::Field, Type::Rate, "NORA", 3 ,""}, "KEYW" );
expect_key( { "KEYW", Category::Region, Type::Rate, "NORA", 4 ,""}, "KEYW:4" );
expect_key( { "KEYW", Category::Block, Type::Rate, "NORA", 5 ,""}, "KEYW:5" );
expect_key( { "KEYW", Category::Connection, Type::Rate, "NORA", 6 ,""}, "KEYW:NORA:6" );
expect_key( { "KEYW", Category::Segment, Type::Rate, "NORA", 7 ,""}, "KEYW:NORA:7" );
expect_key( { "KEYW", Category::Miscellaneous, Type::Rate, "NORA", 8 ,""}, "KEYW" );
expect_key( { "KEYW", Category::Well, Type::Rate, "NORA", 1, std::nullopt, std::nullopt}, "KEYW:NORA" );
expect_key( { "KEYW", Category::Group, Type::Rate, "NORA", 2, std::nullopt, std::nullopt}, "KEYW:NORA" );
expect_key( { "KEYW", Category::Field, Type::Rate, "NORA", 3, std::nullopt, std::nullopt}, "KEYW" );
expect_key( { "KEYW", Category::Region, Type::Rate, "NORA", 4, std::nullopt, std::nullopt}, "KEYW:4" );
expect_key( { "KEYW", Category::Block, Type::Rate, "NORA", 5, std::nullopt, std::nullopt}, "KEYW:5" );
expect_key( { "KEYW", Category::Connection, Type::Rate, "NORA", 6, std::nullopt, std::nullopt}, "KEYW:NORA:6" );
expect_key( { "KEYW", Category::Segment, Type::Rate, "NORA", 7, std::nullopt, std::nullopt}, "KEYW:NORA:7" );
expect_key( { "KEYW", Category::Miscellaneous, Type::Rate, "NORA", 8, std::nullopt, std::nullopt}, "KEYW" );
}
BOOST_AUTO_TEST_CASE(InjectedNumberRenderer) {
@ -55,7 +55,8 @@ BOOST_AUTO_TEST_CASE(InjectedNumberRenderer) {
Type::Undefined,
"-",
2,
""
std::nullopt,
std::nullopt
};
Opm::EclIO::SummaryNode negativeNode {
@ -64,7 +65,8 @@ BOOST_AUTO_TEST_CASE(InjectedNumberRenderer) {
Type::Undefined,
"-",
-2,
""
std::nullopt,
std::nullopt
};
auto chooseSign = [](const Opm::EclIO::SummaryNode& node) -> std::string {
@ -76,7 +78,10 @@ BOOST_AUTO_TEST_CASE(InjectedNumberRenderer) {
}
BOOST_AUTO_TEST_CASE(user_defined) {
auto summary_node = Opm::EclIO::SummaryNode{"FU_VAR1", Opm::EclIO::SummaryNode::Category::Field, Opm::EclIO::SummaryNode::Type::Undefined, "", -1 , ""};
auto summary_node = Opm::EclIO::SummaryNode{"FU_VAR1",
Opm::EclIO::SummaryNode::Category::Field,
Opm::EclIO::SummaryNode::Type::Undefined,
"", -1 , std::nullopt, std::nullopt};
BOOST_CHECK( summary_node.is_user_defined() );
}