Fixed test cases (#415)

Author: bkryza

src/class_diagram/model/class.cc

@@ -21,6 +21,7 @@
 #include "common/model/filters/diagram_filter.h"
 #include "util/util.h"
 
+#include <algorithm>
 #include <sstream>
 
 namespace clanguml::class_diagram::model {
@@ -118,4 +119,23 @@ std::optional<std::string> class_::doxygen_link() const
     util::replace_all(name, "##", "_1_1"); // nested classes
     return fmt::format("{}{}.html", type, name);
 }
+
+void class_::append(const class_ &other)
+{
+    // Add members from other only if they don't already exist in this
+    for (const auto &member : other.members()) {
+        auto it = std::find(members_.begin(), members_.end(), member);
+        if (it == members_.end()) {
+            members_.push_back(member);
+        }
+    }
+
+    // Add methods from other only if they don't already exist in this
+    for (const auto &method : other.methods()) {
+        auto it = std::find(methods_.begin(), methods_.end(), method);
+        if (it == methods_.end()) {
+            methods_.push_back(method);
+        }
+    }
+}
 } // namespace clanguml::class_diagram::model

src/class_diagram/model/class.h

@@ -143,6 +143,8 @@ class class_ : public common::model::template_element,
     void apply_filter(const common::model::diagram_filter &filter,
         const std::set<common::model::eid_t> &removed) override;
 
+    void append(const class_ &other);
+
 protected:
     /**
      * @brief Get class full name.

src/class_diagram/model/class_element.cc

@@ -47,4 +47,10 @@ void class_element::set_qualified_name(const std::string &qn)
 
 std::string class_element::qualified_name() const { return qualified_name_; }
 
+bool class_element::operator==(const class_element &other) const
+{
+    return access_ == other.access_ && name_ == other.name_ &&
+        qualified_name_ == other.qualified_name_ && type_ == other.type_;
+}
+
 } // namespace clanguml::class_diagram::model

src/class_diagram/model/class_element.h

@@ -85,6 +85,8 @@ class class_element : public common::model::decorated_element,
      */
     std::string qualified_name() const;
 
+    bool operator==(const class_element &other) const;
+
 private:
     common::model::access_t access_;
     std::string name_;

src/class_diagram/model/class_member.cc

@@ -1,5 +1,5 @@
 /**
- * @file src/class_diagram/model/class_member_base.cc
+ * @file src/class_diagram/model/class_member.cc
  *
  * Copyright (c) 2021-2025 Bartek Kryza <[email protected]>
  *
@@ -16,4 +16,13 @@
  * limitations under the License.
  */
 
-#include "class_member_base.h"
+#include "class_member.h"
+
+namespace clanguml::class_diagram::model {
+
+bool class_member::operator==(const class_member &other) const
+{
+    return class_member_base::operator==(other);
+}
+
+} // namespace clanguml::class_diagram::model

src/class_diagram/model/class_member.h

@@ -29,6 +29,8 @@ namespace clanguml::class_diagram::model {
 class class_member : public class_member_base {
 public:
     using class_member_base::class_member_base;
+
+    bool operator==(const class_member &other) const;
 };
 
 } // namespace clanguml::class_diagram::model

src/class_diagram/model/class_member_base.cc

@@ -40,4 +40,10 @@ std::optional<size_t> class_member_base::destination_multiplicity() const
     return destination_multiplicity_;
 }
 
+bool class_member_base::operator==(const class_member_base &other) const
+{
+    return class_element::operator==(other) && is_static_ == other.is_static_ &&
+        destination_multiplicity_ == other.destination_multiplicity_;
+}
+
 } // namespace clanguml::class_diagram::model

src/class_diagram/model/class_member_base.h

@@ -68,6 +68,8 @@ class class_member_base : public class_element {
      */
     std::optional<size_t> destination_multiplicity() const;
 
+    bool operator==(const class_member_base &other) const;
+
 private:
     bool is_static_{false};
     std::optional<size_t> destination_multiplicity_{};

src/class_diagram/model/class_method.cc

@@ -122,4 +122,23 @@ bool class_method::is_operator() const { return is_operator_; }
 
 void class_method::is_operator(bool is_operator) { is_operator_ = is_operator; }
 
+bool class_method::operator==(const class_method &other) const
+{
+    return class_method_base::operator==(other) &&
+        template_params() == other.template_params() &&
+        is_pure_virtual_ == other.is_pure_virtual_ &&
+        is_virtual_ == other.is_virtual_ && is_const_ == other.is_const_ &&
+        is_defaulted_ == other.is_defaulted_ &&
+        is_deleted_ == other.is_deleted_ &&
+        is_noexcept_ == other.is_noexcept_ &&
+        is_constexpr_ == other.is_constexpr_ &&
+        is_consteval_ == other.is_consteval_ &&
+        is_coroutine_ == other.is_coroutine_ &&
+        is_constructor_ == other.is_constructor_ &&
+        is_destructor_ == other.is_destructor_ &&
+        is_move_assignment_ == other.is_move_assignment_ &&
+        is_copy_assignment_ == other.is_copy_assignment_ &&
+        is_operator_ == other.is_operator_;
+}
+
 } // namespace clanguml::class_diagram::model

src/class_diagram/model/class_method.h

@@ -238,6 +238,8 @@ class class_method : public class_method_base, public template_trait {
      */
     void is_operator(bool is_operator);
 
+    bool operator==(const class_method &other) const;
+
 private:
     bool is_pure_virtual_{false};
     bool is_virtual_{false};