Refactored class, package and include diagram test cases (#266)

src/class_diagram/generators/json/class_diagram_generator.cc

@@ -247,18 +247,33 @@ void generator::generate(const package &p, nlohmann::json &parent) const
 void generator::generate(const class_ &c, nlohmann::json &parent) const
 {
     nlohmann::json object = c;
+
+    if (!config().generate_fully_qualified_name())
+        object["display_name"] =
+            common::generators::json::render_name(c.full_name_no_ns());
+
     parent["elements"].push_back(std::move(object));
 }
 
 void generator::generate(const enum_ &e, nlohmann::json &parent) const
 {
     nlohmann::json object = e;
+
+    if (!config().generate_fully_qualified_name())
+        object["display_name"] =
+            common::generators::json::render_name(e.full_name_no_ns());
+
     parent["elements"].push_back(std::move(object));
 }
 
 void generator::generate(const concept_ &c, nlohmann::json &parent) const
 {
     nlohmann::json object = c;
+
+    if (!config().generate_fully_qualified_name())
+        object["display_name"] =
+            common::generators::json::render_name(c.full_name_no_ns());
+
     parent["elements"].push_back(std::move(object));
 }
 

src/class_diagram/generators/mermaid/class_diagram_generator.cc

@@ -281,7 +281,8 @@ void generator::generate_member(
 
 void generator::generate(const concept_ &c, std::ostream &ostr) const
 {
-    ostr << indent(1) << "class" << " " << c.alias();
+    ostr << indent(1) << "class"
+         << " " << c.alias();
 
     ostr << " {" << '\n';
     ostr << indent(2) << "<<concept>>\n";
@@ -299,7 +300,8 @@ void generator::generate(const concept_ &c, std::ostream &ostr) const
              << fmt::format("\"({})\"\n", fmt::join(parameters, ","));
 
         for (const auto &req : c.requires_statements()) {
-            ostr << indent(2) << fmt::format("\"{}\"\n", render_name(req));
+            ostr << indent(2)
+                 << fmt::format("\"{}\"\n", render_name(req, false));
         }
     }
 

src/class_diagram/generators/plantuml/class_diagram_generator.cc

@@ -67,7 +67,7 @@ void generator::generate_alias(const class_ &c, std::ostream &ostr) const
         class_type = "abstract";
 
     std::string full_name;
-    if (config().generate_fully_qualified_name())
+    if (!config().generate_fully_qualified_name())
         full_name = c.full_name_no_ns();
     else
         full_name = c.full_name();
@@ -89,7 +89,7 @@ void generator::generate_alias(const enum_ &e, std::ostream &ostr) const
 {
     print_debug(e, ostr);
 
-    if (config().generate_fully_qualified_name())
+    if (!config().generate_fully_qualified_name())
         ostr << "enum"
              << " \"" << e.name();
     else
@@ -106,7 +106,7 @@ void generator::generate_alias(const concept_ &c, std::ostream &ostr) const
 {
     print_debug(c, ostr);
 
-    if (config().generate_fully_qualified_name())
+    if (!config().generate_fully_qualified_name())
         ostr << "class"
              << " \"" << c.full_name_no_ns();
     else

src/class_diagram/model/class_method.h

@@ -46,7 +46,7 @@ public:
 
     ~class_method() override = default;
 
-    void update(const common::model::namespace_& un);
+    void update(const common::model::namespace_ &un);
 
     /**
      * @brief Method name including template parameters/arguments if any