Refactored handling of relative paths (#213)

This commit is contained in:
Bartek Kryza
2023-12-08 08:17:00 +01:00
parent f1d3695ccc
commit d7195d5a5d
130 changed files with 317 additions and 255 deletions

View File

@@ -37,41 +37,41 @@ TEST_CASE("t20012", "[test-case][sequence]")
// Check if all calls exist
REQUIRE_THAT(src,
HasCall(_A("tmain()"),
_A("tmain()::(lambda ../../tests/t20012/t20012.cc:67:20)"),
_A("tmain()::(lambda tests/t20012/t20012.cc:67:20)"),
"operator()()"));
REQUIRE_THAT(src,
HasCall(_A("tmain()::(lambda ../../tests/t20012/t20012.cc:67:20)"),
HasCall(_A("tmain()::(lambda tests/t20012/t20012.cc:67:20)"),
_A("A"), "a()"));
REQUIRE_THAT(src, HasCall(_A("A"), _A("A"), "aa()"));
REQUIRE_THAT(src, HasCall(_A("A"), _A("A"), "aaa()"));
REQUIRE_THAT(src,
HasCall(_A("tmain()::(lambda ../../tests/t20012/t20012.cc:67:20)"),
HasCall(_A("tmain()::(lambda tests/t20012/t20012.cc:67:20)"),
_A("B"), "b()"));
REQUIRE_THAT(src, HasCall(_A("B"), _A("B"), "bb()"));
REQUIRE_THAT(src, HasCall(_A("B"), _A("B"), "bbb()"));
REQUIRE_THAT(src,
HasCall(_A("tmain()::(lambda ../../tests/t20012/t20012.cc:80:20)"),
HasCall(_A("tmain()::(lambda tests/t20012/t20012.cc:80:20)"),
_A("C"), "c()"));
REQUIRE_THAT(src, HasCall(_A("C"), _A("C"), "cc()"));
REQUIRE_THAT(src, HasCall(_A("C"), _A("C"), "ccc()"));
REQUIRE_THAT(src,
HasCall(_A("tmain()::(lambda ../../tests/t20012/t20012.cc:80:20)"),
_A("tmain()::(lambda ../../tests/t20012/t20012.cc:67:20)"),
HasCall(_A("tmain()::(lambda tests/t20012/t20012.cc:80:20)"),
_A("tmain()::(lambda tests/t20012/t20012.cc:67:20)"),
"operator()()"));
REQUIRE_THAT(src, HasCall(_A("C"), _A("C"), "ccc()"));
REQUIRE_THAT(src,
HasCall(_A("tmain()"),
_A("R<R::(lambda ../../tests/t20012/t20012.cc:86:9)>"), "r()"));
_A("R<R::(lambda tests/t20012/t20012.cc:86:9)>"), "r()"));
REQUIRE_THAT(src,
HasCall(_A("R<R::(lambda ../../tests/t20012/t20012.cc:86:9)>"),
_A("tmain()::(lambda ../../tests/t20012/t20012.cc:86:9)"),
HasCall(_A("R<R::(lambda tests/t20012/t20012.cc:86:9)>"),
_A("tmain()::(lambda tests/t20012/t20012.cc:86:9)"),
"operator()()"));
REQUIRE_THAT(src,
HasCall(_A("tmain()::(lambda ../../tests/t20012/t20012.cc:86:9)"),
HasCall(_A("tmain()::(lambda tests/t20012/t20012.cc:86:9)"),
_A("C"), "c()"));
// @todo #168
@@ -87,32 +87,27 @@ TEST_CASE("t20012", "[test-case][sequence]")
std::vector<int> messages = {
FindMessage(j, "tmain()",
"tmain()::(lambda ../../tests/t20012/t20012.cc:67:20)",
"tmain()::(lambda tests/t20012/t20012.cc:67:20)",
"operator()()"),
FindMessage(j,
"tmain()::(lambda ../../tests/t20012/t20012.cc:67:20)", "A",
"a()"),
FindMessage(j, "tmain()::(lambda tests/t20012/t20012.cc:67:20)",
"A", "a()"),
FindMessage(j, "A", "A", "aa()"), FindMessage(j, "A", "A", "aaa()"),
FindMessage(j,
"tmain()::(lambda ../../tests/t20012/t20012.cc:67:20)", "B",
"b()"),
FindMessage(j, "tmain()::(lambda tests/t20012/t20012.cc:67:20)",
"B", "b()"),
FindMessage(j, "B", "B", "bb()"), FindMessage(j, "B", "B", "bbb()"),
FindMessage(j,
"tmain()::(lambda ../../tests/t20012/t20012.cc:80:20)", "C",
"c()"),
FindMessage(j, "tmain()::(lambda tests/t20012/t20012.cc:80:20)",
"C", "c()"),
FindMessage(j, "C", "C", "cc()"), FindMessage(j, "C", "C", "ccc()"),
FindMessage(j,
"tmain()::(lambda ../../tests/t20012/t20012.cc:80:20)",
"tmain()::(lambda ../../tests/t20012/t20012.cc:67:20)",
FindMessage(j, "tmain()::(lambda tests/t20012/t20012.cc:80:20)",
"tmain()::(lambda tests/t20012/t20012.cc:67:20)",
"operator()()"),
FindMessage(j, "tmain()",
"R<R::(lambda ../../tests/t20012/t20012.cc:86:9)>", "r()"),
FindMessage(j, "R<R::(lambda ../../tests/t20012/t20012.cc:86:9)>",
"tmain()::(lambda ../../tests/t20012/t20012.cc:86:9)",
"R<R::(lambda tests/t20012/t20012.cc:86:9)>", "r()"),
FindMessage(j, "R<R::(lambda tests/t20012/t20012.cc:86:9)>",
"tmain()::(lambda tests/t20012/t20012.cc:86:9)",
"operator()()"),
FindMessage(j,
"tmain()::(lambda ../../tests/t20012/t20012.cc:86:9)", "C",
"c()"),
FindMessage(
j, "tmain()::(lambda tests/t20012/t20012.cc:86:9)", "C", "c()"),
// @todo #168
// FindMessage(j, "tmain()", "D", "add5(int)")
};
@@ -130,41 +125,41 @@ TEST_CASE("t20012", "[test-case][sequence]")
REQUIRE_THAT(src,
HasCall(_A("tmain()"),
_A("tmain()::(lambda ../../tests/t20012/t20012.cc:67:20)"),
_A("tmain()::(lambda tests/t20012/t20012.cc:67:20)"),
"operator()()"));
REQUIRE_THAT(src,
HasCall(_A("tmain()::(lambda ../../tests/t20012/t20012.cc:67:20)"),
HasCall(_A("tmain()::(lambda tests/t20012/t20012.cc:67:20)"),
_A("A"), "a()"));
REQUIRE_THAT(src, HasCall(_A("A"), _A("A"), "aa()"));
REQUIRE_THAT(src, HasCall(_A("A"), _A("A"), "aaa()"));
REQUIRE_THAT(src,
HasCall(_A("tmain()::(lambda ../../tests/t20012/t20012.cc:67:20)"),
HasCall(_A("tmain()::(lambda tests/t20012/t20012.cc:67:20)"),
_A("B"), "b()"));
REQUIRE_THAT(src, HasCall(_A("B"), _A("B"), "bb()"));
REQUIRE_THAT(src, HasCall(_A("B"), _A("B"), "bbb()"));
REQUIRE_THAT(src,
HasCall(_A("tmain()::(lambda ../../tests/t20012/t20012.cc:80:20)"),
HasCall(_A("tmain()::(lambda tests/t20012/t20012.cc:80:20)"),
_A("C"), "c()"));
REQUIRE_THAT(src, HasCall(_A("C"), _A("C"), "cc()"));
REQUIRE_THAT(src, HasCall(_A("C"), _A("C"), "ccc()"));
REQUIRE_THAT(src,
HasCall(_A("tmain()::(lambda ../../tests/t20012/t20012.cc:80:20)"),
_A("tmain()::(lambda ../../tests/t20012/t20012.cc:67:20)"),
HasCall(_A("tmain()::(lambda tests/t20012/t20012.cc:80:20)"),
_A("tmain()::(lambda tests/t20012/t20012.cc:67:20)"),
"operator()()"));
REQUIRE_THAT(src, HasCall(_A("C"), _A("C"), "ccc()"));
REQUIRE_THAT(src,
HasCall(_A("tmain()"),
_A("R<R::(lambda ../../tests/t20012/t20012.cc:86:9)>"), "r()"));
_A("R<R::(lambda tests/t20012/t20012.cc:86:9)>"), "r()"));
REQUIRE_THAT(src,
HasCall(_A("R<R::(lambda ../../tests/t20012/t20012.cc:86:9)>"),
_A("tmain()::(lambda ../../tests/t20012/t20012.cc:86:9)"),
HasCall(_A("R<R::(lambda tests/t20012/t20012.cc:86:9)>"),
_A("tmain()::(lambda tests/t20012/t20012.cc:86:9)"),
"operator()()"));
REQUIRE_THAT(src,
HasCall(_A("tmain()::(lambda ../../tests/t20012/t20012.cc:86:9)"),
HasCall(_A("tmain()::(lambda tests/t20012/t20012.cc:86:9)"),
_A("C"), "c()"));
save_mermaid(config.output_directory(), diagram->name + ".mmd", src);