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

Refactoring getID to a unique global ID for entities

Browse Source
This commit is contained in:
Bartek Kryza
2022-08-11 17:04:16 +02:00
parent d63426e574
commit e4289c4cab
15 changed files with 264 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/t00003/test_case.h
View File

@@ -48,6 +48,11 @@ TEST_CASE("t00003", "[test-case][class]")
REQUIRE_THAT(puml, (IsMethod<Public>("basic_method")));
REQUIRE_THAT(puml, (IsMethod<Public, Static>("static_method", "int")));
REQUIRE_THAT(puml, (IsMethod<Public, Const>("const_method")));
REQUIRE_THAT(puml, (IsMethod<Public>("default_int", "int", "int i = 12")));
REQUIRE_THAT(puml,
(IsMethod<Public>("default_string", "std::string",
"int i, std::string s = \"abc\"")));
REQUIRE_THAT(puml, (IsMethod<Protected>("protected_method")));
REQUIRE_THAT(puml, (IsMethod<Private>("private_method")));
REQUIRE_THAT(puml, (IsField<Public>("public_member", "int")));

16
tests/t00048/.clang-uml Normal file
View File

@@ -0,0 +1,16 @@
compilation_database_dir: ..
output_directory: puml
diagrams:
t00048_class:
type: class
glob:
# - ../../tests/t00048/*.cc
# - ../../tests/t00048/t00048.cc
#
- ../../tests/t00048/b_t00048.cc
- ../../tests/t00048/a_t00048.cc
using_namespace: clanguml::t00048
parse_includes: true
include:
namespaces:
- clanguml::t00048

9
tests/t00048/a_t00048.cc Normal file
View File

@@ -0,0 +1,9 @@
#include "a_t00048.h"
namespace clanguml {
namespace t00048 {
void A::foo() {}
}
}

21
tests/t00048/a_t00048.h Normal file
View File

@@ -0,0 +1,21 @@
#include "t00048.h"
#pragma once
namespace clanguml {
namespace t00048 {
struct A : public Base {
int a;
void foo() override;
};
template <typename T> struct ATemplate : public BaseTemplate<T> {
T a;
void foo() override {}
};
}
}

9
tests/t00048/b_t00048.cc Normal file
View File

@@ -0,0 +1,9 @@
#include "b_t00048.h"
namespace clanguml {
namespace t00048 {
void B::foo() {}
}
}

21
tests/t00048/b_t00048.h Normal file
View File

@@ -0,0 +1,21 @@
#include "t00048.h"
#pragma once
namespace clanguml {
namespace t00048 {
struct B : public Base {
int b;
void foo() override;
};
template <typename T> struct BTemplate : public BaseTemplate<T> {
T b;
void foo() override {}
};
}
}

7
tests/t00048/t00048.cc Normal file
View File

@@ -0,0 +1,7 @@
#include "t00048.h"
namespace clanguml {
namespace t00048
{
}
}

19
tests/t00048/t00048.h Normal file
View File

@@ -0,0 +1,19 @@
#pragma once
namespace clanguml {
namespace t00048 {
struct Base {
int base;
virtual void foo() = 0;
};
template <typename T> struct BaseTemplate {
T base;
virtual void foo() = 0;
};
}
}

75
tests/t00048/test_case.h Normal file
View File

@@ -0,0 +1,75 @@
/**
* tests/t00048/test_case.h
*
* Copyright (c) 2021-2022 Bartek Kryza <bkryza@gmail.com>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
TEST_CASE("t00048", "[test-case][class]")
{
auto [config, db] = load_config("t00048");
auto diagram = config.diagrams["t00048_class"];
REQUIRE(diagram->name == "t00048_class");
auto model = generate_class_diagram(*db, diagram);
REQUIRE(model->name() == "t00048_class");
auto puml = generate_class_puml(diagram, *model);
AliasMatcher _A(puml);
REQUIRE_THAT(puml, StartsWith("@startuml"));
REQUIRE_THAT(puml, EndsWith("@enduml\n"));
// Check if all classes exist
REQUIRE_THAT(puml, IsAbstractClass(_A("Base")));
REQUIRE_THAT(puml, IsClass(_A("A")));
REQUIRE_THAT(puml, IsClass(_A("B")));
// Check if class templates exist
REQUIRE_THAT(puml, IsAbstractClassTemplate("BaseTemplate", "T"));
REQUIRE_THAT(puml, IsClassTemplate("ATemplate", "T"));
REQUIRE_THAT(puml, IsClassTemplate("BTemplate", "T"));
// Check if all enums exist
//REQUIRE_THAT(puml, IsEnum(_A("Lights")));
// Check if all inner classes exist
//REQUIRE_THAT(puml, IsInnerClass(_A("A"), _A("AA")));
// Check if all inheritance relationships exist
REQUIRE_THAT(puml, IsBaseClass(_A("Base"), _A("A")));
REQUIRE_THAT(puml, IsBaseClass(_A("Base"), _A("B")));
// Check if all methods exist
//REQUIRE_THAT(puml, (IsMethod<Public, Const>("foo")));
// Check if all fields exist
//REQUIRE_THAT(puml, (IsField<Private>("private_member", "int")));
// Check if all relationships exist
//REQUIRE_THAT(puml, IsAssociation(_A("D"), _A("A"), "-as"));
//REQUIRE_THAT(puml, IsDependency(_A("R"), _A("B")));
//REQUIRE_THAT(puml, IsAggregation(_A("R"), _A("D")));
//REQUIRE_THAT(puml, IsComposition(_A("R"), _A("D")));
//REQUIRE_THAT(puml, IsInstantiation(_A("ABCD::F<T>"), _A("F<int>")));
save_puml(
"./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
}

1
tests/test_cases.cc
View File

@@ -236,6 +236,7 @@ using namespace clanguml::test::matchers;
#include "t00045/test_case.h"
#include "t00046/test_case.h"
#include "t00047/test_case.h"
#include "t00048/test_case.h"
////
//// Sequence diagram tests

12
tests/test_cases.h
View File

@@ -229,6 +229,14 @@ ContainsMatcher IsAbstractClass(std::string const &str,
return ContainsMatcher(CasedString("abstract " + str, caseSensitivity));
}
ContainsMatcher IsAbstractClassTemplate(std::string const &str,
std::string const &tmplt,
CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes)
{
return ContainsMatcher(CasedString(
fmt::format("abstract \"{}<{}>\"", str, tmplt), caseSensitivity));
}
ContainsMatcher IsBaseClass(std::string const &base, std::string const &sub,
CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes)
{
@@ -376,7 +384,7 @@ ContainsMatcher HasLink(std::string const &alias, std::string const &link,
template <typename... Ts>
ContainsMatcher IsMethod(std::string const &name,
std::string const &type = "void",
std::string const &type = "void", std::string const &params = "",
CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes)
{
std::string pattern;
@@ -395,7 +403,7 @@ ContainsMatcher IsMethod(std::string const &name,
pattern += name;
pattern += "()";
pattern += "(" + params + ")";
if constexpr (has_type<Const, Ts...>())
pattern += " const";