[#53] Fix operator++/-- in NumericTypeWrapper

ndsev · Dec 13, 2024 · fe9c611 · fe9c611
1 parent 19822bb
commit fe9c611
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 14 deletions.
diff --git a/runtime/src/zserio/Types.h b/runtime/src/zserio/Types.h
@@ -83,7 +83,7 @@ class NumericTypeWrapper
 
     constexpr NumericTypeWrapper operator++(int) noexcept
     {
-        NumericTypeWrapper old;
+        NumericTypeWrapper old = *this;
         operator++();
         return old;
     }
@@ -96,7 +96,7 @@ class NumericTypeWrapper
 
     constexpr NumericTypeWrapper operator--(int) noexcept
     {
-        NumericTypeWrapper old;
+        NumericTypeWrapper old = *this;
         operator--();
         return old;
     }

diff --git a/runtime/test/zserio/TypesTest.cpp b/runtime/test/zserio/TypesTest.cpp
@@ -58,10 +58,13 @@ void testIntOperators(typename T::ValueType minValue = NumericLimits<T>::min())
     }
 
     // increment / decrement
-    ++value;
-    --value;
-    value++;
-    value--;
+    Int64 origValue = value;
+    ASSERT_EQ(origValue + 1, ++value);
+    ASSERT_EQ(origValue, --value);
+    ASSERT_EQ(origValue, value++);
+    ASSERT_EQ(origValue + 1, value);
+    ASSERT_EQ(origValue + 1, value--);
+    ASSERT_EQ(origValue, value);
 
     // logical
     ASSERT_FALSE(!valueMin);
@@ -133,10 +136,13 @@ void testUIntOperators(typename T::ValueType minValue = NumericLimits<T>::min())
     }
 
     // increment / decrement
-    ++value;
-    --value;
-    value++;
-    value--;
+    UInt64 origValue = value;
+    ASSERT_EQ(origValue + 1, ++value);
+    ASSERT_EQ(origValue, --value);
+    ASSERT_EQ(origValue, value++);
+    ASSERT_EQ(origValue + 1, value);
+    ASSERT_EQ(origValue + 1, value--);
+    ASSERT_EQ(origValue, value);
 
     // logical
     ASSERT_FALSE(!valueMax);
@@ -210,10 +216,13 @@ void testFloatOperators()
     value = valueMax / valueMin;
 
     // increment / decrement
-    ++value;
-    --value;
-    value++;
-    value--;
+    FloatWrapper origValue = value;
+    ASSERT_DOUBLE_EQ(origValue + 1, ++value);
+    ASSERT_DOUBLE_EQ(origValue, --value);
+    ASSERT_DOUBLE_EQ(origValue, value++);
+    ASSERT_DOUBLE_EQ(origValue + 1, value);
+    ASSERT_DOUBLE_EQ(origValue + 1, value--);
+    ASSERT_DOUBLE_EQ(origValue, value);
 
     // comparison
     ASSERT_TRUE(valueMin < valueMax);