Enabled subclass filter to generate class inheritance diagram

This commit is contained in:
Bartek Kryza
2022-03-29 00:26:21 +02:00
parent ece02c09df
commit 3d7c446d57
62 changed files with 253 additions and 231 deletions

View File

@@ -33,12 +33,12 @@ TEST_CASE("t00002", "[test-case][class]")
auto model = generate_class_diagram(db, diagram);
REQUIRE(model.name() == "t00002_class");
REQUIRE(model->name() == "t00002_class");
REQUIRE(model.should_include({"clanguml", "t00002"}, "A"));
REQUIRE(!model.should_include({"std"}, "vector"));
REQUIRE(model->should_include({"clanguml", "t00002"}, "A"));
REQUIRE(!model->should_include({"std"}, "vector"));
auto puml = generate_class_puml(diagram, model);
auto puml = generate_class_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));

View File

@@ -30,10 +30,10 @@ TEST_CASE("t00003", "[test-case][class]")
auto model = generate_class_diagram(db, diagram);
REQUIRE(model.name() == "t00003_class");
REQUIRE(model.should_include(std::string("clanguml::t00003::A")));
REQUIRE(model->name() == "t00003_class");
REQUIRE(model->should_include(std::string("clanguml::t00003::A")));
auto puml = generate_class_puml(diagram, model);
auto puml = generate_class_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));

View File

@@ -29,13 +29,13 @@ TEST_CASE("t00004", "[test-case][class]")
auto model = generate_class_diagram(db, diagram);
REQUIRE(model.name() == "t00004_class");
REQUIRE(!model.should_include("std::vector"));
REQUIRE(model.should_include("clanguml::t00004::A"));
REQUIRE(model.should_include("clanguml::t00004::A::AA"));
REQUIRE(model.should_include("clanguml::t00004::A:::AAA"));
REQUIRE(model->name() == "t00004_class");
REQUIRE(!model->should_include("std::vector"));
REQUIRE(model->should_include("clanguml::t00004::A"));
REQUIRE(model->should_include("clanguml::t00004::A::AA"));
REQUIRE(model->should_include("clanguml::t00004::A:::AAA"));
auto puml = generate_class_puml(diagram, model);
auto puml = generate_class_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));

View File

@@ -26,13 +26,13 @@ TEST_CASE("t00005", "[test-case][class]")
auto model = generate_class_diagram(db, diagram);
REQUIRE(model.name() == "t00005_class");
REQUIRE(model.should_include("clanguml::t00005::A"));
REQUIRE(model.should_include("clanguml::t00005::B"));
REQUIRE(model.should_include("clanguml::t00005::C"));
REQUIRE(model.should_include("clanguml::t00005::D"));
REQUIRE(model->name() == "t00005_class");
REQUIRE(model->should_include("clanguml::t00005::A"));
REQUIRE(model->should_include("clanguml::t00005::B"));
REQUIRE(model->should_include("clanguml::t00005::C"));
REQUIRE(model->should_include("clanguml::t00005::D"));
auto puml = generate_class_puml(diagram, model);
auto puml = generate_class_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));

View File

@@ -26,15 +26,15 @@ TEST_CASE("t00006", "[test-case][class]")
auto model = generate_class_diagram(db, diagram);
REQUIRE(model.name() == "t00006_class");
REQUIRE(model->name() == "t00006_class");
REQUIRE(model.should_include("clanguml::t00006::A"));
REQUIRE(model.should_include("clanguml::t00006::B"));
REQUIRE(model.should_include("clanguml::t00006::C"));
REQUIRE(model.should_include("clanguml::t00006::D"));
REQUIRE(model.should_include("clanguml::t00006::E"));
REQUIRE(model->should_include("clanguml::t00006::A"));
REQUIRE(model->should_include("clanguml::t00006::B"));
REQUIRE(model->should_include("clanguml::t00006::C"));
REQUIRE(model->should_include("clanguml::t00006::D"));
REQUIRE(model->should_include("clanguml::t00006::E"));
auto puml = generate_class_puml(diagram, model);
auto puml = generate_class_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));

View File

@@ -26,9 +26,9 @@ TEST_CASE("t00007", "[test-case][class]")
auto model = generate_class_diagram(db, diagram);
REQUIRE(model.name() == "t00007_class");
REQUIRE(model->name() == "t00007_class");
auto puml = generate_class_puml(diagram, model);
auto puml = generate_class_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));

View File

@@ -26,9 +26,9 @@ TEST_CASE("t00008", "[test-case][class]")
auto model = generate_class_diagram(db, diagram);
REQUIRE(model.name() == "t00008_class");
REQUIRE(model->name() == "t00008_class");
auto puml = generate_class_puml(diagram, model);
auto puml = generate_class_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));

View File

@@ -26,9 +26,9 @@ TEST_CASE("t00009", "[test-case][class]")
auto model = generate_class_diagram(db, diagram);
REQUIRE(model.name() == "t00009_class");
REQUIRE(model->name() == "t00009_class");
auto puml = generate_class_puml(diagram, model);
auto puml = generate_class_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));

View File

@@ -26,9 +26,9 @@ TEST_CASE("t00010", "[test-case][class]")
auto model = generate_class_diagram(db, diagram);
REQUIRE(model.name() == "t00010_class");
REQUIRE(model->name() == "t00010_class");
auto puml = generate_class_puml(diagram, model);
auto puml = generate_class_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));

View File

@@ -26,9 +26,9 @@ TEST_CASE("t00011", "[test-case][class]")
auto model = generate_class_diagram(db, diagram);
REQUIRE(model.name() == "t00011_class");
REQUIRE(model->name() == "t00011_class");
auto puml = generate_class_puml(diagram, model);
auto puml = generate_class_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));

View File

@@ -26,9 +26,9 @@ TEST_CASE("t00012", "[test-case][class]")
auto model = generate_class_diagram(db, diagram);
REQUIRE(model.name() == "t00012_class");
REQUIRE(model->name() == "t00012_class");
auto puml = generate_class_puml(diagram, model);
auto puml = generate_class_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));

View File

@@ -26,13 +26,12 @@ TEST_CASE("t00013", "[test-case][class]")
auto model = generate_class_diagram(db, diagram);
REQUIRE(model.name() == "t00013_class");
REQUIRE(model.should_include("clanguml::t00013::A"));
REQUIRE(model.should_include("clanguml::t00013::B"));
REQUIRE(model.should_include("ABCD::F"));
REQUIRE(model->name() == "t00013_class");
REQUIRE(model->should_include("clanguml::t00013::A"));
REQUIRE(model->should_include("clanguml::t00013::B"));
REQUIRE(model->should_include("ABCD::F"));
auto puml = generate_class_puml(diagram, model);
auto puml = generate_class_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));

View File

@@ -24,13 +24,12 @@ TEST_CASE("t00014", "[test-case][class]")
REQUIRE(diagram->name == "t00014_class");
auto model = generate_class_diagram(db, diagram);
REQUIRE(model.name() == "t00014_class");
REQUIRE(model.should_include("clanguml::t00014::S"));
REQUIRE(model->name() == "t00014_class");
REQUIRE(model->should_include("clanguml::t00014::B"));
auto puml = generate_class_puml(diagram, model);
auto puml = generate_class_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));

View File

@@ -24,13 +24,12 @@ TEST_CASE("t00015", "[test-case][class]")
REQUIRE(diagram->name == "t00015_class");
auto model = generate_class_diagram(db, diagram);
REQUIRE(model.name() == "t00015_class");
REQUIRE(model.should_include("clanguml::t00015::ns1::ns2::A"));
REQUIRE(model->name() == "t00015_class");
REQUIRE(model->should_include("clanguml::t00015::ns1::ns2::A"));
auto puml = generate_class_puml(diagram, model);
auto puml = generate_class_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));

View File

@@ -24,13 +24,12 @@ TEST_CASE("t00016", "[test-case][class]")
REQUIRE(diagram->name == "t00016_class");
auto model = generate_class_diagram(db, diagram);
REQUIRE(model.name() == "t00016_class");
REQUIRE(model.should_include("clanguml::t00016::is_numeric"));
REQUIRE(model->name() == "t00016_class");
REQUIRE(model->should_include("clanguml::t00016::is_numeric"));
auto puml = generate_class_puml(diagram, model);
auto puml = generate_class_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));

View File

@@ -26,9 +26,9 @@ TEST_CASE("t00017", "[test-case][class]")
auto model = generate_class_diagram(db, diagram);
REQUIRE(model.name() == "t00017_class");
REQUIRE(model->name() == "t00017_class");
auto puml = generate_class_puml(diagram, model);
auto puml = generate_class_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));

View File

@@ -24,13 +24,12 @@ TEST_CASE("t00018", "[test-case][class]")
REQUIRE(diagram->name == "t00018_class");
auto model = generate_class_diagram(db, diagram);
REQUIRE(model.name() == "t00018_class");
REQUIRE(model.should_include("clanguml::t00018::widget"));
REQUIRE(model->name() == "t00018_class");
REQUIRE(model->should_include("clanguml::t00018::widget"));
auto puml = generate_class_puml(diagram, model);
auto puml = generate_class_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));

View File

@@ -26,9 +26,9 @@ TEST_CASE("t00019", "[test-case][class]")
auto model = generate_class_diagram(db, diagram);
REQUIRE(model.name() == "t00019_class");
REQUIRE(model->name() == "t00019_class");
auto puml = generate_class_puml(diagram, model);
auto puml = generate_class_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));

View File

@@ -24,13 +24,12 @@ TEST_CASE("t00020", "[test-case][class]")
REQUIRE(diagram->name == "t00020_class");
auto model = generate_class_diagram(db, diagram);
REQUIRE(model.name() == "t00020_class");
REQUIRE(model.should_include("clanguml::t00020::ProductA"));
REQUIRE(model->name() == "t00020_class");
REQUIRE(model->should_include("clanguml::t00020::ProductA"));
auto puml = generate_class_puml(diagram, model);
auto puml = generate_class_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));

View File

@@ -26,10 +26,10 @@ TEST_CASE("t00021", "[test-case][class]")
auto model = generate_class_diagram(db, diagram);
REQUIRE(model.name() == "t00021_class");
REQUIRE(model.should_include("clanguml::t00021::Visitor"));
REQUIRE(model->name() == "t00021_class");
REQUIRE(model->should_include("clanguml::t00021::Visitor"));
auto puml = generate_class_puml(diagram, model);
auto puml = generate_class_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));

View File

@@ -24,13 +24,12 @@ TEST_CASE("t00022", "[test-case][class]")
REQUIRE(diagram->name == "t00022_class");
auto model = generate_class_diagram(db, diagram);
REQUIRE(model.name() == "t00022_class");
REQUIRE(model.should_include("clanguml::t00022::A"));
REQUIRE(model->name() == "t00022_class");
REQUIRE(model->should_include("clanguml::t00022::A"));
auto puml = generate_class_puml(diagram, model);
auto puml = generate_class_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));

View File

@@ -24,13 +24,12 @@ TEST_CASE("t00023", "[test-case][class]")
REQUIRE(diagram->name == "t00023_class");
auto model = generate_class_diagram(db, diagram);
REQUIRE(model.name() == "t00023_class");
REQUIRE(model.should_include("clanguml::t00023::Visitor"));
REQUIRE(model->name() == "t00023_class");
REQUIRE(model->should_include("clanguml::t00023::Visitor"));
auto puml = generate_class_puml(diagram, model);
auto puml = generate_class_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));

View File

@@ -24,13 +24,12 @@ TEST_CASE("t00024", "[test-case][class]")
REQUIRE(diagram->name == "t00024_class");
auto model = generate_class_diagram(db, diagram);
REQUIRE(model.name() == "t00024_class");
REQUIRE(model.should_include("clanguml::t00024::A"));
REQUIRE(model->name() == "t00024_class");
REQUIRE(model->should_include("clanguml::t00024::A"));
auto puml = generate_class_puml(diagram, model);
auto puml = generate_class_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));

View File

@@ -24,13 +24,12 @@ TEST_CASE("t00025", "[test-case][class]")
REQUIRE(diagram->name == "t00025_class");
auto model = generate_class_diagram(db, diagram);
REQUIRE(model.name() == "t00025_class");
REQUIRE(model.should_include("clanguml::t00025::A"));
REQUIRE(model->name() == "t00025_class");
REQUIRE(model->should_include("clanguml::t00025::A"));
auto puml = generate_class_puml(diagram, model);
auto puml = generate_class_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));

View File

@@ -24,13 +24,12 @@ TEST_CASE("t00026", "[test-case][class]")
REQUIRE(diagram->name == "t00026_class");
auto model = generate_class_diagram(db, diagram);
REQUIRE(model.name() == "t00026_class");
REQUIRE(model.should_include("clanguml::t00026::A"));
REQUIRE(model->name() == "t00026_class");
REQUIRE(model->should_include("clanguml::t00026::A"));
auto puml = generate_class_puml(diagram, model);
auto puml = generate_class_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));

View File

@@ -24,13 +24,12 @@ TEST_CASE("t00027", "[test-case][class]")
REQUIRE(diagram->name == "t00027_class");
auto model = generate_class_diagram(db, diagram);
REQUIRE(model.name() == "t00027_class");
REQUIRE(model.should_include("clanguml::t00027::A"));
REQUIRE(model->name() == "t00027_class");
REQUIRE(model->should_include("clanguml::t00027::A"));
auto puml = generate_class_puml(diagram, model);
auto puml = generate_class_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));

View File

@@ -24,13 +24,12 @@ TEST_CASE("t00028", "[test-case][class]")
REQUIRE(diagram->name == "t00028_class");
auto model = generate_class_diagram(db, diagram);
REQUIRE(model.name() == "t00028_class");
REQUIRE(model.should_include("clanguml::t00028::A"));
REQUIRE(model->name() == "t00028_class");
REQUIRE(model->should_include("clanguml::t00028::A"));
auto puml = generate_class_puml(diagram, model);
auto puml = generate_class_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));

View File

@@ -24,13 +24,12 @@ TEST_CASE("t00029", "[test-case][class]")
REQUIRE(diagram->name == "t00029_class");
auto model = generate_class_diagram(db, diagram);
REQUIRE(model.name() == "t00029_class");
REQUIRE(model.should_include("clanguml::t00029::A"));
REQUIRE(model->name() == "t00029_class");
REQUIRE(model->should_include("clanguml::t00029::A"));
auto puml = generate_class_puml(diagram, model);
auto puml = generate_class_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));

View File

@@ -24,13 +24,12 @@ TEST_CASE("t00030", "[test-case][class]")
REQUIRE(diagram->name == "t00030_class");
auto model = generate_class_diagram(db, diagram);
REQUIRE(model.name() == "t00030_class");
REQUIRE(model.should_include("clanguml::t00030::A"));
REQUIRE(model->name() == "t00030_class");
REQUIRE(model->should_include("clanguml::t00030::A"));
auto puml = generate_class_puml(diagram, model);
auto puml = generate_class_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));

View File

@@ -24,13 +24,12 @@ TEST_CASE("t00031", "[test-case][class]")
REQUIRE(diagram->name == "t00031_class");
auto model = generate_class_diagram(db, diagram);
REQUIRE(model.name() == "t00031_class");
REQUIRE(model.should_include("clanguml::t00031::A"));
REQUIRE(model->name() == "t00031_class");
REQUIRE(model->should_include("clanguml::t00031::A"));
auto puml = generate_class_puml(diagram, model);
auto puml = generate_class_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));

View File

@@ -24,13 +24,12 @@ TEST_CASE("t00032", "[test-case][class]")
REQUIRE(diagram->name == "t00032_class");
auto model = generate_class_diagram(db, diagram);
REQUIRE(model.name() == "t00032_class");
REQUIRE(model.should_include("clanguml::t00032::A"));
REQUIRE(model->name() == "t00032_class");
REQUIRE(model->should_include("clanguml::t00032::A"));
auto puml = generate_class_puml(diagram, model);
auto puml = generate_class_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));

View File

@@ -26,10 +26,10 @@ TEST_CASE("t00033", "[test-case][class]")
auto model = generate_class_diagram(db, diagram);
REQUIRE(model.name() == "t00033_class");
REQUIRE(model.should_include("clanguml::t00033::A"));
REQUIRE(model->name() == "t00033_class");
REQUIRE(model->should_include("clanguml::t00033::A"));
auto puml = generate_class_puml(diagram, model);
auto puml = generate_class_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));

View File

@@ -26,10 +26,10 @@ TEST_CASE("t00034", "[test-case][class]")
auto model = generate_class_diagram(db, diagram);
REQUIRE(model.name() == "t00034_class");
REQUIRE(model.should_include("clanguml::t00034::A"));
REQUIRE(model->name() == "t00034_class");
REQUIRE(model->should_include("clanguml::t00034::A"));
auto puml = generate_class_puml(diagram, model);
auto puml = generate_class_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));

View File

@@ -26,10 +26,10 @@ TEST_CASE("t00035", "[test-case][class]")
auto model = generate_class_diagram(db, diagram);
REQUIRE(model.name() == "t00035_class");
REQUIRE(model.should_include("clanguml::t00035::A"));
REQUIRE(model->name() == "t00035_class");
REQUIRE(model->should_include("clanguml::t00035::A"));
auto puml = generate_class_puml(diagram, model);
auto puml = generate_class_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));

View File

@@ -27,9 +27,9 @@ TEST_CASE("t00036", "[test-case][class]")
auto model = generate_class_diagram(db, diagram);
REQUIRE(model.name() == "t00036_class");
REQUIRE(model->name() == "t00036_class");
auto puml = generate_class_puml(diagram, model);
auto puml = generate_class_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));

View File

@@ -27,9 +27,9 @@ TEST_CASE("t00037", "[test-case][class]")
auto model = generate_class_diagram(db, diagram);
REQUIRE(model.name() == "t00037_class");
REQUIRE(model->name() == "t00037_class");
auto puml = generate_class_puml(diagram, model);
auto puml = generate_class_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));

View File

@@ -27,9 +27,9 @@ TEST_CASE("t00038", "[test-case][class]")
auto model = generate_class_diagram(db, diagram);
REQUIRE(model.name() == "t00038_class");
REQUIRE(model->name() == "t00038_class");
auto puml = generate_class_puml(diagram, model);
auto puml = generate_class_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));

View File

@@ -27,9 +27,9 @@ TEST_CASE("t00039", "[test-case][class]")
auto model = generate_class_diagram(db, diagram);
REQUIRE(model.name() == "t00039_class");
REQUIRE(model->name() == "t00039_class");
auto puml = generate_class_puml(diagram, model);
auto puml = generate_class_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));

View File

@@ -26,13 +26,13 @@ TEST_CASE("t20001", "[test-case][sequence]")
auto model = generate_sequence_diagram(db, diagram);
REQUIRE(model.name() == "t20001_sequence");
REQUIRE(model->name() == "t20001_sequence");
REQUIRE(model.should_include("clanguml::t20001::A"));
REQUIRE(!model.should_include("clanguml::t20001::detail::C"));
REQUIRE(!model.should_include("std::vector"));
REQUIRE(model->should_include("clanguml::t20001::A"));
REQUIRE(!model->should_include("clanguml::t20001::detail::C"));
REQUIRE(!model->should_include("std::vector"));
auto puml = generate_sequence_puml(diagram, model);
auto puml = generate_sequence_puml(diagram, *model);
REQUIRE_THAT(puml, StartsWith("@startuml"));
REQUIRE_THAT(puml, EndsWith("@enduml\n"));

View File

@@ -26,9 +26,9 @@ TEST_CASE("t20002", "[test-case][sequence]")
auto model = generate_sequence_diagram(db, diagram);
REQUIRE(model.name() == "t20002_sequence");
REQUIRE(model->name() == "t20002_sequence");
auto puml = generate_sequence_puml(diagram, model);
auto puml = generate_sequence_puml(diagram, *model);
REQUIRE_THAT(puml, StartsWith("@startuml"));
REQUIRE_THAT(puml, EndsWith("@enduml\n"));

View File

@@ -26,13 +26,13 @@ TEST_CASE("t30001", "[test-case][package]")
auto model = generate_package_diagram(db, diagram);
REQUIRE(model.name() == "t30001_package");
REQUIRE(model->name() == "t30001_package");
REQUIRE(model.should_include("clanguml::t30001::A"));
REQUIRE(!model.should_include("clanguml::t30001::detail::C"));
REQUIRE(!model.should_include("std::vector"));
REQUIRE(model->should_include("clanguml::t30001::A"));
REQUIRE(!model->should_include("clanguml::t30001::detail::C"));
REQUIRE(!model->should_include("std::vector"));
auto puml = generate_package_puml(diagram, model);
auto puml = generate_package_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));

View File

@@ -26,9 +26,9 @@ TEST_CASE("t30002", "[test-case][package]")
auto model = generate_package_diagram(db, diagram);
REQUIRE(model.name() == "t30002_package");
REQUIRE(model->name() == "t30002_package");
auto puml = generate_package_puml(diagram, model);
auto puml = generate_package_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));

View File

@@ -26,9 +26,9 @@ TEST_CASE("t30003", "[test-case][package]")
auto model = generate_package_diagram(db, diagram);
REQUIRE(model.name() == "t30003_package");
REQUIRE(model->name() == "t30003_package");
auto puml = generate_package_puml(diagram, model);
auto puml = generate_package_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));

View File

@@ -26,9 +26,9 @@ TEST_CASE("t30004", "[test-case][package]")
auto model = generate_package_diagram(db, diagram);
REQUIRE(model.name() == "t30004_package");
REQUIRE(model->name() == "t30004_package");
auto puml = generate_package_puml(diagram, model);
auto puml = generate_package_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));

View File

@@ -26,9 +26,9 @@ TEST_CASE("t30005", "[test-case][package]")
auto model = generate_package_diagram(db, diagram);
REQUIRE(model.name() == "t30005_package");
REQUIRE(model->name() == "t30005_package");
auto puml = generate_package_puml(diagram, model);
auto puml = generate_package_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));

View File

@@ -26,9 +26,9 @@ TEST_CASE("t30006", "[test-case][package]")
auto model = generate_package_diagram(db, diagram);
REQUIRE(model.name() == "t30006_package");
REQUIRE(model->name() == "t30006_package");
auto puml = generate_package_puml(diagram, model);
auto puml = generate_package_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));

View File

@@ -26,9 +26,9 @@ TEST_CASE("t30007", "[test-case][package]")
auto model = generate_package_diagram(db, diagram);
REQUIRE(model.name() == "t30007_package");
REQUIRE(model->name() == "t30007_package");
auto puml = generate_package_puml(diagram, model);
auto puml = generate_package_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));

View File

@@ -24,9 +24,9 @@ TEST_CASE("t90000", "[test-case][config]")
auto model = generate_class_diagram(db, diagram);
REQUIRE(model.name() == "t90000_class");
REQUIRE(model->name() == "t90000_class");
auto puml = generate_class_puml(diagram, model);
auto puml = generate_class_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));

View File

@@ -51,8 +51,8 @@ std::pair<clanguml::config::config, compilation_database> load_config2(
return std::make_pair(std::move(config), std::move(db));
}
clanguml::sequence_diagram::model::diagram generate_sequence_diagram(
cppast::libclang_compilation_database &db,
std::unique_ptr<clanguml::sequence_diagram::model::diagram>
generate_sequence_diagram(cppast::libclang_compilation_database &db,
std::shared_ptr<clanguml::config::diagram> diagram)
{
using diagram_config = clanguml::config::sequence_diagram;
@@ -69,7 +69,7 @@ clanguml::sequence_diagram::model::diagram generate_sequence_diagram(
return std::move(model);
}
clanguml::class_diagram::model::diagram generate_class_diagram(
std::unique_ptr<clanguml::class_diagram::model::diagram> generate_class_diagram(
cppast::libclang_compilation_database &db,
std::shared_ptr<clanguml::config::diagram> diagram)
{
@@ -87,8 +87,8 @@ clanguml::class_diagram::model::diagram generate_class_diagram(
return std::move(model);
}
clanguml::package_diagram::model::diagram generate_package_diagram(
cppast::libclang_compilation_database &db,
std::unique_ptr<clanguml::package_diagram::model::diagram>
generate_package_diagram(cppast::libclang_compilation_database &db,
std::shared_ptr<clanguml::config::diagram> diagram)
{
using diagram_config = clanguml::config::package_diagram;