Added basic container-based relationship discovery

tests/t00002/test_case.h

@@ -54,6 +54,8 @@ TEST_CASE("Test t00002", "[unit-test]")
     REQUIRE_THAT(puml, IsMethod(Abstract(Public("foo_a"))));
     REQUIRE_THAT(puml, IsMethod(Abstract(Public("foo_c"))));
 
+    REQUIRE_THAT(puml, IsAssociation("D", "A", "as"));
+
     save_puml(
         "./" + config.output_directory + "/" + diagram->name + ".puml", puml);
 }

tests/t00006/.clanguml

@@ -0,0 +1,12 @@
+compilation_database_dir: ..
+output_directory: puml
+diagrams:
+  t00006_class:
+    type: class
+    glob:
+      - ../../tests/t00006/t00006.cc
+    using_namespace:
+      - clanguml::t00006
+    include:
+      namespaces:
+        - clanguml::t00006

tests/t00006/t00006.cc

@@ -0,0 +1,64 @@
+#include <map>
+#include <vector>
+
+namespace clanguml {
+namespace t00006 {
+class A {
+};
+
+class B {
+};
+
+class C {
+};
+
+class D {
+};
+
+class E {
+};
+
+class F {
+};
+
+class G {
+};
+
+class H {
+};
+
+class I {
+};
+
+class J {
+};
+
+class K {
+};
+
+template <typename T> class custom_container {
+public:
+    std::vector<T> data;
+};
+
+class R {
+public:
+    std::vector<A> a;
+    std::vector<B *> b;
+
+    std::map<int, C> c;
+    std::map<int, D *> d;
+
+    custom_container<E> e;
+
+    std::vector<std::vector<F>> f;
+    std::map<int, std::vector<G *>> g;
+
+    std::array<H, 10> h;
+    std::array<I *, 5> i;
+
+    J j[10];
+    K *k[20];
+};
+}
+}

tests/t00006/test_case.h

@@ -0,0 +1,76 @@
+/**
+ * tests/t00006/test_case.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.
+ */
+
+TEST_CASE("Test t00006", "[unit-test]")
+{
+    spdlog::set_level(spdlog::level::debug);
+
+    auto [config, db] = load_config("t00006");
+
+    auto diagram = config.diagrams["t00006_class"];
+
+    REQUIRE(diagram->name == "t00006_class");
+
+    REQUIRE(diagram->include.namespaces.size() == 1);
+    REQUIRE_THAT(diagram->include.namespaces,
+        VectorContains(std::string{"clanguml::t00006"}));
+
+    REQUIRE(diagram->exclude.namespaces.size() == 0);
+
+    REQUIRE(diagram->should_include("clanguml::t00006::A"));
+    REQUIRE(diagram->should_include("clanguml::t00006::B"));
+    REQUIRE(diagram->should_include("clanguml::t00006::C"));
+    REQUIRE(diagram->should_include("clanguml::t00006::D"));
+    REQUIRE(diagram->should_include("clanguml::t00006::E"));
+
+    auto model = generate_class_diagram(db, diagram);
+
+    REQUIRE(model.name == "t00006_class");
+
+    auto puml = generate_class_puml(diagram, model);
+
+    REQUIRE_THAT(puml, StartsWith("@startuml"));
+    REQUIRE_THAT(puml, EndsWith("@enduml\n"));
+    REQUIRE_THAT(puml, IsClass("A"));
+    REQUIRE_THAT(puml, IsClass("B"));
+    REQUIRE_THAT(puml, IsClass("C"));
+    REQUIRE_THAT(puml, IsClass("D"));
+    REQUIRE_THAT(puml, IsClass("E"));
+    REQUIRE_THAT(puml, IsClass("F"));
+    REQUIRE_THAT(puml, IsClass("G"));
+    REQUIRE_THAT(puml, IsClass("H"));
+    REQUIRE_THAT(puml, IsClass("I"));
+    REQUIRE_THAT(puml, IsClass("J"));
+    REQUIRE_THAT(puml, IsClass("K"));
+    REQUIRE_THAT(puml, IsClass("R"));
+
+    REQUIRE_THAT(puml, IsComposition("R", "A", "a"));
+    REQUIRE_THAT(puml, IsAssociation("R", "B", "b"));
+    REQUIRE_THAT(puml, IsComposition("R", "C", "c"));
+    REQUIRE_THAT(puml, IsAssociation("R", "D", "d"));
+    REQUIRE_THAT(puml, IsComposition("R", "E", "e"));
+    REQUIRE_THAT(puml, IsComposition("R", "F", "f"));
+    REQUIRE_THAT(puml, IsAssociation("R", "G", "g"));
+    REQUIRE_THAT(puml, IsComposition("R", "H", "h"));
+    REQUIRE_THAT(puml, IsAssociation("R", "I", "i"));
+    REQUIRE_THAT(puml, IsComposition("R", "J", "j"));
+    REQUIRE_THAT(puml, IsAssociation("R", "K", "k"));
+
+    save_puml(
+        "./" + config.output_directory + "/" + diagram->name + ".puml", puml);
+}

tests/test_cases.cc

@@ -114,3 +114,4 @@ using clanguml::test::matchers::Static;
 #include "t00003/test_case.h"
 #include "t00004/test_case.h"
 #include "t00005/test_case.h"
+#include "t00006/test_case.h"