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

Fixed up to 33

Browse Source
This commit is contained in:
Bartek Kryza
2022-07-24 13:28:19 +02:00
parent 8efbb2446e
commit 1cf271fedf
23 changed files with 97 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tests/t00030/t00030.cc
View File

@@ -4,17 +4,15 @@
namespace clanguml {
namespace t00030 {
class A {
};
class A { };
class B {
};
class B { };
class C {
};
class C { };
class D {
};
class D { };
class E { };
struct R {
/// @uml{association[]}
@@ -28,6 +26,9 @@ struct R {
/// @uml{association[:1]}
D ddd;
/// @uml{aggregation[:1]}
E *eee;
};
} // namespace t00030

1
tests/t00030/test_case.h
View File

@@ -44,6 +44,7 @@ TEST_CASE("t00030", "[test-case][class]")
REQUIRE_THAT(puml, IsComposition(_A("R"), _A("B"), "+bbb", "0..1", "1..*"));
REQUIRE_THAT(puml, IsAggregation(_A("R"), _A("C"), "+ccc", "0..1", "1..5"));
REQUIRE_THAT(puml, IsAssociation(_A("R"), _A("D"), "+ddd", "", "1"));
REQUIRE_THAT(puml, IsAggregation(_A("R"), _A("E"), "+eee", "", "1"));
save_puml(
"./" + config.output_directory() + "/" + diagram->name + ".puml", puml);

2
tests/t00031/test_case.h
View File

@@ -24,7 +24,7 @@ TEST_CASE("t00031", "[test-case][class]")
REQUIRE(diagram->name == "t00031_class");
auto model = generate_class_diagram(db, diagram);
auto model = generate_class_diagram(*db, diagram);
REQUIRE(model->name() == "t00031_class");
REQUIRE(model->should_include("clanguml::t00031::A"));

2
tests/t00032/test_case.h
View File

@@ -24,7 +24,7 @@ TEST_CASE("t00032", "[test-case][class]")
REQUIRE(diagram->name == "t00032_class");
auto model = generate_class_diagram(db, diagram);
auto model = generate_class_diagram(*db, diagram);
REQUIRE(model->name() == "t00032_class");
REQUIRE(model->should_include("clanguml::t00032::A"));

2
tests/t00033/test_case.h
View File

@@ -24,7 +24,7 @@ TEST_CASE("t00033", "[test-case][class]")
REQUIRE(diagram->name == "t00033_class");
auto model = generate_class_diagram(db, diagram);
auto model = generate_class_diagram(*db, diagram);
REQUIRE(model->name() == "t00033_class");
REQUIRE(model->should_include("clanguml::t00033::A"));

2
tests/t00034/test_case.h
View File

@@ -24,7 +24,7 @@ TEST_CASE("t00034", "[test-case][class]")
REQUIRE(diagram->name == "t00034_class");
auto model = generate_class_diagram(db, diagram);
auto model = generate_class_diagram(*db, diagram);
REQUIRE(model->name() == "t00034_class");
REQUIRE(model->should_include("clanguml::t00034::A"));

2
tests/t00035/test_case.h
View File

@@ -24,7 +24,7 @@ TEST_CASE("t00035", "[test-case][class]")
REQUIRE(diagram->name == "t00035_class");
auto model = generate_class_diagram(db, diagram);
auto model = generate_class_diagram(*db, diagram);
REQUIRE(model->name() == "t00035_class");
REQUIRE(model->should_include("clanguml::t00035::A"));

2
tests/t00036/test_case.h
View File

@@ -25,7 +25,7 @@ TEST_CASE("t00036", "[test-case][class]")
REQUIRE(diagram->name == "t00036_class");
REQUIRE(diagram->generate_packages() == true);
auto model = generate_class_diagram(db, diagram);
auto model = generate_class_diagram(*db, diagram);
REQUIRE(model->name() == "t00036_class");

2
tests/t00037/test_case.h
View File

@@ -25,7 +25,7 @@ TEST_CASE("t00037", "[test-case][class]")
REQUIRE(diagram->name == "t00037_class");
REQUIRE(diagram->generate_packages() == true);
auto model = generate_class_diagram(db, diagram);
auto model = generate_class_diagram(*db, diagram);
REQUIRE(model->name() == "t00037_class");

2
tests/t00038/test_case.h
View File

@@ -25,7 +25,7 @@ TEST_CASE("t00038", "[test-case][class]")
REQUIRE(diagram->name == "t00038_class");
REQUIRE(diagram->generate_packages() == false);
auto model = generate_class_diagram(db, diagram);
auto model = generate_class_diagram(*db, diagram);
REQUIRE(model->name() == "t00038_class");

2
tests/t00039/test_case.h
View File

@@ -25,7 +25,7 @@ TEST_CASE("t00039", "[test-case][class]")
REQUIRE(diagram->name == "t00039_class");
REQUIRE(diagram->generate_packages() == false);
auto model = generate_class_diagram(db, diagram);
auto model = generate_class_diagram(*db, diagram);
REQUIRE(model->name() == "t00039_class");

2
tests/t00040/test_case.h
View File

@@ -25,7 +25,7 @@ TEST_CASE("t00040", "[test-case][class]")
REQUIRE(diagram->name == "t00040_class");
REQUIRE(diagram->generate_packages() == false);
auto model = generate_class_diagram(db, diagram);
auto model = generate_class_diagram(*db, diagram);
REQUIRE(model->name() == "t00040_class");

2
tests/t00041/test_case.h
View File

@@ -25,7 +25,7 @@ TEST_CASE("t00041", "[test-case][class]")
REQUIRE(diagram->name == "t00041_class");
REQUIRE(diagram->generate_packages() == false);
auto model = generate_class_diagram(db, diagram);
auto model = generate_class_diagram(*db, diagram);
REQUIRE(model->name() == "t00041_class");

2
tests/t00042/test_case.h
View File

@@ -25,7 +25,7 @@ TEST_CASE("t00042", "[test-case][class]")
REQUIRE(diagram->name == "t00042_class");
REQUIRE(diagram->generate_packages() == false);
auto model = generate_class_diagram(db, diagram);
auto model = generate_class_diagram(*db, diagram);
REQUIRE(model->name() == "t00042_class");

2
tests/t00043/test_case.h
View File

@@ -25,7 +25,7 @@ TEST_CASE("t00043", "[test-case][class]")
REQUIRE(diagram->name == "t00043_class");
REQUIRE(diagram->generate_packages() == true);
auto model = generate_class_diagram(db, diagram);
auto model = generate_class_diagram(*db, diagram);
REQUIRE(model->name() == "t00043_class");

2
tests/t00044/test_case.h
View File

@@ -25,7 +25,7 @@ TEST_CASE("t00044", "[test-case][class]")
REQUIRE(diagram->name == "t00044_class");
REQUIRE(diagram->generate_packages() == true);
auto model = generate_class_diagram(db, diagram);
auto model = generate_class_diagram(*db, diagram);
REQUIRE(model->name() == "t00044_class");

2
tests/t00045/test_case.h
View File

@@ -24,7 +24,7 @@ TEST_CASE("t00045", "[test-case][class]")
REQUIRE(diagram->name == "t00045_class");
auto model = generate_class_diagram(db, diagram);
auto model = generate_class_diagram(*db, diagram);
REQUIRE(model->name() == "t00045_class");
REQUIRE(model->should_include("clanguml::t00045::ns1::ns2::A"));

2
tests/t00046/test_case.h
View File

@@ -24,7 +24,7 @@ TEST_CASE("t00046", "[test-case][class]")
REQUIRE(diagram->name == "t00046_class");
auto model = generate_class_diagram(db, diagram);
auto model = generate_class_diagram(*db, diagram);
REQUIRE(model->name() == "t00046_class");
REQUIRE(model->should_include("ns1::ns2::A"));

34
tests/test_cases.cc
View File

@@ -219,23 +219,23 @@ using namespace clanguml::test::matchers;
#include "t00028/test_case.h"
#include "t00029/test_case.h"
#include "t00030/test_case.h"
//#include "t00031/test_case.h"
//#include "t00032/test_case.h"
//#include "t00033/test_case.h"
//#include "t00034/test_case.h"
//#include "t00035/test_case.h"
//#include "t00036/test_case.h"
//#include "t00037/test_case.h"
//#include "t00038/test_case.h"
//#include "t00039/test_case.h"
//#include "t00040/test_case.h"
//#include "t00041/test_case.h"
//#include "t00042/test_case.h"
//#include "t00043/test_case.h"
//#include "t00044/test_case.h"
//#include "t00045/test_case.h"
//#include "t00046/test_case.h"
//
#include "t00031/test_case.h"
#include "t00032/test_case.h"
#include "t00033/test_case.h"
#include "t00034/test_case.h"
#include "t00035/test_case.h"
#include "t00036/test_case.h"
#include "t00037/test_case.h"
#include "t00038/test_case.h"
#include "t00039/test_case.h"
#include "t00040/test_case.h"
#include "t00041/test_case.h"
#include "t00042/test_case.h"
#include "t00043/test_case.h"
#include "t00044/test_case.h"
#include "t00045/test_case.h"
#include "t00046/test_case.h"
////
//// Sequence diagram tests
////