Added test case for recursive variadic template specialization

tests/t00012/test_case.h

@@ -34,12 +34,12 @@ TEST_CASE("t00012", "[test-case][class]")
     REQUIRE_THAT(puml, StartsWith("@startuml"));
     REQUIRE_THAT(puml, EndsWith("@enduml\n"));
     REQUIRE_THAT(puml, IsClassTemplate("A", "T,Ts..."));
-    REQUIRE_THAT(puml, IsClassTemplate("B", "int Is..."));
+    REQUIRE_THAT(puml, IsClassTemplate("B", "int... Is"));
 
-    REQUIRE_THAT(puml, IsInstantiation(_A("B<int Is...>"), _A("B<3,2,1>")));
-    REQUIRE_THAT(puml, IsInstantiation(_A("B<int Is...>"), _A("B<1,1,1,1>")));
+    REQUIRE_THAT(puml, IsInstantiation(_A("B<int... Is>"), _A("B<3,2,1>")));
+    REQUIRE_THAT(puml, IsInstantiation(_A("B<int... Is>"), _A("B<1,1,1,1>")));
     REQUIRE_THAT(puml,
-        IsInstantiation(_A("C<T,int Is...>"),
+        IsInstantiation(_A("C<T,int... Is>"),
             _A("C<std::map<int,"
                "std::vector<std::vector<std::vector<std::string>>>>,3,3,3>")));
 

tests/t00047/.clang-uml

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

tests/t00047/t00047.cc

@@ -0,0 +1,26 @@
+#include <type_traits>
+
+namespace clanguml {
+namespace t00047 {
+
+template <typename... Ts> struct conditional_t;
+
+template <typename Else> struct conditional_t<Else> {
+    using type = Else;
+};
+
+template <typename Result, typename... Tail>
+struct conditional_t<std::true_type, Result, Tail...> {
+    using type = Result;
+};
+
+template <typename Result, typename... Tail>
+struct conditional_t<std::false_type, Result, Tail...> {
+    using type = typename conditional_t<Tail...>::type;
+};
+
+template <typename... Ts>
+using conditional = typename conditional_t<Ts...>::type;
+
+}
+}

tests/t00047/test_case.h

@@ -0,0 +1,47 @@
+/**
+ * tests/t00047/test_case.h
+ *
+ * Copyright (c) 2021-2022 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("t00047", "[test-case][class]")
+{
+    auto [config, db] = load_config("t00047");
+
+    auto diagram = config.diagrams["t00047_class"];
+
+    REQUIRE(diagram->name == "t00047_class");
+
+    auto model = generate_class_diagram(*db, diagram);
+
+    REQUIRE(model->name() == "t00047_class");
+
+    auto puml = generate_class_puml(diagram, *model);
+    AliasMatcher _A(puml);
+
+    REQUIRE_THAT(puml, StartsWith("@startuml"));
+    REQUIRE_THAT(puml, EndsWith("@enduml\n"));
+
+    // Check if class templates exist
+    REQUIRE_THAT(puml, IsClassTemplate("conditional_t", "Ts..."));
+    REQUIRE_THAT(puml, IsClassTemplate("conditional_t", "Else"));
+    REQUIRE_THAT(puml,
+        IsClassTemplate("conditional_t", "std::true_type,Result,Tail..."));
+    REQUIRE_THAT(puml,
+        IsClassTemplate("conditional_t", "std::false_type,Result,Tail..."));
+
+    save_puml(
+        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+}

tests/test_cases.cc

@@ -235,6 +235,7 @@ using namespace clanguml::test::matchers;
 #include "t00044/test_case.h"
 #include "t00045/test_case.h"
 #include "t00046/test_case.h"
+#include "t00047/test_case.h"
 
 ////
 //// Sequence diagram tests

tests/test_cases.yaml

@@ -135,6 +135,9 @@ test_cases:
     - name: t00046
       title: Test case for root namespace handling with packages
       description:
+    - name: t00047
+      title: Test case for recursive variadic template
+      description:
   Sequence diagrams:
     - name: t20001
       title: Basic sequence diagram test case

tests/test_util.cc

@@ -135,4 +135,37 @@ TEST_CASE("Test parse_unexposed_template_params", "[unit-test]")
     CHECK(class2.template_params()[1].type() == "std::vector");
     CHECK(class2.template_params()[1].template_params()[0].type() ==
         "std::string");
+
+    const std::string empty_string = R"(
+            > {
+                using type = Result;
+            };)";
+
+    auto empty_template = parse_unexposed_template_params(
+        empty_string, [](const auto &n) { return n; });
+
+    CHECK(empty_template.size() == 0);
+
+    const std::string single_template_string = R"(Else> {
+            using type = Else;)";
+
+    auto single_template = parse_unexposed_template_params(
+        single_template_string, [](const auto &n) { return n; });
+
+    CHECK(single_template.size() == 1);
+    CHECK(single_template[0].type() == "Else");
+
+    const std::string declaration_string = R"(
+
+            std::true_type, Result, Tail> {
+                using type = Result;
+            };)";
+
+    auto declaration_template = parse_unexposed_template_params(
+        declaration_string, [](const auto &n) { return n; });
+
+    CHECK(declaration_template.size() == 3);
+    CHECK(declaration_template[0].type() == "std::true_type");
+    CHECK(declaration_template[1].type() == "Result");
+    CHECK(declaration_template[2].type() == "Tail");
 }