Simplified test cases configs

src/config/config.h

@@ -456,6 +456,18 @@ struct inheritable_diagram_options {
 
     std::string simplify_template_type(std::string full_name) const;
 
+    /**
+     * @brief Get reference to `relative_to` diagram config option
+     *
+     * This method is only to allow access to `relative_to` for loading
+     * and adjusting configuration file and for making test cases work.
+     *
+     * Instead use @see config::diagram::root_directory() method.
+     *
+     * @return Reference to `relative_to` config option.
+     */
+    option<std::filesystem::path> &get_relative_to() { return relative_to; }
+
     option<std::vector<std::string>> glob{"glob"};
     option<common::model::namespace_> using_namespace{"using_namespace"};
     option<bool> include_relations_also_as_members{
@@ -499,18 +511,6 @@ struct inheritable_diagram_options {
     option<bool> debug_mode{"debug_mode", false};
     option<bool> generate_metadata{"generate_metadata", true};
 
-    /**
-     * @brief Get reference to `relative_to` diagram config option
-     *
-     * This method is only to allow access to `relative_to` for loading
-     * and adjusting configuration file and for making test cases work.
-     *
-     * Instead use @see config::diagram::root_directory() method.
-     *
-     * @return Reference to `relative_to` config option.
-     */
-    option<std::filesystem::path> &get_relative_to() { return relative_to; }
-
 protected:
     // This is the relative path with respect to the `base_directory`,
     // against which all matches are made, if not provided it defaults to

src/config/yaml_decoders.cc

@@ -578,6 +578,7 @@ template <typename T> bool decode_diagram(const Node &node, T &rhs)
     get_option(node, rhs.debug_mode);
     get_option(node, rhs.generate_metadata);
     get_option(node, rhs.title);
+    get_option(node, rhs.get_relative_to());
 
     return true;
 }
@@ -602,6 +603,7 @@ template <> struct convert<class_diagram> {
         get_option(node, rhs.skip_redundant_dependencies);
         get_option(node, rhs.relationship_hints);
         get_option(node, rhs.type_aliases);
+
         get_option(node, rhs.get_relative_to());
 
         rhs.initialize_relationship_hints();
@@ -626,16 +628,12 @@ template <> struct convert<sequence_diagram> {
         get_option(node, rhs.combine_free_functions_into_file_participants);
         get_option(node, rhs.generate_return_types);
         get_option(node, rhs.generate_condition_statements);
-        get_option(node, rhs.get_relative_to());
         get_option(node, rhs.participants_order);
         get_option(node, rhs.generate_method_arguments);
         get_option(node, rhs.generate_message_comments);
         get_option(node, rhs.message_comment_width);
 
-        // Ensure relative_to has a value
+        get_option(node, rhs.get_relative_to());
-        if (!rhs.get_relative_to().has_value)
-            rhs.get_relative_to().set(
-                std::filesystem::current_path().lexically_normal());
 
         rhs.initialize_type_aliases();
 
@@ -653,13 +651,9 @@ template <> struct convert<package_diagram> {
             return false;
 
         get_option(node, rhs.layout);
-        get_option(node, rhs.get_relative_to());
         get_option(node, rhs.package_type);
 
-        // Ensure relative_to has a value
+        get_option(node, rhs.get_relative_to());
-        if (!rhs.get_relative_to().has_value)
-            rhs.get_relative_to().set(
-                std::filesystem::current_path().lexically_normal());
 
         return true;
     }
@@ -675,12 +669,9 @@ template <> struct convert<include_diagram> {
             return false;
 
         get_option(node, rhs.layout);
-        get_option(node, rhs.get_relative_to());
         get_option(node, rhs.generate_system_headers);
 
-        if (!rhs.get_relative_to().has_value)
+        get_option(node, rhs.get_relative_to());
-            rhs.get_relative_to().set(
-                std::filesystem::current_path().lexically_normal());
 
         return true;
     }
@@ -862,27 +853,29 @@ void config::inherit()
 {
     for (auto &[name, diagram] : diagrams) {
         diagram->inherit(*this);
+
+        assert(diagram->get_relative_to().has_value);
     }
 }
 
 namespace {
-void resolve_option_path(YAML::Node &doc, const std::string &option)
+void resolve_option_path(YAML::Node &doc, const std::string &option_name)
 {
     std::filesystem::path relative_to_path{
         doc["relative_to"].as<std::string>()};
 
     assert(relative_to_path.is_absolute());
 
-    std::filesystem::path option_path{doc[option].as<std::string>()};
+    std::filesystem::path option_path{doc[option_name].as<std::string>()};
 
     if (option_path.is_absolute())
         return;
 
-    option_path = relative_to_path / option_path.string();
+    option_path = relative_to_path / option_path;
     option_path = option_path.lexically_normal();
     option_path.make_preferred();
 
-    doc[option] = option_path.string();
+    doc[option_name] = option_path.string();
 }
 } // namespace
 
@@ -909,7 +902,7 @@ config load(const std::string &config_file, bool inherit,
         }
 
         // Store the parent path of the config_file to properly resolve
-        // the include files paths
+        // relative paths in config file
         if (has_key(doc, "__parent_path"))
             doc.remove("__parent_path");
         if (config_file == "-") {
@@ -918,11 +911,13 @@ config load(const std::string &config_file, bool inherit,
         }
         else {
             config_file_path =
-                std::filesystem::absolute(std::filesystem::path{config_file});
+                canonical(absolute(std::filesystem::path{config_file}));
             doc.force_insert(
                 "__parent_path", config_file_path.parent_path().string());
         }
 
+        LOG_DBG("Effective config file path is {}", config_file_path.string());
+
         //
         // If no relative_to path is specified in the config, make all paths
         // resolvable against the parent directory of the .clang-uml config
@@ -931,9 +926,11 @@ config load(const std::string &config_file, bool inherit,
         //
         if (!doc["relative_to"]) {
             bool paths_relative_to_config_file = true;
+
             if (doc["paths_relative_to_config_file"] &&
                 !doc["paths_relative_to_config_file"].as<bool>())
                 paths_relative_to_config_file = false;
+
             if (paths_relative_to_pwd && *paths_relative_to_pwd)
                 paths_relative_to_config_file = false;
 
@@ -950,7 +947,14 @@ config load(const std::string &config_file, bool inherit,
         //
         // Resolve common path-like config options relative to `relative_to`
         //
+        if (!doc["output_directory"]) {
+            doc["output_directory"] = ".";
+        }
         resolve_option_path(doc, "output_directory");
+
+        if (!doc["compilation_database_dir"]) {
+            doc["compilation_database_dir"] = ".";
+        }
         resolve_option_path(doc, "compilation_database_dir");
 
         // If the current directory is also a git repository,

tests/t00002/.clang-uml

@@ -1,14 +1,11 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00002_class:
     type: class
     title: Basic class diagram example
     glob:
-      - tests/t00002/t00002.cc
+      - t00002.cc
     comment_parser: clang
-    using_namespace:
+    using_namespace: clanguml::t00002
-      - clanguml::t00002
     include:
       namespaces:
         - clanguml::t00002

tests/t00003/.clang-uml

@@ -1,10 +1,8 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00003_class:
     type: class
     glob:
-      - tests/t00003/t00003.cc
+      - t00003.cc
     using_namespace: clanguml::t00003
     include:
       namespaces:

tests/t00004/.clang-uml

@@ -1,14 +1,9 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00004_class:
     type: class
     glob:
-      - tests/t00004/t00004.cc
+      - t00004.cc
-    using_namespace:
+    using_namespace: clanguml::t00004
-      - clanguml::t00004
-      - clanguml::t00004::A
-      - clanguml::t00004::A::AA
     include:
       namespaces:
         - clanguml::t00004

tests/t00005/.clang-uml

@@ -1,12 +1,9 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00005_class:
     type: class
     glob:
-      - tests/t00005/t00005.cc
+      - t00005.cc
-    using_namespace:
+    using_namespace: clanguml::t00005
-      - clanguml::t00005
     include:
       namespaces:
         - clanguml::t00005

tests/t00006/.clang-uml

@@ -1,12 +1,9 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00006_class:
     type: class
     glob:
-      - tests/t00006/t00006.cc
+      - t00006.cc
-    using_namespace:
+    using_namespace: clanguml::t00006
-      - clanguml::t00006
     include:
       namespaces:
         - clanguml::t00006

tests/t00007/.clang-uml

@@ -1,12 +1,9 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00007_class:
     type: class
     glob:
-      - tests/t00007/t00007.cc
+      - t00007.cc
-    using_namespace:
+    using_namespace: clanguml::t00007
-      - clanguml::t00007
     include:
       namespaces:
         - clanguml::t00007

tests/t00008/.clang-uml

@@ -1,12 +1,9 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00008_class:
     type: class
     glob:
-      - tests/t00008/t00008.cc
+      - t00008.cc
-    using_namespace:
+    using_namespace: clanguml::t00008
-      - clanguml::t00008
     include:
       namespaces:
         - clanguml::t00008

tests/t00009/.clang-uml

@@ -1,12 +1,9 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00009_class:
     type: class
     glob:
-      - tests/t00009/t00009.cc
+      - t00009.cc
-    using_namespace:
+    using_namespace: clanguml::t00009
-      - clanguml::t00009
     include:
       namespaces:
         - clanguml::t00009

tests/t00010/.clang-uml

@@ -1,12 +1,9 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00010_class:
     type: class
     glob:
-      - tests/t00010/t00010.cc
+      - t00010.cc
-    using_namespace:
+    using_namespace: clanguml::t00010
-      - clanguml::t00010
     include:
       namespaces:
         - clanguml::t00010

tests/t00011/.clang-uml

@@ -1,12 +1,9 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00011_class:
     type: class
     glob:
-      - tests/t00011/t00011.cc
+      - t00011.cc
-    using_namespace:
+    using_namespace: clanguml::t00011
-      - clanguml::t00011
     include:
       namespaces:
         - clanguml::t00011

tests/t00012/.clang-uml

@@ -1,12 +1,9 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00012_class:
     type: class
     glob:
-      - tests/t00012/t00012.cc
+      - t00012.cc
-    using_namespace:
+    using_namespace: clanguml::t00012
-      - clanguml::t00012
     include:
       namespaces:
         - clanguml::t00012

tests/t00013/.clang-uml

@@ -1,12 +1,9 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00013_class:
     type: class
     glob:
-      - tests/t00013/t00013.cc
+      - t00013.cc
-    using_namespace:
+    using_namespace: clanguml::t00013
-      - clanguml::t00013
     include:
       namespaces:
         - clanguml::t00013

tests/t00014/.clang-uml

@@ -1,13 +1,9 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00014_class:
     type: class
     glob:
-      - tests/t00014/t00014.cc
+      - t00014.cc
-#    relative_to: ../../..
+    using_namespace: clanguml::t00014
-    using_namespace:
-      - clanguml::t00014
     include:
       namespaces:
         - clanguml::t00014

tests/t00015/.clang-uml

@@ -1,12 +1,9 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00015_class:
     type: class
     glob:
-      - tests/t00015/t00015.cc
+      - t00015.cc
-    using_namespace:
+    using_namespace: clanguml::t00015
-      - clanguml::t00015
     include:
       namespaces:
         - clanguml::t00015

tests/t00016/.clang-uml

@@ -1,12 +1,9 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00016_class:
     type: class
     glob:
-      - tests/t00016/t00016.cc
+      - t00016.cc
-    using_namespace:
+    using_namespace: clanguml::t00016
-      - clanguml::t00016
     include:
       namespaces:
         - clanguml::t00016

tests/t00017/.clang-uml

@@ -1,13 +1,10 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00017_class:
     type: class
     include_relations_also_as_members: false
     glob:
-      - tests/t00017/t00017.cc
+      - t00017.cc
-    using_namespace:
+    using_namespace: clanguml::t00017
-      - clanguml::t00017
     include:
       namespaces:
         - clanguml::t00017

tests/t00018/.clang-uml

@@ -1,12 +1,9 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00018_class:
     type: class
     glob:
-      - tests/t00018/**.cc
+      - "*.cc"
-    using_namespace:
+    using_namespace: clanguml::t00018
-      - clanguml::t00018
     include:
       namespaces:
         - clanguml::t00018

tests/t00019/.clang-uml

@@ -1,13 +1,10 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00019_class:
     type: class
     glob:
-      - tests/t00019/**.cc
+      - "*.cc"
     generate_template_argument_dependencies: false
-    using_namespace:
+    using_namespace: clanguml::t00019
-      - clanguml::t00019
     include:
       namespaces:
         - clanguml::t00019

tests/t00020/.clang-uml

@@ -1,12 +1,9 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00020_class:
     type: class
     glob:
-      - tests/t00020/t00020.cc
+      - t00020.cc
-    using_namespace:
+    using_namespace: clanguml::t00020
-      - clanguml::t00020
     include:
       namespaces:
         - clanguml::t00020

tests/t00021/.clang-uml

@@ -1,12 +1,9 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00021_class:
     type: class
     glob:
-      - tests/t00021/t00021.cc
+      - t00021.cc
-    using_namespace:
+    using_namespace: clanguml::t00021
-      - clanguml::t00021
     include:
       namespaces:
         - clanguml::t00021

tests/t00022/.clang-uml

@@ -1,12 +1,9 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00022_class:
     type: class
     glob:
-      - tests/t00022/t00022.cc
+      - t00022.cc
-    using_namespace:
+    using_namespace: clanguml::t00022
-      - clanguml::t00022
     include:
       namespaces:
         - clanguml::t00022

tests/t00023/.clang-uml

@@ -1,12 +1,9 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00023_class:
     type: class
     glob:
-      - tests/t00023/t00023.cc
+      - t00023.cc
-    using_namespace:
+    using_namespace: clanguml::t00023
-      - clanguml::t00023
     include:
       namespaces:
         - clanguml::t00023

tests/t00024/.clang-uml

@@ -1,12 +1,9 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00024_class:
     type: class
     glob:
-      - tests/t00024/t00024.cc
+      - t00024.cc
-    using_namespace:
+    using_namespace: clanguml::t00024
-      - clanguml::t00024
     include:
       namespaces:
         - clanguml::t00024

tests/t00025/.clang-uml

@@ -1,12 +1,9 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00025_class:
     type: class
     glob:
-      - tests/t00025/t00025.cc
+      - /t00025.cc
-    using_namespace:
+    using_namespace: clanguml::t00025
-      - clanguml::t00025
     include:
       namespaces:
         - clanguml::t00025

tests/t00026/.clang-uml

@@ -1,12 +1,9 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00026_class:
     type: class
     glob:
-      - tests/t00026/t00026.cc
+      - t00026.cc
-    using_namespace:
+    using_namespace: clanguml::t00026
-      - clanguml::t00026
     include:
       namespaces:
         - clanguml::t00026

tests/t00027/.clang-uml

@@ -1,12 +1,9 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00027_class:
     type: class
     glob:
-      - tests/t00027/t00027.cc
+      - t00027.cc
-    using_namespace:
+    using_namespace: clanguml::t00027
-      - clanguml::t00027
     include:
       namespaces:
         - clanguml::t00027

tests/t00028/.clang-uml

@@ -1,12 +1,9 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00028_class:
     type: class
     glob:
-      - tests/t00028/t00028.cc
+      - t00028.cc
-    using_namespace:
+    using_namespace: clanguml::t00028
-      - clanguml::t00028
     include:
       namespaces:
         - clanguml::t00028

tests/t00029/.clang-uml

@@ -1,12 +1,9 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00029_class:
     type: class
     glob:
-      - tests/t00029/t00029.cc
+      - t00029.cc
-    using_namespace:
+    using_namespace: clanguml::t00029
-      - clanguml::t00029
     include:
       namespaces:
         - clanguml::t00029

tests/t00030/.clang-uml

@@ -1,12 +1,9 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00030_class:
     type: class
     glob:
-      - tests/t00030/t00030.cc
+      - t00030.cc
-    using_namespace:
+    using_namespace: clanguml::t00030
-      - clanguml::t00030
     include:
       namespaces:
         - clanguml::t00030

tests/t00031/.clang-uml

@@ -1,13 +1,10 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00031_class:
     type: class
     glob:
-      - tests/t00031/t00031.cc
+      - t00031.cc
     skip_redundant_dependencies: false
-    using_namespace:
+    using_namespace: clanguml::t00031
-      - clanguml::t00031
     include:
       namespaces:
         - clanguml::t00031

tests/t00032/.clang-uml

@@ -1,12 +1,9 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00032_class:
     type: class
     glob:
-      - tests/t00032/t00032.cc
+      - t00032.cc
-    using_namespace:
+    using_namespace: clanguml::t00032
-      - clanguml::t00032
     include:
       namespaces:
         - clanguml::t00032

tests/t00033/.clang-uml

@@ -1,12 +1,9 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00033_class:
     type: class
     glob:
-      - tests/t00033/t00033.cc
+      - t00033.cc
-    using_namespace:
+    using_namespace: clanguml::t00033
-      - clanguml::t00033
     include:
       namespaces:
         - clanguml::t00033

tests/t00034/.clang-uml

@@ -1,12 +1,9 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00034_class:
     type: class
     glob:
-      - tests/t00034/t00034.cc
+      - t00034.cc
-    using_namespace:
+    using_namespace: clanguml::t00034
-      - clanguml::t00034
     include:
       namespaces:
         - clanguml::t00034

tests/t00035/.clang-uml

@@ -1,12 +1,9 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00035_class:
     type: class
     glob:
-      - tests/t00035/t00035.cc
+      - t00035.cc
-    using_namespace:
+    using_namespace: clanguml::t00035
-      - clanguml::t00035
     include:
       namespaces:
         - clanguml::t00035

tests/t00036/.clang-uml

@@ -1,13 +1,10 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00036_class:
     type: class
     generate_packages: true
     glob:
-      - tests/t00036/t00036.cc
+      - t00036.cc
-    using_namespace:
+    using_namespace: clanguml::t00036
-      - clanguml::t00036
     include:
       namespaces:
         - clanguml::t00036

tests/t00037/.clang-uml

@@ -1,13 +1,10 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00037_class:
     type: class
     generate_packages: true
     glob:
-      - tests/t00037/t00037.cc
+      - t00037.cc
-    using_namespace:
+    using_namespace: clanguml::t00037
-      - clanguml::t00037
     include:
       namespaces:
         - clanguml::t00037

tests/t00038/.clang-uml

@@ -1,13 +1,10 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00038_class:
     type: class
     generate_packages: false
     glob:
-      - tests/t00038/t00038.cc
+      - t00038.cc
-    using_namespace:
+    using_namespace: clanguml::t00038
-      - clanguml::t00038
     include:
       namespaces:
         - clanguml::t00038

tests/t00039/.clang-uml

@@ -1,13 +1,10 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00039_class:
     type: class
     generate_packages: false
     glob:
-      - tests/t00039/t00039.cc
+      - t00039.cc
-    using_namespace:
+    using_namespace: clanguml::t00039
-      - clanguml::t00039
     include:
       subclasses:
         - clanguml::t00039::A

tests/t00040/.clang-uml

@@ -1,13 +1,10 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00040_class:
     type: class
     generate_packages: false
     glob:
-      - tests/t00040/t00040.cc
+      - t00040.cc
-    using_namespace:
+    using_namespace: clanguml::t00040
-      - clanguml::t00040
     include:
       namespaces:
         - clanguml::t00040

tests/t00041/.clang-uml

@@ -1,13 +1,10 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00041_class:
     type: class
     generate_packages: false
     glob:
-      - tests/t00041/t00041.cc
+      - t00041.cc
-    using_namespace:
+    using_namespace: clanguml::t00041
-      - clanguml::t00041
     include:
       namespaces:
         - clanguml::t00041

tests/t00042/.clang-uml

@@ -1,13 +1,10 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00042_class:
     type: class
     generate_packages: false
     glob:
-      - tests/t00042/t00042.cc
+      - t00042.cc
-    using_namespace:
+    using_namespace: clanguml::t00042
-      - clanguml::t00042
     include:
       specializations:
         - clanguml::t00042::A<T>

tests/t00043/.clang-uml

@@ -1,13 +1,10 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00043_class:
     type: class
     generate_packages: true
     glob:
-      - tests/t00043/t00043.cc
+      - t00043.cc
-    using_namespace:
+    using_namespace: clanguml::t00043
-      - clanguml::t00043
     include:
       dependants:
         - clanguml::t00043::dependants::A

tests/t00044/.clang-uml

@@ -1,13 +1,10 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00044_class:
     type: class
     generate_packages: true
     glob:
-      - tests/t00044/t00044.cc
+      - t00044.cc
-    using_namespace:
+    using_namespace: clanguml::t00044
-      - clanguml::t00044
     include:
       namespaces:
         - clanguml::t00044

tests/t00045/.clang-uml

@@ -1,10 +1,8 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00045_class:
     type: class
     glob:
-      - tests/t00045/t00045.cc
+      - t00045.cc
     exclude:
       namespaces:
         - std

tests/t00046/.clang-uml

@@ -1,11 +1,9 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00046_class:
     type: class
     generate_packages: true
     glob:
-      - tests/t00046/t00046.cc
+      - t00046.cc
     exclude:
       namespaces:
         - std

tests/t00047/.clang-uml

@@ -1,10 +1,8 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00047_class:
     type: class
     glob:
-      - tests/t00047/t00047.cc
+      - t00047.cc
     using_namespace: clanguml::t00047
     include:
       namespaces:

tests/t00048/.clang-uml

@@ -1,12 +1,10 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00048_class:
     type: class
     glob:
-      - tests/t00048/b_t00048.cc
+      - b_t00048.cc
-      - tests/t00048/a_t00048.cc
+      - a_t00048.cc
-      - tests/t00048/t00048.cc
+      - t00048.cc
     using_namespace: clanguml::t00048
     include:
       namespaces:

tests/t00049/.clang-uml

@@ -1,5 +1,3 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00049_class:
     type: class
@@ -11,7 +9,7 @@ diagrams:
       "std::vector<thestring>": string_vector
       "std::map<int,int>": intmap
     glob:
-      - tests/t00049/t00049.cc
+      - t00049.cc
     include:
       namespaces:
         - clanguml::t00049

tests/t00050/.clang-uml

@@ -1,10 +1,8 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00050_class:
     type: class
     glob:
-      - tests/t00050/t00050.cc
+      - t00050.cc
     comment_parser: clang
     include:
       namespaces:

tests/t00051/.clang-uml

@@ -1,12 +1,9 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00051_class:
     type: class
     glob:
-      - tests/t00051/t00051.cc
+      - t00051.cc
     include:
       namespaces:
         - clanguml::t00051
-    using_namespace:
+    using_namespace: clanguml::t00051
-      - clanguml::t00051

tests/t00051/test_case.h

@@ -44,15 +44,14 @@ TEST_CASE("t00051", "[test-case][class]")
             (IsMethod<Public>("custom_thread1<Function,Args...>", "void",
                 "Function && f, Args &&... args")));
         REQUIRE_THAT(src,
-            (IsMethod<Public>("thread", "void",
+            (IsMethod<Public>(
-                "(lambda at tests/t00051/t00051.cc:59:27) &&")));
+                "thread", "void", "(lambda at t00051.cc:59:27) &&")));
         REQUIRE_THAT(src,
             (IsMethod<Private>("start_thread3",
-                "B<(lambda at tests/t00051/t00051.cc:43:18),(lambda at "
+                "B<(lambda at t00051.cc:43:18),(lambda at "
-                "tests/t00051/t00051.cc:43:27)>")));
+                "t00051.cc:43:27)>")));
         REQUIRE_THAT(src,
-            (IsMethod<Private>(
+            (IsMethod<Private>("get_function", "(lambda at t00051.cc:48:16)")));
-                "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 +59,17 @@ TEST_CASE("t00051", "[test-case][class]")
 
         REQUIRE_THAT(src,
             IsClassTemplate("B",
-                "(lambda at tests/t00051/t00051.cc:43:18),(lambda at "
+                "(lambda at t00051.cc:43:18),(lambda at t00051.cc:43:27)"));
-                "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 "
+                _A("B<(lambda at t00051.cc:43:18),(lambda at "
-                   "at tests/t00051/t00051.cc:43:27)>")));
+                   "t00051.cc:43:27)>")));
 
         REQUIRE_THAT(src,
             IsDependency(_A("A"),
-                _A("B<(lambda at tests/t00051/t00051.cc:43:18),(lambda "
+                _A("B<(lambda at t00051.cc:43:18),(lambda "
-                   "at tests/t00051/t00051.cc:43:27)>")));
+                   "at t00051.cc:43:27)>")));
 
         save_puml(config.output_directory(), diagram->name + ".puml", src);
     }
@@ -102,33 +100,31 @@ TEST_CASE("t00051", "[test-case][class]")
             (IsMethod<Public>("custom_thread1<Function,Args...>", "void",
                 "Function && f, Args &&... args")));
         REQUIRE_THAT(src,
-            (IsMethod<Public>("thread", "void",
+            (IsMethod<Public>(
-                "(lambda at tests/t00051/t00051.cc:59:27) &&")));
+                "thread", "void", "(lambda at t00051.cc:59:27) &&")));
         REQUIRE_THAT(src,
             (IsMethod<Private>("start_thread3",
-                "B<(lambda at tests/t00051/t00051.cc:43:18),(lambda at "
+                "B<(lambda at t00051.cc:43:18),(lambda at t00051.cc:43:27)>")));
-                "tests/t00051/t00051.cc:43:27)>")));
         REQUIRE_THAT(src,
-            (IsMethod<Private>(
+            (IsMethod<Private>("get_function", "(lambda at t00051.cc:48:16)")));
-                "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 "
+            IsClass(_A("B<(lambda at t00051.cc:43:18),(lambda at "
-                       "tests/t00051/t00051.cc:43:27)>")));
+                       "t00051.cc:43:27)>")));
 
         REQUIRE_THAT(src,
             IsInstantiation(_A("B<F,FF=F>"),
-                _A("B<(lambda at tests/t00051/t00051.cc:43:18),(lambda "
+                _A("B<(lambda at t00051.cc:43:18),(lambda at "
-                   "at tests/t00051/t00051.cc:43:27)>")));
+                   "t00051.cc:43:27)>")));
 
         REQUIRE_THAT(src,
             IsDependency(_A("A"),
-                _A("B<(lambda at tests/t00051/t00051.cc:43:18),(lambda "
+                _A("B<(lambda at t00051.cc:43:18),(lambda "
-                   "at tests/t00051/t00051.cc:43:27)>")));
+                   "at t00051.cc:43:27)>")));
 
         save_mermaid(config.output_directory(), diagram->name + ".mmd", src);
     }

tests/t00052/.clang-uml

@@ -1,12 +1,9 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00052_class:
     type: class
     glob:
-      - tests/t00052/t00052.cc
+      - t00052.cc
     include:
       namespaces:
         - clanguml::t00052
-    using_namespace:
+    using_namespace: clanguml::t00052
-      - clanguml::t00052

tests/t00053/.clang-uml

@@ -1,15 +1,12 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00053_class:
     type: class
     glob:
-      - tests/t00053/t00053.cc
+      - t00053.cc
     include:
       namespaces:
         - clanguml::t00053
-    using_namespace:
+    using_namespace: clanguml::t00053
-      - clanguml::t00053
     layout:
       a:
         - together: [c,e,f]

tests/t00054/.clang-uml

@@ -1,15 +1,12 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00054_class:
     type: class
     glob:
-      - tests/t00054/t00054.cc
+      - t00054.cc
     include:
       namespaces:
         - clanguml::t00054
-    using_namespace:
+    using_namespace: clanguml::t00054
-      - clanguml::t00054
     generate_packages: true
     layout:
       a:

tests/t00055/.clang-uml

@@ -1,15 +1,12 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00055_class:
     type: class
     glob:
-      - tests/t00055/t00055.cc
+      - t00055.cc
     include:
       namespaces:
         - clanguml::t00055
-    using_namespace:
+    using_namespace: clanguml::t00055
-      - clanguml::t00055
     layout:
       A:
         - row: [C, E, G, I]

tests/t00056/.clang-uml

@@ -1,12 +1,9 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00056_class:
     type: class
     glob:
-      - tests/t00056/t00056.cc
+      - t00056.cc
     include:
       namespaces:
         - clanguml::t00056
-    using_namespace:
+    using_namespace: clanguml::t00056
-      - clanguml::t00056

tests/t00057/.clang-uml

@@ -1,8 +1,6 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00057_class:
     type: class
     glob:
-      - tests/t00057/t00057.c
+      - t00057.c
-      - tests/t00057/src/t00057_impl.c
+      - src/t00057_impl.c

tests/t00058/.clang-uml

@@ -1,15 +1,12 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00058_class:
     type: class
     glob:
-      - tests/t00058/t00058.cc
+      - t00058.cc
     include:
       namespaces:
         - clanguml::t00058
-    using_namespace:
+    using_namespace: clanguml::t00058
-      - clanguml::t00058
     plantuml:
       after:
         - '{{ alias("same_as_first_type<T,Args...>") }} ..> {{ alias("first_type<T,Args...>") }}'

tests/t00059/.clang-uml

@@ -1,12 +1,9 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00059_class:
     type: class
     glob:
-      - tests/t00059/t00059.cc
+      - t00059.cc
     include:
       namespaces:
         - clanguml::t00059
-    using_namespace:
+    using_namespace: clanguml::t00059
-      - clanguml::t00059

tests/t00060/.clang-uml

@@ -1,15 +1,12 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00060_class:
     type: class
     glob:
-      - tests/t00060/t00060.cc
+      - t00060.cc
     include:
       namespaces:
         - clanguml::t00060
       parents:
         - clanguml::t00060::D
         - clanguml::t00060::H<T,P>
-    using_namespace:
+    using_namespace: clanguml::t00060
-      - clanguml::t00060

tests/t00061/.clang-uml

@@ -1,9 +1,6 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00061_class:
     type: class
-    relative_to: ../../../tests/t00061
     glob:
       - t00061.cc
     include:
@@ -11,5 +8,4 @@ diagrams:
         - clanguml::t00061
       paths:
         - include/*_a.h
-    using_namespace:
+    using_namespace: clanguml::t00061
-      - clanguml::t00061

tests/t00062/.clang-uml

@@ -1,15 +1,12 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00062_class:
     type: class
     glob:
-      - tests/t00062/t00062.cc
+      - t00062.cc
     include:
       namespaces:
         - clanguml::t00062
-    using_namespace:
+    using_namespace: clanguml::t00062
-      - clanguml::t00062
     plantuml:
       before:
         - left to right direction

tests/t00063/.clang-uml

@@ -1,15 +1,12 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00063_class:
     type: class
     glob:
-      - tests/t00063/t00063.cc
+      - t00063.cc
     include:
       namespaces:
         - clanguml::t00063
     exclude:
       element_types:
         - enum
-    using_namespace:
+    using_namespace: clanguml::t00063
-      - clanguml::t00063

tests/t00064/.clang-uml

@@ -1,15 +1,12 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00064_class:
     type: class
     glob:
-      - tests/t00064/t00064.cc
+      - t00064.cc
     include:
       namespaces:
         - clanguml::t00064
-    using_namespace:
+    using_namespace: clanguml::t00064
-      - clanguml::t00064
     plantuml:
       before:
         - left to right direction

tests/t00065/.clang-uml

@@ -1,15 +1,11 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00065_class:
     type: class
     glob:
       - t00065.cc
-    relative_to: ../../../tests/t00065
     generate_packages: true
     package_type: directory
     include:
       namespaces:
         - clanguml::t00065
-    using_namespace:
+    using_namespace: clanguml::t00065
-      - clanguml::t00065

tests/t00066/.clang-uml

@@ -1,14 +1,11 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00066_class:
     type: class
     glob:
-      - tests/t00066/t00066.cc
+      - t00066.cc
     include:
       namespaces:
         - clanguml::t00066
     member_order: as_is
     group_methods: false
-    using_namespace:
+    using_namespace: clanguml::t00066
-      - clanguml::t00066

tests/t00067/.clang-uml

@@ -1,10 +1,8 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00067_class:
     type: class
     glob:
-      - tests/t00067/t00067.cc
+      - t00067.cc
     include:
       namespaces:
         - clanguml::t00067
@@ -15,5 +13,4 @@ diagrams:
         - operator
         - assignment
         - static
-    using_namespace:
+    using_namespace: clanguml::t00067
-      - clanguml::t00067

tests/t00068/.clang-uml

@@ -1,11 +1,9 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t00068_r0_class:
     type: class
     title: AAA context of radius 0
     glob:
-      - tests/t00068/t00068.cc
+      - t00068.cc
     include:
       namespaces:
         - clanguml::t00068
@@ -13,13 +11,12 @@ diagrams:
         - match:
             radius: 0
             pattern: clanguml::t00068::AAA
-    using_namespace:
+    using_namespace: clanguml::t00068
-      - clanguml::t00068
   t00068_r1_class:
     type: class
     title: AAA context of radius 1
     glob:
-      - tests/t00068/t00068.cc
+      - t00068.cc
     include:
       namespaces:
         - clanguml::t00068
@@ -27,13 +24,12 @@ diagrams:
         - match:
             radius: 1
             pattern: clanguml::t00068::AAA
-    using_namespace:
+    using_namespace: clanguml::t00068
-      - clanguml::t00068
   t00068_r2_class:
     type: class
     title: AAA context of radius 2
     glob:
-      - tests/t00068/t00068.cc
+      - t00068.cc
     include:
       namespaces:
         - clanguml::t00068
@@ -41,5 +37,4 @@ diagrams:
         - match:
             radius: 2
             pattern: clanguml::t00068::AAA
-    using_namespace:
+    using_namespace: clanguml::t00068
-      - clanguml::t00068

tests/t20001/.clang-uml

@@ -1,5 +1,3 @@
-compilation_database_dir: ..
-output_directory: diagrams
 add_compile_flags:
   - -fparse-all-comments
 diagrams:
@@ -7,15 +5,14 @@ diagrams:
     type: sequence
     title: Basic sequence diagram example
     glob:
-      - tests/t20001/t20001.cc
+      - t20001.cc
     include:
       namespaces:
         - clanguml::t20001
     exclude:
       namespaces:
         - clanguml::t20001::detail
-    using_namespace:
+    using_namespace: clanguml::t20001
-      - clanguml::t20001
     from:
       - function: "clanguml::t20001::tmain()"
     plantuml:

tests/t20002/.clang-uml

@@ -1,14 +1,11 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t20002_sequence:
     type: sequence
     glob:
-      - tests/t20002/t20002.cc
+      - t20002.cc
     include:
       namespaces:
         - clanguml::t20002
-    using_namespace:
+    using_namespace: clanguml::t20002
-      - clanguml::t20002
     from:
       - function: "clanguml::t20002::m1()"

tests/t20003/.clang-uml

@@ -1,14 +1,11 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t20003_sequence:
     type: sequence
     glob:
-      - tests/t20003/t20003.cc
+      - t20003.cc
     include:
       namespaces:
         - clanguml::t20003
-    using_namespace:
+    using_namespace: clanguml::t20003
-      - clanguml::t20003
     from:
       - function: "clanguml::t20003::m1<T>(T)"

tests/t20004/.clang-uml

@@ -1,14 +1,11 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t20004_sequence:
     type: sequence
     glob:
-      - tests/t20004/t20004.cc
+      - t20004.cc
     include:
       namespaces:
         - clanguml::t20004
-    using_namespace:
+    using_namespace: clanguml::t20004
-      - clanguml::t20004
     from:
       - function: "clanguml::t20004::main()"

tests/t20005/.clang-uml

@@ -1,14 +1,11 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t20005_sequence:
     type: sequence
     glob:
-      - tests/t20005/t20005.cc
+      - t20005.cc
     include:
       namespaces:
         - clanguml::t20005
-    using_namespace:
+    using_namespace: clanguml::t20005
-      - clanguml::t20005
     from:
       - function: "clanguml::t20005::C<T>::c(T)"

tests/t20006/.clang-uml

@@ -1,14 +1,11 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t20006_sequence:
     type: sequence
     glob:
-      - tests/t20006/t20006.cc
+      - t20006.cc
     include:
       namespaces:
         - clanguml::t20006
-    using_namespace:
+    using_namespace: clanguml::t20006
-      - clanguml::t20006
     from:
       - function: "clanguml::t20006::tmain()"

tests/t20007/.clang-uml

@@ -1,14 +1,11 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t20007_sequence:
     type: sequence
     glob:
-      - tests/t20007/t20007.cc
+      - t20007.cc
     include:
       namespaces:
         - clanguml::t20007
-    using_namespace:
+    using_namespace: clanguml::t20007
-      - clanguml::t20007
     from:
       - function: "clanguml::t20007::tmain()"

tests/t20008/.clang-uml

@@ -1,14 +1,11 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t20008_sequence:
     type: sequence
     glob:
-      - tests/t20008/t20008.cc
+      - t20008.cc
     include:
       namespaces:
         - clanguml::t20008
-    using_namespace:
+    using_namespace: clanguml::t20008
-      - clanguml::t20008
     from:
       - function: "clanguml::t20008::tmain()"

tests/t20009/.clang-uml

@@ -1,14 +1,11 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t20009_sequence:
     type: sequence
     glob:
-      - tests/t20009/t20009.cc
+      - t20009.cc
     include:
       namespaces:
         - clanguml::t20009
-    using_namespace:
+    using_namespace: clanguml::t20009
-      - clanguml::t20009
     from:
       - function: "clanguml::t20009::tmain()"

tests/t20010/.clang-uml

@@ -1,14 +1,11 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t20010_sequence:
     type: sequence
     glob:
-      - tests/t20010/t20010.cc
+      - t20010.cc
     include:
       namespaces:
         - clanguml::t20010
-    using_namespace:
+    using_namespace: clanguml::t20010
-      - clanguml::t20010
     from:
       - function: "clanguml::t20010::tmain()"

tests/t20011/.clang-uml

@@ -1,14 +1,11 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t20011_sequence:
     type: sequence
     glob:
-      - tests/t20011/t20011.cc
+      - t20011.cc
     include:
       namespaces:
         - clanguml::t20011
-    using_namespace:
+    using_namespace: clanguml::t20011
-      - clanguml::t20011
     from:
       - function: "clanguml::t20011::tmain()"

tests/t20012/.clang-uml

@@ -1,14 +1,11 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t20012_sequence:
     type: sequence
     glob:
-      - tests/t20012/t20012.cc
+      - t20012.cc
     include:
       namespaces:
         - clanguml::t20012
-    using_namespace:
+    using_namespace: clanguml::t20012
-      - clanguml::t20012
     from:
       - function: "clanguml::t20012::tmain()"

tests/t20012/test_case.h

@@ -1,5 +1,5 @@
 /**
- * tests/t20012/test_case.h
+ * test_case.h
  *
  * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
  *
@@ -36,43 +36,35 @@ TEST_CASE("t20012", "[test-case][sequence]")
 
         // Check if all calls exist
         REQUIRE_THAT(src,
-            HasCall(_A("tmain()"),
+            HasCall(_A("tmain()"), _A("tmain()::(lambda 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 t20012.cc:67:20)"), _A("A"), "a()"));
-                _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 t20012.cc:67:20)"), _A("B"), "b()"));
-                _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 t20012.cc:80:20)"), _A("C"), "c()"));
-                _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)"),
+            HasCall(_A("tmain()::(lambda t20012.cc:80:20)"),
-                _A("tmain()::(lambda tests/t20012/t20012.cc:67:20)"),
+                _A("tmain()::(lambda t20012.cc:67:20)"), "operator()()"));
-                "operator()()"));
 
         REQUIRE_THAT(src, HasCall(_A("C"), _A("C"), "ccc()"));
 
         REQUIRE_THAT(src,
-            HasCall(_A("tmain()"),
+            HasCall(_A("tmain()"), _A("R<R::(lambda 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)>"),
+            HasCall(_A("R<R::(lambda t20012.cc:86:9)>"),
-                _A("tmain()::(lambda tests/t20012/t20012.cc:86:9)"),
+                _A("tmain()::(lambda t20012.cc:86:9)"), "operator()()"));
-                "operator()()"));
         REQUIRE_THAT(src,
-            HasCall(_A("tmain()::(lambda tests/t20012/t20012.cc:86:9)"),
+            HasCall(_A("tmain()::(lambda t20012.cc:86:9)"), _A("C"), "c()"));
-                _A("C"), "c()"));
 
         // @todo #168
         // REQUIRE_THAT(puml, HasCall(_A("tmain()"), _A("D"), "add5(int)"));
@@ -86,28 +78,20 @@ TEST_CASE("t20012", "[test-case][sequence]")
         using namespace json;
 
         std::vector<int> messages = {
-            FindMessage(j, "tmain()",
+            FindMessage(j, "tmain()", "tmain()::(lambda t20012.cc:67:20)",
-                "tmain()::(lambda tests/t20012/t20012.cc:67:20)",
                 "operator()()"),
-            FindMessage(j, "tmain()::(lambda tests/t20012/t20012.cc:67:20)",
+            FindMessage(j, "tmain()::(lambda t20012.cc:67:20)", "A", "a()"),
-                "A", "a()"),
             FindMessage(j, "A", "A", "aa()"), FindMessage(j, "A", "A", "aaa()"),
-            FindMessage(j, "tmain()::(lambda tests/t20012/t20012.cc:67:20)",
+            FindMessage(j, "tmain()::(lambda t20012.cc:67:20)", "B", "b()"),
-                "B", "b()"),
             FindMessage(j, "B", "B", "bb()"), FindMessage(j, "B", "B", "bbb()"),
-            FindMessage(j, "tmain()::(lambda tests/t20012/t20012.cc:80:20)",
+            FindMessage(j, "tmain()::(lambda t20012.cc:80:20)", "C", "c()"),
-                "C", "c()"),
             FindMessage(j, "C", "C", "cc()"), FindMessage(j, "C", "C", "ccc()"),
-            FindMessage(j, "tmain()::(lambda tests/t20012/t20012.cc:80:20)",
+            FindMessage(j, "tmain()::(lambda t20012.cc:80:20)",
-                "tmain()::(lambda tests/t20012/t20012.cc:67:20)",
+                "tmain()::(lambda t20012.cc:67:20)", "operator()()"),
-                "operator()()"),
+            FindMessage(j, "tmain()", "R<R::(lambda t20012.cc:86:9)>", "r()"),
-            FindMessage(j, "tmain()",
+            FindMessage(j, "R<R::(lambda t20012.cc:86:9)>",
-                "R<R::(lambda tests/t20012/t20012.cc:86:9)>", "r()"),
+                "tmain()::(lambda t20012.cc:86:9)", "operator()()"),
-            FindMessage(j, "R<R::(lambda tests/t20012/t20012.cc:86:9)>",
+            FindMessage(j, "tmain()::(lambda t20012.cc:86:9)", "C", "c()"),
-                "tmain()::(lambda tests/t20012/t20012.cc:86:9)",
-                "operator()()"),
-            FindMessage(
-                j, "tmain()::(lambda tests/t20012/t20012.cc:86:9)", "C", "c()"),
             // @todo #168
             // FindMessage(j, "tmain()", "D", "add5(int)")
         };
@@ -124,43 +108,35 @@ TEST_CASE("t20012", "[test-case][sequence]")
         using mermaid::HasCall;
 
         REQUIRE_THAT(src,
-            HasCall(_A("tmain()"),
+            HasCall(_A("tmain()"), _A("tmain()::(lambda 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 t20012.cc:67:20)"), _A("A"), "a()"));
-                _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 t20012.cc:67:20)"), _A("B"), "b()"));
-                _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 t20012.cc:80:20)"), _A("C"), "c()"));
-                _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)"),
+            HasCall(_A("tmain()::(lambda t20012.cc:80:20)"),
-                _A("tmain()::(lambda tests/t20012/t20012.cc:67:20)"),
+                _A("tmain()::(lambda t20012.cc:67:20)"), "operator()()"));
-                "operator()()"));
 
         REQUIRE_THAT(src, HasCall(_A("C"), _A("C"), "ccc()"));
 
         REQUIRE_THAT(src,
-            HasCall(_A("tmain()"),
+            HasCall(_A("tmain()"), _A("R<R::(lambda 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)>"),
+            HasCall(_A("R<R::(lambda t20012.cc:86:9)>"),
-                _A("tmain()::(lambda tests/t20012/t20012.cc:86:9)"),
+                _A("tmain()::(lambda t20012.cc:86:9)"), "operator()()"));
-                "operator()()"));
         REQUIRE_THAT(src,
-            HasCall(_A("tmain()::(lambda tests/t20012/t20012.cc:86:9)"),
+            HasCall(_A("tmain()::(lambda t20012.cc:86:9)"), _A("C"), "c()"));
-                _A("C"), "c()"));
 
         save_mermaid(config.output_directory(), diagram->name + ".mmd", src);
     }

tests/t20013/.clang-uml

@@ -1,14 +1,11 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t20013_sequence:
     type: sequence
     glob:
-      - tests/t20013/t20013.cc
+      - t20013.cc
     include:
       namespaces:
         - clanguml::t20013
-    using_namespace:
+    using_namespace: clanguml::t20013
-      - clanguml::t20013
     from:
       - function: "clanguml::t20013::tmain(int,char **)"

tests/t20014/.clang-uml

@@ -1,17 +1,14 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t20014_sequence:
     type: sequence
     glob:
-      - tests/t20014/t20014.cc
+      - t20014.cc
-      - tests/t20014/t20014_c.cc
+      - t20014_c.cc
-      - tests/t20014/t20014_b.cc
+      - t20014_b.cc
-      - tests/t20014/t20014_a.cc
+      - t20014_a.cc
     include:
       namespaces:
         - clanguml::t20014
-    using_namespace:
+    using_namespace: clanguml::t20014
-      - clanguml::t20014
     from:
       - function: "clanguml::t20014::tmain()"

tests/t20015/.clang-uml

@@ -1,17 +1,14 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t20015_sequence:
     type: sequence
     glob:
-      - tests/t20015/t20015.cc
+      - t20015.cc
     include:
       namespaces:
         - clanguml::t20015
     exclude:
       namespaces:
         - clanguml::t20015::detail
-    using_namespace:
+    using_namespace: clanguml::t20015
-      - clanguml::t20015
     from:
       - function: "clanguml::t20015::tmain()"

tests/t20016/.clang-uml

@@ -1,14 +1,11 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t20016_sequence:
     type: sequence
     glob:
-      - tests/t20016/t20016.cc
+      - t20016.cc
     include:
       namespaces:
         - clanguml::t20016
-    using_namespace:
+    using_namespace: clanguml::t20016
-      - clanguml::t20016
     from:
       - function: "clanguml::t20016::tmain()"

tests/t20017/.clang-uml

@@ -1,10 +1,7 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t20017_sequence:
     type: sequence
     combine_free_functions_into_file_participants: true
-    relative_to: ../../../tests/t20017
     glob:
       - t20017.cc
     include:

tests/t20018/.clang-uml

@@ -1,14 +1,11 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t20018_sequence:
     type: sequence
     glob:
-      - tests/t20018/t20018.cc
+      - t20018.cc
     include:
       namespaces:
         - clanguml::t20018
-    using_namespace:
+    using_namespace: clanguml::t20018
-      - clanguml::t20018
     from:
       - function: "clanguml::t20018::tmain()"

tests/t20019/.clang-uml

@@ -1,14 +1,11 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t20019_sequence:
     type: sequence
     glob:
-      - tests/t20019/t20019.cc
+      - t20019.cc
     include:
       namespaces:
         - clanguml::t20019
-    using_namespace:
+    using_namespace: clanguml::t20019
-      - clanguml::t20019
     from:
       - function: "clanguml::t20019::tmain()"

tests/t20020/.clang-uml

@@ -1,14 +1,11 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t20020_sequence:
     type: sequence
     glob:
-      - tests/t20020/t20020.cc
+      - t20020.cc
     include:
       namespaces:
         - clanguml::t20020
-    using_namespace:
+    using_namespace: clanguml::t20020
-      - clanguml::t20020
     from:
       - function: "clanguml::t20020::tmain()"

tests/t20021/.clang-uml

@@ -1,14 +1,11 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t20021_sequence:
     type: sequence
     glob:
-      - tests/t20021/t20021.cc
+      - t20021.cc
     include:
       namespaces:
         - clanguml::t20021
-    using_namespace:
+    using_namespace: clanguml::t20021
-      - clanguml::t20021
     from:
       - function: "clanguml::t20021::tmain()"

tests/t20022/.clang-uml

@@ -1,14 +1,11 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t20022_sequence:
     type: sequence
     glob:
-      - tests/t20022/t20022.cc
+      - t20022.cc
     include:
       namespaces:
         - clanguml::t20022
-    using_namespace:
+    using_namespace: clanguml::t20022
-      - clanguml::t20022
     from:
       - function: "clanguml::t20022::tmain()"

tests/t20023/.clang-uml

@@ -1,14 +1,11 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t20023_sequence:
     type: sequence
     glob:
-      - tests/t20023/t20023.cc
+      - t20023.cc
     include:
       namespaces:
         - clanguml::t20023
-    using_namespace:
+    using_namespace: clanguml::t20023
-      - clanguml::t20023
     start_from:
       - function: "clanguml::t20023::tmain()"

tests/t20024/.clang-uml

@@ -1,14 +1,11 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t20024_sequence:
     type: sequence
     glob:
-      - tests/t20024/t20024.cc
+      - t20024.cc
     include:
       namespaces:
         - clanguml::t20024
-    using_namespace:
+    using_namespace: clanguml::t20024
-      - clanguml::t20024
     from:
       - function: "clanguml::t20024::tmain()"

tests/t20025/.clang-uml

@@ -1,14 +1,11 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t20025_sequence:
     type: sequence
     glob:
-      - tests/t20025/t20025.cc
+      - t20025.cc
     include:
       namespaces:
         - clanguml::t20025
-    using_namespace:
+    using_namespace: clanguml::t20025
-      - clanguml::t20025
     from:
       - function: "clanguml::t20025::tmain()"

tests/t20026/.clang-uml

@@ -1,14 +1,11 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t20026_sequence:
     type: sequence
     glob:
-      - tests/t20026/t20026.cc
+      - t20026.cc
     include:
       namespaces:
         - clanguml::t20026
-    using_namespace:
+    using_namespace: clanguml::t20026
-      - clanguml::t20026
     from:
       - function: "clanguml::t20026::tmain()"

tests/t20027/.clang-uml

@@ -1,16 +1,13 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t20027_sequence:
     type: sequence
     glob:
-      - tests/t20027/t20027.cc
+      - t20027.cc
     include:
       namespaces:
         - clanguml::t20027
       access:
         - public
-    using_namespace:
+    using_namespace: clanguml::t20027
-      - clanguml::t20027
     from:
       - function: "clanguml::t20027::tmain()"

tests/t20028/.clang-uml

@@ -1,17 +1,14 @@
-compilation_database_dir: ..
-output_directory: diagrams
 diagrams:
   t20028_sequence:
     type: sequence
     glob:
-      - tests/t20028/t20028.cc
+      - t20028.cc
     include:
       namespaces:
         - clanguml::t20028
     exclude:
       namespaces:
         - clanguml::t20028::detail
-    using_namespace:
+    using_namespace: clanguml::t20028
-      - clanguml::t20028
     from:
       - function: "clanguml::t20028::tmain()"

tests/t20029/.clang-uml

@@ -1,20 +1,17 @@
-compilation_database_dir: ..
-output_directory: diagrams
 add_compile_flags:
   - -fparse-all-comments
 diagrams:
   t20029_sequence:
     type: sequence
     glob:
-      - tests/t20029/t20029.cc
+      - t20029.cc
     include:
       namespaces:
         - clanguml::t20029
     exclude:
       access:
         - private
-    using_namespace:
+    using_namespace: clanguml::t20029
-      - clanguml::t20029
     from:
       - function: clanguml::t20029::tmain()
     generate_message_comments: true