Added style decorators

tests/t00029/test_case.h

@@ -45,7 +45,7 @@ TEST_CASE("t00029", "[test-case][class]")
     REQUIRE_THAT(puml, IsClass(_A("A")));
     REQUIRE_THAT(puml, !IsClass(_A("B")));
     REQUIRE_THAT(puml, IsClassTemplate("C", "T"));
-    REQUIRE_THAT(puml, IsClassTemplate("D", "T"));
+    REQUIRE_THAT(puml, !IsClassTemplate("D", "T"));
     REQUIRE_THAT(puml, IsEnum(_A("E")));
     REQUIRE_THAT(puml, !IsEnum(_A("F")));
     REQUIRE_THAT(puml, IsClass(_A("G1")));

tests/t00031/.clang-uml

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

tests/t00031/t00031.cc

@@ -0,0 +1,42 @@
+#include <memory>
+#include <vector>
+
+namespace clanguml {
+namespace t00031 {
+
+/// @uml{style[#back:lightgreen|yellow;header:blue/red]}
+class A {
+};
+
+/// @uml{style[#line.dotted:blue]}
+enum B {
+    one,
+    two,
+    three
+};
+
+/// @uml{style[#pink;line:red;line.bold;text:red]}
+template<typename T> class C {
+    T ttt;
+};
+
+class D {
+};
+
+struct R {
+    /// @uml{style[#red,dashed,thickness=2]}
+    A *aaa;
+
+    /// @uml{composition}
+    /// @uml{style[#green,dashed,thickness=4]}
+    std::vector<B> bbb;
+
+    /// @uml{style[#blue,dotted,thickness=8]}
+    C<int> ccc;
+
+    /// @uml{style[#blue,plain,thickness=16]}
+    D *ddd;
+};
+
+} // namespace t00031
+} // namespace clanguml

tests/t00031/test_case.h

@@ -0,0 +1,65 @@
+/**
+ * tests/t00031/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("t00031", "[test-case][class]")
+{
+    auto [config, db] = load_config("t00031");
+
+    auto diagram = config.diagrams["t00031_class"];
+
+    REQUIRE(diagram->name == "t00031_class");
+
+    REQUIRE(diagram->include.namespaces.size() == 1);
+    REQUIRE_THAT(diagram->include.namespaces,
+        VectorContains(std::string{"clanguml::t00031"}));
+
+    REQUIRE(diagram->exclude.namespaces.size() == 0);
+
+    REQUIRE(diagram->should_include("clanguml::t00031::A"));
+
+    auto model = generate_class_diagram(db, diagram);
+
+    REQUIRE(model.name == "t00031_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, IsEnum(_A("B")));
+    REQUIRE_THAT(puml, IsClassTemplate("C", "T"));
+    REQUIRE_THAT(puml, IsClass(_A("D")));
+
+    REQUIRE_THAT(puml,
+        IsAssociationWithStyle(
+            _A("R"), _A("A"), "+aaa", "#red,dashed,thickness=2"));
+    REQUIRE_THAT(puml,
+        IsCompositionWithStyle(
+            _A("R"), _A("B"), "+bbb", "#green,dashed,thickness=4"));
+    REQUIRE_THAT(puml,
+        IsAggregationWithStyle(
+            _A("R"), _A("C<int>"), "+ccc", "#blue,dotted,thickness=8"));
+    REQUIRE_THAT(puml,
+        IsAssociationWithStyle(
+            _A("R"), _A("D"), "+ddd", "#blue,plain,thickness=16"));
+
+    save_puml(
+        "./" + config.output_directory + "/" + diagram->name + ".puml", puml);
+}

tests/test_cases.cc

@@ -134,6 +134,7 @@ using namespace clanguml::test::matchers;
 #include "t00028/test_case.h"
 #include "t00029/test_case.h"
 #include "t00030/test_case.h"
+#include "t00031/test_case.h"
 
 //
 // Sequence diagram tests

tests/test_cases.h

@@ -283,6 +283,33 @@ ContainsMatcher IsAggregation(std::string const &from, std::string const &to,
         fmt::format(format_string, from, to, label), caseSensitivity));
 }
 
+ContainsMatcher IsAggregationWithStyle(std::string const &from,
+    std::string const &to, std::string const &label, std::string style,
+    CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes)
+{
+    return ContainsMatcher(
+        CasedString(fmt::format("{} o-[{}]- {} : {}", from, style, to, label),
+            caseSensitivity));
+}
+
+ContainsMatcher IsAssociationWithStyle(std::string const &from,
+    std::string const &to, std::string const &label, std::string style,
+    CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes)
+{
+    return ContainsMatcher(
+        CasedString(fmt::format("{} -[{}]-> {} : {}", from, style, to, label),
+            caseSensitivity));
+}
+
+ContainsMatcher IsCompositionWithStyle(std::string const &from,
+    std::string const &to, std::string const &label, std::string style,
+    CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes)
+{
+    return ContainsMatcher(
+        CasedString(fmt::format("{} *-[{}]- {} : {}", from, style, to, label),
+            caseSensitivity));
+}
+
 ContainsMatcher IsInstantiation(std::string const &from, std::string const &to,
     CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes)
 {