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

Switched default composition for aggregation

Browse Source
This commit is contained in:
Bartek Kryza
2021-07-18 14:55:25 +02:00
parent 5a1491d679
commit 9bf1dca9e5
9 changed files with 40 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/t00005/test_case.h
View File

@@ -61,12 +61,12 @@ TEST_CASE("t00005", "[test-case][class]")
REQUIRE_THAT(puml, (IsField<Public>("some_int_pointer", "int*")));
REQUIRE_THAT(puml, (IsField<Public>("some_int_pointer_pointer", "int**")));
REQUIRE_THAT(puml, IsComposition(_A("R"), _A("A"), "a"));
REQUIRE_THAT(puml, IsAggregation(_A("R"), _A("A"), "a"));
REQUIRE_THAT(puml, IsAssociation(_A("R"), _A("B"), "b"));
REQUIRE_THAT(puml, IsAssociation(_A("R"), _A("C"), "c"));
REQUIRE_THAT(puml, IsAssociation(_A("R"), _A("D"), "d"));
REQUIRE_THAT(puml, IsAssociation(_A("R"), _A("E"), "e"));
REQUIRE_THAT(puml, IsComposition(_A("R"), _A("F"), "f"));
REQUIRE_THAT(puml, IsAggregation(_A("R"), _A("F"), "f"));
REQUIRE_THAT(puml, IsAssociation(_A("R"), _A("G"), "g"));
REQUIRE_THAT(puml, IsAssociation(_A("R"), _A("H"), "h"));
REQUIRE_THAT(puml, IsAssociation(_A("R"), _A("I"), "i"));

22
tests/t00006/test_case.h
View File

@@ -65,22 +65,22 @@ TEST_CASE("t00006", "[test-case][class]")
REQUIRE_THAT(puml,
IsInstantiation(_A("custom_container<T>"), _A("custom_container<E>")));
REQUIRE_THAT(puml, IsComposition(_A("R"), _A("A"), "a"));
REQUIRE_THAT(puml, IsAggregation(_A("R"), _A("A"), "a"));
REQUIRE_THAT(puml, IsAssociation(_A("R"), _A("B"), "b"));
REQUIRE_THAT(puml, IsComposition(_A("R"), _A("C"), "c"));
REQUIRE_THAT(puml, IsAggregation(_A("R"), _A("C"), "c"));
REQUIRE_THAT(puml, IsAssociation(_A("R"), _A("D"), "d"));
REQUIRE_THAT(puml, IsComposition(_A("R"), _A("custom_container<E>"), "e"));
REQUIRE_THAT(puml, IsComposition(_A("R"), _A("F"), "f"));
REQUIRE_THAT(puml, IsAggregation(_A("R"), _A("custom_container<E>"), "e"));
REQUIRE_THAT(puml, IsAggregation(_A("R"), _A("F"), "f"));
REQUIRE_THAT(puml, IsAssociation(_A("R"), _A("G"), "g"));
REQUIRE_THAT(puml, IsComposition(_A("R"), _A("H"), "h"));
REQUIRE_THAT(puml, IsAggregation(_A("R"), _A("H"), "h"));
REQUIRE_THAT(puml, IsAssociation(_A("R"), _A("I"), "i"));
REQUIRE_THAT(puml, IsComposition(_A("R"), _A("J"), "j"));
REQUIRE_THAT(puml, IsAggregation(_A("R"), _A("J"), "j"));
REQUIRE_THAT(puml, IsAssociation(_A("R"), _A("K"), "k"));
REQUIRE_THAT(puml, IsComposition(_A("R"), _A("L"), "lm"));
REQUIRE_THAT(puml, IsComposition(_A("R"), _A("M"), "lm"));
REQUIRE_THAT(puml, IsComposition(_A("R"), _A("N"), "ns"));
REQUIRE_THAT(puml, IsComposition(_A("R"), _A("NN"), "ns"));
REQUIRE_THAT(puml, IsComposition(_A("R"), _A("NNN"), "ns"));
REQUIRE_THAT(puml, IsAggregation(_A("R"), _A("L"), "lm"));
REQUIRE_THAT(puml, IsAggregation(_A("R"), _A("M"), "lm"));
REQUIRE_THAT(puml, IsAggregation(_A("R"), _A("N"), "ns"));
REQUIRE_THAT(puml, IsAggregation(_A("R"), _A("NN"), "ns"));
REQUIRE_THAT(puml, IsAggregation(_A("R"), _A("NNN"), "ns"));
save_puml(
"./" + config.output_directory + "/" + diagram->name + ".puml", puml);

2
tests/t00007/test_case.h
View File

@@ -50,7 +50,7 @@ TEST_CASE("t00007", "[test-case][class]")
REQUIRE_THAT(puml, IsClass(_A("C")));
REQUIRE_THAT(puml, IsClass(_A("R")));
REQUIRE_THAT(puml, IsComposition(_A("R"), _A("A"), "a"));
REQUIRE_THAT(puml, IsAggregation(_A("R"), _A("A"), "a"));
REQUIRE_THAT(puml, IsAssociation(_A("R"), _A("B"), "b"));
REQUIRE_THAT(puml, IsAssociation(_A("R"), _A("C"), "c"));

2
tests/t00009/test_case.h
View File

@@ -54,7 +54,7 @@ TEST_CASE("t00009", "[test-case][class]")
REQUIRE_THAT(puml, IsInstantiation(_A("A<T>"), _A("A<int>")));
REQUIRE_THAT(puml, IsInstantiation(_A("A<T>"), _A("A<std::string>")));
REQUIRE_THAT(puml, IsComposition(_A("B"), _A("A<int>"), "aint"));
REQUIRE_THAT(puml, IsAggregation(_A("B"), _A("A<int>"), "aint"));
REQUIRE_THAT(puml, IsAssociation(_A("B"), _A("A<std::string>"), "astring"));
REQUIRE_THAT(puml,
IsAssociation(_A("B"), _A("A<std::vector<std::string>>"), "avector"));

4
tests/t00010/test_case.h
View File

@@ -52,8 +52,8 @@ TEST_CASE("t00010", "[test-case][class]")
REQUIRE_THAT(puml, IsInstantiation(_A("B<T>"), _A("B<int>")));
REQUIRE_THAT(
puml, IsComposition(_A("B<T>"), _A("A<T,std::string>"), "astring"));
REQUIRE_THAT(puml, IsComposition(_A("C"), _A("B<int>"), "aintstring"));
puml, IsAggregation(_A("B<T>"), _A("A<T,std::string>"), "astring"));
REQUIRE_THAT(puml, IsAggregation(_A("C"), _A("B<int>"), "aintstring"));
save_puml(
"./" + config.output_directory + "/" + diagram->name + ".puml", puml);

2
tests/t00013/test_case.h
View File

@@ -56,7 +56,7 @@ TEST_CASE("t00013", "[test-case][class]")
REQUIRE_THAT(puml, IsDependency(_A("R"), _A("E<int>")));
REQUIRE_THAT(puml, IsInstantiation(_A("E<T>"), _A("E<int>")));
REQUIRE_THAT(puml, IsInstantiation(_A("E<T>"), _A("E<std::string>")));
REQUIRE_THAT(puml, IsComposition(_A("R"), _A("E<std::string>"), "estring"));
REQUIRE_THAT(puml, IsAggregation(_A("R"), _A("E<std::string>"), "estring"));
REQUIRE_THAT(puml, IsDependency(_A("R"), _A("ABCD::F<T>")));
REQUIRE_THAT(puml, IsInstantiation(_A("ABCD::F<T>"), _A("ABCD::F<int>")));
REQUIRE_THAT(puml, IsDependency(_A("R"), _A("ABCD::F<int>")));

8
tests/t00014/test_case.h
View File

@@ -52,11 +52,11 @@ TEST_CASE("t00014", "[test-case][class]")
REQUIRE_THAT(
puml, IsInstantiation(_A("A<T,std::string>"), _A("AString<float>")));
REQUIRE_THAT(
puml, IsComposition(_A("R"), _A("A<bool,std::string>"), "boolstring"));
puml, IsAggregation(_A("R"), _A("A<bool,std::string>"), "boolstring"));
REQUIRE_THAT(
puml, IsComposition(_A("R"), _A("AString<float>"), "floatstring"));
REQUIRE_THAT(puml, IsComposition(_A("R"), _A("B"), "bs"));
REQUIRE_THAT(puml, IsComposition(_A("R"), _A("B"), "bs2"));
puml, IsAggregation(_A("R"), _A("AString<float>"), "floatstring"));
REQUIRE_THAT(puml, IsAggregation(_A("R"), _A("B"), "bs"));
REQUIRE_THAT(puml, IsAggregation(_A("R"), _A("B"), "bs2"));
save_puml(
"./" + config.output_directory + "/" + diagram->name + ".puml", puml);