From fa742a03c4f24ac0d2934b48a2e844a9f69598d1 Mon Sep 17 00:00:00 2001 From: Bartek Kryza Date: Mon, 10 Jun 2024 15:51:17 +0200 Subject: [PATCH] Improved test coverage (#287) --- .clang-uml | 1 + .github/workflows/build.yml | 2 +- CMakeLists.txt | 9 +++ Makefile | 4 +- .../visitor/translation_unit_visitor.cc | 73 ------------------- .../visitor/translation_unit_visitor.h | 2 +- src/common/model/diagram_filter.cc | 61 +++++++--------- src/common/model/diagram_filter.h | 28 +++++-- src/common/model/template_parameter.cc | 28 ------- src/common/model/template_parameter.h | 6 -- src/config/config.h | 2 + tests/t00002/test_case.h | 2 +- tests/t00003/test_case.h | 2 +- tests/t00004/test_case.h | 2 +- tests/t00005/test_case.h | 2 +- tests/t00006/test_case.h | 2 +- tests/t00007/test_case.h | 2 +- tests/t00008/test_case.h | 2 +- tests/t00009/test_case.h | 2 +- tests/t00010/test_case.h | 2 +- tests/t00011/test_case.h | 2 +- tests/t00012/test_case.h | 2 +- tests/t00013/test_case.h | 2 +- tests/t00014/test_case.h | 2 +- tests/t00015/test_case.h | 2 +- tests/t00016/test_case.h | 2 +- tests/t00017/test_case.h | 2 +- tests/t00018/test_case.h | 2 +- tests/t00019/test_case.h | 2 +- tests/t00020/test_case.h | 2 +- tests/t00021/test_case.h | 2 +- tests/t00022/test_case.h | 2 +- tests/t00023/test_case.h | 2 +- tests/t00024/test_case.h | 2 +- tests/t00025/test_case.h | 2 +- tests/t00026/test_case.h | 2 +- tests/t00027/test_case.h | 2 +- tests/t00028/test_case.h | 2 +- tests/t00029/test_case.h | 2 +- tests/t00030/test_case.h | 2 +- tests/t00031/test_case.h | 2 +- tests/t00032/test_case.h | 2 +- tests/t00033/test_case.h | 2 +- tests/t00034/test_case.h | 2 +- tests/t00035/test_case.h | 2 +- tests/t00036/test_case.h | 2 +- tests/t00037/test_case.h | 2 +- tests/t00038/test_case.h | 2 +- tests/t00039/test_case.h | 2 +- tests/t00040/test_case.h | 2 +- tests/t00041/test_case.h | 2 +- tests/t00042/test_case.h | 2 +- tests/t00043/test_case.h | 2 +- tests/t00044/test_case.h | 2 +- tests/t00045/test_case.h | 2 +- tests/t00046/test_case.h | 2 +- tests/t00047/test_case.h | 2 +- tests/t00048/test_case.h | 2 +- tests/t00049/test_case.h | 2 +- tests/t00050/test_case.h | 2 +- tests/t00051/test_case.h | 2 +- tests/t00052/test_case.h | 2 +- tests/t00053/test_case.h | 2 +- tests/t00054/test_case.h | 2 +- tests/t00055/test_case.h | 2 +- tests/t00056/test_case.h | 2 +- tests/t00057/test_case.h | 2 +- tests/t00058/test_case.h | 2 +- tests/t00059/test_case.h | 2 +- tests/t00060/test_case.h | 2 +- tests/t00061/test_case.h | 2 +- tests/t00062/test_case.h | 2 +- tests/t00063/test_case.h | 2 +- tests/t00064/test_case.h | 2 +- tests/t00065/test_case.h | 2 +- tests/t00066/test_case.h | 2 +- tests/t00067/test_case.h | 2 +- tests/t00068/test_case.h | 6 +- tests/t00069/test_case.h | 2 +- tests/t00070/test_case.h | 2 +- tests/t00071/test_case.h | 2 +- tests/t00072/test_case.h | 2 +- tests/t00073/test_case.h | 2 +- tests/t00074/test_case.h | 2 +- tests/t00075/test_case.h | 2 +- tests/t20001/test_case.h | 2 +- tests/t20002/test_case.h | 2 +- tests/t20003/test_case.h | 2 +- tests/t20004/test_case.h | 2 +- tests/t20005/test_case.h | 2 +- tests/t20006/test_case.h | 2 +- tests/t20007/test_case.h | 2 +- tests/t20008/test_case.h | 2 +- tests/t20009/test_case.h | 2 +- tests/t20010/test_case.h | 2 +- tests/t20011/test_case.h | 2 +- tests/t20012/test_case.h | 2 +- tests/t20013/test_case.h | 2 +- tests/t20014/test_case.h | 2 +- tests/t20015/test_case.h | 2 +- tests/t20016/test_case.h | 2 +- tests/t20017/test_case.h | 2 +- tests/t20018/test_case.h | 2 +- tests/t20019/test_case.h | 2 +- tests/t20020/test_case.h | 2 +- tests/t20021/test_case.h | 2 +- tests/t20022/test_case.h | 2 +- tests/t20023/test_case.h | 2 +- tests/t20024/test_case.h | 2 +- tests/t20025/test_case.h | 2 +- tests/t20026/test_case.h | 2 +- tests/t20027/test_case.h | 2 +- tests/t20028/test_case.h | 2 +- tests/t20029/test_case.h | 2 +- tests/t20030/test_case.h | 2 +- tests/t20031/test_case.h | 2 +- tests/t20032/test_case.h | 2 +- tests/t20033/test_case.h | 2 +- tests/t20034/test_case.h | 2 +- tests/t20035/test_case.h | 2 +- tests/t20036/test_case.h | 2 +- tests/t20037/test_case.h | 2 +- tests/t20038/test_case.h | 2 +- tests/t20039/test_case.h | 2 +- tests/t20040/test_case.h | 2 +- tests/t20041/test_case.h | 2 +- tests/t20042/test_case.h | 2 +- tests/t20043/test_case.h | 2 +- tests/t20044/test_case.h | 2 +- tests/t20045/test_case.h | 2 +- tests/t20046/test_case.h | 2 +- tests/t20047/test_case.h | 2 +- tests/t20048/test_case.h | 2 +- tests/t20049/test_case.h | 2 +- tests/t20050/test_case.h | 2 +- tests/t20051/test_case.h | 2 +- tests/t20052/test_case.h | 2 +- tests/t20053/test_case.h | 2 +- tests/t20054/test_case.h | 2 +- tests/t30001/test_case.h | 2 +- tests/t30002/test_case.h | 2 +- tests/t30003/test_case.h | 2 +- tests/t30004/test_case.h | 2 +- tests/t30005/test_case.h | 2 +- tests/t30006/test_case.h | 2 +- tests/t30007/test_case.h | 2 +- tests/t30008/test_case.h | 2 +- tests/t30009/test_case.h | 2 +- tests/t30010/test_case.h | 2 +- tests/t30011/test_case.h | 2 +- tests/t30012/test_case.h | 2 +- tests/t30013/test_case.h | 2 +- tests/t30014/test_case.h | 2 +- tests/t30015/test_case.h | 2 +- tests/t40001/test_case.h | 2 +- tests/t40002/test_case.h | 2 +- tests/t40003/.clang-uml | 9 ++- tests/t40003/include/dependants/t10.h | 7 ++ tests/t40003/include/dependants/t11.h | 7 ++ tests/t40003/include/dependencies/t5.h | 7 +- tests/t40003/include/dependencies/t7.h | 5 ++ tests/t40003/include/dependencies/t8.h | 7 ++ tests/t40003/src/dependencies/t2.cc | 1 + tests/t40003/test_case.h | 8 +- tests/t90000/test_case.h | 2 +- tests/t90001/test_case.h | 12 +-- tests/test_cases.cc | 28 ++++--- tests/test_cases.h | 3 +- tests/test_cli_handler.cc | 31 ++++++++ util/generate_test_case.py | 6 +- 170 files changed, 320 insertions(+), 323 deletions(-) create mode 100644 tests/t40003/include/dependants/t10.h create mode 100644 tests/t40003/include/dependants/t11.h create mode 100644 tests/t40003/include/dependencies/t7.h create mode 100644 tests/t40003/include/dependencies/t8.h diff --git a/.clang-uml b/.clang-uml index ceef3fe2..14bdc662 100644 --- a/.clang-uml +++ b/.clang-uml @@ -4,6 +4,7 @@ comment_parser: clang add_compile_flags: - -fparse-all-comments - -Wno-deprecated-declarations + - -Wno-ignored-optimization-argument remove_compile_flags: - -Wno-class-memaccess - -Wno-dangling-reference diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a1c115af..a5633854 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,7 +41,7 @@ jobs: make check-formatting - name: Build and unit test run: | - NUMPROC=2 CMAKE_CXX_FLAGS="--coverage -fno-inline" CMAKE_EXE_LINKER_FLAGS="-lgcov --coverage" LLVM_VERSION=15 make test + NUMPROC=2 CODE_COVERAGE=ON LLVM_VERSION=15 make test - name: Run coverage run: | lcov -c -d debug -o coverage.info diff --git a/CMakeLists.txt b/CMakeLists.txt index f690f761..d5ef2451 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,6 +61,15 @@ setup_git_version() message(STATUS "clang-uml version: " "${GIT_VERSION_MAJOR}.${GIT_VERSION_MINOR}.${GIT_VERSION_PATCH}") +# +# Setup coverage +# +option(CODE_COVERAGE "" OFF) +if(CODE_COVERAGE) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage -fno-inline") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lgcov --coverage") +endif(CODE_COVERAGE) + # # Setup LLVM # diff --git a/Makefile b/Makefile index b375b87a..51a20559 100644 --- a/Makefile +++ b/Makefile @@ -37,6 +37,7 @@ CMAKE_PREFIX ?= CMAKE_CXX_FLAGS ?= CMAKE_EXE_LINKER_FLAGS ?= CMAKE_GENERATOR ?= Unix Makefiles +CODE_COVERAGE ?= OFF ENABLE_CXX_MODULES_TEST_CASES ?= OFF ENABLE_CUDA_TEST_CASES ?= OFF @@ -65,7 +66,8 @@ debug/CMakeLists.txt: -DLINK_LLVM_SHARED=${LLVM_SHARED} \ -DCMAKE_PREFIX=${CMAKE_PREFIX} \ -DENABLE_CUDA_TEST_CASES=$(ENABLE_CUDA_TEST_CASES) \ - -DENABLE_CXX_MODULES_TEST_CASES=$(ENABLE_CXX_MODULES_TEST_CASES) + -DENABLE_CXX_MODULES_TEST_CASES=$(ENABLE_CXX_MODULES_TEST_CASES) \ + -DCODE_COVERAGE=$(CODE_COVERAGE) release/CMakeLists.txt: cmake -S . -B release \ diff --git a/src/class_diagram/visitor/translation_unit_visitor.cc b/src/class_diagram/visitor/translation_unit_visitor.cc index 1280874c..e0aa96b5 100644 --- a/src/class_diagram/visitor/translation_unit_visitor.cc +++ b/src/class_diagram/visitor/translation_unit_visitor.cc @@ -207,10 +207,6 @@ bool translation_unit_visitor::VisitClassTemplateSpecializationDecl( auto &template_specialization = *template_specialization_ptr; - if (cls->hasBody()) { - process_template_specialization_children(cls, template_specialization); - } - if (cls->hasDefinition()) { // Process template specialization bases process_class_bases(cls, template_specialization); @@ -1005,75 +1001,6 @@ void translation_unit_visitor::process_class_bases( } } -void translation_unit_visitor::process_template_specialization_children( - const clang::ClassTemplateSpecializationDecl *cls, class_ &c) -{ - assert(cls != nullptr); - - // Iterate over class methods (both regular and static) - for (const auto *method : cls->methods()) { - if (method != nullptr) { - process_method(*method, c); - } - } - - // Iterate over class template methods - if (const auto *cls_decl_context = - clang::dyn_cast_or_null(cls); - cls_decl_context != nullptr) { - for (auto const *decl_iterator : - clang::dyn_cast_or_null(cls)->decls()) { - auto const *method_template = - llvm::dyn_cast_or_null( - decl_iterator); - if (method_template == nullptr) - continue; - - process_template_method(*method_template, c); - } - } - - // Iterate over regular class fields - for (const auto *field : cls->fields()) { - if (field != nullptr) - process_field(*field, c); - } - - // Static fields have to be processed by iterating over variable - // declarations - for (const auto *decl : cls->decls()) { - if (decl->getKind() == clang::Decl::Var) { - const clang::VarDecl *variable_declaration{ - dynamic_cast(decl)}; - if ((variable_declaration != nullptr) && - variable_declaration->isStaticDataMember()) { - process_static_field(*variable_declaration, c); - } - } - else if (decl->getKind() == clang::Decl::Enum) { - const auto *enum_decl = - clang::dyn_cast_or_null(decl); - if (enum_decl == nullptr) - continue; - - if (enum_decl->getNameAsString().empty()) { - for (const auto *enum_const : enum_decl->enumerators()) { - class_member m{common::access_specifier_to_access_t( - enum_decl->getAccess()), - enum_const->getNameAsString(), "enum"}; - c.add_member(std::move(m)); - } - } - } - } - - if (cls->hasFriends()) { - for (const auto *friend_declaration : cls->friends()) { - process_friend(*friend_declaration, c); - } - } -} - void translation_unit_visitor::process_record_members( const clang::RecordDecl *cls, class_ &c) { diff --git a/src/class_diagram/visitor/translation_unit_visitor.h b/src/class_diagram/visitor/translation_unit_visitor.h index e4196e8a..8540ca9a 100644 --- a/src/class_diagram/visitor/translation_unit_visitor.h +++ b/src/class_diagram/visitor/translation_unit_visitor.h @@ -224,7 +224,7 @@ private: clang::ClassTemplateSpecializationDecl *cls); /** - * @brief Process template specialiaztion children (members and methods) + * @brief Process template specialization children (members and methods) * @param cls Class template specialization declaration * @param c Class diagram element model */ diff --git a/src/common/model/diagram_filter.cc b/src/common/model/diagram_filter.cc index e290215f..95689ba0 100644 --- a/src/common/model/diagram_filter.cc +++ b/src/common/model/diagram_filter.cc @@ -1086,7 +1086,7 @@ void diagram_filter::init_filters(const config::diagram &c) element_filters.emplace_back( std::make_unique( filter_t::kInclusive, relationship_t::kAssociation, - dependants)); + dependants, false)); element_filters.emplace_back( std::make_unique( @@ -1149,26 +1149,29 @@ void diagram_filter::init_filters(const config::diagram &c) std::make_unique(filter_t::kExclusive, relationship_t::kInstantiation, c.exclude().specializations)); - add_exclusive_filter( - std::make_unique(filter_t::kExclusive, - relationship_t::kDependency, c.exclude().dependants)); + if (c.type() == diagram_t::kClass) { + add_exclusive_filter(std::make_unique( + filter_t::kExclusive, relationship_t::kDependency, + c.exclude().dependants)); - add_exclusive_filter( - std::make_unique(filter_t::kExclusive, - relationship_t::kDependency, c.exclude().dependants)); - - add_exclusive_filter( - std::make_unique(filter_t::kExclusive, - relationship_t::kDependency, c.exclude().dependencies, true)); - - add_exclusive_filter(std::make_unique( - filter_t::kExclusive, relationship_t::kDependency, - c.exclude().dependencies, true)); - - if (c.type() == diagram_t::kSequence) { + add_exclusive_filter(std::make_unique( + filter_t::kExclusive, relationship_t::kDependency, + c.exclude().dependencies, true)); + } + else if (c.type() == diagram_t::kSequence) { add_exclusive_filter(std::make_unique( filter_t::kExclusive, c.exclude().callee_types)); } + else if (c.type() == diagram_t::kPackage) { + add_exclusive_filter( + std::make_unique( + filter_t::kExclusive, relationship_t::kDependency, + c.exclude().dependencies, true)); + + add_exclusive_filter(std::make_unique( + filter_t::kExclusive, relationship_t::kDependency, + c.exclude().dependants)); + } else if (c.type() == diagram_t::kInclude) { std::vector dependants; std::vector dependencies; @@ -1176,10 +1179,6 @@ void diagram_filter::init_filters(const config::diagram &c) for (auto &&path : c.exclude().dependants) { if (auto p = path.get(); p.has_value()) { std::filesystem::path dep_path{*p}; - if (dep_path.is_relative()) { - dep_path = relative(*p, c.root_directory()); - } - dependants.emplace_back( dep_path.lexically_normal().string()); } @@ -1188,24 +1187,20 @@ void diagram_filter::init_filters(const config::diagram &c) for (auto &&path : c.exclude().dependencies) { if (auto p = path.get(); p.has_value()) { std::filesystem::path dep_path{*p}; - if (dep_path.is_relative()) { - dep_path = relative(*p, c.root_directory()); - } - dependencies.emplace_back( dep_path.lexically_normal().string()); } } - add_exclusive_filter(std::make_unique< - edge_traversal_filter>(filter_t::kExclusive, - relationship_t::kAssociation, dependencies, true)); + add_exclusive_filter( + std::make_unique( + filter_t::kExclusive, relationship_t::kAssociation, + dependants, false)); - add_exclusive_filter(std::make_unique< - edge_traversal_filter>(filter_t::kExclusive, - relationship_t::kAssociation, dependants)); + add_exclusive_filter( + std::make_unique( + filter_t::kExclusive, relationship_t::kAssociation, + dependencies, true)); } add_exclusive_filter(std::make_unique( diff --git a/src/common/model/diagram_filter.h b/src/common/model/diagram_filter.h index df8f82d4..6dee4a36 100644 --- a/src/common/model/diagram_filter.h +++ b/src/common/model/diagram_filter.h @@ -319,7 +319,13 @@ struct edge_traversal_filter : public filter_visitor { // Now check if the e element is contained in the calculated set return std::any_of(matching_elements_.begin(), matching_elements_.end(), [&e](const auto &te) { - return te.get().full_name(false) == e.full_name(false); + std::string tes = te.get().full_name(false); + std::string es = e.full_name(false); + + if (tes == es) + return true; + + return false; }); } @@ -397,9 +403,7 @@ private: } } - assert(roots_.empty() == matching_elements_.empty()); - - bool keep_looking{true}; + bool keep_looking{!matching_elements_.empty()}; while (keep_looking) { keep_looking = false; if (forward_) { @@ -647,14 +651,22 @@ public: */ template bool should_include(const T &e) const { - auto exc = tvl::any_of(exclusive_.begin(), exclusive_.end(), - [this, &e](const auto &ex) { return ex->match(diagram_, e); }); + auto exc = tvl::any_of( + exclusive_.begin(), exclusive_.end(), [this, &e](const auto &ex) { + assert(ex.get() != nullptr); + + return ex->match(diagram_, e); + }); if (tvl::is_true(exc)) return false; - auto inc = tvl::all_of(inclusive_.begin(), inclusive_.end(), - [this, &e](const auto &in) { return in->match(diagram_, e); }); + auto inc = tvl::all_of( + inclusive_.begin(), inclusive_.end(), [this, &e](const auto &in) { + assert(in.get() != nullptr); + + return in->match(diagram_, e); + }); return static_cast(tvl::is_undefined(inc) || tvl::is_true(inc)); } diff --git a/src/common/model/template_parameter.cc b/src/common/model/template_parameter.cc index 447ad29e..e19643f7 100644 --- a/src/common/model/template_parameter.cc +++ b/src/common/model/template_parameter.cc @@ -332,34 +332,6 @@ template_parameter::template_params() const return template_params_; } -bool operator==(const template_parameter &l, const template_parameter &r) -{ - bool res{false}; - - if (l.is_template_parameter() != r.is_template_parameter()) - return res; - - if (l.is_function_template() != r.is_function_template()) - return res; - - if (l.is_template_parameter()) { - // If this is a template parameter (e.g. 'typename T' or 'typename U' - // we don't actually care what it is called - res = (l.is_variadic() == r.is_variadic()) && - (l.default_value() == r.default_value()); - } - else - res = (l.name() == r.name()) && (l.type() == r.type()) && - (l.default_value() == r.default_value()); - - return res && (l.template_params_ == r.template_params_); -} - -bool operator!=(const template_parameter &l, const template_parameter &r) -{ - return !(l == r); -} - std::string template_parameter::deduced_context_str() const { std::vector deduced_contexts; diff --git a/src/common/model/template_parameter.h b/src/common/model/template_parameter.h index 854b9536..c50d01f4 100644 --- a/src/common/model/template_parameter.h +++ b/src/common/model/template_parameter.h @@ -143,12 +143,6 @@ public: static template_parameter make_unexposed_argument(const std::string &type, const std::optional &default_value = {}); - friend bool operator==( - const template_parameter &l, const template_parameter &r); - - friend bool operator!=( - const template_parameter &l, const template_parameter &r); - /** * Set the type of template argument * diff --git a/src/config/config.h b/src/config/config.h index 82dd454b..5dff6399 100644 --- a/src/config/config.h +++ b/src/config/config.h @@ -756,6 +756,8 @@ struct config : public inheritable_diagram_options { void inherit(); }; +using config_ptr = std::unique_ptr; + /** * @brief Load and parse `.clang-uml` configuration file * diff --git a/tests/t00002/test_case.h b/tests/t00002/test_case.h index 7a237d5f..ec9d78ca 100644 --- a/tests/t00002/test_case.h +++ b/tests/t00002/test_case.h @@ -31,7 +31,7 @@ TEST_CASE("t00002") REQUIRE(!model->should_include({"std"}, "vector")); CHECK_CLASS_DIAGRAM( - config, diagram, *model, + *config, diagram, *model, // Common test case for all diagram types [](const auto &src) { REQUIRE(HasTitle(src, "Basic class diagram example")); diff --git a/tests/t00003/test_case.h b/tests/t00003/test_case.h index b9e2897a..76ed00e0 100644 --- a/tests/t00003/test_case.h +++ b/tests/t00003/test_case.h @@ -27,7 +27,7 @@ TEST_CASE("t00003") REQUIRE(diagram->include().namespaces.size() == 1); REQUIRE(diagram->exclude().namespaces.size() == 0); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClass(src, "A")); REQUIRE(!IsDependency(src, "A", "A")); diff --git a/tests/t00004/test_case.h b/tests/t00004/test_case.h index 604ac731..97730e8d 100644 --- a/tests/t00004/test_case.h +++ b/tests/t00004/test_case.h @@ -26,7 +26,7 @@ TEST_CASE("t00004") REQUIRE(diagram->include().namespaces.size() == 1); REQUIRE(diagram->exclude().namespaces.size() == 0); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClass(src, "A")); REQUIRE(IsClass(src, "A::AA")); REQUIRE(IsClass(src, "A::AA::AAA")); diff --git a/tests/t00005/test_case.h b/tests/t00005/test_case.h index 44e60a26..e988349b 100644 --- a/tests/t00005/test_case.h +++ b/tests/t00005/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00005") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00005", "t00005_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClass(src, "A")); REQUIRE(IsClass(src, "B")); REQUIRE(IsClass(src, "C")); diff --git a/tests/t00006/test_case.h b/tests/t00006/test_case.h index bdd4a56e..5e10fcc0 100644 --- a/tests/t00006/test_case.h +++ b/tests/t00006/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00006") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00006", "t00006_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClass(src, "A")); REQUIRE(IsClass(src, "B")); REQUIRE(IsClass(src, "C")); diff --git a/tests/t00007/test_case.h b/tests/t00007/test_case.h index a8bc596e..d437cfb1 100644 --- a/tests/t00007/test_case.h +++ b/tests/t00007/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00007") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00007", "t00007_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClass(src, "A")); REQUIRE(IsClass(src, "B")); REQUIRE(IsClass(src, "C")); diff --git a/tests/t00008/test_case.h b/tests/t00008/test_case.h index fb90fdc3..42c32dad 100644 --- a/tests/t00008/test_case.h +++ b/tests/t00008/test_case.h @@ -24,7 +24,7 @@ TEST_CASE("t00008") CHECK_CLASS_MODEL("t00008", "t00008_class"); CHECK_CLASS_DIAGRAM( - config, diagram, *model, + *config, diagram, *model, [](const auto &src) { // TODO: add option to resolve using declared types // REQUIRE(IsClassTemplate(src, "A")); diff --git a/tests/t00009/test_case.h b/tests/t00009/test_case.h index 9fdb667d..a2c03663 100644 --- a/tests/t00009/test_case.h +++ b/tests/t00009/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00009") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00009", "t00009_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClassTemplate(src, "A")); REQUIRE(IsClass(src, "B")); diff --git a/tests/t00010/test_case.h b/tests/t00010/test_case.h index 6dfb726e..9da7b3a4 100644 --- a/tests/t00010/test_case.h +++ b/tests/t00010/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00010") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00010", "t00010_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClassTemplate(src, "A")); REQUIRE(IsClassTemplate(src, "B")); diff --git a/tests/t00011/test_case.h b/tests/t00011/test_case.h index cd05c673..283172cf 100644 --- a/tests/t00011/test_case.h +++ b/tests/t00011/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00011") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00011", "t00011_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClass(src, "A")); REQUIRE(IsClass(src, "B")); REQUIRE(!IsClass(src, "external::C")); diff --git a/tests/t00012/test_case.h b/tests/t00012/test_case.h index 02a6af31..9715518a 100644 --- a/tests/t00012/test_case.h +++ b/tests/t00012/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00012") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00012", "t00012_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClassTemplate(src, "A")); REQUIRE(IsClassTemplate(src, "B")); diff --git a/tests/t00013/test_case.h b/tests/t00013/test_case.h index 7f96873f..f98018bd 100644 --- a/tests/t00013/test_case.h +++ b/tests/t00013/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00013") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00013", "t00013_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClass(src, "A")); REQUIRE(IsClass(src, "B")); REQUIRE(IsClass(src, "C")); diff --git a/tests/t00014/test_case.h b/tests/t00014/test_case.h index 0829306f..2b144141 100644 --- a/tests/t00014/test_case.h +++ b/tests/t00014/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00014") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00014", "t00014_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(!src.contains("type-parameter-")); REQUIRE(IsClassTemplate(src, "A")); diff --git a/tests/t00015/test_case.h b/tests/t00015/test_case.h index 34f32410..9e267944 100644 --- a/tests/t00015/test_case.h +++ b/tests/t00015/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00015") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00015", "t00015_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClass(src, "ns1::A")); REQUIRE(IsClass(src, "ns1::ns2_v0_9_0::A")); REQUIRE(IsClass(src, "ns1::Anon")); diff --git a/tests/t00016/test_case.h b/tests/t00016/test_case.h index a4e0dfbc..9c2edfce 100644 --- a/tests/t00016/test_case.h +++ b/tests/t00016/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00016") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00016", "t00016_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClassTemplate(src, "is_numeric")); REQUIRE(IsClassTemplate(src, "is_numeric")); REQUIRE(IsClassTemplate(src, "is_numeric")); diff --git a/tests/t00017/test_case.h b/tests/t00017/test_case.h index bf61fb62..0767a502 100644 --- a/tests/t00017/test_case.h +++ b/tests/t00017/test_case.h @@ -24,7 +24,7 @@ TEST_CASE("t00017") CHECK_CLASS_MODEL("t00017", "t00017_class"); CHECK_CLASS_DIAGRAM( - config, diagram, *model, + *config, diagram, *model, [](const auto &src) { REQUIRE(IsClass(src, "A")); REQUIRE(IsClass(src, "B")); diff --git a/tests/t00018/test_case.h b/tests/t00018/test_case.h index 5ab46a7e..ffd539b9 100644 --- a/tests/t00018/test_case.h +++ b/tests/t00018/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00018") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00018", "t00018_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClass(src, "widget")); REQUIRE(IsClass(src, "impl::widget")); REQUIRE(IsDependency(src, "impl::widget", "widget")); diff --git a/tests/t00019/test_case.h b/tests/t00019/test_case.h index ceab5e62..1968948f 100644 --- a/tests/t00019/test_case.h +++ b/tests/t00019/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00019") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00019", "t00019_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClass(src, "Base")); REQUIRE(IsClassTemplate(src, "Layer1")); REQUIRE(IsClassTemplate(src, "Layer2")); diff --git a/tests/t00020/test_case.h b/tests/t00020/test_case.h index e4a58272..1bfef1df 100644 --- a/tests/t00020/test_case.h +++ b/tests/t00020/test_case.h @@ -24,7 +24,7 @@ TEST_CASE("t00020") CHECK_CLASS_MODEL("t00020", "t00020_class"); CHECK_CLASS_DIAGRAM( - config, diagram, *model, + *config, diagram, *model, [](const auto &src) { REQUIRE(IsAbstractClass(src, "AbstractFactory")); REQUIRE(IsAbstractClass(src, "ProductA")); diff --git a/tests/t00021/test_case.h b/tests/t00021/test_case.h index 8b99c173..d4a0e2bc 100644 --- a/tests/t00021/test_case.h +++ b/tests/t00021/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00021") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00021", "t00021_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsAbstractClass(src, "Item")); REQUIRE(IsAbstractClass(src, "Visitor")); REQUIRE(IsClass(src, "A")); diff --git a/tests/t00022/test_case.h b/tests/t00022/test_case.h index cf060684..eea85f6e 100644 --- a/tests/t00022/test_case.h +++ b/tests/t00022/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00022") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00022", "t00022_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClass(src, "A1")); REQUIRE(IsClass(src, "A2")); REQUIRE(IsAbstractClass(src, "A")); diff --git a/tests/t00023/test_case.h b/tests/t00023/test_case.h index 14da15a7..15beb720 100644 --- a/tests/t00023/test_case.h +++ b/tests/t00023/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00023") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00023", "t00023_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsAbstractClass(src, "Strategy")); REQUIRE(IsClass(src, "StrategyA")); REQUIRE(IsClass(src, "StrategyB")); diff --git a/tests/t00024/test_case.h b/tests/t00024/test_case.h index c0f79c35..0a8f146a 100644 --- a/tests/t00024/test_case.h +++ b/tests/t00024/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00024") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00024", "t00024_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClass(src, "Target1")); REQUIRE(IsClass(src, "Target2")); REQUIRE(IsClass(src, "Proxy")); diff --git a/tests/t00025/test_case.h b/tests/t00025/test_case.h index c6b466a6..b7476354 100644 --- a/tests/t00025/test_case.h +++ b/tests/t00025/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00025") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00025", "t00025_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClass(src, "Target1")); REQUIRE(IsClass(src, "Target2")); REQUIRE(IsClassTemplate(src, "Proxy")); diff --git a/tests/t00026/test_case.h b/tests/t00026/test_case.h index 92349753..dbe0c8b0 100644 --- a/tests/t00026/test_case.h +++ b/tests/t00026/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00026") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00026", "t00026_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClassTemplate(src, "Memento")); REQUIRE(IsClassTemplate(src, "Originator")); REQUIRE(IsClassTemplate(src, "Caretaker")); diff --git a/tests/t00027/test_case.h b/tests/t00027/test_case.h index 71afe72e..b3cf49b7 100644 --- a/tests/t00027/test_case.h +++ b/tests/t00027/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00027") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00027", "t00027_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsAbstractClass(src, "Shape")); REQUIRE(IsAbstractClass(src, "ShapeDecorator")); diff --git a/tests/t00028/test_case.h b/tests/t00028/test_case.h index ad2860b0..76613248 100644 --- a/tests/t00028/test_case.h +++ b/tests/t00028/test_case.h @@ -24,7 +24,7 @@ TEST_CASE("t00028") CHECK_CLASS_MODEL("t00028", "t00028_class"); CHECK_CLASS_DIAGRAM( - config, diagram, *model, + *config, diagram, *model, [](const auto &src) { REQUIRE(IsClass(src, "A")); REQUIRE(IsClass(src, "B")); diff --git a/tests/t00029/test_case.h b/tests/t00029/test_case.h index 4d969d1d..03e729f6 100644 --- a/tests/t00029/test_case.h +++ b/tests/t00029/test_case.h @@ -25,7 +25,7 @@ TEST_CASE("t00029") REQUIRE(model->name() == "t00029_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClass(src, "A")); REQUIRE(!IsClass(src, "B")); REQUIRE(IsClassTemplate(src, "C")); diff --git a/tests/t00030/test_case.h b/tests/t00030/test_case.h index f51dbd1c..ea877031 100644 --- a/tests/t00030/test_case.h +++ b/tests/t00030/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00030") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00030", "t00030_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClass(src, "A")); REQUIRE(IsClass(src, "B")); REQUIRE(IsClass(src, "C")); diff --git a/tests/t00031/test_case.h b/tests/t00031/test_case.h index c3f873dd..c0c7bfb7 100644 --- a/tests/t00031/test_case.h +++ b/tests/t00031/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00031") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00031", "t00031_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClass(src, "A")); REQUIRE(IsEnum(src, "B")); REQUIRE(IsClass(src, "D")); diff --git a/tests/t00032/test_case.h b/tests/t00032/test_case.h index 59582dfa..cd5be0ad 100644 --- a/tests/t00032/test_case.h +++ b/tests/t00032/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00032") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00032", "t00032_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClass(src, "Base")); REQUIRE(IsClass(src, "TBase")); REQUIRE(IsClass(src, "A")); diff --git a/tests/t00033/test_case.h b/tests/t00033/test_case.h index b5cca187..45e3e54c 100644 --- a/tests/t00033/test_case.h +++ b/tests/t00033/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00033") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00033", "t00033_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClassTemplate(src, "A")); REQUIRE(IsClassTemplate(src, "B")); REQUIRE(IsClassTemplate(src, "C")); diff --git a/tests/t00034/test_case.h b/tests/t00034/test_case.h index 45040d82..1605e3a0 100644 --- a/tests/t00034/test_case.h +++ b/tests/t00034/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00034") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00034", "t00034_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClassTemplate(src, "lift_void")); REQUIRE(IsClassTemplate(src, "drop_void")); REQUIRE(IsClass(src, "Void")); diff --git a/tests/t00035/test_case.h b/tests/t00035/test_case.h index 02d63311..b9268a8a 100644 --- a/tests/t00035/test_case.h +++ b/tests/t00035/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00035") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00035", "t00035_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClass(src, "Top")); REQUIRE(IsClass(src, "Bottom")); REQUIRE(IsClass(src, "Center")); diff --git a/tests/t00036/test_case.h b/tests/t00036/test_case.h index 6e44a5d9..d102952e 100644 --- a/tests/t00036/test_case.h +++ b/tests/t00036/test_case.h @@ -26,7 +26,7 @@ TEST_CASE("t00036") REQUIRE(diagram->generate_packages() == true); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClassTemplate(src, {"ns1::ns11", "A"})); REQUIRE(IsClassTemplate(src, {"ns1::ns11", "A"})); REQUIRE(IsClass(src, {"ns1::ns11::ns111", "B"})); diff --git a/tests/t00037/test_case.h b/tests/t00037/test_case.h index 16472dc6..7e4ef101 100644 --- a/tests/t00037/test_case.h +++ b/tests/t00037/test_case.h @@ -25,7 +25,7 @@ TEST_CASE("t00037") REQUIRE(diagram->generate_packages() == true); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClass(src, "ST")); REQUIRE(IsClass(src, "A")); REQUIRE(IsClass(src, "ST::(units)")); diff --git a/tests/t00038/test_case.h b/tests/t00038/test_case.h index ae900531..5c79327f 100644 --- a/tests/t00038/test_case.h +++ b/tests/t00038/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00038") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00038", "t00038_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClass(src, "A")); REQUIRE(IsClass(src, "B")); REQUIRE(IsClass(src, "C")); diff --git a/tests/t00039/test_case.h b/tests/t00039/test_case.h index 1d722056..95d38846 100644 --- a/tests/t00039/test_case.h +++ b/tests/t00039/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00039") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00039", "t00039_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClass(src, "A")); REQUIRE(IsClass(src, "AA")); REQUIRE(IsClass(src, "AAA")); diff --git a/tests/t00040/test_case.h b/tests/t00040/test_case.h index d5915b71..68a76500 100644 --- a/tests/t00040/test_case.h +++ b/tests/t00040/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00040") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00040", "t00040_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClass(src, "A")); REQUIRE(IsClass(src, "AA")); REQUIRE(IsClass(src, "AAA")); diff --git a/tests/t00041/test_case.h b/tests/t00041/test_case.h index ddf10b23..33347bd9 100644 --- a/tests/t00041/test_case.h +++ b/tests/t00041/test_case.h @@ -25,7 +25,7 @@ TEST_CASE("t00041") REQUIRE(diagram->generate_packages() == false); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(!IsClass(src, "A")); REQUIRE(!IsClass(src, "AA")); REQUIRE(!IsClass(src, "AAA")); diff --git a/tests/t00042/test_case.h b/tests/t00042/test_case.h index b5c411ea..c152ab49 100644 --- a/tests/t00042/test_case.h +++ b/tests/t00042/test_case.h @@ -25,7 +25,7 @@ TEST_CASE("t00042") REQUIRE(diagram->generate_packages() == false); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClassTemplate(src, "A")); REQUIRE(IsClassTemplate(src, "B")); REQUIRE(!IsClassTemplate(src, "C")); diff --git a/tests/t00043/test_case.h b/tests/t00043/test_case.h index 23c4c85f..8292b5d6 100644 --- a/tests/t00043/test_case.h +++ b/tests/t00043/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00043") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00043", "t00043_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClass(src, {"dependants", "A"})); REQUIRE(IsClass(src, {"dependants", "B"})); REQUIRE(IsClass(src, {"dependants", "C"})); diff --git a/tests/t00044/test_case.h b/tests/t00044/test_case.h index da66d8e7..af2da120 100644 --- a/tests/t00044/test_case.h +++ b/tests/t00044/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00044") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00044", "t00044_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(!src.contains("type-parameter-")); REQUIRE(IsClassTemplate(src, "sink")); diff --git a/tests/t00045/test_case.h b/tests/t00045/test_case.h index be6b8957..14aef728 100644 --- a/tests/t00045/test_case.h +++ b/tests/t00045/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00045") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00045", "t00045_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClass(src, "A")); REQUIRE(IsClass(src, {"ns1", "A"})); REQUIRE(IsClass(src, {"ns1::ns2", "A"})); diff --git a/tests/t00046/test_case.h b/tests/t00046/test_case.h index b7fca9a4..64b1083c 100644 --- a/tests/t00046/test_case.h +++ b/tests/t00046/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00046") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00046", "t00046_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClass(src, "A")); REQUIRE(IsClass(src, "AA")); REQUIRE(IsClass(src, {"ns1::ns2", "B"})); diff --git a/tests/t00047/test_case.h b/tests/t00047/test_case.h index bef97c84..5de9e821 100644 --- a/tests/t00047/test_case.h +++ b/tests/t00047/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00047") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00047", "t00047_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClassTemplate(src, "conditional_t")); REQUIRE(IsClass(src, "conditional_t")); REQUIRE(IsClass(src, "conditional_t")); diff --git a/tests/t00048/test_case.h b/tests/t00048/test_case.h index f7f7b5f3..771c8a17 100644 --- a/tests/t00048/test_case.h +++ b/tests/t00048/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00048") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00048", "t00048_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { // Check if all classes exist REQUIRE(IsAbstractClass(src, "Base")); REQUIRE(IsClass(src, "A")); diff --git a/tests/t00049/test_case.h b/tests/t00049/test_case.h index b75afa8f..8d33d15f 100644 --- a/tests/t00049/test_case.h +++ b/tests/t00049/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00049") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00049", "t00049_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClass(src, "R")); REQUIRE(IsClassTemplate(src, "A")); diff --git a/tests/t00050/test_case.h b/tests/t00050/test_case.h index 32802240..2dacd441 100644 --- a/tests/t00050/test_case.h +++ b/tests/t00050/test_case.h @@ -24,7 +24,7 @@ TEST_CASE("t00050") CHECK_CLASS_MODEL("t00050", "t00050_class"); CHECK_CLASS_DIAGRAM( - config, diagram, *model, + *config, diagram, *model, [](const auto &src) { REQUIRE(IsClass(src, "A")); REQUIRE(IsClass(src, "B")); diff --git a/tests/t00051/test_case.h b/tests/t00051/test_case.h index f3f3c39a..a8ca7867 100644 --- a/tests/t00051/test_case.h +++ b/tests/t00051/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00051") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00051", "t00051_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClass(src, "A")); REQUIRE(IsInnerClass(src, "A", "A::custom_thread1")); REQUIRE(IsInnerClass(src, "A", "A::custom_thread2")); diff --git a/tests/t00052/test_case.h b/tests/t00052/test_case.h index e9c27346..24f39e3e 100644 --- a/tests/t00052/test_case.h +++ b/tests/t00052/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00052") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00052", "t00052_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClass(src, "A")); REQUIRE(IsClassTemplate(src, "B")); diff --git a/tests/t00053/test_case.h b/tests/t00053/test_case.h index 23d3b4ac..9af5f402 100644 --- a/tests/t00053/test_case.h +++ b/tests/t00053/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00053") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00053", "t00053_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClass(src, "a")); REQUIRE(IsClass(src, "b")); REQUIRE(IsClass(src, "c")); diff --git a/tests/t00054/test_case.h b/tests/t00054/test_case.h index 43ff755b..28444c4c 100644 --- a/tests/t00054/test_case.h +++ b/tests/t00054/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00054") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00054", "t00054_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClass(src, "a")); REQUIRE(IsClass(src, "b")); REQUIRE(IsClass(src, {"detail", "c"})); diff --git a/tests/t00055/test_case.h b/tests/t00055/test_case.h index 25afa8d0..09e92960 100644 --- a/tests/t00055/test_case.h +++ b/tests/t00055/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00055") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00055", "t00055_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClass(src, "A")); REQUIRE(IsClass(src, "B")); REQUIRE(IsClass(src, "C")); diff --git a/tests/t00056/test_case.h b/tests/t00056/test_case.h index a74fcd43..1351c898 100644 --- a/tests/t00056/test_case.h +++ b/tests/t00056/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00056") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00056", "t00056_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsConcept(src, "greater_than_simple")); REQUIRE(IsConcept(src, "greater_than_with_requires")); REQUIRE(IsConcept(src, "max_four_bytes")); diff --git a/tests/t00057/test_case.h b/tests/t00057/test_case.h index 662c6606..32036a9b 100644 --- a/tests/t00057/test_case.h +++ b/tests/t00057/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00057") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00057", "t00057_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClass(src, "t00057_A")); REQUIRE(IsClass(src, "t00057_B")); REQUIRE(IsClass(src, "t00057_C")); diff --git a/tests/t00058/test_case.h b/tests/t00058/test_case.h index cceb976b..d7aa1378 100644 --- a/tests/t00058/test_case.h +++ b/tests/t00058/test_case.h @@ -24,7 +24,7 @@ TEST_CASE("t00058") CHECK_CLASS_MODEL("t00058", "t00058_class"); CHECK_CLASS_DIAGRAM( - config, diagram, *model, + *config, diagram, *model, [](const auto &src) { REQUIRE(IsClassTemplate(src, "A")); REQUIRE(IsClassTemplate( diff --git a/tests/t00059/test_case.h b/tests/t00059/test_case.h index 9d6899c0..63661210 100644 --- a/tests/t00059/test_case.h +++ b/tests/t00059/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00059") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00059", "t00059_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsConcept(src, "fruit_c")); REQUIRE(IsConcept(src, "apple_c")); REQUIRE(IsConcept(src, "orange_c")); diff --git a/tests/t00060/test_case.h b/tests/t00060/test_case.h index de813fdf..13ca3909 100644 --- a/tests/t00060/test_case.h +++ b/tests/t00060/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00060") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00060", "t00060_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClass(src, "A")); REQUIRE(IsClass(src, "B")); REQUIRE(IsClass(src, "C")); diff --git a/tests/t00061/test_case.h b/tests/t00061/test_case.h index 847cfc6d..56e490b1 100644 --- a/tests/t00061/test_case.h +++ b/tests/t00061/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00061") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00061", "t00061_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClass(src, "A")); REQUIRE(!IsClass(src, "B")); REQUIRE(!IsClass(src, "C")); diff --git a/tests/t00062/test_case.h b/tests/t00062/test_case.h index 198b875c..f18ffb17 100644 --- a/tests/t00062/test_case.h +++ b/tests/t00062/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00062") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00062", "t00062_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(!src.contains("type-parameter-")); REQUIRE(IsClassTemplate(src, "A")); diff --git a/tests/t00063/test_case.h b/tests/t00063/test_case.h index c66ae44e..6bd05307 100644 --- a/tests/t00063/test_case.h +++ b/tests/t00063/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00063") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00063", "t00063_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClass(src, "A")); REQUIRE(!IsEnum(src, "B")); REQUIRE(!IsEnum(src, "C")); diff --git a/tests/t00064/test_case.h b/tests/t00064/test_case.h index de0d9fd6..d794d236 100644 --- a/tests/t00064/test_case.h +++ b/tests/t00064/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00064") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00064", "t00064_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(!src.contains("type-parameter-")); REQUIRE(IsClass(src, "A")); diff --git a/tests/t00065/test_case.h b/tests/t00065/test_case.h index 00da8823..99016627 100644 --- a/tests/t00065/test_case.h +++ b/tests/t00065/test_case.h @@ -24,7 +24,7 @@ TEST_CASE("t00065") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00065", "t00065_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClass(src, "R")); REQUIRE(IsClass(src, "A")); REQUIRE(IsClass(src, {"detail", "AImpl"})); diff --git a/tests/t00066/test_case.h b/tests/t00066/test_case.h index 4f930b04..d58721c0 100644 --- a/tests/t00066/test_case.h +++ b/tests/t00066/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00066") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00066", "t00066_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClass(src, "A")); REQUIRE(!IsDependency(src, "A", "A")); diff --git a/tests/t00067/test_case.h b/tests/t00067/test_case.h index 5182cad3..85aeec6f 100644 --- a/tests/t00067/test_case.h +++ b/tests/t00067/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00067") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00067", "t00067_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(!IsMethod(src, "A", "A")); REQUIRE(!IsMethod(src, "A", "void", "A &&")); REQUIRE(!IsMethod(src, "A", "void", "const A &")); diff --git a/tests/t00068/test_case.h b/tests/t00068/test_case.h index ab6bd96b..c2e7bcd8 100644 --- a/tests/t00068/test_case.h +++ b/tests/t00068/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00068_r0") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00068", "t00068_r0_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(!IsClass(src, "A")); REQUIRE(!IsClass(src, "AA")); REQUIRE(IsClass(src, "AAA")); @@ -45,7 +45,7 @@ TEST_CASE("t00068_r1") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00068", "t00068_r1_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(!IsClass(src, "A")); REQUIRE(IsClass(src, "AA")); REQUIRE(IsClass(src, "AAA")); @@ -67,7 +67,7 @@ TEST_CASE("t00068_r2") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00068", "t00068_r2_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClass(src, "A")); REQUIRE(IsClass(src, "AA")); REQUIRE(IsClass(src, "AAA")); diff --git a/tests/t00069/test_case.h b/tests/t00069/test_case.h index 2f56279c..abbaafda 100644 --- a/tests/t00069/test_case.h +++ b/tests/t00069/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00069") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00069", "t00069_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClass(src, "A")); REQUIRE(IsClassTemplate(src, "generator")); diff --git a/tests/t00070/test_case.h b/tests/t00070/test_case.h index edde2b70..b3f47afb 100644 --- a/tests/t00070/test_case.h +++ b/tests/t00070/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00070") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00070", "t00070_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClass(src, "A")); REQUIRE(IsClass(src, "B")); REQUIRE(!IsClass(src, "C")); diff --git a/tests/t00071/test_case.h b/tests/t00071/test_case.h index fcdec30b..3b433164 100644 --- a/tests/t00071/test_case.h +++ b/tests/t00071/test_case.h @@ -24,7 +24,7 @@ TEST_CASE("t00071") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00071", "t00071_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClass(src, "A")); REQUIRE(IsClass(src, "R")); diff --git a/tests/t00072/test_case.h b/tests/t00072/test_case.h index 87d29ab0..6924bd6d 100644 --- a/tests/t00072/test_case.h +++ b/tests/t00072/test_case.h @@ -24,7 +24,7 @@ TEST_CASE("t00072") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00072", "t00072_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsModulePackage(src, "app"s)); REQUIRE(IsModulePackage(src, "app"s, ":lib1"s)); REQUIRE(IsModulePackage(src, "app"s, ":lib1"s, "mod1"s)); diff --git a/tests/t00073/test_case.h b/tests/t00073/test_case.h index 9491a1c9..2f8c599e 100644 --- a/tests/t00073/test_case.h +++ b/tests/t00073/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00073") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00073", "t00073_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClass(src, "A")); REQUIRE(IsClass(src, "B")); REQUIRE(IsClass(src, "AHandler")); diff --git a/tests/t00074/test_case.h b/tests/t00074/test_case.h index 3c18a396..8f524e90 100644 --- a/tests/t00074/test_case.h +++ b/tests/t00074/test_case.h @@ -24,7 +24,7 @@ TEST_CASE("t00074") CHECK_CLASS_MODEL("t00074", "t00074_class"); CHECK_CLASS_DIAGRAM( - config, diagram, *model, + *config, diagram, *model, [](const auto &src) { REQUIRE(IsConcept(src, "fruit_c")); REQUIRE(IsConcept(src, "apple_c")); diff --git a/tests/t00075/test_case.h b/tests/t00075/test_case.h index 7d551eb0..1a2ba23f 100644 --- a/tests/t00075/test_case.h +++ b/tests/t00075/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t00075") auto [config, db, diagram, model] = CHECK_CLASS_MODEL("t00075", "t00075_class"); - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsClass(src, {"ns1::ns2", "A"})); REQUIRE(IsClass(src, {"ns1::ns2", "B"})); REQUIRE(IsClass(src, {"ns1::ns2", "ABE"})); diff --git a/tests/t20001/test_case.h b/tests/t20001/test_case.h index 818c55b9..48ad2c70 100644 --- a/tests/t20001/test_case.h +++ b/tests/t20001/test_case.h @@ -24,7 +24,7 @@ TEST_CASE("t20001") CHECK_SEQUENCE_MODEL("t20001", "t20001_sequence"); CHECK_SEQUENCE_DIAGRAM( - config, diagram, *model, + *config, diagram, *model, [](const auto &src) { REQUIRE(HasTitle(src, "Basic sequence diagram example")); diff --git a/tests/t20002/test_case.h b/tests/t20002/test_case.h index aecc06e9..1361a033 100644 --- a/tests/t20002/test_case.h +++ b/tests/t20002/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20002") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20002", "t20002_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsFunctionParticipant(src, "m1()")); REQUIRE(IsFunctionParticipant(src, "m2()")); REQUIRE(IsFunctionParticipant(src, "m3()")); diff --git a/tests/t20003/test_case.h b/tests/t20003/test_case.h index ba5c844e..54a55d19 100644 --- a/tests/t20003/test_case.h +++ b/tests/t20003/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20003") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20003", "t20003_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsFunctionTemplateParticipant(src, "m1(T)")); REQUIRE(IsFunctionTemplateParticipant(src, "m2(T)")); REQUIRE(IsFunctionTemplateParticipant(src, "m3(T)")); diff --git a/tests/t20004/test_case.h b/tests/t20004/test_case.h index b576a878..f3ded5d9 100644 --- a/tests/t20004/test_case.h +++ b/tests/t20004/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20004") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20004", "t20004_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(MessageOrder(src, { // diff --git a/tests/t20005/test_case.h b/tests/t20005/test_case.h index 672b0444..6d2f12dc 100644 --- a/tests/t20005/test_case.h +++ b/tests/t20005/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20005") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20005", "t20005_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(MessageOrder(src, { // diff --git a/tests/t20006/test_case.h b/tests/t20006/test_case.h index d643b4c0..222ea230 100644 --- a/tests/t20006/test_case.h +++ b/tests/t20006/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20006") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20006", "t20006_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(MessageOrder(src, { // diff --git a/tests/t20007/test_case.h b/tests/t20007/test_case.h index ada4af73..dd704d87 100644 --- a/tests/t20007/test_case.h +++ b/tests/t20007/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20007") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20007", "t20007_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(MessageOrder(src, { {"tmain()", "Adder", "add(int &&,int &&)"}, // diff --git a/tests/t20008/test_case.h b/tests/t20008/test_case.h index 3d0d5c20..7bff95e7 100644 --- a/tests/t20008/test_case.h +++ b/tests/t20008/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20008") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20008", "t20008_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(MessageOrder(src, { // diff --git a/tests/t20009/test_case.h b/tests/t20009/test_case.h index 4388615b..20dbaa5a 100644 --- a/tests/t20009/test_case.h +++ b/tests/t20009/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20009") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20009", "t20009_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(MessageOrder(src, { // diff --git a/tests/t20010/test_case.h b/tests/t20010/test_case.h index 274a88ff..ef54457b 100644 --- a/tests/t20010/test_case.h +++ b/tests/t20010/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20010") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20010", "t20010_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(MessageOrder(src, { {"tmain()", "B", "b1()"}, // diff --git a/tests/t20011/test_case.h b/tests/t20011/test_case.h index b9ba1828..739b1e72 100644 --- a/tests/t20011/test_case.h +++ b/tests/t20011/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20011") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20011", "t20011_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(MessageOrder(src, { // diff --git a/tests/t20012/test_case.h b/tests/t20012/test_case.h index 2327889d..ea64183b 100644 --- a/tests/t20012/test_case.h +++ b/tests/t20012/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20012") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20012", "t20012_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(MessageOrder(src, { {"tmain()", "tmain()::(lambda t20012.cc:67:20)", diff --git a/tests/t20013/test_case.h b/tests/t20013/test_case.h index 7dad2a28..b977eba8 100644 --- a/tests/t20013/test_case.h +++ b/tests/t20013/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20013") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20013", "t20013_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(MessageOrder(src, { // diff --git a/tests/t20014/test_case.h b/tests/t20014/test_case.h index 43f54e5a..7edac5fc 100644 --- a/tests/t20014/test_case.h +++ b/tests/t20014/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20014") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20014", "t20014_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(MessageOrder(src, { // diff --git a/tests/t20015/test_case.h b/tests/t20015/test_case.h index 98ad91e1..9a87cf16 100644 --- a/tests/t20015/test_case.h +++ b/tests/t20015/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20015") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20015", "t20015_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(MessageOrder(src, { {"tmain()", "B", "setup_a(std::shared_ptr &)"} // diff --git a/tests/t20016/test_case.h b/tests/t20016/test_case.h index df0e4c06..2aba2a6d 100644 --- a/tests/t20016/test_case.h +++ b/tests/t20016/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20016") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20016", "t20016_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(MessageOrder(src, { // diff --git a/tests/t20017/test_case.h b/tests/t20017/test_case.h index 30cc8778..580b8726 100644 --- a/tests/t20017/test_case.h +++ b/tests/t20017/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20017") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20017", "t20017_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(MessageOrder(src, { // diff --git a/tests/t20018/test_case.h b/tests/t20018/test_case.h index 5f99216a..60c34865 100644 --- a/tests/t20018/test_case.h +++ b/tests/t20018/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20018") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20018", "t20018_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(MessageOrder(src, { // diff --git a/tests/t20019/test_case.h b/tests/t20019/test_case.h index e2ef00da..e3deeace 100644 --- a/tests/t20019/test_case.h +++ b/tests/t20019/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20019") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20019", "t20019_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(MessageOrder(src, { // diff --git a/tests/t20020/test_case.h b/tests/t20020/test_case.h index 55c8cd13..f392fdbd 100644 --- a/tests/t20020/test_case.h +++ b/tests/t20020/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20020") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20020", "t20020_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(MessageOrder(src, { // diff --git a/tests/t20021/test_case.h b/tests/t20021/test_case.h index 6179831d..55f02f4f 100644 --- a/tests/t20021/test_case.h +++ b/tests/t20021/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20021") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20021", "t20021_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(MessageOrder(src, { // diff --git a/tests/t20022/test_case.h b/tests/t20022/test_case.h index 0f6d284e..b5561f16 100644 --- a/tests/t20022/test_case.h +++ b/tests/t20022/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20022") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20022", "t20022_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(MessageOrder(src, { // diff --git a/tests/t20023/test_case.h b/tests/t20023/test_case.h index dec644c4..21481d06 100644 --- a/tests/t20023/test_case.h +++ b/tests/t20023/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20023") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20023", "t20023_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(MessageOrder(src, { // diff --git a/tests/t20024/test_case.h b/tests/t20024/test_case.h index e61ecaaf..ba4415e7 100644 --- a/tests/t20024/test_case.h +++ b/tests/t20024/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20024") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20024", "t20024_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(MessageOrder(src, { // diff --git a/tests/t20025/test_case.h b/tests/t20025/test_case.h index c3c9fa13..08578ede 100644 --- a/tests/t20025/test_case.h +++ b/tests/t20025/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20025") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20025", "t20025_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(MessageOrder(src, { // diff --git a/tests/t20026/test_case.h b/tests/t20026/test_case.h index 1533d993..9dd4a96e 100644 --- a/tests/t20026/test_case.h +++ b/tests/t20026/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20026") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20026", "t20026_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(MessageOrder(src, { // diff --git a/tests/t20027/test_case.h b/tests/t20027/test_case.h index faa3bb66..6d93a6a5 100644 --- a/tests/t20027/test_case.h +++ b/tests/t20027/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20027") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20027", "t20027_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(MessageOrder(src, { // diff --git a/tests/t20028/test_case.h b/tests/t20028/test_case.h index b6128e6f..950fbc92 100644 --- a/tests/t20028/test_case.h +++ b/tests/t20028/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20028") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20028", "t20028_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(MessageOrder(src, { // diff --git a/tests/t20029/test_case.h b/tests/t20029/test_case.h index c28a6860..43a60f89 100644 --- a/tests/t20029/test_case.h +++ b/tests/t20029/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20029") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20029", "t20029_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(MessageOrder(src, { // diff --git a/tests/t20030/test_case.h b/tests/t20030/test_case.h index 88327c5d..2f12d3e0 100644 --- a/tests/t20030/test_case.h +++ b/tests/t20030/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20030") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20030", "t20030_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(MessageOrder(src, { // diff --git a/tests/t20031/test_case.h b/tests/t20031/test_case.h index 12232577..cd1a125c 100644 --- a/tests/t20031/test_case.h +++ b/tests/t20031/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20031") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20031", "t20031_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(MessageOrder(src, { // diff --git a/tests/t20032/test_case.h b/tests/t20032/test_case.h index 88ec1dd3..755811fa 100644 --- a/tests/t20032/test_case.h +++ b/tests/t20032/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20032") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20032", "t20032_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(MessageOrder(src, { // diff --git a/tests/t20033/test_case.h b/tests/t20033/test_case.h index 83a483bc..db3bd6c1 100644 --- a/tests/t20033/test_case.h +++ b/tests/t20033/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20033") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20033", "t20033_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(MessageOrder(src, { // diff --git a/tests/t20034/test_case.h b/tests/t20034/test_case.h index 45d8ff59..f09fe934 100644 --- a/tests/t20034/test_case.h +++ b/tests/t20034/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20034") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20034", "t20034_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(MessageChainsOrder(src, { // diff --git a/tests/t20035/test_case.h b/tests/t20035/test_case.h index 0549da2a..aa7776b2 100644 --- a/tests/t20035/test_case.h +++ b/tests/t20035/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20035") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20035", "t20035_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(MessageChainsOrder(src, {{ // diff --git a/tests/t20036/test_case.h b/tests/t20036/test_case.h index a96a06f9..d7bd2b2c 100644 --- a/tests/t20036/test_case.h +++ b/tests/t20036/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20036") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20036", "t20036_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(MessageChainsOrder(src, { // diff --git a/tests/t20037/test_case.h b/tests/t20037/test_case.h index 4a18a5d3..4d2396cc 100644 --- a/tests/t20037/test_case.h +++ b/tests/t20037/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20037") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20037", "t20037_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(MessageOrder(src, { // diff --git a/tests/t20038/test_case.h b/tests/t20038/test_case.h index 33e01e7e..d94fbce8 100644 --- a/tests/t20038/test_case.h +++ b/tests/t20038/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20038") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20038", "t20038_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(MessageOrder(src, { // diff --git a/tests/t20039/test_case.h b/tests/t20039/test_case.h index 88a011f6..1f2fa4e2 100644 --- a/tests/t20039/test_case.h +++ b/tests/t20039/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20039") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20039", "t20039_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(MessageOrder(src, { // diff --git a/tests/t20040/test_case.h b/tests/t20040/test_case.h index 87277908..f283b07f 100644 --- a/tests/t20040/test_case.h +++ b/tests/t20040/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20040") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20040", "t20040_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(MessageOrder(src, { // diff --git a/tests/t20041/test_case.h b/tests/t20041/test_case.h index 044de4a7..5a47736e 100644 --- a/tests/t20041/test_case.h +++ b/tests/t20041/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20041") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20041", "t20041_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(MessageOrder(src, { // diff --git a/tests/t20042/test_case.h b/tests/t20042/test_case.h index 4a36b7b0..f0008f43 100644 --- a/tests/t20042/test_case.h +++ b/tests/t20042/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20042") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20042", "t20042_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(MessageOrder(src, { // diff --git a/tests/t20043/test_case.h b/tests/t20043/test_case.h index 60ee3d59..c6ea8d18 100644 --- a/tests/t20043/test_case.h +++ b/tests/t20043/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20043") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20043", "t20043_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(MessageOrder(src, { // diff --git a/tests/t20044/test_case.h b/tests/t20044/test_case.h index 66e52d93..dc869307 100644 --- a/tests/t20044/test_case.h +++ b/tests/t20044/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20044") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20044", "t20044_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(!IsClassParticipant(src, "detail::expected")); REQUIRE(IsClassParticipant(src, "result_t")); diff --git a/tests/t20045/test_case.h b/tests/t20045/test_case.h index 8e4b43e5..7170c38a 100644 --- a/tests/t20045/test_case.h +++ b/tests/t20045/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20045") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20045", "t20045_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(MessageOrder(src, { // diff --git a/tests/t20046/test_case.h b/tests/t20046/test_case.h index 7214fe4d..2a4a4b96 100644 --- a/tests/t20046/test_case.h +++ b/tests/t20046/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20046") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20046", "t20046_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(MessageOrder(src, { // diff --git a/tests/t20047/test_case.h b/tests/t20047/test_case.h index 34b7b155..ec76737c 100644 --- a/tests/t20047/test_case.h +++ b/tests/t20047/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20047") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20047", "t20047_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(MessageOrder(src, { // diff --git a/tests/t20048/test_case.h b/tests/t20048/test_case.h index a45632ba..04836610 100644 --- a/tests/t20048/test_case.h +++ b/tests/t20048/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20048") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20048", "t20048_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(MessageOrder(src, { // diff --git a/tests/t20049/test_case.h b/tests/t20049/test_case.h index 6655ff89..3266939c 100644 --- a/tests/t20049/test_case.h +++ b/tests/t20049/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20049") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20049", "t20049_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(MessageOrder(src, { // diff --git a/tests/t20050/test_case.h b/tests/t20050/test_case.h index 33d0b9db..c9b4bb54 100644 --- a/tests/t20050/test_case.h +++ b/tests/t20050/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20050") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20050", "t20050_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsFileParticipant(src, "t20050.cu")); REQUIRE(MessageOrder(src, diff --git a/tests/t20051/test_case.h b/tests/t20051/test_case.h index 838536bd..0e9b578f 100644 --- a/tests/t20051/test_case.h +++ b/tests/t20051/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20051") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20051", "t20051_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(!IsFileParticipant(src, "t20051.cu")); REQUIRE(MessageOrder(src, diff --git a/tests/t20052/test_case.h b/tests/t20052/test_case.h index 24ef4fe2..63b456de 100644 --- a/tests/t20052/test_case.h +++ b/tests/t20052/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20052") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20052", "t20052_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(!IsFileParticipant(src, "t20052.cu")); REQUIRE(MessageOrder(src, diff --git a/tests/t20053/test_case.h b/tests/t20053/test_case.h index a3b54a9a..82279e95 100644 --- a/tests/t20053/test_case.h +++ b/tests/t20053/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t20053") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20053", "t20053_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(!IsFileParticipant(src, "t20053.cu")); REQUIRE(MessageOrder(src, diff --git a/tests/t20054/test_case.h b/tests/t20054/test_case.h index bb9f9632..4a3dfe48 100644 --- a/tests/t20054/test_case.h +++ b/tests/t20054/test_case.h @@ -24,7 +24,7 @@ TEST_CASE("t20054") auto [config, db, diagram, model] = CHECK_SEQUENCE_MODEL("t20054", "t20054_sequence"); - CHECK_SEQUENCE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_SEQUENCE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(MessageOrder(src, {{"tmain()", "A", "a()"}, {"A", "A::AA", "aa()"}, {"A::AA", "A::AA::AAA", "aaa()"}, diff --git a/tests/t30001/test_case.h b/tests/t30001/test_case.h index 80e3e4f2..d200e218 100644 --- a/tests/t30001/test_case.h +++ b/tests/t30001/test_case.h @@ -24,7 +24,7 @@ TEST_CASE("t30001") auto [config, db, diagram, model] = CHECK_PACKAGE_MODEL("t30001", "t30001_package"); - CHECK_PACKAGE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_PACKAGE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(HasTitle(src, "Basic package diagram example")); REQUIRE(!IsNamespacePackage(src, "clanguml"s)); diff --git a/tests/t30002/test_case.h b/tests/t30002/test_case.h index bc0badda..f1c013e1 100644 --- a/tests/t30002/test_case.h +++ b/tests/t30002/test_case.h @@ -24,7 +24,7 @@ TEST_CASE("t30002") auto [config, db, diagram, model] = CHECK_PACKAGE_MODEL("t30002", "t30002_package"); - CHECK_PACKAGE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_PACKAGE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsNamespacePackage(src, "A"s, "AA"s)); REQUIRE(IsNamespacePackage(src, "A"s, "AA"s, "A1"s)); REQUIRE(IsNamespacePackage(src, "A"s, "AA"s, "A2"s)); diff --git a/tests/t30003/test_case.h b/tests/t30003/test_case.h index 841e14b4..6130c17a 100644 --- a/tests/t30003/test_case.h +++ b/tests/t30003/test_case.h @@ -24,7 +24,7 @@ TEST_CASE("t30003") auto [config, db, diagram, model] = CHECK_PACKAGE_MODEL("t30003", "t30003_package"); - CHECK_PACKAGE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_PACKAGE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsNamespacePackage(src, "ns1"s)); REQUIRE(IsNamespacePackage(src, "ns1"s, "ns2_v1_0_0"s)); REQUIRE(IsNamespacePackage(src, "ns1"s, "ns2_v0_9_0"s)); diff --git a/tests/t30004/test_case.h b/tests/t30004/test_case.h index 91c49361..e03ac1ad 100644 --- a/tests/t30004/test_case.h +++ b/tests/t30004/test_case.h @@ -24,7 +24,7 @@ TEST_CASE("t30004") auto [config, db, diagram, model] = CHECK_PACKAGE_MODEL("t30004", "t30004_package"); - CHECK_PACKAGE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_PACKAGE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsNamespacePackage(src, "A"s)); REQUIRE(IsNamespacePackage(src, "A"s, "AAA"s)); REQUIRE(IsNamespacePackage(src, "A"s, "BBB"s)); diff --git a/tests/t30005/test_case.h b/tests/t30005/test_case.h index 055f8359..8aaf1144 100644 --- a/tests/t30005/test_case.h +++ b/tests/t30005/test_case.h @@ -24,7 +24,7 @@ TEST_CASE("t30005") auto [config, db, diagram, model] = CHECK_PACKAGE_MODEL("t30005", "t30005_package"); - CHECK_PACKAGE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_PACKAGE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsNamespacePackage(src, "A"s)); REQUIRE(IsNamespacePackage(src, "A"s, "AA"s)); REQUIRE(IsNamespacePackage(src, "A"s, "AA"s, "AAA"s)); diff --git a/tests/t30006/test_case.h b/tests/t30006/test_case.h index b71807cb..008978c3 100644 --- a/tests/t30006/test_case.h +++ b/tests/t30006/test_case.h @@ -24,7 +24,7 @@ TEST_CASE("t30006") auto [config, db, diagram, model] = CHECK_PACKAGE_MODEL("t30006", "t30006_package"); - CHECK_PACKAGE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_PACKAGE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsNamespacePackage(src, "A"s)); REQUIRE(IsNamespacePackage(src, "B"s)); REQUIRE(IsNamespacePackage(src, "C"s)); diff --git a/tests/t30007/test_case.h b/tests/t30007/test_case.h index 3832c181..f040d686 100644 --- a/tests/t30007/test_case.h +++ b/tests/t30007/test_case.h @@ -24,7 +24,7 @@ TEST_CASE("t30007") auto [config, db, diagram, model] = CHECK_PACKAGE_MODEL("t30007", "t30007_package"); - CHECK_PACKAGE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_PACKAGE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsNamespacePackage(src, "A"s)); REQUIRE(IsNamespacePackage(src, "A"s, "AA"s)); REQUIRE(IsNamespacePackage(src, "B"s)); diff --git a/tests/t30008/test_case.h b/tests/t30008/test_case.h index 95c3d048..a2b098fa 100644 --- a/tests/t30008/test_case.h +++ b/tests/t30008/test_case.h @@ -24,7 +24,7 @@ TEST_CASE("t30008") auto [config, db, diagram, model] = CHECK_PACKAGE_MODEL("t30008", "t30008_package"); - CHECK_PACKAGE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_PACKAGE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsNamespacePackage(src, "dependants"s, "A"s)); REQUIRE(IsNamespacePackage(src, "dependants"s, "B"s)); REQUIRE(IsNamespacePackage(src, "dependants"s, "C"s)); diff --git a/tests/t30009/test_case.h b/tests/t30009/test_case.h index 6644441a..e393f6c1 100644 --- a/tests/t30009/test_case.h +++ b/tests/t30009/test_case.h @@ -24,7 +24,7 @@ TEST_CASE("t30009") auto [config, db, diagram, model] = CHECK_PACKAGE_MODEL("t30009", "t30009_package"); - CHECK_PACKAGE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_PACKAGE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsNamespacePackage(src, "One"s)); REQUIRE(IsNamespacePackage(src, "Two"s)); REQUIRE(IsNamespacePackage(src, "One"s, "A"s)); diff --git a/tests/t30010/test_case.h b/tests/t30010/test_case.h index e48ebbc2..f2adc85e 100644 --- a/tests/t30010/test_case.h +++ b/tests/t30010/test_case.h @@ -24,7 +24,7 @@ TEST_CASE("t30010") auto [config, db, diagram, model] = CHECK_PACKAGE_MODEL("t30010", "t30010_package"); - CHECK_PACKAGE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_PACKAGE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsDirectoryPackage(src, "app"s)); REQUIRE(IsDirectoryPackage(src, "libraries"s, "lib1"s)); REQUIRE(IsDirectoryPackage(src, "libraries"s, "lib2"s)); diff --git a/tests/t30011/test_case.h b/tests/t30011/test_case.h index 70153b43..8f95d358 100644 --- a/tests/t30011/test_case.h +++ b/tests/t30011/test_case.h @@ -24,7 +24,7 @@ TEST_CASE("t30011") auto [config, db, diagram, model] = CHECK_PACKAGE_MODEL("t30011", "t30011_package"); - CHECK_PACKAGE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_PACKAGE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsDirectoryPackage(src, "app"s)); REQUIRE(IsDirectoryPackage(src, "libraries"s, "lib1"s)); REQUIRE(IsDirectoryPackage(src, "libraries"s, "lib2"s)); diff --git a/tests/t30012/test_case.h b/tests/t30012/test_case.h index 1c919c44..c1e5bfb7 100644 --- a/tests/t30012/test_case.h +++ b/tests/t30012/test_case.h @@ -24,7 +24,7 @@ TEST_CASE("t30012") auto [config, db, diagram, model] = CHECK_PACKAGE_MODEL("t30012", "t30012_package"); - CHECK_PACKAGE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_PACKAGE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsModulePackage(src, "app"s)); REQUIRE(IsModulePackage(src, "app"s, "lib1"s)); REQUIRE(IsModulePackage(src, "app"s, "lib1"s, "mod1"s)); diff --git a/tests/t30013/test_case.h b/tests/t30013/test_case.h index 5a5ac1db..5f8717c2 100644 --- a/tests/t30013/test_case.h +++ b/tests/t30013/test_case.h @@ -24,7 +24,7 @@ TEST_CASE("t30013") auto [config, db, diagram, model] = CHECK_PACKAGE_MODEL("t30013", "t30013_package"); - CHECK_PACKAGE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_PACKAGE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsModulePackage(src, "app"s)); REQUIRE(IsModulePackage(src, "mod1"s)); REQUIRE(IsModulePackage(src, "mod2"s)); diff --git a/tests/t30014/test_case.h b/tests/t30014/test_case.h index e98fee7d..4ba26e11 100644 --- a/tests/t30014/test_case.h +++ b/tests/t30014/test_case.h @@ -24,7 +24,7 @@ TEST_CASE("t30014") auto [config, db, diagram, model] = CHECK_PACKAGE_MODEL("t30014", "t30014_package"); - CHECK_PACKAGE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_PACKAGE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsModulePackage(src, "app"s)); REQUIRE(IsModulePackage(src, "app"s, ":lib1"s)); REQUIRE(IsModulePackage(src, "app"s, ":lib2"s)); diff --git a/tests/t30015/test_case.h b/tests/t30015/test_case.h index 1cce3c53..b48116bd 100644 --- a/tests/t30015/test_case.h +++ b/tests/t30015/test_case.h @@ -24,7 +24,7 @@ TEST_CASE("t30015") auto [config, db, diagram, model] = CHECK_PACKAGE_MODEL("t30015", "t30015_package"); - CHECK_PACKAGE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_PACKAGE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsModulePackage(src, "app"s)); REQUIRE(IsModulePackage(src, "lib1"s)); REQUIRE(IsModulePackage(src, "lib1"s, ":mod1"s)); diff --git a/tests/t40001/test_case.h b/tests/t40001/test_case.h index 7aa56330..31aead58 100644 --- a/tests/t40001/test_case.h +++ b/tests/t40001/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t40001") auto [config, db, diagram, model] = CHECK_INCLUDE_MODEL("t40001", "t40001_include"); - CHECK_INCLUDE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_INCLUDE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(HasTitle(src, "Basic include diagram example")); REQUIRE(IsFolder(src, "include/lib1")); diff --git a/tests/t40002/test_case.h b/tests/t40002/test_case.h index 456d9d2e..dfdbeeed 100644 --- a/tests/t40002/test_case.h +++ b/tests/t40002/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t40002") auto [config, db, diagram, model] = CHECK_INCLUDE_MODEL("t40002", "t40002_include"); - CHECK_INCLUDE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_INCLUDE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsFolder(src, "include")); REQUIRE(IsFolder(src, "include/lib1")); REQUIRE(IsFolder(src, "include/lib2")); diff --git a/tests/t40003/.clang-uml b/tests/t40003/.clang-uml index 7a2a11d7..3d876f5e 100644 --- a/tests/t40003/.clang-uml +++ b/tests/t40003/.clang-uml @@ -8,12 +8,19 @@ diagrams: - src/dependencies/t2.cc # Render the paths relative to this directory include: - # Include only files which depend on t1.h + # Include files which depend on t1.h dependants: - include/dependants/t1.h # and dependencies of t2.cc dependencies: - src/dependencies/t2.cc + exclude: + # Exclude files which depend on t10.h + dependants: + - include/dependants/t10.h + # and other dependencies of t8.h + dependencies: + - include/dependencies/t8.h plantuml: before: - "' t40003 test include diagram" \ No newline at end of file diff --git a/tests/t40003/include/dependants/t10.h b/tests/t40003/include/dependants/t10.h new file mode 100644 index 00000000..71d03b1c --- /dev/null +++ b/tests/t40003/include/dependants/t10.h @@ -0,0 +1,7 @@ +#pragma once + +#include "t3.h" + +namespace clanguml::t40003::dependants { +void t10() { t3(); } +} \ No newline at end of file diff --git a/tests/t40003/include/dependants/t11.h b/tests/t40003/include/dependants/t11.h new file mode 100644 index 00000000..d01d3752 --- /dev/null +++ b/tests/t40003/include/dependants/t11.h @@ -0,0 +1,7 @@ +#pragma once + +#include "t10.h" + +namespace clanguml::t40003::dependants { +void t11() { t10(); } +} \ No newline at end of file diff --git a/tests/t40003/include/dependencies/t5.h b/tests/t40003/include/dependencies/t5.h index 575d665a..8b191cc5 100644 --- a/tests/t40003/include/dependencies/t5.h +++ b/tests/t40003/include/dependencies/t5.h @@ -1,7 +1,12 @@ #pragma once #include "t1.h" +#include "t8.h" namespace clanguml::t40003::dependencies { -void t5() { t1(); } +void t5() +{ + t1(); + t8(); +} } \ No newline at end of file diff --git a/tests/t40003/include/dependencies/t7.h b/tests/t40003/include/dependencies/t7.h new file mode 100644 index 00000000..8c9933a6 --- /dev/null +++ b/tests/t40003/include/dependencies/t7.h @@ -0,0 +1,5 @@ +#pragma once + +namespace clanguml::t40003::dependencies { +void t7() { } +} \ No newline at end of file diff --git a/tests/t40003/include/dependencies/t8.h b/tests/t40003/include/dependencies/t8.h new file mode 100644 index 00000000..2208a48b --- /dev/null +++ b/tests/t40003/include/dependencies/t8.h @@ -0,0 +1,7 @@ +#pragma once + +#include "t7.h" + +namespace clanguml::t40003::dependencies { +void t8() { t7(); } +} \ No newline at end of file diff --git a/tests/t40003/src/dependencies/t2.cc b/tests/t40003/src/dependencies/t2.cc index 24db7644..f6a19285 100644 --- a/tests/t40003/src/dependencies/t2.cc +++ b/tests/t40003/src/dependencies/t2.cc @@ -6,5 +6,6 @@ void t() { t3(); t5(); + t8(); } } \ No newline at end of file diff --git a/tests/t40003/test_case.h b/tests/t40003/test_case.h index 119c43d3..10df0ee0 100644 --- a/tests/t40003/test_case.h +++ b/tests/t40003/test_case.h @@ -23,7 +23,7 @@ TEST_CASE("t40003") auto [config, db, diagram, model] = CHECK_INCLUDE_MODEL("t40003", "t40003_include"); - CHECK_INCLUDE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_INCLUDE_DIAGRAM(*config, diagram, *model, [](const auto &src) { REQUIRE(IsFolder(src, "include/dependants")); REQUIRE(IsFolder(src, "include/dependencies")); REQUIRE(IsFolder(src, "src/dependants")); @@ -34,11 +34,17 @@ TEST_CASE("t40003") REQUIRE(IsFile(src, "include/dependants/t3.h")); REQUIRE(!IsFile(src, "include/dependants/t4.h")); REQUIRE(IsFile(src, "src/dependants/t1.cc")); + REQUIRE(!IsFile(src, "include/dependants/t10.h")); + REQUIRE(!IsFile(src, "include/dependants/t11.h")); REQUIRE(IsFile(src, "include/dependencies/t1.h")); REQUIRE(IsFile(src, "include/dependencies/t2.h")); REQUIRE(IsFile(src, "include/dependencies/t3.h")); REQUIRE(!IsFile(src, "include/dependencies/t4.h")); + REQUIRE(!IsFile(src, "include/dependencies/t6.h")); + REQUIRE(IsFile(src, "src/dependencies/t2.cc")); + REQUIRE(!IsFile(src, "include/dependencies/t7.h")); + REQUIRE(!IsFile(src, "include/dependencies/t8.h")); }); } diff --git a/tests/t90000/test_case.h b/tests/t90000/test_case.h index 945733c5..45c7db16 100644 --- a/tests/t90000/test_case.h +++ b/tests/t90000/test_case.h @@ -24,7 +24,7 @@ TEST_CASE("t90000") CHECK_CLASS_MODEL("t90000", "t90000_class"); CHECK_CLASS_DIAGRAM( - config, diagram, *model, + *config, diagram, *model, [](const plantuml_t &src) { REQUIRE(IsClass(src, "Foo")); REQUIRE(IsClass(src, "Boo")); diff --git a/tests/t90001/test_case.h b/tests/t90001/test_case.h index 99767514..5b864212 100644 --- a/tests/t90001/test_case.h +++ b/tests/t90001/test_case.h @@ -21,10 +21,12 @@ TEST_CASE("t90001") using namespace clanguml::test; using clanguml::error::empty_diagram_error; - auto [config, db] = load_config("t90001"); + auto [cfg, db] = load_config("t90001"); + + const auto &config = *cfg; { - auto diagram = config.diagrams["t90001_class"]; + auto diagram = config.diagrams.at("t90001_class"); auto model = generate_class_diagram(*db, diagram); @@ -41,7 +43,7 @@ TEST_CASE("t90001") } { - auto diagram = config.diagrams["t90001_sequence"]; + auto diagram = config.diagrams.at("t90001_sequence"); auto model = generate_sequence_diagram(*db, diagram); @@ -58,7 +60,7 @@ TEST_CASE("t90001") } { - auto diagram = config.diagrams["t90001_package"]; + auto diagram = config.diagrams.at("t90001_package"); auto model = generate_package_diagram(*db, diagram); @@ -75,7 +77,7 @@ TEST_CASE("t90001") } { - auto diagram = config.diagrams["t90001_include"]; + auto diagram = config.diagrams.at("t90001_include"); auto model = generate_include_diagram(*db, diagram); diff --git a/tests/test_cases.cc b/tests/test_cases.cc index 4605d8d2..7bb8d8e1 100644 --- a/tests/test_cases.cc +++ b/tests/test_cases.cc @@ -37,10 +37,11 @@ void inject_diagram_options(std::shared_ptr diagram) diagram->generate_links.set(links_config); } -std::pair +std::pair load_config(const std::string &test_name) { - std::pair res; @@ -54,22 +55,25 @@ load_config(const std::string &test_name) const auto output_directory = weakly_canonical( std::filesystem::current_path() / std::filesystem::path{"diagrams"}); - res.first = clanguml::config::load(test_config_path, true, false, true); + res.first = std::make_unique( + clanguml::config::load(test_config_path, true, false, true)); - res.first.compilation_database_dir.set(compilation_database_dir.string()); - res.first.output_directory.set(output_directory.string()); + assert(res.first.get() != nullptr); + + res.first->compilation_database_dir.set(compilation_database_dir.string()); + res.first->output_directory.set(output_directory.string()); LOG_DBG("Loading compilation database from {}", - res.first.compilation_database_dir()); + res.first->compilation_database_dir()); std::vector remove_compile_flags{ std::string{"-Wno-class-memaccess"}}; - res.first.remove_compile_flags.set(remove_compile_flags); + res.first->remove_compile_flags.set(remove_compile_flags); res.second = clanguml::common::compilation_database::auto_detect_from_directory( - res.first); + *res.first); return res; } @@ -301,7 +305,7 @@ auto CHECK_CLASS_MODEL( { auto [config, db] = load_config(test_name); - auto diagram = config.diagrams[diagram_name]; + auto diagram = config->diagrams[diagram_name]; REQUIRE(diagram->name == diagram_name); @@ -318,7 +322,7 @@ auto CHECK_SEQUENCE_MODEL( { auto [config, db] = load_config(test_name); - auto diagram = config.diagrams[diagram_name]; + auto diagram = config->diagrams[diagram_name]; REQUIRE(diagram->name == diagram_name); @@ -335,7 +339,7 @@ auto CHECK_PACKAGE_MODEL( { auto [config, db] = load_config(test_name); - auto diagram = config.diagrams[diagram_name]; + auto diagram = config->diagrams[diagram_name]; REQUIRE(diagram->name == diagram_name); @@ -352,7 +356,7 @@ auto CHECK_INCLUDE_MODEL( { auto [config, db] = load_config(test_name); - auto diagram = config.diagrams[diagram_name]; + auto diagram = config->diagrams[diagram_name]; REQUIRE(diagram->name == diagram_name); diff --git a/tests/test_cases.h b/tests/test_cases.h index 3ab946b3..1716817f 100644 --- a/tests/test_cases.h +++ b/tests/test_cases.h @@ -48,7 +48,8 @@ using namespace clanguml::util; -std::pair +std::pair load_config(const std::string &test_name); namespace clanguml::test { diff --git a/tests/test_cli_handler.cc b/tests/test_cli_handler.cc index 98a3b739..97c0231c 100644 --- a/tests/test_cli_handler.cc +++ b/tests/test_cli_handler.cc @@ -497,3 +497,34 @@ TEST_CASE("Test cli handler properly adds new diagram configs") REQUIRE(clanguml::util::contains( config_file_content, fmt::format("{}:", diagram_name))); } + +TEST_CASE("Test cli handler fail to add diagram with stdin config") +{ + using clanguml::cli::cli_flow_t; + using clanguml::cli::cli_handler; + + std::vector argv = {"clang-uml", "--init", "-c", "-"}; + + std::ostringstream ostr; + cli_handler cli{ostr, make_sstream_logger(ostr)}; + + auto res = cli.handle_options(argv.size(), argv.data()); + + REQUIRE(res == cli_flow_t::kError); +} + +TEST_CASE("Test cli handler fail when print_to or print_from do not have " + "specified diagram") +{ + using clanguml::cli::cli_flow_t; + using clanguml::cli::cli_handler; + + std::vector argv = {"clang-uml", "--print-from"}; + + std::ostringstream ostr; + cli_handler cli{ostr, make_sstream_logger(ostr)}; + + auto res = cli.handle_options(argv.size(), argv.data()); + + REQUIRE(res == cli_flow_t::kError); +} diff --git a/util/generate_test_case.py b/util/generate_test_case.py index b59527e9..0da83ccd 100755 --- a/util/generate_test_case.py +++ b/util/generate_test_case.py @@ -25,7 +25,7 @@ import jinja2 TEST_CASE_MULTIPLIER = 10000 CLASS_DIAGRAM_TEST_CASE_EXAMPLES = """ - CHECK_CLASS_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_CLASS_DIAGRAM(*config, diagram, *model, [](const auto &src) { // REQUIRE(HasTitle(src, "Basic class diagram example")); // REQUIRE(!IsClass(src, "NOSUCHCLASS")); @@ -43,7 +43,7 @@ CLASS_DIAGRAM_TEST_CASE_EXAMPLES = """ SEQUENCE_DIAGRAM_TEST_CASE_EXAMPLES = """ CHECK_SEQUENCE_DIAGRAM( - config, diagram, *model, + *config, diagram, *model, [](const auto &src) { // REQUIRE(HasTitle(src, "Basic sequence diagram example")); @@ -63,7 +63,7 @@ SEQUENCE_DIAGRAM_TEST_CASE_EXAMPLES = """ """ PACKAGE_DIAGRAM_TEST_CASE_EXAMPLES = """ - CHECK_PACKAGE_DIAGRAM(config, diagram, *model, [](const auto &src) { + CHECK_PACKAGE_DIAGRAM(*config, diagram, *model, [](const auto &src) { // REQUIRE(IsNamespacePackage(src, "A"s, "AA"s)); // REQUIRE(IsNamespacePackage(src, "B"s, "BB"s, "BBB"s));