Added split namespace test case

src/common/model/decorated_element.cc

@@ -80,4 +80,11 @@ void decorated_element::add_decorators(
         decorators_.push_back(d);
     }
 }
+
+void decorated_element::append(const decorated_element &de)
+{
+    for (auto d : de.decorators()) {
+        decorators_.push_back(d);
+    }
+}
 }

src/common/model/decorated_element.h

@@ -43,6 +43,8 @@ public:
     void add_decorators(
         const std::vector<std::shared_ptr<decorators::decorator>> &decorators);
 
+    void append(const decorated_element &de);
+
 private:
     std::vector<std::shared_ptr<decorators::decorator>> decorators_;
 };

src/common/model/element.cc

@@ -64,4 +64,6 @@ const std::vector<relationship> &element::relationships() const
 {
     return relationships_;
 }
+
+void element::append(const element &e) { decorated_element::append(e); }
 }

src/common/model/element.h

@@ -52,6 +52,8 @@ public:
 
     void add_relationship(relationship &&cr);
 
+    void append(const element &e);
+
 protected:
     const uint64_t m_id{0};
 

src/package_diagram/model/package.h

@@ -37,9 +37,16 @@ class package_trait {
 public:
     void add_package(std::unique_ptr<T> p)
     {
-        if (!util::contains(packages_, p.get()))
+        auto it = std::find_if(packages_.begin(), packages_.end(),
+            [&p](const auto &e) { return *e == *p; });
+
+        if (it != packages_.end()) {
+            (*it)->append(*p);
+        }
+        else {
             packages_.emplace_back(std::move(p));
         }
+    }
 
     void add_package(std::vector<std::string> path, std::unique_ptr<T> p)
     {

tests/t30004/t30004.cc

@@ -26,6 +26,10 @@ namespace DDD {
 /// \uml{note[top] We skipped DDD.}
 namespace EEE {
 }
+
+/// \uml{note[top] Another CCC note.}
+namespace CCC {
+}
 }
 }
 }

tests/t30006/.clang-uml

@@ -0,0 +1,15 @@
+compilation_database_dir: ..
+output_directory: puml
+diagrams:
+  t30006_package:
+    type: package
+    glob:
+      - ../../tests/t30006/t30006.cc
+    include:
+      namespaces:
+        - clanguml::t30006
+    using_namespace:
+      - clanguml::t30006
+    plantuml:
+      before:
+        - "' t30006 test package diagram"

tests/t30006/t30006.cc

@@ -0,0 +1,29 @@
+namespace clanguml {
+namespace t30006 {
+
+namespace B {
+struct BB {
+};
+}
+
+/// \uml{note[top] Top A note.}
+namespace A {
+struct A1 {
+    B::BB *b;
+};
+}
+
+namespace C {
+struct CC {
+};
+}
+
+/// \uml{note[bottom] Bottom A note.}
+namespace A {
+struct A2 {
+    C::CC *c;
+};
+}
+
+}
+}

tests/t30006/test_case.h

@@ -0,0 +1,54 @@
+/**
+ * tests/t30006/test_case.cc
+ *
+ * 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("t30006", "[test-case][package]")
+{
+    auto [config, db] = load_config("t30006");
+
+    auto diagram = config.diagrams["t30006_package"];
+
+    REQUIRE(diagram->include.namespaces.size() == 1);
+    REQUIRE_THAT(diagram->include.namespaces,
+        VectorContains(std::string{"clanguml::t30006"}));
+
+    REQUIRE(diagram->should_include("clanguml::t30006::A"));
+    REQUIRE(diagram->should_include("clanguml::t30006::C"));
+    REQUIRE(!diagram->should_include("std::vector"));
+
+    REQUIRE(diagram->name == "t30006_package");
+
+    auto model = generate_package_diagram(db, diagram);
+
+    REQUIRE(model.name() == "t30006_package");
+
+    auto puml = generate_package_puml(diagram, model);
+    AliasMatcher _A(puml);
+
+    REQUIRE_THAT(puml, StartsWith("@startuml"));
+    REQUIRE_THAT(puml, EndsWith("@enduml\n"));
+
+    REQUIRE_THAT(puml, IsPackage("A"));
+    REQUIRE_THAT(puml, IsPackage("B"));
+    REQUIRE_THAT(puml, IsPackage("C"));
+
+    REQUIRE_THAT(puml, IsDependency(_A("A"), _A("B")));
+    REQUIRE_THAT(puml, IsDependency(_A("A"), _A("C")));
+
+    save_puml(
+        "./" + config.output_directory + "/" + diagram->name + ".puml", puml);
+}

tests/test_cases.cc

@@ -181,6 +181,7 @@ using namespace clanguml::test::matchers;
 #include "t30003/test_case.h"
 #include "t30004/test_case.h"
 #include "t30005/test_case.h"
+#include "t30006/test_case.h"
 
 //
 // Other tests (e.g. configuration file)