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

Fixed formatting

Browse Source
This commit is contained in:
Bartek Kryza
2022-07-31 00:42:13 +02:00
parent 37757b2ccc
commit dd85cfc19b
23 changed files with 76 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tests/t00014/test_case.h
View File

@@ -46,7 +46,7 @@ TEST_CASE("t00014", "[test-case][class]")
REQUIRE_THAT(puml, IsClassTemplate("A", "double,float"));
REQUIRE_THAT(puml, IsClassTemplate("A", "bool,std::string"));
REQUIRE_THAT(puml, IsClassTemplate("A", "std::string,std::string"));
// REQUIRE_THAT(puml, IsClassTemplate("A", "char,std::string"));
// REQUIRE_THAT(puml, IsClassTemplate("A", "char,std::string"));
REQUIRE_THAT(puml, IsClass(_A("B")));
REQUIRE_THAT(puml, IsField<Private>("bapair", "PairPairBA<bool>"));
@@ -83,10 +83,12 @@ TEST_CASE("t00014", "[test-case][class]")
REQUIRE_THAT(puml, IsInstantiation(_A("A<T,P>"), _A("A<T,std::string>")));
REQUIRE_THAT(puml,
IsInstantiation(_A("A<T,std::string>"), _A("A<bool,std::string>")));
// REQUIRE_THAT(puml,
// IsInstantiation(_A("A<T,std::string>"), _A("A<char,std::string>")));
// REQUIRE_THAT(puml,
// IsInstantiation(_A("A<T,std::string>"), _A("A<wchar_t,std::string>")));
// REQUIRE_THAT(puml,
// IsInstantiation(_A("A<T,std::string>"),
// _A("A<char,std::string>")));
// REQUIRE_THAT(puml,
// IsInstantiation(_A("A<T,std::string>"),
// _A("A<wchar_t,std::string>")));
REQUIRE_THAT(puml,
IsInstantiation(_A("A<T,std::unique_ptr<std::string>>"),
@@ -108,8 +110,9 @@ TEST_CASE("t00014", "[test-case][class]")
REQUIRE_THAT(puml,
IsAggregation(_A("R"), _A("A<float,std::unique_ptr<std::string>>"),
"-floatstring"));
// REQUIRE_THAT(puml, IsDependency(_A("R"), _A("A<char,std::string>")));
// REQUIRE_THAT(puml, IsDependency(_A("R"), _A("A<wchar_t,std::string>")));
// REQUIRE_THAT(puml, IsDependency(_A("R"), _A("A<char,std::string>")));
// REQUIRE_THAT(puml, IsDependency(_A("R"),
// _A("A<wchar_t,std::string>")));
save_puml(
"./" + config.output_directory() + "/" + diagram->name + ".puml", puml);

4
tests/t00016/test_case.h
View File

@@ -46,8 +46,8 @@ TEST_CASE("t00016", "[test-case][class]")
puml, IsInstantiation(_A("is_numeric<>"), _A("is_numeric<bool>")));
REQUIRE_THAT(
puml, IsInstantiation(_A("is_numeric<>"), _A("is_numeric<char>")));
REQUIRE_THAT(puml,
IsInstantiation(_A("is_numeric<>"), _A("is_numeric<float>")));
REQUIRE_THAT(
puml, IsInstantiation(_A("is_numeric<>"), _A("is_numeric<float>")));
save_puml(
"./" + config.output_directory() + "/" + diagram->name + ".puml", puml);

3
tests/t00017/test_case.h
View File

@@ -48,7 +48,8 @@ TEST_CASE("t00017", "[test-case][class]")
REQUIRE_THAT(puml, (IsField<Private>("some_int", "int")));
REQUIRE_THAT(puml, (IsField<Private>("some_int_pointer", "int *")));
REQUIRE_THAT(puml, (IsField<Private>("some_int_pointer_pointer", "int **")));
REQUIRE_THAT(
puml, (IsField<Private>("some_int_pointer_pointer", "int **")));
// Relationship members should not be rendered as part of this testcase
REQUIRE_THAT(puml, !(IsField<Private>("a", _A("A"))));

6
tests/t00025/test_case.h
View File

@@ -47,10 +47,8 @@ TEST_CASE("t00025", "[test-case][class]")
puml, !IsAggregation(_A("ProxyHolder"), _A("Target1"), "+proxy1"));
REQUIRE_THAT(
puml, !IsAggregation(_A("ProxyHolder"), _A("Target2"), "+proxy2"));
REQUIRE_THAT(
puml, IsDependency(_A("Proxy<Target1>"), _A("Target1")));
REQUIRE_THAT(
puml, IsDependency(_A("Proxy<Target2>"), _A("Target2")));
REQUIRE_THAT(puml, IsDependency(_A("Proxy<Target1>"), _A("Target1")));
REQUIRE_THAT(puml, IsDependency(_A("Proxy<Target2>"), _A("Target2")));
save_puml(
"./" + config.output_directory() + "/" + diagram->name + ".puml", puml);

15
tests/t00030/t00030.cc
View File

@@ -4,15 +4,20 @@
namespace clanguml {
namespace t00030 {
class A { };
class A {
};
class B { };
class B {
};
class C { };
class C {
};
class D { };
class D {
};
class E { };
class E {
};
struct R {
/// @uml{association[]}

3
tests/t00036/t00036.cc
View File

@@ -25,7 +25,8 @@ namespace ns2 {
namespace ns22 {
// TODO: Fix for incomplete struct C declaration "struct C;"
struct C {};
struct C {
};
}
}

3
tests/t00038/t00038.cc
View File

@@ -32,7 +32,8 @@ struct key_t {
std::string key;
};
template <typename T> struct map {};
template <typename T> struct map {
};
using namespace thirdparty::ns1;

2
tests/t00044/test_case.h
View File

@@ -37,7 +37,7 @@ TEST_CASE("t00044", "[test-case][class]")
// TODO:
// Check dependants filter<void(int), bool>
//REQUIRE_THAT(puml, IsClassTemplate("signal_handler", "Ret,Args...,A"));
// REQUIRE_THAT(puml, IsClassTemplate("signal_handler", "Ret,Args...,A"));
save_puml(
"./" + config.output_directory() + "/" + diagram->name + ".puml", puml);

2
tests/test_cases.cc
View File

@@ -41,7 +41,7 @@ load_config(const std::string &test_name)
clang::tooling::CompilationDatabase::autoDetectFromDirectory(
config.compilation_database_dir(), err);
if(!err.empty())
if (!err.empty())
throw std::runtime_error{err};
return std::make_pair(std::move(config), std::move(compilation_database));

5
tests/test_cases.h
View File

@@ -37,8 +37,8 @@
#include "catch.h"
#include <clang/Tooling/Tooling.h>
#include <clang/Tooling/CompilationDatabase.h>
#include <clang/Tooling/Tooling.h>
#include <algorithm>
#include <complex>
@@ -52,7 +52,8 @@ using Catch::Matchers::StartsWith;
using Catch::Matchers::VectorContains;
using namespace clanguml::util;
std::pair<clanguml::config::config, std::unique_ptr<clang::tooling::CompilationDatabase>>
std::pair<clanguml::config::config,
std::unique_ptr<clang::tooling::CompilationDatabase>>
load_config(const std::string &test_name);
std::string generate_sequence_puml(