Added support for nested classes and enums

tests/CMakeLists.txt

@@ -9,6 +9,7 @@ set(CLANG_UML_TEST_CASES_SRC
     t00001/t00001.cc
     t00002/t00002.cc
     t00003/t00003.cc
+    t00004/t00004.cc
 )
 set(CLANG_UML_TEST_CASES_HEADER
     catch.h
@@ -27,5 +28,6 @@ target_link_libraries(test_cases
 configure_file(t00001/.clanguml t00001/.clanguml COPYONLY)
 configure_file(t00002/.clanguml t00002/.clanguml COPYONLY)
 configure_file(t00003/.clanguml t00003/.clanguml COPYONLY)
+configure_file(t00004/.clanguml t00004/.clanguml COPYONLY)
 
 add_test(NAME test_cases COMMAND test_cases)

tests/t00004/.clanguml

@@ -0,0 +1,17 @@
+compilation_database_dir: ..
+output_directory: puml
+diagrams:
+  t00004_class:
+    type: class
+    glob:
+      - ../../tests/t00004/t00004.cc
+    using_namespace:
+      - clanguml::t00004
+    include:
+      namespaces:
+        - clanguml::t00004
+    plantuml:
+      before:
+        - "' t00004 test class members"
+      after:
+        - 'note over "A": A class'

tests/t00004/t00004.cc

@@ -0,0 +1,17 @@
+namespace clanguml {
+namespace t00004 {
+
+class A {
+public:
+    class AA {
+    public:
+        enum class Lights { Green, Yellow, Red };
+
+        class AAA {
+        };
+    };
+
+    void foo() const {}
+};
+}
+}

tests/test_cases.cc

@@ -1,3 +1,20 @@
+/**
+ * tests/test_cases.cc
+ *
+ * Copyright (c) 2021 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.
+ */
 #define CATCH_CONFIG_MAIN
 
 #include "config/config.h"
@@ -204,7 +221,43 @@ TEST_CASE("Test t00003", "[unit-test]")
     REQUIRE_THAT(puml, Contains("-int a"));
     REQUIRE_THAT(puml, Contains("-int b"));
     REQUIRE_THAT(puml, Contains("-int c"));
-    REQUIRE_THAT(puml, Contains("{static} +int static_int"));
+
+    save_puml(
+        "./" + config.output_directory + "/" + diagram->name + ".puml", puml);
+}
+
+TEST_CASE("Test t00004", "[unit-test]")
+{
+    spdlog::set_level(spdlog::level::debug);
+
+    auto [config, db] = load_config("t00004");
+
+    auto diagram = config.diagrams["t00004_class"];
+
+    REQUIRE(diagram->name == "t00004_class");
+
+    REQUIRE(diagram->include.namespaces.size() == 1);
+    REQUIRE_THAT(diagram->include.namespaces,
+        VectorContains(std::string{"clanguml::t00004"}));
+
+    REQUIRE(diagram->exclude.namespaces.size() == 0);
+
+    REQUIRE(diagram->should_include("clanguml::t00004::A"));
+    REQUIRE(diagram->should_include("clanguml::t00004::A::AA"));
+    REQUIRE(diagram->should_include("clanguml::t00004::A:::AAA"));
+
+    auto model = generate_class_diagram(db, diagram);
+
+    REQUIRE(model.name == "t00004_class");
+
+    auto puml = generate_class_puml(diagram, model);
+
+    REQUIRE_THAT(puml, StartsWith("@startuml"));
+    REQUIRE_THAT(puml, EndsWith("@enduml\n"));
+    REQUIRE_THAT(puml, Contains("class A"));
+    REQUIRE_THAT(puml, Contains("A +-- A::AA"));
+    REQUIRE_THAT(puml, Contains("A::AA +-- A::AA::AAA"));
+    REQUIRE_THAT(puml, Contains("A::AA +-- A::AA::Lights"));
 
     save_puml(
         "./" + config.output_directory + "/" + diagram->name + ".puml", puml);