Skip to content

Commit 35cd2da

Browse files
hebastohebasto
committed
test: Fix 'make cov' with clang
1 parent 8a85377 commit 35cd2da

File tree

1 file changed

+57
-64
lines changed

1 file changed

+57
-64
lines changed

‎src/test/util_tests.cpp

Lines changed: 57 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -550,57 +550,52 @@ BOOST_AUTO_TEST_CASE(util_ReadConfigStream)
550550
BOOST_CHECK(test_args.m_settings.ro_config["sec1"].size() == 3);
551551
BOOST_CHECK(test_args.m_settings.ro_config["sec2"].size() == 2);
552552

553-
BOOST_CHECK(test_args.m_settings.ro_config[""].count("a")
554-
&& test_args.m_settings.ro_config[""].count("b")
555-
&& test_args.m_settings.ro_config[""].count("ccc")
556-
&& test_args.m_settings.ro_config[""].count("d")
557-
&& test_args.m_settings.ro_config[""].count("fff")
558-
&& test_args.m_settings.ro_config[""].count("ggg")
559-
&& test_args.m_settings.ro_config[""].count("h")
560-
&& test_args.m_settings.ro_config[""].count("i")
561-
);
562-
BOOST_CHECK(test_args.m_settings.ro_config["sec1"].count("ccc")
563-
&& test_args.m_settings.ro_config["sec1"].count("h")
564-
&& test_args.m_settings.ro_config["sec2"].count("ccc")
565-
&& test_args.m_settings.ro_config["sec2"].count("iii")
566-
);
567-
568-
BOOST_CHECK(test_args.IsArgSet("-a")
569-
&& test_args.IsArgSet("-b")
570-
&& test_args.IsArgSet("-ccc")
571-
&& test_args.IsArgSet("-d")
572-
&& test_args.IsArgSet("-fff")
573-
&& test_args.IsArgSet("-ggg")
574-
&& test_args.IsArgSet("-h")
575-
&& test_args.IsArgSet("-i")
576-
&& !test_args.IsArgSet("-zzz")
577-
&& !test_args.IsArgSet("-iii")
578-
);
579-
580-
BOOST_CHECK(test_args.GetArg("-a", "xxx") == ""
581-
&& test_args.GetArg("-b", "xxx") == "1"
582-
&& test_args.GetArg("-ccc", "xxx") == "argument"
583-
&& test_args.GetArg("-d", "xxx") == "e"
584-
&& test_args.GetArg("-fff", "xxx") == "0"
585-
&& test_args.GetArg("-ggg", "xxx") == "1"
586-
&& test_args.GetArg("-h", "xxx") == "0"
587-
&& test_args.GetArg("-i", "xxx") == "1"
588-
&& test_args.GetArg("-zzz", "xxx") == "xxx"
589-
&& test_args.GetArg("-iii", "xxx") == "xxx"
590-
);
553+
BOOST_CHECK(test_args.m_settings.ro_config[""].count("a"));
554+
BOOST_CHECK(test_args.m_settings.ro_config[""].count("b"));
555+
BOOST_CHECK(test_args.m_settings.ro_config[""].count("ccc"));
556+
BOOST_CHECK(test_args.m_settings.ro_config[""].count("d"));
557+
BOOST_CHECK(test_args.m_settings.ro_config[""].count("fff"));
558+
BOOST_CHECK(test_args.m_settings.ro_config[""].count("ggg"));
559+
BOOST_CHECK(test_args.m_settings.ro_config[""].count("h"));
560+
BOOST_CHECK(test_args.m_settings.ro_config[""].count("i"));
561+
BOOST_CHECK(test_args.m_settings.ro_config["sec1"].count("ccc"));
562+
BOOST_CHECK(test_args.m_settings.ro_config["sec1"].count("h"));
563+
BOOST_CHECK(test_args.m_settings.ro_config["sec2"].count("ccc"));
564+
BOOST_CHECK(test_args.m_settings.ro_config["sec2"].count("iii"));
565+
566+
BOOST_CHECK(test_args.IsArgSet("-a"));
567+
BOOST_CHECK(test_args.IsArgSet("-b"));
568+
BOOST_CHECK(test_args.IsArgSet("-ccc"));
569+
BOOST_CHECK(test_args.IsArgSet("-d"));
570+
BOOST_CHECK(test_args.IsArgSet("-fff"));
571+
BOOST_CHECK(test_args.IsArgSet("-ggg"));
572+
BOOST_CHECK(test_args.IsArgSet("-h"));
573+
BOOST_CHECK(test_args.IsArgSet("-i"));
574+
BOOST_CHECK(!test_args.IsArgSet("-zzz"));
575+
BOOST_CHECK(!test_args.IsArgSet("-iii"));
576+
577+
BOOST_CHECK_EQUAL(test_args.GetArg("-a", "xxx"), "");
578+
BOOST_CHECK_EQUAL(test_args.GetArg("-b", "xxx"), "1");
579+
BOOST_CHECK_EQUAL(test_args.GetArg("-ccc", "xxx"), "argument");
580+
BOOST_CHECK_EQUAL(test_args.GetArg("-d", "xxx"), "e");
581+
BOOST_CHECK_EQUAL(test_args.GetArg("-fff", "xxx"), "0");
582+
BOOST_CHECK_EQUAL(test_args.GetArg("-ggg", "xxx"), "1");
583+
BOOST_CHECK_EQUAL(test_args.GetArg("-h", "xxx"), "0");
584+
BOOST_CHECK_EQUAL(test_args.GetArg("-i", "xxx"), "1");
585+
BOOST_CHECK_EQUAL(test_args.GetArg("-zzz", "xxx"), "xxx");
586+
BOOST_CHECK_EQUAL(test_args.GetArg("-iii", "xxx"), "xxx");
591587

592588
for (const bool def : {false, true}) {
593-
BOOST_CHECK(test_args.GetBoolArg("-a", def)
594-
&& test_args.GetBoolArg("-b", def)
595-
&& !test_args.GetBoolArg("-ccc", def)
596-
&& !test_args.GetBoolArg("-d", def)
597-
&& !test_args.GetBoolArg("-fff", def)
598-
&& test_args.GetBoolArg("-ggg", def)
599-
&& !test_args.GetBoolArg("-h", def)
600-
&& test_args.GetBoolArg("-i", def)
601-
&& test_args.GetBoolArg("-zzz", def) == def
602-
&& test_args.GetBoolArg("-iii", def) == def
603-
);
589+
BOOST_CHECK(test_args.GetBoolArg("-a", def));
590+
BOOST_CHECK(test_args.GetBoolArg("-b", def));
591+
BOOST_CHECK(!test_args.GetBoolArg("-ccc", def));
592+
BOOST_CHECK(!test_args.GetBoolArg("-d", def));
593+
BOOST_CHECK(!test_args.GetBoolArg("-fff", def));
594+
BOOST_CHECK(test_args.GetBoolArg("-ggg", def));
595+
BOOST_CHECK(!test_args.GetBoolArg("-h", def));
596+
BOOST_CHECK(test_args.GetBoolArg("-i", def));
597+
BOOST_CHECK(test_args.GetBoolArg("-zzz", def) == def);
598+
BOOST_CHECK(test_args.GetBoolArg("-iii", def) == def);
604599
}
605600

606601
BOOST_CHECK(test_args.GetArgs("-a").size() == 1
@@ -636,13 +631,12 @@ BOOST_AUTO_TEST_CASE(util_ReadConfigStream)
636631
test_args.SelectConfigNetwork("sec1");
637632

638633
// same as original
639-
BOOST_CHECK(test_args.GetArg("-a", "xxx") == ""
640-
&& test_args.GetArg("-b", "xxx") == "1"
641-
&& test_args.GetArg("-fff", "xxx") == "0"
642-
&& test_args.GetArg("-ggg", "xxx") == "1"
643-
&& test_args.GetArg("-zzz", "xxx") == "xxx"
644-
&& test_args.GetArg("-iii", "xxx") == "xxx"
645-
);
634+
BOOST_CHECK_EQUAL(test_args.GetArg("-a", "xxx"), "");
635+
BOOST_CHECK_EQUAL(test_args.GetArg("-b", "xxx"), "1");
636+
BOOST_CHECK_EQUAL(test_args.GetArg("-fff", "xxx"), "0");
637+
BOOST_CHECK_EQUAL(test_args.GetArg("-ggg", "xxx"), "1");
638+
BOOST_CHECK_EQUAL(test_args.GetArg("-zzz", "xxx"), "xxx");
639+
BOOST_CHECK_EQUAL(test_args.GetArg("-iii", "xxx"), "xxx");
646640
// d is overridden
647641
BOOST_CHECK(test_args.GetArg("-d", "xxx") == "eee");
648642
// section-specific setting
@@ -657,14 +651,13 @@ BOOST_AUTO_TEST_CASE(util_ReadConfigStream)
657651
test_args.SelectConfigNetwork("sec2");
658652

659653
// same as original
660-
BOOST_CHECK(test_args.GetArg("-a", "xxx") == ""
661-
&& test_args.GetArg("-b", "xxx") == "1"
662-
&& test_args.GetArg("-d", "xxx") == "e"
663-
&& test_args.GetArg("-fff", "xxx") == "0"
664-
&& test_args.GetArg("-ggg", "xxx") == "1"
665-
&& test_args.GetArg("-zzz", "xxx") == "xxx"
666-
&& test_args.GetArg("-h", "xxx") == "0"
667-
);
654+
BOOST_CHECK(test_args.GetArg("-a", "xxx") == "");
655+
BOOST_CHECK(test_args.GetArg("-b", "xxx") == "1");
656+
BOOST_CHECK(test_args.GetArg("-d", "xxx") == "e");
657+
BOOST_CHECK(test_args.GetArg("-fff", "xxx") == "0");
658+
BOOST_CHECK(test_args.GetArg("-ggg", "xxx") == "1");
659+
BOOST_CHECK(test_args.GetArg("-zzz", "xxx") == "xxx");
660+
BOOST_CHECK(test_args.GetArg("-h", "xxx") == "0");
668661
// section-specific setting
669662
BOOST_CHECK(test_args.GetArg("-iii", "xxx") == "2");
670663
// section takes priority for multiple values

0 commit comments

Comments
 (0)