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

Fixed package diagram generation

Browse Source
This commit is contained in:
Bartek Kryza
2022-07-31 16:14:36 +02:00
parent 79942e06d7
commit 7274809561
26 changed files with 600 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/t30001/test_case.h
View File

@@ -24,7 +24,7 @@ TEST_CASE("t30001", "[test-case][package]")
REQUIRE(diagram->name == "t30001_package");
auto model = generate_package_diagram(db, diagram);
auto model = generate_package_diagram(*db, diagram);
REQUIRE(model->name() == "t30001_package");

13
tests/t30002/t30002.cc
View File

@@ -66,6 +66,14 @@ namespace A15 {
struct CO {
};
}
namespace A16 {
struct CP {
};
}
namespace A17 {
struct CR {
};
}
}
namespace B::BB::BBB {
class CBA : public A::AA::A6::CF {
@@ -75,11 +83,14 @@ public:
std::shared_ptr<A::AA::A3::CC> cc_;
std::map<std::string, std::unique_ptr<A::AA::A4::CD>> *cd_;
std::array<A::AA::A15::CO, 5> co_;
static A::AA::A16::CP* cp_;
CBA() = default;
CBA(A::AA::A14::CN *cn) { }
friend A::AA::A17::CR;
template <typename... Item> CBA(std::tuple<Item...> &items) { }
void ce(const std::vector<A::AA::A5::CE> /*ce_*/) { }
@@ -87,7 +98,7 @@ public:
std::shared_ptr<A::AA::A7::CG> cg() { return {}; }
template <typename T>
void ch(std::map<T, std::shared_ptr<A::AA::A8::CH>> & /*ch_*/)
void ch(std::map<T, std::shared_ptr<A::AA::A8::CH>> & ch_)
{
}

6
tests/t30002/test_case.h
View File

@@ -24,7 +24,7 @@ TEST_CASE("t30002", "[test-case][package]")
REQUIRE(diagram->name == "t30002_package");
auto model = generate_package_diagram(db, diagram);
auto model = generate_package_diagram(*db, diagram);
REQUIRE(model->name() == "t30002_package");
@@ -48,6 +48,8 @@ TEST_CASE("t30002", "[test-case][package]")
REQUIRE_THAT(puml, IsPackage("A13"));
REQUIRE_THAT(puml, IsPackage("A14"));
REQUIRE_THAT(puml, IsPackage("A15"));
REQUIRE_THAT(puml, IsPackage("A16"));
REQUIRE_THAT(puml, IsPackage("A17"));
REQUIRE_THAT(puml, IsDependency(_A("BBB"), _A("A1")));
REQUIRE_THAT(puml, IsDependency(_A("BBB"), _A("A2")));
@@ -64,6 +66,8 @@ TEST_CASE("t30002", "[test-case][package]")
REQUIRE_THAT(puml, IsDependency(_A("BBB"), _A("A13")));
REQUIRE_THAT(puml, IsDependency(_A("BBB"), _A("A14")));
REQUIRE_THAT(puml, IsDependency(_A("BBB"), _A("A15")));
REQUIRE_THAT(puml, IsDependency(_A("BBB"), _A("A16")));
REQUIRE_THAT(puml, IsDependency(_A("BBB"), _A("A17")));
save_puml(
"./" + config.output_directory() + "/" + diagram->name + ".puml", puml);

2
tests/t30003/test_case.h
View File

@@ -24,7 +24,7 @@ TEST_CASE("t30003", "[test-case][package]")
REQUIRE(diagram->name == "t30003_package");
auto model = generate_package_diagram(db, diagram);
auto model = generate_package_diagram(*db, diagram);
REQUIRE(model->name() == "t30003_package");

2
tests/t30004/test_case.h
View File

@@ -24,7 +24,7 @@ TEST_CASE("t30004", "[test-case][package]")
REQUIRE(diagram->name == "t30004_package");
auto model = generate_package_diagram(db, diagram);
auto model = generate_package_diagram(*db, diagram);
REQUIRE(model->name() == "t30004_package");

2
tests/t30005/test_case.h
View File

@@ -24,7 +24,7 @@ TEST_CASE("t30005", "[test-case][package]")
REQUIRE(diagram->name == "t30005_package");
auto model = generate_package_diagram(db, diagram);
auto model = generate_package_diagram(*db, diagram);
REQUIRE(model->name() == "t30005_package");

2
tests/t30006/test_case.h
View File

@@ -24,7 +24,7 @@ TEST_CASE("t30006", "[test-case][package]")
REQUIRE(diagram->name == "t30006_package");
auto model = generate_package_diagram(db, diagram);
auto model = generate_package_diagram(*db, diagram);
REQUIRE(model->name() == "t30006_package");

2
tests/t30007/test_case.h
View File

@@ -24,7 +24,7 @@ TEST_CASE("t30007", "[test-case][package]")
REQUIRE(diagram->name == "t30007_package");
auto model = generate_package_diagram(db, diagram);
auto model = generate_package_diagram(*db, diagram);
REQUIRE(model->name() == "t30007_package");

2
tests/t30008/test_case.h
View File

@@ -24,7 +24,7 @@ TEST_CASE("t30008", "[test-case][package]")
REQUIRE(diagram->name == "t30008_package");
auto model = generate_package_diagram(db, diagram);
auto model = generate_package_diagram(*db, diagram);
REQUIRE(model->name() == "t30008_package");

16
tests/test_cases.cc
View File

@@ -245,14 +245,14 @@ using namespace clanguml::test::matchers;
////
//// Package diagram tests
////
//#include "t30001/test_case.h"
//#include "t30002/test_case.h"
//#include "t30003/test_case.h"
//#include "t30004/test_case.h"
//#include "t30005/test_case.h"
//#include "t30006/test_case.h"
//#include "t30007/test_case.h"
//#include "t30008/test_case.h"
#include "t30001/test_case.h"
#include "t30002/test_case.h"
#include "t30003/test_case.h"
#include "t30004/test_case.h"
#include "t30005/test_case.h"
#include "t30006/test_case.h"
#include "t30007/test_case.h"
#include "t30008/test_case.h"
//
////
//// Include diagram tests