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

Improved skipping of empty packages in class diagrams

Browse Source
This commit is contained in:
Bartek Kryza
2023-05-28 18:09:01 +02:00
parent 5c4a98ba79
commit 81c7ce71df
15 changed files with 121 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/t00036/.clang-uml
View File

@@ -10,4 +10,7 @@ diagrams:
- clanguml::t00036
include:
namespaces:
- clanguml::t00036
- clanguml::t00036
exclude:
subclasses:
- clanguml::t00036::ns2::ns22::D

10
tests/t00036/t00036.cc
View File

@@ -27,8 +27,18 @@ namespace ns22 {
// TODO: Fix for incomplete struct C declaration "struct C;"
struct C { };
struct D { };
}
}
namespace ns3 {
namespace ns33 {
namespace detail {
struct DImpl : public ns2::ns22::D { };
}
} // namespace ns33
} // namespace ns3
} // namespace t00036
} // namespace clanguml

3
tests/t00036/test_case.h
View File

@@ -40,8 +40,11 @@ TEST_CASE("t00036", "[test-case][class]")
REQUIRE_THAT(puml, IsEnum(_A("E")));
REQUIRE_THAT(puml, IsClass(_A("B")));
REQUIRE_THAT(puml, IsClass(_A("C")));
REQUIRE_THAT(puml, !IsClass(_A("DImpl")));
REQUIRE_THAT(puml, IsPackage("ns111"));
REQUIRE_THAT(puml, IsPackage("ns22"));
REQUIRE_THAT(puml, !IsPackage("ns3"));
REQUIRE_THAT(puml, !IsPackage("ns33"));
REQUIRE_THAT(puml, IsAggregation(_A("B"), _A("A<int>"), "+a_int"));

1
tests/t00065/module2/module2.h
View File

@@ -15,6 +15,7 @@ template <typename T> struct C {
template <bconcept T> struct D {
T t;
C<int> c;
};
}

40
tests/t00065/test_case.h
View File

@@ -36,38 +36,16 @@ TEST_CASE("t00065", "[test-case][class]")
REQUIRE_THAT(puml, EndsWith("@enduml\n"));
// Check if all classes exist
// REQUIRE_THAT(puml, IsClass(_A("AAA")));
REQUIRE_THAT(puml, IsClass(_A("R")));
REQUIRE_THAT(puml, IsClass(_A("A")));
REQUIRE_THAT(puml, IsClass(_A("AImpl")));
REQUIRE_THAT(puml, IsEnum(_A("XYZ")));
REQUIRE_THAT(puml, IsEnum(_A("ABC")));
// Check if class templates exist
// REQUIRE_THAT(puml, IsClassTemplate("A", "T,P,CMP,int N"));
// Check concepts
// REQUIRE_THAT(puml, IsConcept(_A("AConcept<T>")));
// REQUIRE_THAT(puml,
// IsConceptRequirement(
// _A("AConcept<T,P>"), "sizeof (T) > sizeof (P)"));
// Check if all enums exist
// REQUIRE_THAT(puml, IsEnum(_A("Lights")));
// Check if all inner classes exist
// REQUIRE_THAT(puml, IsInnerClass(_A("A"), _A("AA")));
// Check if all inheritance relationships exist
// REQUIRE_THAT(puml, IsBaseClass(_A("Base"), _A("Child")));
// Check if all methods exist
// REQUIRE_THAT(puml, (IsMethod<Public, Const>("foo")));
// Check if all fields exist
// REQUIRE_THAT(puml, (IsField<Private>("private_member", "int")));
// Check if all relationships exist
// REQUIRE_THAT(puml, IsAssociation(_A("D"), _A("A"), "-as"));
// REQUIRE_THAT(puml, IsDependency(_A("R"), _A("B")));
// REQUIRE_THAT(puml, IsAggregation(_A("R"), _A("D"), "-ag"));
// REQUIRE_THAT(puml, IsComposition(_A("R"), _A("D"), "-ac"));
// REQUIRE_THAT(puml, IsInstantiation(_A("ABCD::F<T>"), _A("F<int>")));
REQUIRE_THAT(puml, IsPackage("module1"));
REQUIRE_THAT(puml, IsPackage("module2"));
REQUIRE_THAT(puml, IsPackage("submodule1a"));
REQUIRE_THAT(puml, IsPackage("concepts"));
save_puml(
config.output_directory() + "/" + diagram->name + ".puml", puml);