Refine CouponList capacity boundary test

Author: jihuayu

hll/test/CouponListTest.cpp

@@ -190,25 +190,23 @@ TEST_CASE("coupon list: rejects malformed coupon count in bytes", "[coupon_list]
   const auto validBytes = sk1.serialize_compact();
 
   const uint8_t listCapacity = static_cast<uint8_t>(1u << hll_constants::LG_INIT_LIST_SIZE);
-  const uint8_t malformedCounts[] = {listCapacity, static_cast<uint8_t>(listCapacity + 2)};
-  for (const uint8_t malformedCount: malformedCounts) {
-    auto sketchBytes = validBytes;
-    // Keep the input long enough to validate the declared LIST count.
-    const size_t requiredLen = hll_constants::LIST_INT_ARR_START
-                               + malformedCount * sizeof(uint32_t);
-    if (sketchBytes.size() < requiredLen) {
-      sketchBytes.resize(requiredLen, 0);
-    }
-    sketchBytes[hll_constants::LIST_COUNT_BYTE] = malformedCount;
-
-    REQUIRE_THROWS_AS(
-        hll_sketch::deserialize(sketchBytes.data(), sketchBytes.size()),
-        std::invalid_argument);
-    REQUIRE_THROWS_AS(
-        CouponList<std::allocator<uint8_t>>::newList(
-            sketchBytes.data(), sketchBytes.size(), std::allocator<uint8_t>()),
-        std::invalid_argument);
+  const uint8_t malformedCount = listCapacity;
+  auto sketchBytes = validBytes;
+  // Keep the input long enough to validate the declared LIST count.
+  const size_t requiredLen = hll_constants::LIST_INT_ARR_START
+                             + malformedCount * sizeof(uint32_t);
+  if (sketchBytes.size() < requiredLen) {
+    sketchBytes.resize(requiredLen, 0);
   }
+  sketchBytes[hll_constants::LIST_COUNT_BYTE] = malformedCount;
+
+  REQUIRE_THROWS_AS(
+      hll_sketch::deserialize(sketchBytes.data(), sketchBytes.size()),
+      std::invalid_argument);
+  REQUIRE_THROWS_AS(
+      CouponList<std::allocator<uint8_t>>::newList(
+          sketchBytes.data(), sketchBytes.size(), std::allocator<uint8_t>()),
+      std::invalid_argument);
 }
 
 TEST_CASE("coupon list: rejects malformed coupon count in stream", "[coupon_list]") {
@@ -218,34 +216,32 @@ TEST_CASE("coupon list: rejects malformed coupon count in stream", "[coupon_list
   sk1.update(2);
 
   const uint8_t listCapacity = static_cast<uint8_t>(1u << hll_constants::LG_INIT_LIST_SIZE);
-  const uint8_t malformedCounts[] = {listCapacity, static_cast<uint8_t>(listCapacity + 2)};
-  for (const uint8_t malformedCount: malformedCounts) {
-    std::stringstream ss(std::ios::in | std::ios::out | std::ios::binary);
-    sk1.serialize_compact(ss);
-
-    const size_t requiredLen = hll_constants::LIST_INT_ARR_START
-                               + malformedCount * sizeof(uint32_t);
-    // Keep the stream long enough to validate the declared LIST count.
-    ss.seekp(0, std::ios::end);
-    const auto endPos = static_cast<size_t>(ss.tellp());
-    if (endPos < requiredLen) {
-      std::vector<char> pad(requiredLen - endPos, 0);
-      ss.write(pad.data(), pad.size());
-    }
-
-    ss.seekp(hll_constants::LIST_COUNT_BYTE);
-    ss.put(static_cast<char>(malformedCount));
-
-    ss.clear();
-    ss.seekg(0);
-    REQUIRE_THROWS_AS(hll_sketch::deserialize(ss), std::invalid_argument);
-
-    ss.clear();
-    ss.seekg(0);
-    REQUIRE_THROWS_AS(
-        CouponList<std::allocator<uint8_t>>::newList(ss, std::allocator<uint8_t>()),
-        std::invalid_argument);
+  const uint8_t malformedCount = listCapacity;
+  std::stringstream ss(std::ios::in | std::ios::out | std::ios::binary);
+  sk1.serialize_compact(ss);
+
+  const size_t requiredLen = hll_constants::LIST_INT_ARR_START
+                             + malformedCount * sizeof(uint32_t);
+  // Keep the stream long enough to validate the declared LIST count.
+  ss.seekp(0, std::ios::end);
+  const auto endPos = static_cast<size_t>(ss.tellp());
+  if (endPos < requiredLen) {
+    std::vector<char> pad(requiredLen - endPos, 0);
+    ss.write(pad.data(), pad.size());
   }
+
+  ss.seekp(hll_constants::LIST_COUNT_BYTE);
+  ss.put(static_cast<char>(malformedCount));
+
+  ss.clear();
+  ss.seekg(0);
+  REQUIRE_THROWS_AS(hll_sketch::deserialize(ss), std::invalid_argument);
+
+  ss.clear();
+  ss.seekg(0);
+  REQUIRE_THROWS_AS(
+      CouponList<std::allocator<uint8_t>>::newList(ss, std::allocator<uint8_t>()),
+      std::invalid_argument);
 }
 
 } /* namespace datasketches */