Fixed generation of lambda names in class diagrams (#78)

tests/t00051/.clang-uml

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

tests/t00051/t00051.cc

@@ -0,0 +1,63 @@
+#include <thread>
+
+namespace clanguml {
+namespace t00051 {
+
+template <typename F, typename FF = F> struct B : private std::thread {
+    B(F &&f, FF &&ff)
+        : f_{std::move(f)}
+        , ff_{std::move(ff)}
+    {
+    }
+
+    void f() { f_(); }
+    void ff() { ff_(); }
+
+    F f_;
+    FF ff_;
+};
+
+class A {
+public:
+private:
+    class custom_thread1 : private std::thread {
+    public:
+        template <class Function, class... Args>
+        explicit custom_thread1(Function &&f, Args &&...args)
+            : std::thread::thread(
+                  std::forward<Function>(f), std::forward<Args>(args)...)
+        {
+        }
+    };
+
+    static custom_thread1 start_thread1();
+
+    class custom_thread2 : private std::thread {
+        using std::thread::thread;
+    };
+
+    static custom_thread2 start_thread2();
+
+    auto start_thread3()
+    {
+        return B{[]() {}, []() {}};
+    }
+
+    auto get_function()
+    {
+        return []() {};
+    }
+};
+
+A::custom_thread1 A::start_thread1()
+{
+    return custom_thread1{[]() {}};
+}
+
+A::custom_thread2 A::start_thread2()
+{
+    return custom_thread2{[]() {}};
+}
+
+}
+}

tests/t00051/test_case.h

@@ -0,0 +1,57 @@
+/**
+ * tests/t00051/test_case.h
+ *
+ * Copyright (c) 2021-2023 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("t00051", "[test-case][class]")
+{
+    auto [config, db] = load_config("t00051");
+
+    auto diagram = config.diagrams["t00051_class"];
+
+    REQUIRE(diagram->name == "t00051_class");
+
+    auto model = generate_class_diagram(*db, diagram);
+
+    REQUIRE(model->name() == "t00051_class");
+
+    auto puml = generate_class_puml(diagram, *model);
+    AliasMatcher _A(puml);
+
+    REQUIRE_THAT(puml, StartsWith("@startuml"));
+    REQUIRE_THAT(puml, EndsWith("@enduml\n"));
+
+    // Check if all classes exist
+    REQUIRE_THAT(puml, IsClass(_A("A")));
+    REQUIRE_THAT(puml, IsInnerClass(_A("A"), _A("A::custom_thread1")));
+    REQUIRE_THAT(puml, IsInnerClass(_A("A"), _A("A::custom_thread2")));
+
+    REQUIRE_THAT(puml,
+        (IsMethod<Public>(
+            "custom_thread1", "void", "Function && f, Args &&... args")));
+    REQUIRE_THAT(puml,
+        (IsMethod<Public>("thread", "void",
+            "(lambda at ../../tests/t00051/t00051.cc:59:27) && ")));
+    REQUIRE_THAT(puml,
+        (IsMethod<Private>("start_thread3",
+            "B<(lambda at ../../tests/t00051/t00051.cc:43:18),(lambda at "
+            "../../tests/t00051/t00051.cc:43:27)>")));
+    REQUIRE_THAT(puml,
+        (IsMethod<Private>(
+            "get_function", "(lambda at ../../tests/t00051/t00051.cc:48:16)")));
+
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
+}

tests/test_cases.cc

@@ -244,6 +244,7 @@ using namespace clanguml::test::matchers;
 #include "t00048/test_case.h"
 #include "t00049/test_case.h"
 #include "t00050/test_case.h"
+#include "t00051/test_case.h"
 
 ///
 /// Sequence diagram tests

tests/test_cases.yaml

@@ -147,6 +147,9 @@ test_cases:
     - name: t00050
       title: Test case for generating notes from comments using jinja templates
       description:
+    - name: t00051
+      title: Test case for relative paths in lambda names
+      description:
   Sequence diagrams:
     - name: t20001
       title: Basic sequence diagram test case