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

Added variadic class template recursive call sequence diagram

Browse Source
This commit is contained in:
Bartek Kryza
2024-02-11 23:52:32 +01:00
parent 7f25fa58f5
commit 3af55f1e78
7 changed files with 178 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/t20039/test_case.h
View File

@@ -59,8 +59,17 @@ TEST_CASE("t20039", "[test-case][sequence]")
{
auto src = generate_sequence_mermaid(diagram, *model);
mermaid::AliasMatcher _A(src);
using mermaid::IsClass;
mermaid::SequenceDiagramAliasMatcher _A(src);
using mermaid::HasCall;
REQUIRE_THAT(src, HasCall(_A("tmain()"), _A("R"), "run()"));
REQUIRE_THAT(src, HasCall(_A("R"), _A("A<int>"), "a(int)"));
REQUIRE_THAT(src, HasCall(_A("R"), _A("A<int_vec_t>"), "a(int_vec_t)"));
REQUIRE_THAT(
src, HasCall(_A("R"), _A("A<string_vec_t>"), "a(string_vec_t)"));
REQUIRE_THAT(src, HasCall(_A("R"), _A("A<int_map_t>"), "a(int_map_t)"));
REQUIRE_THAT(
src, HasCall(_A("R"), _A("A<string_map_t>"), "a(string_map_t)"));
save_mermaid(config.output_directory(), diagram->name + ".mmd", src);
}

31
tests/t20040/test_case.h
View File

@@ -40,6 +40,17 @@ TEST_CASE("t20040", "[test-case][sequence]")
_A("print<int,double,std::string>(int,double,std::string)"),
""));
REQUIRE_THAT(src,
HasCall(_A("print<int,double,std::string>(int,double,std::string)"),
_A("print<double,std::string>(double,std::string)"), ""));
REQUIRE_THAT(src,
HasCall(_A("print<double,std::string>(double,std::string)"),
_A("print<std::string>(std::string)"), ""));
REQUIRE_THAT(src,
HasCall(_A("print<std::string>(std::string)"), _A("print()"), ""));
save_puml(config.output_directory(), diagram->name + ".puml", src);
}
@@ -54,8 +65,24 @@ TEST_CASE("t20040", "[test-case][sequence]")
{
auto src = generate_sequence_mermaid(diagram, *model);
mermaid::AliasMatcher _A(src);
using mermaid::IsClass;
mermaid::SequenceDiagramAliasMatcher _A(src);
using mermaid::HasCall;
REQUIRE_THAT(src,
HasCall(_A("tmain()"),
_A("print<int,double,std::string>(int,double,std::string)"),
""));
REQUIRE_THAT(src,
HasCall(_A("print<int,double,std::string>(int,double,std::string)"),
_A("print<double,std::string>(double,std::string)"), ""));
REQUIRE_THAT(src,
HasCall(_A("print<double,std::string>(double,std::string)"),
_A("print<std::string>(std::string)"), ""));
REQUIRE_THAT(src,
HasCall(_A("print<std::string>(std::string)"), _A("print()"), ""));
save_mermaid(config.output_directory(), diagram->name + ".mmd", src);
}

11
tests/t20041/.clang-uml Normal file
View File

@@ -0,0 +1,11 @@
diagrams:
t20041_sequence:
type: sequence
glob:
- t20041.cc
include:
namespaces:
- clanguml::t20041
using_namespace: clanguml::t20041
from:
- function: "clanguml::t20041::tmain()"

31
tests/t20041/t20041.cc Normal file
View File

@@ -0,0 +1,31 @@
#include <iostream>
#include <string>
namespace clanguml {
namespace t20041 {
template <typename... Args> struct A;
template <typename First, typename... Rest> struct A<First, Rest...> {
void print(First first, Rest... rest)
{
std::cout << first << std::endl;
A<Rest...> a;
a.print(rest...);
}
};
template <> struct A<> {
void print() { }
};
void tmain()
{
using namespace std::literals::string_literals;
A<int, double, std::string> a;
a.print(1, 3.14, "test"s);
}
}
}

89
tests/t20041/test_case.h Normal file
View File

@@ -0,0 +1,89 @@
/**
* tests/t20041/test_case.h
*
* Copyright (c) 2021-2024 Bartek Kryza <bkryza@gmail.com>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
TEST_CASE("t20041", "[test-case][sequence]")
{
auto [config, db] = load_config("t20041");
auto diagram = config.diagrams["t20041_sequence"];
REQUIRE(diagram->name == "t20041_sequence");
auto model = generate_sequence_diagram(*db, diagram);
REQUIRE(model->name() == "t20041_sequence");
{
auto src = generate_sequence_puml(diagram, *model);
AliasMatcher _A(src);
REQUIRE_THAT(src, StartsWith("@startuml"));
REQUIRE_THAT(src, EndsWith("@enduml\n"));
REQUIRE_THAT(src,
HasCall(_A("tmain()"), _A("A<int,double,std::string>"),
"print(int,double,std::string)"));
REQUIRE_THAT(src,
HasCall(_A("A<int,double,std::string>"),
_A("A<double,std::string>"), "print(double,std::string)"));
REQUIRE_THAT(src,
HasCall(_A("A<double,std::string>"), _A("A<std::string>"),
"print(std::string)"));
REQUIRE_THAT(src, HasCall(_A("A<std::string>"), _A("A"), "print()"));
save_puml(config.output_directory(), diagram->name + ".puml", src);
}
{
auto j = generate_sequence_json(diagram, *model);
using namespace json;
std::vector<int> messages = {
FindMessage(j, "tmain()", "A<int,double,std::string>",
"print(int,double,std::string)"),
FindMessage(j, "A<int,double,std::string>", "A<double,std::string>",
"print(double,std::string)"),
FindMessage(j, "A<double,std::string>", "A<std::string>",
"print(std::string)"),
FindMessage(j, "A<std::string>", "A", "print()")};
REQUIRE(std::is_sorted(messages.begin(), messages.end()));
save_json(config.output_directory(), diagram->name + ".json", j);
}
{
auto src = generate_sequence_mermaid(diagram, *model);
mermaid::SequenceDiagramAliasMatcher _A(src);
using mermaid::HasCall;
REQUIRE_THAT(src,
HasCall(_A("tmain()"), _A("A<int,double,std::string>"),
"print(int,double,std::string)"));
REQUIRE_THAT(src,
HasCall(_A("A<int,double,std::string>"),
_A("A<double,std::string>"), "print(double,std::string)"));
REQUIRE_THAT(src,
HasCall(_A("A<double,std::string>"), _A("A<std::string>"),
"print(std::string)"));
save_mermaid(config.output_directory(), diagram->name + ".mmd", src);
}
}

1
tests/test_cases.cc
View File

@@ -462,6 +462,7 @@ using namespace clanguml::test::matchers;
#include "t20038/test_case.h"
#include "t20039/test_case.h"
#include "t20040/test_case.h"
#include "t20041/test_case.h"
///
/// Package diagram tests

6
tests/test_cases.yaml
View File

@@ -331,6 +331,12 @@ test_cases:
- name: t20039
title: Test case for type aliases config option in sequence diagrams
description:
- name: t20040
title: Test case for recursive variadic template function call
description:
- name: t20041
title: Test case for recursive variadic template class call
description:
Package diagrams:
- name: t30001
title: Basic package diagram test case