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

Fixed handling of nested and anonymous classes

Browse Source
This commit is contained in:
Bartek Kryza
2022-09-04 18:12:54 +02:00
parent 4d4eb02e57
commit d887353c24
11 changed files with 102 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/t00004/t00004.cc
View File

@@ -1,6 +1,11 @@
namespace clanguml {
namespace t00004 {
class B {
public:
enum AA { AA_1, AA_2, AA_3 };
};
class A {
public:
void foo() const { }
@@ -15,5 +20,6 @@ public:
void foo2() const { }
};
}
}

14
tests/t00004/test_case.h
View File

@@ -41,12 +41,14 @@ TEST_CASE("t00004", "[test-case][class]")
REQUIRE_THAT(puml, StartsWith("@startuml"));
REQUIRE_THAT(puml, EndsWith("@enduml\n"));
REQUIRE_THAT(puml, IsClass(_A("A")));
REQUIRE_THAT(puml, IsClass(_A("AA")));
REQUIRE_THAT(puml, IsClass(_A("AAA")));
REQUIRE_THAT(puml, IsEnum(_A("Lights")));
REQUIRE_THAT(puml, IsInnerClass(_A("A"), _A("AA")));
REQUIRE_THAT(puml, IsInnerClass(_A("AA"), _A("AAA")));
REQUIRE_THAT(puml, IsInnerClass(_A("AA"), _A("Lights")));
REQUIRE_THAT(puml, IsClass(_A("A::AA")));
REQUIRE_THAT(puml, IsClass(_A("A::AA::AAA")));
REQUIRE_THAT(puml, IsEnum(_A("B::AA")));
REQUIRE_THAT(puml, IsEnum(_A("A::AA::Lights")));
REQUIRE_THAT(puml, IsInnerClass(_A("A"), _A("A::AA")));
REQUIRE_THAT(puml, IsInnerClass(_A("A::AA"), _A("A::AA::AAA")));
REQUIRE_THAT(puml, IsInnerClass(_A("A::AA"), _A("A::AA::Lights")));
REQUIRE_THAT(puml, (IsMethod<Public, Const>("foo")));
REQUIRE_THAT(puml, (IsMethod<Public, Const>("foo2")));

8
tests/t00037/t00037.cc
View File

@@ -8,6 +8,11 @@ struct ST {
double y;
double z;
} dimensions;
struct {
double c;
double h;
} units;
};
struct A {
@@ -17,6 +22,9 @@ struct A {
st.dimensions.x = 1;
st.dimensions.y = 1;
st.dimensions.z = 1;
st.units.c = 1;
st.units.h = 1;
}
ST st;

2
tests/t00037/test_case.h
View File

@@ -37,7 +37,7 @@ TEST_CASE("t00037", "[test-case][class]")
REQUIRE_THAT(puml, IsClass(_A("ST")));
REQUIRE_THAT(puml, IsClass(_A("A")));
REQUIRE_THAT(puml, IsInnerClass(_A("ST"), _A("<<anonymous>>")));
REQUIRE_THAT(puml, IsClass(_A("ST::\\(anonymous_\\d+\\)")));
save_puml(
"./" + config.output_directory() + "/" + diagram->name + ".puml", puml);