Added include_relations_also_as_members flag

tests/t00017/.clanguml

@@ -0,0 +1,13 @@
+compilation_database_dir: ..
+output_directory: puml
+diagrams:
+  t00017_class:
+    type: class
+    include_relations_also_as_members: false
+    glob:
+      - ../../tests/t00017/t00017.cc
+    using_namespace:
+      - clanguml::t00017
+    include:
+      namespaces:
+        - clanguml::t00017

tests/t00017/t00017.cc

@@ -0,0 +1,55 @@
+namespace clanguml {
+namespace t00017 {
+class A {
+};
+
+class B {
+};
+
+class C {
+};
+
+class D {
+};
+
+class E {
+};
+
+class F {
+};
+
+class G {
+};
+
+class H {
+};
+
+class I {
+};
+
+class J {
+};
+
+class K {
+};
+
+class R {
+private:
+    int some_int;
+    int *some_int_pointer;
+    int **some_int_pointer_pointer;
+    int &some_int_reference;
+    A a;
+    B *b;
+    C &c;
+    const D *d;
+    const E &e{};
+    F &&f;
+    G **g;
+    H ***h;
+    I *&i;
+    volatile J *j;
+    mutable K *k;
+};
+}
+}

tests/t00017/test_case.h

@@ -0,0 +1,82 @@
+/**
+ * tests/t00017/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("t00017", "[test-case][class]")
+{
+    auto [config, db] = load_config("t00017");
+
+    auto diagram = config.diagrams["t00017_class"];
+
+    REQUIRE(diagram->name == "t00017_class");
+
+    REQUIRE(diagram->include.namespaces.size() == 1);
+    REQUIRE_THAT(diagram->include.namespaces,
+        VectorContains(std::string{"clanguml::t00017"}));
+
+    REQUIRE(diagram->exclude.namespaces.size() == 0);
+
+    REQUIRE(diagram->should_include("clanguml::t00017::A"));
+    REQUIRE(diagram->should_include("clanguml::t00017::B"));
+    REQUIRE(diagram->should_include("clanguml::t00017::C"));
+    REQUIRE(diagram->should_include("clanguml::t00017::D"));
+
+    auto model = generate_class_diagram(db, diagram);
+
+    REQUIRE(model.name == "t00017_class");
+
+    auto puml = generate_class_puml(diagram, model);
+    AliasMatcher _A(puml);
+
+    REQUIRE_THAT(puml, StartsWith("@startuml"));
+    REQUIRE_THAT(puml, EndsWith("@enduml\n"));
+    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("H")));
+    REQUIRE_THAT(puml, IsClass(_A("I")));
+    REQUIRE_THAT(puml, IsClass(_A("J")));
+    REQUIRE_THAT(puml, IsClass(_A("K")));
+    REQUIRE_THAT(puml, IsClass(_A("R")));
+
+    REQUIRE_THAT(puml, (IsField<Private>("some_int", "int")));
+    REQUIRE_THAT(puml, (IsField<Private>("some_int_pointer", "int*")));
+    REQUIRE_THAT(puml, (IsField<Private>("some_int_pointer_pointer", "int**")));
+
+    // Relationship members should not be rendered as part of this testcase
+    REQUIRE_THAT(puml, !(IsField<Private>("a", _A("A"))));
+    REQUIRE_THAT(puml, !(IsField<Private>("b", _A("B"))));
+
+    REQUIRE_THAT(puml, IsAggregation(_A("R"), _A("A"), "-a"));
+    REQUIRE_THAT(puml, IsAssociation(_A("R"), _A("B"), "-b"));
+    REQUIRE_THAT(puml, IsAssociation(_A("R"), _A("C"), "-c"));
+    REQUIRE_THAT(puml, IsAssociation(_A("R"), _A("D"), "-d"));
+    REQUIRE_THAT(puml, IsAssociation(_A("R"), _A("E"), "-e"));
+    REQUIRE_THAT(puml, IsAggregation(_A("R"), _A("F"), "-f"));
+    REQUIRE_THAT(puml, IsAssociation(_A("R"), _A("G"), "-g"));
+    REQUIRE_THAT(puml, IsAssociation(_A("R"), _A("H"), "-h"));
+    REQUIRE_THAT(puml, IsAssociation(_A("R"), _A("I"), "-i"));
+    REQUIRE_THAT(puml, IsAssociation(_A("R"), _A("J"), "-j"));
+    REQUIRE_THAT(puml, IsAssociation(_A("R"), _A("K"), "-k"));
+
+    save_puml(
+        "./" + config.output_directory + "/" + diagram->name + ".puml", puml);
+}

tests/test_cases.cc

@@ -120,6 +120,7 @@ using namespace clanguml::test::matchers;
 #include "t00014/test_case.h"
 #include "t00015/test_case.h"
 #include "t00016/test_case.h"
+#include "t00017/test_case.h"
 
 //
 // Sequence diagram tests

tests/test_cases.yaml

@@ -45,6 +45,9 @@ test_cases:
     - name: t00016
       title: Unnamed enums and empty templates
       description:
+    - name: t00017
+      title: Test include relations also as members flag
+      description:
   Sequence diagrams:
     - name: t20001
       title: Basic sequence diagram