matthias/clang-uml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed friend relationship generation in mermaid class diagram generator

Browse Source
This commit is contained in:
Bartek Kryza
2023-09-12 20:18:11 +02:00
parent 7c70ab69ad
commit 59180efebf
4 changed files with 50 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/t00011/test_case.h
View File

@@ -59,6 +59,7 @@ TEST_CASE("t00011", "[test-case][class]")
auto src = generate_class_mermaid(diagram, *model);
mermaid::AliasMatcher _A(src);
using mermaid::IsFriend;
REQUIRE_THAT(src, IsClass(_A("A")));
REQUIRE_THAT(src, IsClass(_A("B")));
@@ -67,7 +68,7 @@ TEST_CASE("t00011", "[test-case][class]")
REQUIRE_THAT(src, IsAssociation(_A("B"), _A("A")));
REQUIRE_THAT(src, IsFriend<Public>(_A("A"), _A("B")));
// REQUIRE_THAT(puml, IsFriend(_A("A"), _A("D<T>")));
// REQUIRE_THAT(src, IsFriend(_A("A"), _A("D<T>")));
save_mermaid(config.output_directory(), diagram->name + ".mmd", src);
}

1
tests/t00045/test_case.h
View File

@@ -89,6 +89,7 @@ TEST_CASE("t00045", "[test-case][class]")
auto src = generate_class_mermaid(diagram, *model);
mermaid::AliasMatcher _A(src);
using mermaid::IsFriend;
REQUIRE_THAT(src, IsClass(_A("A")));
REQUIRE_THAT(src, IsClass(_A("ns1::A")));

20
tests/test_cases.h
View File

@@ -905,6 +905,26 @@ ContainsMatcher IsFriend(std::string const &from, std::string const &to,
caseSensitivity));
}
namespace mermaid {
template <typename... Ts>
ContainsMatcher IsFriend(std::string const &from, std::string const &to,
CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes)
{
std::string pattern;
if constexpr (has_type<Public, Ts...>())
pattern = "+";
else if constexpr (has_type<Protected, Ts...>())
pattern = "#";
else
pattern = "-";
return ContainsMatcher(
CasedString(fmt::format("{} <.. {} : {}[friend]", from, to, pattern),
caseSensitivity));
}
}
ContainsMatcher IsPackage(std::string const &str,
CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes)
{