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

Fixed up to t00011

Browse Source
This commit is contained in:
Bartek Kryza
2022-07-21 23:47:12 +02:00
parent 673b08f027
commit b5b116a14d
10 changed files with 170 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/t00008/test_case.h
View File

@@ -40,10 +40,10 @@ TEST_CASE("t00008", "[test-case][class]")
REQUIRE_THAT(puml, IsClassTemplate("B", "T,C<>"));
REQUIRE_THAT(puml, (IsField<Public>("value", "T")));
REQUIRE_THAT(puml, (IsField<Public>("pointer", "T*")));
REQUIRE_THAT(puml, (IsField<Public>("reference", "T&")));
REQUIRE_THAT(puml, (IsField<Public>("pointer", "T *")));
REQUIRE_THAT(puml, (IsField<Public>("reference", "T &")));
REQUIRE_THAT(puml, (IsField<Public>("values", "std::vector<P>")));
REQUIRE_THAT(puml, (IsField<Public>("ints", "std::array<int,N>")));
REQUIRE_THAT(puml, (IsField<Public>("ints", "std::array<int, N>")));
// TODO: add option to resolve using declared types
// REQUIRE_THAT(puml, IsField(Public("bool (*)(int, int) comparator")));
REQUIRE_THAT(puml, (IsField<Public>("comparator", "CMP")));

6
tests/t00009/test_case.h
View File

@@ -24,7 +24,7 @@ TEST_CASE("t00009", "[test-case][class]")
REQUIRE(diagram->name == "t00009_class");
auto model = generate_class_diagram(db, diagram);
auto model = generate_class_diagram(*db, diagram);
REQUIRE(model->name() == "t00009_class");
@@ -38,9 +38,9 @@ TEST_CASE("t00009", "[test-case][class]")
REQUIRE_THAT(puml, (IsField<Public>("value", "T")));
REQUIRE_THAT(puml, (IsField<Public>("aint", "A<int>")));
REQUIRE_THAT(puml, (IsField<Public>("astring", "A<std::string>*")));
REQUIRE_THAT(puml, (IsField<Public>("astring", "A<std::string> *")));
REQUIRE_THAT(
puml, (IsField<Public>("avector", "A<std::vector<std::string>>&")));
puml, (IsField<Public>("avector", "A<std::vector<std::string>> &")));
REQUIRE_THAT(puml, IsInstantiation(_A("A<T>"), _A("A<int>")));
REQUIRE_THAT(puml, IsInstantiation(_A("A<T>"), _A("A<std::string>")));

4
tests/t00010/test_case.h
View File

@@ -24,7 +24,7 @@ TEST_CASE("t00010", "[test-case][class]")
REQUIRE(diagram->name == "t00010_class");
auto model = generate_class_diagram(db, diagram);
auto model = generate_class_diagram(*db, diagram);
REQUIRE(model->name() == "t00010_class");
@@ -36,7 +36,7 @@ TEST_CASE("t00010", "[test-case][class]")
REQUIRE_THAT(puml, IsClassTemplate("A", "T,P"));
REQUIRE_THAT(puml, IsClassTemplate("B", "T"));
REQUIRE_THAT(puml, (IsField<Public>("astring", "A<T,std::string>")));
REQUIRE_THAT(puml, (IsField<Public>("astring", "A<T, std::string>")));
REQUIRE_THAT(puml, (IsField<Public>("aintstring", "B<int>")));
REQUIRE_THAT(puml, IsInstantiation(_A("A<T,P>"), _A("A<T,std::string>")));

2
tests/t00011/t00011.cc
View File

@@ -13,7 +13,7 @@ template <typename T> class D {
};
class A {
private:
public:
void foo() { }
friend class B;
friend class external::C;

6
tests/t00011/test_case.h
View File

@@ -24,7 +24,7 @@ TEST_CASE("t00011", "[test-case][class]")
REQUIRE(diagram->name == "t00011_class");
auto model = generate_class_diagram(db, diagram);
auto model = generate_class_diagram(*db, diagram);
REQUIRE(model->name() == "t00011_class");
@@ -35,9 +35,11 @@ TEST_CASE("t00011", "[test-case][class]")
REQUIRE_THAT(puml, EndsWith("@enduml\n"));
REQUIRE_THAT(puml, IsClass(_A("A")));
REQUIRE_THAT(puml, IsClass(_A("B")));
REQUIRE_THAT(puml, !IsClass(_A("external::C")));
REQUIRE_THAT(puml, IsClass(_A("D<T>")));
REQUIRE_THAT(puml, IsFriend<Private>(_A("A"), _A("B")));
REQUIRE_THAT(puml, IsAssociation(_A("B"), _A("A")));
REQUIRE_THAT(puml, IsFriend<Public>(_A("A"), _A("B")));
// REQUIRE_THAT(puml, IsFriend(_A("A"), _A("D<T>")));
save_puml(

6
tests/test_cases.cc
View File

@@ -197,9 +197,9 @@ using namespace clanguml::test::matchers;
#include "t00006/test_case.h"
#include "t00007/test_case.h"
#include "t00008/test_case.h"
//#include "t00009/test_case.h"
//#include "t00010/test_case.h"
//#include "t00011/test_case.h"
#include "t00009/test_case.h"
#include "t00010/test_case.h"
#include "t00011/test_case.h"
//#include "t00012/test_case.h"
//#include "t00013/test_case.h"
//#include "t00014/test_case.h"