Refactored handling of relative paths (#213)

This commit is contained in:
Bartek Kryza
2023-12-08 08:17:00 +01:00
parent f1d3695ccc
commit d7195d5a5d
130 changed files with 317 additions and 255 deletions

View File

@@ -5,7 +5,7 @@ diagrams:
type: class
title: Basic class diagram example
glob:
- ../../tests/t00002/t00002.cc
- tests/t00002/t00002.cc
comment_parser: clang
using_namespace:
- clanguml::t00002

View File

@@ -4,7 +4,7 @@ diagrams:
t00003_class:
type: class
glob:
- ../../tests/t00003/t00003.cc
- tests/t00003/t00003.cc
using_namespace: clanguml::t00003
include:
namespaces:

View File

@@ -4,7 +4,7 @@ diagrams:
t00004_class:
type: class
glob:
- ../../tests/t00004/t00004.cc
- tests/t00004/t00004.cc
using_namespace:
- clanguml::t00004
- clanguml::t00004::A

View File

@@ -4,7 +4,7 @@ diagrams:
t00005_class:
type: class
glob:
- ../../tests/t00005/t00005.cc
- tests/t00005/t00005.cc
using_namespace:
- clanguml::t00005
include:

View File

@@ -4,7 +4,7 @@ diagrams:
t00006_class:
type: class
glob:
- ../../tests/t00006/t00006.cc
- tests/t00006/t00006.cc
using_namespace:
- clanguml::t00006
include:

View File

@@ -4,7 +4,7 @@ diagrams:
t00007_class:
type: class
glob:
- ../../tests/t00007/t00007.cc
- tests/t00007/t00007.cc
using_namespace:
- clanguml::t00007
include:

View File

@@ -4,7 +4,7 @@ diagrams:
t00008_class:
type: class
glob:
- ../../tests/t00008/t00008.cc
- tests/t00008/t00008.cc
using_namespace:
- clanguml::t00008
include:

View File

@@ -4,7 +4,7 @@ diagrams:
t00009_class:
type: class
glob:
- ../../tests/t00009/t00009.cc
- tests/t00009/t00009.cc
using_namespace:
- clanguml::t00009
include:

View File

@@ -4,7 +4,7 @@ diagrams:
t00010_class:
type: class
glob:
- ../../tests/t00010/t00010.cc
- tests/t00010/t00010.cc
using_namespace:
- clanguml::t00010
include:

View File

@@ -4,7 +4,7 @@ diagrams:
t00011_class:
type: class
glob:
- ../../tests/t00011/t00011.cc
- tests/t00011/t00011.cc
using_namespace:
- clanguml::t00011
include:

View File

@@ -4,7 +4,7 @@ diagrams:
t00012_class:
type: class
glob:
- ../../tests/t00012/t00012.cc
- tests/t00012/t00012.cc
using_namespace:
- clanguml::t00012
include:

View File

@@ -4,7 +4,7 @@ diagrams:
t00013_class:
type: class
glob:
- ../../tests/t00013/t00013.cc
- tests/t00013/t00013.cc
using_namespace:
- clanguml::t00013
include:

View File

@@ -4,7 +4,8 @@ diagrams:
t00014_class:
type: class
glob:
- ../../tests/t00014/t00014.cc
- tests/t00014/t00014.cc
# relative_to: ../../..
using_namespace:
- clanguml::t00014
include:

View File

@@ -4,7 +4,7 @@ diagrams:
t00015_class:
type: class
glob:
- ../../tests/t00015/t00015.cc
- tests/t00015/t00015.cc
using_namespace:
- clanguml::t00015
include:

View File

@@ -4,7 +4,7 @@ diagrams:
t00016_class:
type: class
glob:
- ../../tests/t00016/t00016.cc
- tests/t00016/t00016.cc
using_namespace:
- clanguml::t00016
include:

View File

@@ -5,7 +5,7 @@ diagrams:
type: class
include_relations_also_as_members: false
glob:
- ../../tests/t00017/t00017.cc
- tests/t00017/t00017.cc
using_namespace:
- clanguml::t00017
include:

View File

@@ -4,7 +4,7 @@ diagrams:
t00018_class:
type: class
glob:
- ../../tests/t00018/**.cc
- tests/t00018/**.cc
using_namespace:
- clanguml::t00018
include:

View File

@@ -4,7 +4,7 @@ diagrams:
t00019_class:
type: class
glob:
- ../../tests/t00019/**.cc
- tests/t00019/**.cc
generate_template_argument_dependencies: false
using_namespace:
- clanguml::t00019

View File

@@ -4,7 +4,7 @@ diagrams:
t00020_class:
type: class
glob:
- ../../tests/t00020/t00020.cc
- tests/t00020/t00020.cc
using_namespace:
- clanguml::t00020
include:

View File

@@ -4,7 +4,7 @@ diagrams:
t00021_class:
type: class
glob:
- ../../tests/t00021/t00021.cc
- tests/t00021/t00021.cc
using_namespace:
- clanguml::t00021
include:

View File

@@ -4,7 +4,7 @@ diagrams:
t00022_class:
type: class
glob:
- ../../tests/t00022/t00022.cc
- tests/t00022/t00022.cc
using_namespace:
- clanguml::t00022
include:

View File

@@ -4,7 +4,7 @@ diagrams:
t00023_class:
type: class
glob:
- ../../tests/t00023/t00023.cc
- tests/t00023/t00023.cc
using_namespace:
- clanguml::t00023
include:

View File

@@ -4,7 +4,7 @@ diagrams:
t00024_class:
type: class
glob:
- ../../tests/t00024/t00024.cc
- tests/t00024/t00024.cc
using_namespace:
- clanguml::t00024
include:

View File

@@ -4,7 +4,7 @@ diagrams:
t00025_class:
type: class
glob:
- ../../tests/t00025/t00025.cc
- tests/t00025/t00025.cc
using_namespace:
- clanguml::t00025
include:

View File

@@ -4,7 +4,7 @@ diagrams:
t00026_class:
type: class
glob:
- ../../tests/t00026/t00026.cc
- tests/t00026/t00026.cc
using_namespace:
- clanguml::t00026
include:

View File

@@ -4,7 +4,7 @@ diagrams:
t00027_class:
type: class
glob:
- ../../tests/t00027/t00027.cc
- tests/t00027/t00027.cc
using_namespace:
- clanguml::t00027
include:

View File

@@ -4,7 +4,7 @@ diagrams:
t00028_class:
type: class
glob:
- ../../tests/t00028/t00028.cc
- tests/t00028/t00028.cc
using_namespace:
- clanguml::t00028
include:

View File

@@ -4,7 +4,7 @@ diagrams:
t00029_class:
type: class
glob:
- ../../tests/t00029/t00029.cc
- tests/t00029/t00029.cc
using_namespace:
- clanguml::t00029
include:

View File

@@ -4,7 +4,7 @@ diagrams:
t00030_class:
type: class
glob:
- ../../tests/t00030/t00030.cc
- tests/t00030/t00030.cc
using_namespace:
- clanguml::t00030
include:

View File

@@ -4,7 +4,7 @@ diagrams:
t00031_class:
type: class
glob:
- ../../tests/t00031/t00031.cc
- tests/t00031/t00031.cc
skip_redundant_dependencies: false
using_namespace:
- clanguml::t00031

View File

@@ -4,7 +4,7 @@ diagrams:
t00032_class:
type: class
glob:
- ../../tests/t00032/t00032.cc
- tests/t00032/t00032.cc
using_namespace:
- clanguml::t00032
include:

View File

@@ -4,7 +4,7 @@ diagrams:
t00033_class:
type: class
glob:
- ../../tests/t00033/t00033.cc
- tests/t00033/t00033.cc
using_namespace:
- clanguml::t00033
include:

View File

@@ -4,7 +4,7 @@ diagrams:
t00034_class:
type: class
glob:
- ../../tests/t00034/t00034.cc
- tests/t00034/t00034.cc
using_namespace:
- clanguml::t00034
include:

View File

@@ -4,7 +4,7 @@ diagrams:
t00035_class:
type: class
glob:
- ../../tests/t00035/t00035.cc
- tests/t00035/t00035.cc
using_namespace:
- clanguml::t00035
include:

View File

@@ -5,7 +5,7 @@ diagrams:
type: class
generate_packages: true
glob:
- ../../tests/t00036/t00036.cc
- tests/t00036/t00036.cc
using_namespace:
- clanguml::t00036
include:

View File

@@ -5,7 +5,7 @@ diagrams:
type: class
generate_packages: true
glob:
- ../../tests/t00037/t00037.cc
- tests/t00037/t00037.cc
using_namespace:
- clanguml::t00037
include:

View File

@@ -5,7 +5,7 @@ diagrams:
type: class
generate_packages: false
glob:
- ../../tests/t00038/t00038.cc
- tests/t00038/t00038.cc
using_namespace:
- clanguml::t00038
include:

View File

@@ -5,7 +5,7 @@ diagrams:
type: class
generate_packages: false
glob:
- ../../tests/t00039/t00039.cc
- tests/t00039/t00039.cc
using_namespace:
- clanguml::t00039
include:

View File

@@ -5,7 +5,7 @@ diagrams:
type: class
generate_packages: false
glob:
- ../../tests/t00040/t00040.cc
- tests/t00040/t00040.cc
using_namespace:
- clanguml::t00040
include:

View File

@@ -5,7 +5,7 @@ diagrams:
type: class
generate_packages: false
glob:
- ../../tests/t00041/t00041.cc
- tests/t00041/t00041.cc
using_namespace:
- clanguml::t00041
include:

View File

@@ -5,7 +5,7 @@ diagrams:
type: class
generate_packages: false
glob:
- ../../tests/t00042/t00042.cc
- tests/t00042/t00042.cc
using_namespace:
- clanguml::t00042
include:

View File

@@ -5,7 +5,7 @@ diagrams:
type: class
generate_packages: true
glob:
- ../../tests/t00043/t00043.cc
- tests/t00043/t00043.cc
using_namespace:
- clanguml::t00043
include:

View File

@@ -5,7 +5,7 @@ diagrams:
type: class
generate_packages: true
glob:
- ../../tests/t00044/t00044.cc
- tests/t00044/t00044.cc
using_namespace:
- clanguml::t00044
include:

View File

@@ -4,7 +4,7 @@ diagrams:
t00045_class:
type: class
glob:
- ../../tests/t00045/t00045.cc
- tests/t00045/t00045.cc
exclude:
namespaces:
- std

View File

@@ -5,7 +5,7 @@ diagrams:
type: class
generate_packages: true
glob:
- ../../tests/t00046/t00046.cc
- tests/t00046/t00046.cc
exclude:
namespaces:
- std

View File

@@ -4,7 +4,7 @@ diagrams:
t00047_class:
type: class
glob:
- ../../tests/t00047/t00047.cc
- tests/t00047/t00047.cc
using_namespace: clanguml::t00047
include:
namespaces:

View File

@@ -4,9 +4,9 @@ diagrams:
t00048_class:
type: class
glob:
- ../../tests/t00048/b_t00048.cc
- ../../tests/t00048/a_t00048.cc
- ../../tests/t00048/t00048.cc
- tests/t00048/b_t00048.cc
- tests/t00048/a_t00048.cc
- tests/t00048/t00048.cc
using_namespace: clanguml::t00048
include:
namespaces:

View File

@@ -11,7 +11,7 @@ diagrams:
"std::vector<thestring>": string_vector
"std::map<int,int>": intmap
glob:
- ../../tests/t00049/t00049.cc
- tests/t00049/t00049.cc
include:
namespaces:
- clanguml::t00049

View File

@@ -4,7 +4,7 @@ diagrams:
t00050_class:
type: class
glob:
- ../../tests/t00050/t00050.cc
- tests/t00050/t00050.cc
comment_parser: clang
include:
namespaces:

View File

@@ -4,7 +4,7 @@ diagrams:
t00051_class:
type: class
glob:
- ../../tests/t00051/t00051.cc
- tests/t00051/t00051.cc
include:
namespaces:
- clanguml::t00051

View File

@@ -45,14 +45,14 @@ TEST_CASE("t00051", "[test-case][class]")
"Function && f, Args &&... args")));
REQUIRE_THAT(src,
(IsMethod<Public>("thread", "void",
"(lambda at ../../tests/t00051/t00051.cc:59:27) &&")));
"(lambda at tests/t00051/t00051.cc:59:27) &&")));
REQUIRE_THAT(src,
(IsMethod<Private>("start_thread3",
"B<(lambda at ../../tests/t00051/t00051.cc:43:18),(lambda at "
"../../tests/t00051/t00051.cc:43:27)>")));
"B<(lambda at tests/t00051/t00051.cc:43:18),(lambda at "
"tests/t00051/t00051.cc:43:27)>")));
REQUIRE_THAT(src,
(IsMethod<Private>("get_function",
"(lambda at ../../tests/t00051/t00051.cc:48:16)")));
(IsMethod<Private>(
"get_function", "(lambda at tests/t00051/t00051.cc:48:16)")));
REQUIRE_THAT(src, IsClassTemplate("B", "F,FF=F"));
REQUIRE_THAT(src, (IsMethod<Public>("f", "void")));
@@ -60,18 +60,18 @@ TEST_CASE("t00051", "[test-case][class]")
REQUIRE_THAT(src,
IsClassTemplate("B",
"(lambda at ../../tests/t00051/t00051.cc:43:18),(lambda at "
"../../tests/t00051/t00051.cc:43:27)"));
"(lambda at tests/t00051/t00051.cc:43:18),(lambda at "
"tests/t00051/t00051.cc:43:27)"));
REQUIRE_THAT(src,
IsInstantiation(_A("B<F,FF=F>"),
_A("B<(lambda at ../../tests/t00051/t00051.cc:43:18),(lambda "
"at ../../tests/t00051/t00051.cc:43:27)>")));
_A("B<(lambda at tests/t00051/t00051.cc:43:18),(lambda "
"at tests/t00051/t00051.cc:43:27)>")));
REQUIRE_THAT(src,
IsDependency(_A("A"),
_A("B<(lambda at ../../tests/t00051/t00051.cc:43:18),(lambda "
"at ../../tests/t00051/t00051.cc:43:27)>")));
_A("B<(lambda at tests/t00051/t00051.cc:43:18),(lambda "
"at tests/t00051/t00051.cc:43:27)>")));
save_puml(config.output_directory(), diagram->name + ".puml", src);
}
@@ -103,33 +103,32 @@ TEST_CASE("t00051", "[test-case][class]")
"Function && f, Args &&... args")));
REQUIRE_THAT(src,
(IsMethod<Public>("thread", "void",
"(lambda at ../../tests/t00051/t00051.cc:59:27) &&")));
"(lambda at tests/t00051/t00051.cc:59:27) &&")));
REQUIRE_THAT(src,
(IsMethod<Private>("start_thread3",
"B<(lambda at ../../tests/t00051/t00051.cc:43:18),(lambda at "
"../../tests/t00051/t00051.cc:43:27)>")));
"B<(lambda at tests/t00051/t00051.cc:43:18),(lambda at "
"tests/t00051/t00051.cc:43:27)>")));
REQUIRE_THAT(src,
(IsMethod<Private>("get_function",
"(lambda at ../../tests/t00051/t00051.cc:48:16)")));
(IsMethod<Private>(
"get_function", "(lambda at tests/t00051/t00051.cc:48:16)")));
REQUIRE_THAT(src, IsClass(_A("B<F,FF=F>")));
REQUIRE_THAT(src, (IsMethod<Public>("f", "void")));
REQUIRE_THAT(src, (IsMethod<Public>("ff", "void")));
REQUIRE_THAT(src,
IsClass(_A(
"B<(lambda at ../../tests/t00051/t00051.cc:43:18),(lambda at "
"../../tests/t00051/t00051.cc:43:27)>")));
IsClass(_A("B<(lambda at tests/t00051/t00051.cc:43:18),(lambda at "
"tests/t00051/t00051.cc:43:27)>")));
REQUIRE_THAT(src,
IsInstantiation(_A("B<F,FF=F>"),
_A("B<(lambda at ../../tests/t00051/t00051.cc:43:18),(lambda "
"at ../../tests/t00051/t00051.cc:43:27)>")));
_A("B<(lambda at tests/t00051/t00051.cc:43:18),(lambda "
"at tests/t00051/t00051.cc:43:27)>")));
REQUIRE_THAT(src,
IsDependency(_A("A"),
_A("B<(lambda at ../../tests/t00051/t00051.cc:43:18),(lambda "
"at ../../tests/t00051/t00051.cc:43:27)>")));
_A("B<(lambda at tests/t00051/t00051.cc:43:18),(lambda "
"at tests/t00051/t00051.cc:43:27)>")));
save_mermaid(config.output_directory(), diagram->name + ".mmd", src);
}

View File

@@ -4,7 +4,7 @@ diagrams:
t00052_class:
type: class
glob:
- ../../tests/t00052/t00052.cc
- tests/t00052/t00052.cc
include:
namespaces:
- clanguml::t00052

View File

@@ -4,7 +4,7 @@ diagrams:
t00053_class:
type: class
glob:
- ../../tests/t00053/t00053.cc
- tests/t00053/t00053.cc
include:
namespaces:
- clanguml::t00053

View File

@@ -4,7 +4,7 @@ diagrams:
t00054_class:
type: class
glob:
- ../../tests/t00054/t00054.cc
- tests/t00054/t00054.cc
include:
namespaces:
- clanguml::t00054

View File

@@ -4,7 +4,7 @@ diagrams:
t00055_class:
type: class
glob:
- ../../tests/t00055/t00055.cc
- tests/t00055/t00055.cc
include:
namespaces:
- clanguml::t00055

View File

@@ -4,7 +4,7 @@ diagrams:
t00056_class:
type: class
glob:
- ../../tests/t00056/t00056.cc
- tests/t00056/t00056.cc
include:
namespaces:
- clanguml::t00056

View File

@@ -4,5 +4,5 @@ diagrams:
t00057_class:
type: class
glob:
- ../../tests/t00057/t00057.c
- ../../tests/t00057/src/t00057_impl.c
- tests/t00057/t00057.c
- tests/t00057/src/t00057_impl.c

View File

@@ -4,7 +4,7 @@ diagrams:
t00058_class:
type: class
glob:
- ../../tests/t00058/t00058.cc
- tests/t00058/t00058.cc
include:
namespaces:
- clanguml::t00058

View File

@@ -4,7 +4,7 @@ diagrams:
t00059_class:
type: class
glob:
- ../../tests/t00059/t00059.cc
- tests/t00059/t00059.cc
include:
namespaces:
- clanguml::t00059

View File

@@ -4,7 +4,7 @@ diagrams:
t00060_class:
type: class
glob:
- ../../tests/t00060/t00060.cc
- tests/t00060/t00060.cc
include:
namespaces:
- clanguml::t00060

View File

@@ -4,7 +4,7 @@ diagrams:
t00062_class:
type: class
glob:
- ../../tests/t00062/t00062.cc
- tests/t00062/t00062.cc
include:
namespaces:
- clanguml::t00062

View File

@@ -4,7 +4,7 @@ diagrams:
t00063_class:
type: class
glob:
- ../../tests/t00063/t00063.cc
- tests/t00063/t00063.cc
include:
namespaces:
- clanguml::t00063

View File

@@ -4,7 +4,7 @@ diagrams:
t00064_class:
type: class
glob:
- ../../tests/t00064/t00064.cc
- tests/t00064/t00064.cc
include:
namespaces:
- clanguml::t00064

View File

@@ -4,7 +4,7 @@ diagrams:
t00066_class:
type: class
glob:
- ../../tests/t00066/t00066.cc
- tests/t00066/t00066.cc
include:
namespaces:
- clanguml::t00066

View File

@@ -4,7 +4,7 @@ diagrams:
t00067_class:
type: class
glob:
- ../../tests/t00067/t00067.cc
- tests/t00067/t00067.cc
include:
namespaces:
- clanguml::t00067

View File

@@ -5,7 +5,7 @@ diagrams:
type: class
title: AAA context of radius 0
glob:
- ../../tests/t00068/t00068.cc
- tests/t00068/t00068.cc
include:
namespaces:
- clanguml::t00068
@@ -19,7 +19,7 @@ diagrams:
type: class
title: AAA context of radius 1
glob:
- ../../tests/t00068/t00068.cc
- tests/t00068/t00068.cc
include:
namespaces:
- clanguml::t00068
@@ -33,7 +33,7 @@ diagrams:
type: class
title: AAA context of radius 2
glob:
- ../../tests/t00068/t00068.cc
- tests/t00068/t00068.cc
include:
namespaces:
- clanguml::t00068

View File

@@ -7,7 +7,7 @@ diagrams:
type: sequence
title: Basic sequence diagram example
glob:
- ../../tests/t20001/t20001.cc
- tests/t20001/t20001.cc
include:
namespaces:
- clanguml::t20001

View File

@@ -4,7 +4,7 @@ diagrams:
t20002_sequence:
type: sequence
glob:
- ../../tests/t20002/t20002.cc
- tests/t20002/t20002.cc
include:
namespaces:
- clanguml::t20002

View File

@@ -4,7 +4,7 @@ diagrams:
t20003_sequence:
type: sequence
glob:
- ../../tests/t20003/t20003.cc
- tests/t20003/t20003.cc
include:
namespaces:
- clanguml::t20003

View File

@@ -4,7 +4,7 @@ diagrams:
t20004_sequence:
type: sequence
glob:
- ../../tests/t20004/t20004.cc
- tests/t20004/t20004.cc
include:
namespaces:
- clanguml::t20004

View File

@@ -4,7 +4,7 @@ diagrams:
t20005_sequence:
type: sequence
glob:
- ../../tests/t20005/t20005.cc
- tests/t20005/t20005.cc
include:
namespaces:
- clanguml::t20005

View File

@@ -4,7 +4,7 @@ diagrams:
t20006_sequence:
type: sequence
glob:
- ../../tests/t20006/t20006.cc
- tests/t20006/t20006.cc
include:
namespaces:
- clanguml::t20006

View File

@@ -4,7 +4,7 @@ diagrams:
t20007_sequence:
type: sequence
glob:
- ../../tests/t20007/t20007.cc
- tests/t20007/t20007.cc
include:
namespaces:
- clanguml::t20007

View File

@@ -4,7 +4,7 @@ diagrams:
t20008_sequence:
type: sequence
glob:
- ../../tests/t20008/t20008.cc
- tests/t20008/t20008.cc
include:
namespaces:
- clanguml::t20008

View File

@@ -4,7 +4,7 @@ diagrams:
t20009_sequence:
type: sequence
glob:
- ../../tests/t20009/t20009.cc
- tests/t20009/t20009.cc
include:
namespaces:
- clanguml::t20009

View File

@@ -4,7 +4,7 @@ diagrams:
t20010_sequence:
type: sequence
glob:
- ../../tests/t20010/t20010.cc
- tests/t20010/t20010.cc
include:
namespaces:
- clanguml::t20010

View File

@@ -4,7 +4,7 @@ diagrams:
t20011_sequence:
type: sequence
glob:
- ../../tests/t20011/t20011.cc
- tests/t20011/t20011.cc
include:
namespaces:
- clanguml::t20011

View File

@@ -4,7 +4,7 @@ diagrams:
t20012_sequence:
type: sequence
glob:
- ../../tests/t20012/t20012.cc
- tests/t20012/t20012.cc
include:
namespaces:
- clanguml::t20012

View File

@@ -37,41 +37,41 @@ TEST_CASE("t20012", "[test-case][sequence]")
// Check if all calls exist
REQUIRE_THAT(src,
HasCall(_A("tmain()"),
_A("tmain()::(lambda ../../tests/t20012/t20012.cc:67:20)"),
_A("tmain()::(lambda tests/t20012/t20012.cc:67:20)"),
"operator()()"));
REQUIRE_THAT(src,
HasCall(_A("tmain()::(lambda ../../tests/t20012/t20012.cc:67:20)"),
HasCall(_A("tmain()::(lambda tests/t20012/t20012.cc:67:20)"),
_A("A"), "a()"));
REQUIRE_THAT(src, HasCall(_A("A"), _A("A"), "aa()"));
REQUIRE_THAT(src, HasCall(_A("A"), _A("A"), "aaa()"));
REQUIRE_THAT(src,
HasCall(_A("tmain()::(lambda ../../tests/t20012/t20012.cc:67:20)"),
HasCall(_A("tmain()::(lambda tests/t20012/t20012.cc:67:20)"),
_A("B"), "b()"));
REQUIRE_THAT(src, HasCall(_A("B"), _A("B"), "bb()"));
REQUIRE_THAT(src, HasCall(_A("B"), _A("B"), "bbb()"));
REQUIRE_THAT(src,
HasCall(_A("tmain()::(lambda ../../tests/t20012/t20012.cc:80:20)"),
HasCall(_A("tmain()::(lambda tests/t20012/t20012.cc:80:20)"),
_A("C"), "c()"));
REQUIRE_THAT(src, HasCall(_A("C"), _A("C"), "cc()"));
REQUIRE_THAT(src, HasCall(_A("C"), _A("C"), "ccc()"));
REQUIRE_THAT(src,
HasCall(_A("tmain()::(lambda ../../tests/t20012/t20012.cc:80:20)"),
_A("tmain()::(lambda ../../tests/t20012/t20012.cc:67:20)"),
HasCall(_A("tmain()::(lambda tests/t20012/t20012.cc:80:20)"),
_A("tmain()::(lambda tests/t20012/t20012.cc:67:20)"),
"operator()()"));
REQUIRE_THAT(src, HasCall(_A("C"), _A("C"), "ccc()"));
REQUIRE_THAT(src,
HasCall(_A("tmain()"),
_A("R<R::(lambda ../../tests/t20012/t20012.cc:86:9)>"), "r()"));
_A("R<R::(lambda tests/t20012/t20012.cc:86:9)>"), "r()"));
REQUIRE_THAT(src,
HasCall(_A("R<R::(lambda ../../tests/t20012/t20012.cc:86:9)>"),
_A("tmain()::(lambda ../../tests/t20012/t20012.cc:86:9)"),
HasCall(_A("R<R::(lambda tests/t20012/t20012.cc:86:9)>"),
_A("tmain()::(lambda tests/t20012/t20012.cc:86:9)"),
"operator()()"));
REQUIRE_THAT(src,
HasCall(_A("tmain()::(lambda ../../tests/t20012/t20012.cc:86:9)"),
HasCall(_A("tmain()::(lambda tests/t20012/t20012.cc:86:9)"),
_A("C"), "c()"));
// @todo #168
@@ -87,32 +87,27 @@ TEST_CASE("t20012", "[test-case][sequence]")
std::vector<int> messages = {
FindMessage(j, "tmain()",
"tmain()::(lambda ../../tests/t20012/t20012.cc:67:20)",
"tmain()::(lambda tests/t20012/t20012.cc:67:20)",
"operator()()"),
FindMessage(j,
"tmain()::(lambda ../../tests/t20012/t20012.cc:67:20)", "A",
"a()"),
FindMessage(j, "tmain()::(lambda tests/t20012/t20012.cc:67:20)",
"A", "a()"),
FindMessage(j, "A", "A", "aa()"), FindMessage(j, "A", "A", "aaa()"),
FindMessage(j,
"tmain()::(lambda ../../tests/t20012/t20012.cc:67:20)", "B",
"b()"),
FindMessage(j, "tmain()::(lambda tests/t20012/t20012.cc:67:20)",
"B", "b()"),
FindMessage(j, "B", "B", "bb()"), FindMessage(j, "B", "B", "bbb()"),
FindMessage(j,
"tmain()::(lambda ../../tests/t20012/t20012.cc:80:20)", "C",
"c()"),
FindMessage(j, "tmain()::(lambda tests/t20012/t20012.cc:80:20)",
"C", "c()"),
FindMessage(j, "C", "C", "cc()"), FindMessage(j, "C", "C", "ccc()"),
FindMessage(j,
"tmain()::(lambda ../../tests/t20012/t20012.cc:80:20)",
"tmain()::(lambda ../../tests/t20012/t20012.cc:67:20)",
FindMessage(j, "tmain()::(lambda tests/t20012/t20012.cc:80:20)",
"tmain()::(lambda tests/t20012/t20012.cc:67:20)",
"operator()()"),
FindMessage(j, "tmain()",
"R<R::(lambda ../../tests/t20012/t20012.cc:86:9)>", "r()"),
FindMessage(j, "R<R::(lambda ../../tests/t20012/t20012.cc:86:9)>",
"tmain()::(lambda ../../tests/t20012/t20012.cc:86:9)",
"R<R::(lambda tests/t20012/t20012.cc:86:9)>", "r()"),
FindMessage(j, "R<R::(lambda tests/t20012/t20012.cc:86:9)>",
"tmain()::(lambda tests/t20012/t20012.cc:86:9)",
"operator()()"),
FindMessage(j,
"tmain()::(lambda ../../tests/t20012/t20012.cc:86:9)", "C",
"c()"),
FindMessage(
j, "tmain()::(lambda tests/t20012/t20012.cc:86:9)", "C", "c()"),
// @todo #168
// FindMessage(j, "tmain()", "D", "add5(int)")
};
@@ -130,41 +125,41 @@ TEST_CASE("t20012", "[test-case][sequence]")
REQUIRE_THAT(src,
HasCall(_A("tmain()"),
_A("tmain()::(lambda ../../tests/t20012/t20012.cc:67:20)"),
_A("tmain()::(lambda tests/t20012/t20012.cc:67:20)"),
"operator()()"));
REQUIRE_THAT(src,
HasCall(_A("tmain()::(lambda ../../tests/t20012/t20012.cc:67:20)"),
HasCall(_A("tmain()::(lambda tests/t20012/t20012.cc:67:20)"),
_A("A"), "a()"));
REQUIRE_THAT(src, HasCall(_A("A"), _A("A"), "aa()"));
REQUIRE_THAT(src, HasCall(_A("A"), _A("A"), "aaa()"));
REQUIRE_THAT(src,
HasCall(_A("tmain()::(lambda ../../tests/t20012/t20012.cc:67:20)"),
HasCall(_A("tmain()::(lambda tests/t20012/t20012.cc:67:20)"),
_A("B"), "b()"));
REQUIRE_THAT(src, HasCall(_A("B"), _A("B"), "bb()"));
REQUIRE_THAT(src, HasCall(_A("B"), _A("B"), "bbb()"));
REQUIRE_THAT(src,
HasCall(_A("tmain()::(lambda ../../tests/t20012/t20012.cc:80:20)"),
HasCall(_A("tmain()::(lambda tests/t20012/t20012.cc:80:20)"),
_A("C"), "c()"));
REQUIRE_THAT(src, HasCall(_A("C"), _A("C"), "cc()"));
REQUIRE_THAT(src, HasCall(_A("C"), _A("C"), "ccc()"));
REQUIRE_THAT(src,
HasCall(_A("tmain()::(lambda ../../tests/t20012/t20012.cc:80:20)"),
_A("tmain()::(lambda ../../tests/t20012/t20012.cc:67:20)"),
HasCall(_A("tmain()::(lambda tests/t20012/t20012.cc:80:20)"),
_A("tmain()::(lambda tests/t20012/t20012.cc:67:20)"),
"operator()()"));
REQUIRE_THAT(src, HasCall(_A("C"), _A("C"), "ccc()"));
REQUIRE_THAT(src,
HasCall(_A("tmain()"),
_A("R<R::(lambda ../../tests/t20012/t20012.cc:86:9)>"), "r()"));
_A("R<R::(lambda tests/t20012/t20012.cc:86:9)>"), "r()"));
REQUIRE_THAT(src,
HasCall(_A("R<R::(lambda ../../tests/t20012/t20012.cc:86:9)>"),
_A("tmain()::(lambda ../../tests/t20012/t20012.cc:86:9)"),
HasCall(_A("R<R::(lambda tests/t20012/t20012.cc:86:9)>"),
_A("tmain()::(lambda tests/t20012/t20012.cc:86:9)"),
"operator()()"));
REQUIRE_THAT(src,
HasCall(_A("tmain()::(lambda ../../tests/t20012/t20012.cc:86:9)"),
HasCall(_A("tmain()::(lambda tests/t20012/t20012.cc:86:9)"),
_A("C"), "c()"));
save_mermaid(config.output_directory(), diagram->name + ".mmd", src);

View File

@@ -4,7 +4,7 @@ diagrams:
t20013_sequence:
type: sequence
glob:
- ../../tests/t20013/t20013.cc
- tests/t20013/t20013.cc
include:
namespaces:
- clanguml::t20013

View File

@@ -4,10 +4,10 @@ diagrams:
t20014_sequence:
type: sequence
glob:
- ../../tests/t20014/t20014.cc
- ../../tests/t20014/t20014_c.cc
- ../../tests/t20014/t20014_b.cc
- ../../tests/t20014/t20014_a.cc
- tests/t20014/t20014.cc
- tests/t20014/t20014_c.cc
- tests/t20014/t20014_b.cc
- tests/t20014/t20014_a.cc
include:
namespaces:
- clanguml::t20014

View File

@@ -4,7 +4,7 @@ diagrams:
t20015_sequence:
type: sequence
glob:
- ../../tests/t20015/t20015.cc
- tests/t20015/t20015.cc
include:
namespaces:
- clanguml::t20015

View File

@@ -4,7 +4,7 @@ diagrams:
t20016_sequence:
type: sequence
glob:
- ../../tests/t20016/t20016.cc
- tests/t20016/t20016.cc
include:
namespaces:
- clanguml::t20016

View File

@@ -4,7 +4,7 @@ diagrams:
t20018_sequence:
type: sequence
glob:
- ../../tests/t20018/t20018.cc
- tests/t20018/t20018.cc
include:
namespaces:
- clanguml::t20018

View File

@@ -4,7 +4,7 @@ diagrams:
t20019_sequence:
type: sequence
glob:
- ../../tests/t20019/t20019.cc
- tests/t20019/t20019.cc
include:
namespaces:
- clanguml::t20019

View File

@@ -4,7 +4,7 @@ diagrams:
t20020_sequence:
type: sequence
glob:
- ../../tests/t20020/t20020.cc
- tests/t20020/t20020.cc
include:
namespaces:
- clanguml::t20020

View File

@@ -4,7 +4,7 @@ diagrams:
t20021_sequence:
type: sequence
glob:
- ../../tests/t20021/t20021.cc
- tests/t20021/t20021.cc
include:
namespaces:
- clanguml::t20021

View File

@@ -4,7 +4,7 @@ diagrams:
t20022_sequence:
type: sequence
glob:
- ../../tests/t20022/t20022.cc
- tests/t20022/t20022.cc
include:
namespaces:
- clanguml::t20022

View File

@@ -4,7 +4,7 @@ diagrams:
t20023_sequence:
type: sequence
glob:
- ../../tests/t20023/t20023.cc
- tests/t20023/t20023.cc
include:
namespaces:
- clanguml::t20023

View File

@@ -4,7 +4,7 @@ diagrams:
t20024_sequence:
type: sequence
glob:
- ../../tests/t20024/t20024.cc
- tests/t20024/t20024.cc
include:
namespaces:
- clanguml::t20024

View File

@@ -4,7 +4,7 @@ diagrams:
t20025_sequence:
type: sequence
glob:
- ../../tests/t20025/t20025.cc
- tests/t20025/t20025.cc
include:
namespaces:
- clanguml::t20025

View File

@@ -4,7 +4,7 @@ diagrams:
t20026_sequence:
type: sequence
glob:
- ../../tests/t20026/t20026.cc
- tests/t20026/t20026.cc
include:
namespaces:
- clanguml::t20026

View File

@@ -4,7 +4,7 @@ diagrams:
t20027_sequence:
type: sequence
glob:
- ../../tests/t20027/t20027.cc
- tests/t20027/t20027.cc
include:
namespaces:
- clanguml::t20027

View File

@@ -4,7 +4,7 @@ diagrams:
t20028_sequence:
type: sequence
glob:
- ../../tests/t20028/t20028.cc
- tests/t20028/t20028.cc
include:
namespaces:
- clanguml::t20028

View File

@@ -6,7 +6,7 @@ diagrams:
t20029_sequence:
type: sequence
glob:
- ../../tests/t20029/t20029.cc
- tests/t20029/t20029.cc
include:
namespaces:
- clanguml::t20029

View File

@@ -4,7 +4,7 @@ diagrams:
t20030_sequence:
type: sequence
glob:
- ../../tests/t20030/t20030.cc
- tests/t20030/t20030.cc
include:
namespaces:
- clanguml::t20030

View File

@@ -4,7 +4,7 @@ diagrams:
t20031_sequence:
type: sequence
glob:
- ../../tests/t20031/t20031.cc
- tests/t20031/t20031.cc
include:
namespaces:
- clanguml::t20031

View File

@@ -4,7 +4,7 @@ diagrams:
t20032_sequence:
type: sequence
glob:
- ../../tests/t20032/t20032.cc
- tests/t20032/t20032.cc
include:
namespaces:
- clanguml::t20032

View File

@@ -4,7 +4,7 @@ diagrams:
t20033_sequence:
type: sequence
glob:
- ../../tests/t20033/t20033.cc
- tests/t20033/t20033.cc
include:
namespaces:
- clanguml::t20033

View File

@@ -4,7 +4,7 @@ diagrams:
t20034_sequence:
type: sequence
glob:
- ../../tests/t20034/t20034.cc
- tests/t20034/t20034.cc
include:
namespaces:
- clanguml::t20034

Some files were not shown because too many files have changed in this diff Show More