Added support for 'together' option in class diagrams with rendered namespaces

tests/t00054/.clang-uml

@@ -0,0 +1,24 @@
+compilation_database_dir: ..
+output_directory: puml
+diagrams:
+  t00054_class:
+    type: class
+    glob:
+      - ../../tests/t00054/t00054.cc
+    include:
+      namespaces:
+        - clanguml::t00054
+    using_namespace:
+      - clanguml::t00054
+    generate_packages: true
+    layout:
+      a:
+        - together: [f]
+      "detail::c":
+        - together: [detail::e]
+      A:
+        - together: [B,G]
+      "detail2::detail3::D":
+        - together: [detail2::detail3::E]
+      "detail4::h":
+        - together: [detail4::i,detail4::j]

tests/t00054/t00054.cc

@@ -0,0 +1,48 @@
+namespace clanguml {
+namespace t00054 {
+struct a {
+};
+struct b {
+};
+
+namespace detail {
+struct c {
+};
+struct d {
+};
+struct e {
+};
+} // namespace detail
+struct f {
+};
+struct g {
+};
+
+struct A {
+};
+struct B {
+};
+
+namespace detail2 {
+struct C {
+};
+namespace detail3 {
+struct D {
+};
+struct E {
+};
+} // namespace detail3
+struct F {
+};
+} // namespace detail2
+struct G {
+};
+
+namespace detail4 {
+enum class h { hhh };
+enum class i { iii };
+enum class j { jjj };
+} // namespace detail4
+
+}
+}

tests/t00054/test_case.h

@@ -0,0 +1,59 @@
+/**
+ * tests/t00054/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("t00054", "[test-case][class]")
+{
+    auto [config, db] = load_config("t00054");
+
+    auto diagram = config.diagrams["t00054_class"];
+
+    REQUIRE(diagram->name == "t00054_class");
+
+    auto model = generate_class_diagram(*db, diagram);
+
+    REQUIRE(model->name() == "t00054_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, IsClass(_A("b")));
+    REQUIRE_THAT(puml, IsClass(_A("c")));
+    REQUIRE_THAT(puml, IsClass(_A("d")));
+    REQUIRE_THAT(puml, IsClass(_A("e")));
+    REQUIRE_THAT(puml, IsClass(_A("f")));
+    REQUIRE_THAT(puml, IsClass(_A("g")));
+
+    REQUIRE_THAT(puml, IsClass(_A("A")));
+    REQUIRE_THAT(puml, IsClass(_A("B")));
+    REQUIRE_THAT(puml, IsClass(_A("C")));
+    REQUIRE_THAT(puml, IsClass(_A("D")));
+    REQUIRE_THAT(puml, IsClass(_A("E")));
+    REQUIRE_THAT(puml, IsClass(_A("F")));
+    REQUIRE_THAT(puml, IsClass(_A("G")));
+
+    REQUIRE_THAT(puml, IsEnum(_A("i")));
+    REQUIRE_THAT(puml, IsEnum(_A("h")));
+    REQUIRE_THAT(puml, IsEnum(_A("j")));
+
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
+}

tests/test_cases.cc

@@ -247,6 +247,7 @@ using namespace clanguml::test::matchers;
 #include "t00051/test_case.h"
 #include "t00052/test_case.h"
 #include "t00053/test_case.h"
+#include "t00054/test_case.h"
 
 ///
 /// Sequence diagram tests

tests/test_cases.yaml

@@ -154,7 +154,10 @@ test_cases:
       title: Test case for template methods rendering
       description:
     - name: t00053
-      title: Test case for `together` layout hint
+      title: Test case for `together` layout hint in class diagram
+      description:
+    - name: t00054
+      title: Test case for `together` layout hint in class diagram with rendered namespaces
       description:
   Sequence diagrams:
     - name: t20001