Added initial support for directory based packages in class diagrams

tests/t00061/.clang-uml

@@ -3,7 +3,7 @@ output_directory: puml
 diagrams:
   t00061_class:
     type: class
-    relative_to: ../../tests/t00061
+    relative_to: ../../../tests/t00061
     glob:
       - t00061.cc
     include:

tests/t00065/.clang-uml

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

tests/t00065/module1/module1.h

@@ -0,0 +1,11 @@
+#include "submodule1a/submodule1a.h"
+
+#pragma once
+
+namespace clanguml {
+namespace t00065 {
+struct A {
+    detail::AImpl *pimpl;
+};
+}
+}

tests/t00065/module1/submodule1a/submodule1a.h

@@ -0,0 +1,9 @@
+#pragma once
+
+namespace clanguml {
+namespace t00065 {
+namespace detail {
+struct AImpl { };
+}
+}
+}

tests/t00065/module2/module2.h

@@ -0,0 +1,7 @@
+#pragma once
+
+namespace clanguml {
+namespace t00065 {
+struct B { };
+}
+}

tests/t00065/t00065.cc

@@ -0,0 +1,10 @@
+#include "module1/module1.h"
+#include "module2/module2.h"
+
+namespace clanguml {
+namespace t00065 {
+struct R {
+    A *a;
+};
+}
+}

tests/t00065/test_case.h

@@ -0,0 +1,83 @@
+/**
+ * tests/t00065/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("t00065", "[test-case][class]")
+{
+    auto [config, db] = load_config("t00065");
+
+    auto diagram = config.diagrams["t00065_class"];
+
+    REQUIRE(diagram->name == "t00065_class");
+
+    auto model = generate_class_diagram(*db, diagram);
+
+    REQUIRE(model->name() == "t00065_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("AAA")));
+
+        // Check if class templates exist
+        // REQUIRE_THAT(puml, IsClassTemplate("A", "T,P,CMP,int N"));
+
+        // Check concepts
+        // REQUIRE_THAT(puml, IsConcept(_A("AConcept<T>")));
+        // REQUIRE_THAT(puml,
+        //    IsConceptRequirement(
+        //        _A("AConcept<T,P>"), "sizeof (T) > sizeof (P)"));
+
+        // Check if all enums exist
+        // REQUIRE_THAT(puml, IsEnum(_A("Lights")));
+
+        // Check if all inner classes exist
+        // REQUIRE_THAT(puml, IsInnerClass(_A("A"), _A("AA")));
+
+        // Check if all inheritance relationships exist
+        // REQUIRE_THAT(puml, IsBaseClass(_A("Base"), _A("Child")));
+
+        // Check if all methods exist
+        // REQUIRE_THAT(puml, (IsMethod<Public, Const>("foo")));
+
+        // Check if all fields exist
+        // REQUIRE_THAT(puml, (IsField<Private>("private_member", "int")));
+
+        // Check if all relationships exist
+        // REQUIRE_THAT(puml, IsAssociation(_A("D"), _A("A"), "-as"));
+        // REQUIRE_THAT(puml, IsDependency(_A("R"), _A("B")));
+        // REQUIRE_THAT(puml, IsAggregation(_A("R"), _A("D"), "-ag"));
+        // REQUIRE_THAT(puml, IsComposition(_A("R"), _A("D"), "-ac"));
+        // REQUIRE_THAT(puml, IsInstantiation(_A("ABCD::F<T>"), _A("F<int>")));
+
+        save_puml(
+            config.output_directory() + "/" + diagram->name + ".puml", puml);
+    }
+
+    {
+        auto j = generate_class_json(diagram, *model);
+
+        using namespace json;
+
+        save_json(config.output_directory() + "/" + diagram->name + ".json", j);
+    }
+}

tests/t20017/.clang-uml

@@ -4,9 +4,9 @@ diagrams:
   t20017_sequence:
     type: sequence
     combine_free_functions_into_file_participants: true
-    relative_to: ../../tests/t20017
+    relative_to: ../../../tests/t20017
     glob:
-      - ../../tests/t20017/t20017.cc
+      - t20017.cc
     include:
       namespaces:
         - clanguml::t20017

tests/test_cases.cc

@@ -301,6 +301,7 @@ using namespace clanguml::test::matchers;
 #include "t00062/test_case.h"
 #include "t00063/test_case.h"
 #include "t00064/test_case.h"
+#include "t00065/test_case.h"
 
 ///
 /// Sequence diagram tests