fixup c++ test

ndsev · Jun 18, 2024 · 62379fe · 62379fe
1 parent 8311b07
commit 62379fe
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 12 deletions.
diff --git a/test/language/builtin_types/ClangTidySuppressions.txt b/test/language/builtin_types/ClangTidySuppressions.txt
@@ -7,5 +7,6 @@ readability-make-member-function-const:gen/builtin_types/all_builtin_types/AllBu
 readability-make-member-function-const:gen/builtin_types/all_builtin_types/ExternalStructure.cpp
 readability-make-member-function-const:gen/builtin_types/bitfield_function_length/Container.cpp
 readability-make-member-function-const:gen/builtin_types/bitfield_uint64_length/Container.cpp
+readability-make-member-function-const:gen/builtin_types/dynamic_bitfield_length_bounds/Container.cpp
 
-readability-simplify-boolean-expr:gen/builtin_types/all_builtin_types/AllBuiltInTypes.cpp
+readability-simplify-boolean-expr:gen/builtin_types/all_builtin_types/AllBuiltInTypes.cpp
diff --git a/test/language/builtin_types/cpp/DynamicBitFieldLengthBoundsTest.cpp b/test/language/builtin_types/cpp/DynamicBitFieldLengthBoundsTest.cpp
@@ -13,14 +13,38 @@ using BitBuffer = zserio::BasicBitBuffer<zserio::RebindAlloc<allocator_type, uin
 class DynamicBitFieldLengthBoundsTest : public ::testing::Test
 {
 protected:
+    void writeContainer(const Container container)
+    {
+        zserio::BitStreamWriter writer(bitBuffer);
+        writer.writeBits(container.getUnsignedBitLength(), 4);
+        if (container.getUnsignedBitLength() == 0)
+        {
+            return;
+        }
+        writer.writeBits(container.getUnsignedValue(), container.getUnsignedBitLength());
+        writer.writeBits(container.getUnsignedBigBitLength(), 8);
+        if (container.getUnsignedBigBitLength() == 0 || container.getUnsignedBigBitLength() > 64)
+        {
+            return;
+        }
+        writer.writeBits64(container.getUnsignedBigValue(), container.getUnsignedBigBitLength());
+        writer.writeBits64(container.getSignedBitLength(), 64);
+        if (container.getSignedBitLength() == 0 || container.getSignedBitLength() > 64)
+        {
+            return;
+        }
+        writer.writeSignedBits64(
+                container.getSignedValue(), static_cast<uint8_t>(container.getSignedBitLength()));
+    }
+
     static constexpr uint8_t UNSIGNED_BIT_LENGTH = 15;
-    static constexpr uint16_t UNSIGNED_VALUE = (1 << UNSIGNED_BIT_LENGTH) - 1;
+    static constexpr uint16_t UNSIGNED_VALUE = (1U << UNSIGNED_BIT_LENGTH) - 1;
     static constexpr uint16_t UNSIGNED_BIG_BIT_LENGTH = 13;
-    static constexpr uint64_t UNSIGNED_BIG_VALUE = (1 << UNSIGNED_BIG_BIT_LENGTH) - 1;
+    static constexpr uint64_t UNSIGNED_BIG_VALUE = (1U << UNSIGNED_BIG_BIT_LENGTH) - 1;
     static constexpr uint64_t SIGNED_BIT_LENGTH = 7;
-    static constexpr int64_t SIGNED_VALUE = -(1 << (SIGNED_BIT_LENGTH - 1));
+    static constexpr int64_t SIGNED_VALUE = -static_cast<int64_t>(1U << (SIGNED_BIT_LENGTH - 1));
 
-    BitBuffer bitBuffer = zserio::BitBuffer(1024);
+    BitBuffer bitBuffer = BitBuffer(1024);
 };
 
 TEST_F(DynamicBitFieldLengthBoundsTest, writeRead)
@@ -40,21 +64,21 @@ TEST_F(DynamicBitFieldLengthBoundsTest, unsignedBitLengthZero)
             0, UNSIGNED_VALUE, UNSIGNED_BIG_BIT_LENGTH, UNSIGNED_BIG_VALUE, SIGNED_BIT_LENGTH, SIGNED_VALUE};
 
     ASSERT_THROW(zserio::serialize(container), zserio::CppRuntimeException);
+
+    writeContainer(container);
+    zserio::BitStreamReader reader(bitBuffer);
+    ASSERT_THROW(Container readContainer(reader), zserio::CppRuntimeException);
 }
 
 TEST_F(DynamicBitFieldLengthBoundsTest, unsignedBitLengthZeroValueZero)
 {
     Container container = {0, 0, UNSIGNED_BIG_BIT_LENGTH, UNSIGNED_BIG_VALUE, SIGNED_BIT_LENGTH, SIGNED_VALUE};
 
     ASSERT_THROW(zserio::serialize(container), zserio::CppRuntimeException);
-}
 
-TEST_F(DynamicBitFieldLengthBoundsTest, unsignedBitLengthOverMax)
-{
-    Container container = {
-            65, UNSIGNED_VALUE, UNSIGNED_BIG_BIT_LENGTH, UNSIGNED_BIG_VALUE, SIGNED_BIT_LENGTH, SIGNED_VALUE};
-
-    ASSERT_THROW(zserio::serialize(container), zserio::CppRuntimeException);
+    writeContainer(container);
+    zserio::BitStreamReader reader(bitBuffer);
+    ASSERT_THROW(Container readContainer(reader), zserio::CppRuntimeException);
 }
 
 TEST_F(DynamicBitFieldLengthBoundsTest, unsignedBigBitLengthZero)
@@ -63,13 +87,21 @@ TEST_F(DynamicBitFieldLengthBoundsTest, unsignedBigBitLengthZero)
             UNSIGNED_BIT_LENGTH, UNSIGNED_VALUE, 0, UNSIGNED_BIG_VALUE, SIGNED_BIT_LENGTH, SIGNED_VALUE};
 
     ASSERT_THROW(zserio::serialize(container), zserio::CppRuntimeException);
+
+    writeContainer(container);
+    zserio::BitStreamReader reader(bitBuffer);
+    ASSERT_THROW(Container readContainer(reader), zserio::CppRuntimeException);
 }
 
 TEST_F(DynamicBitFieldLengthBoundsTest, unsignedBigBitLengthZeroValueZero)
 {
     Container container = {UNSIGNED_BIT_LENGTH, UNSIGNED_VALUE, 0, 0, SIGNED_BIT_LENGTH, SIGNED_VALUE};
 
     ASSERT_THROW(zserio::serialize(container), zserio::CppRuntimeException);
+
+    writeContainer(container);
+    zserio::BitStreamReader reader(bitBuffer);
+    ASSERT_THROW(Container readContainer(reader), zserio::CppRuntimeException);
 }
 
 TEST_F(DynamicBitFieldLengthBoundsTest, unsignedBigBitLengthOverMax)
@@ -78,6 +110,10 @@ TEST_F(DynamicBitFieldLengthBoundsTest, unsignedBigBitLengthOverMax)
             UNSIGNED_BIT_LENGTH, UNSIGNED_VALUE, 65, UNSIGNED_BIG_VALUE, SIGNED_BIT_LENGTH, SIGNED_VALUE};
 
     ASSERT_THROW(zserio::serialize(container), zserio::CppRuntimeException);
+
+    writeContainer(container);
+    zserio::BitStreamReader reader(bitBuffer);
+    ASSERT_THROW(Container readContainer(reader), zserio::CppRuntimeException);
 }
 
 TEST_F(DynamicBitFieldLengthBoundsTest, signedBitLengthZero)
@@ -86,6 +122,10 @@ TEST_F(DynamicBitFieldLengthBoundsTest, signedBitLengthZero)
             UNSIGNED_BIT_LENGTH, UNSIGNED_VALUE, UNSIGNED_BIG_BIT_LENGTH, UNSIGNED_BIG_VALUE, 0, SIGNED_VALUE};
 
     ASSERT_THROW(zserio::serialize(container), zserio::CppRuntimeException);
+
+    writeContainer(container);
+    zserio::BitStreamReader reader(bitBuffer);
+    ASSERT_THROW(Container readContainer(reader), zserio::CppRuntimeException);
 }
 
 TEST_F(DynamicBitFieldLengthBoundsTest, signedBitLengthZeroValueZero)
@@ -94,6 +134,10 @@ TEST_F(DynamicBitFieldLengthBoundsTest, signedBitLengthZeroValueZero)
             UNSIGNED_BIT_LENGTH, UNSIGNED_VALUE, UNSIGNED_BIG_BIT_LENGTH, UNSIGNED_BIG_VALUE, 0, 0};
 
     ASSERT_THROW(zserio::serialize(container), zserio::CppRuntimeException);
+
+    writeContainer(container);
+    zserio::BitStreamReader reader(bitBuffer);
+    ASSERT_THROW(Container readContainer(reader), zserio::CppRuntimeException);
 }
 
 TEST_F(DynamicBitFieldLengthBoundsTest, signedBitLengthOverMax)
@@ -102,6 +146,10 @@ TEST_F(DynamicBitFieldLengthBoundsTest, signedBitLengthOverMax)
             UNSIGNED_BIT_LENGTH, UNSIGNED_VALUE, UNSIGNED_BIG_BIT_LENGTH, UNSIGNED_BIG_VALUE, 65, SIGNED_VALUE};
 
     ASSERT_THROW(zserio::serialize(container), zserio::CppRuntimeException);
+
+    writeContainer(container);
+    zserio::BitStreamReader reader(bitBuffer);
+    ASSERT_THROW(Container readContainer(reader), zserio::CppRuntimeException);
 }
 
 } // namespace dynamic_bitfield_length_bounds