asn1: Add '==' and '!=' overload to asn1c wrapper

riebl · Jan 29, 2024 · 48f6488 · 48f6488
1 parent a275baf
commit 48f6488
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 7 deletions.
diff --git a/vanetza/asn1/asn1c_wrapper.hpp b/vanetza/asn1/asn1c_wrapper.hpp
@@ -75,6 +75,16 @@ class asn1c_wrapper_common
     const asn1c_type* content() const { return m_struct; }
     asn1c_type* content() { return m_struct; }
 
+    // compare semantics
+    bool operator==(const asn1c_wrapper_common& rhs) const
+    {
+        return vanetza::asn1::compare(m_type, m_struct, rhs.m_struct) == 0;
+    }
+    bool operator!=(const asn1c_wrapper_common& rhs) const
+    {
+        return vanetza::asn1::compare(m_type, m_struct, rhs.m_struct) != 0;
+    }
+
     /**
      * Check ASN.1 constraints
      * \param error (optional) copy of error message

diff --git a/vanetza/asn1/tests/asn1c_wrapper.cpp b/vanetza/asn1/tests/asn1c_wrapper.cpp
@@ -59,21 +59,27 @@ TEST(asn1c_wrapper, validate) {
 TEST(asn1c_wrapper, compare) {
     test_wrapper wrapper1(asn_DEF_VanetzaTest);
     OCTET_STRING_fromString(&wrapper1->string, "1234");
-    EXPECT_TRUE(!wrapper1.compare(wrapper1));
-
     test_wrapper wrapper2(asn_DEF_VanetzaTest);
     OCTET_STRING_fromString(&wrapper2->string, "1234");
-    EXPECT_TRUE(!wrapper1.compare(wrapper2));
-
     test_wrapper wrapper3(asn_DEF_VanetzaTest);
     OCTET_STRING_fromString(&wrapper3->string, "0123");
-    EXPECT_FALSE(!wrapper1.compare(wrapper3));
-    EXPECT_TRUE(wrapper1.compare(wrapper3) > 0);
-
     test_wrapper wrapper4(asn_DEF_VanetzaTest);
     wrapper4->field = 5;
     OCTET_STRING_fromString(&wrapper4->string, "1234");
+
+    // .compare()
+    EXPECT_TRUE(!wrapper1.compare(wrapper1));
+    EXPECT_TRUE(!wrapper1.compare(wrapper2));
+    EXPECT_FALSE(!wrapper1.compare(wrapper3));
+    EXPECT_TRUE(wrapper1.compare(wrapper3) > 0);
     EXPECT_FALSE(!wrapper1.compare(wrapper4));
+
+    // operators == and !=
+    EXPECT_TRUE(wrapper1 == wrapper1);
+    EXPECT_TRUE(wrapper1 == wrapper2);
+    EXPECT_FALSE(wrapper1 == wrapper3);
+    EXPECT_TRUE(wrapper1 != wrapper3);
+    EXPECT_TRUE(wrapper1 != wrapper4);
 }
 
 TEST(asn1c_wrapper, print) {