Fixed namespace exclusion filtering

This commit is contained in:
Bartek Kryza
2022-09-21 23:01:31 +02:00
parent 920388d84a
commit 4caf7308b2
11 changed files with 71 additions and 22 deletions

View File

@@ -10,10 +10,6 @@ diagrams:
include:
namespaces:
- clanguml::t00014
exclude:
namespaces:
- std
- clanguml::t00014::std
plantuml:
before:
- left to right direction

View File

@@ -19,4 +19,5 @@ diagrams:
- inheritance
exclude:
namespaces:
- std
- clanguml::t00039::detail
- clanguml::t00039::ns3::detail

View File

@@ -42,6 +42,11 @@ struct AAAA : public virtual AAA {
};
} // namespace ns2
namespace detail {
struct AA : public A {
};
} // namespace detail
namespace ns3 {
template <typename T> struct F {
T *t;

View File

@@ -42,6 +42,7 @@ TEST_CASE("t00039", "[test-case][class]")
REQUIRE_THAT(puml, IsBaseClass(_A("A"), _A("AA")));
REQUIRE_THAT(puml, IsBaseClass(_A("AA"), _A("AAA")));
REQUIRE_THAT(puml, IsBaseClass(_A("AAA"), _A("ns2::AAAA")));
REQUIRE_THAT(puml, !IsClass(_A("detail::AA")));
REQUIRE_THAT(puml, !IsClass(_A("B")));
REQUIRE_THAT(puml, !IsClass(_A("ns1::BB")));

View File

@@ -14,4 +14,7 @@ diagrams:
context:
- clanguml::t00041::RR
subclasses:
- clanguml::t00041::ns1::N
- clanguml::t00041::ns1::N
exclude:
namespaces:
- clanguml::t00041::detail

View File

@@ -24,9 +24,15 @@ struct E {
struct F {
};
namespace detail {
struct G {
};
} // namespace detail
struct RR : public R {
E *e;
F *f;
detail::G *g;
};
struct RRR : public RR {

View File

@@ -47,6 +47,7 @@ TEST_CASE("t00041", "[test-case][class]")
REQUIRE_THAT(puml, IsClass(_A("R")));
REQUIRE_THAT(puml, IsClass(_A("RR")));
REQUIRE_THAT(puml, IsClass(_A("RRR")));
REQUIRE_THAT(puml, !IsClass(_A("detail::G")));
REQUIRE_THAT(puml, IsBaseClass(_A("R"), _A("RR")));
REQUIRE_THAT(puml, IsBaseClass(_A("RR"), _A("RRR")));