commit 83c726f3e5408cd242905577de25d7f74e147761
author Victor Boivie <boivie@webrtc.org> Thu Apr 01 22:18:48 2021
committer Commit Bot <commit-bot@chromium.org> Thu Apr 08 09:44:14 2021
tree 8247a0fad7da8c439e47ddebd555844c7e5cc4c2
parent 471fc8c329479169784f9d843207fdde71250863

dcsctp: UnwrappedSequenceNumber use StrongAlias

As this library will only use StrongAlias types for all its
sequence numbers, the UnwrappedSequenceNumber class should use those
types and not the primitive underlying types (e.g. uint32_t).

This makes e.g. Unwrap() return a strong type, which is preferred.

Bug: webrtc:12614
Change-Id: Icd0900c643a1988d1a3bbf49d87b4d4d1bbfbf1f
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/213663
Commit-Queue: Victor Boivie <boivie@webrtc.org>
Reviewed-by: Tommi <tommi@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#33651}

net/dcsctp/common/sequence_numbers_test.cc

diff --git a/net/dcsctp/common/sequence_numbers_test.cc b/net/dcsctp/common/sequence_numbers_test.cc
index f7ecd9b..d1d1959 100644
--- a/net/dcsctp/common/sequence_numbers_test.cc
+++ b/net/dcsctp/common/sequence_numbers_test.cc
@@ -14,15 +14,16 @@
 namespace dcsctp {
 namespace {
 
-using TestSequence = UnwrappedSequenceNumber<uint16_t>;
+using Wrapped = StrongAlias<class WrappedTag, uint16_t>;
+using TestSequence = UnwrappedSequenceNumber<Wrapped>;
 
 TEST(SequenceNumbersTest, SimpleUnwrapping) {
   TestSequence::Unwrapper unwrapper;
 
-  TestSequence s0 = unwrapper.Unwrap(0);
-  TestSequence s1 = unwrapper.Unwrap(1);
-  TestSequence s2 = unwrapper.Unwrap(2);
-  TestSequence s3 = unwrapper.Unwrap(3);
+  TestSequence s0 = unwrapper.Unwrap(Wrapped(0));
+  TestSequence s1 = unwrapper.Unwrap(Wrapped(1));
+  TestSequence s2 = unwrapper.Unwrap(Wrapped(2));
+  TestSequence s3 = unwrapper.Unwrap(Wrapped(3));
 
   EXPECT_LT(s0, s1);
   EXPECT_LT(s0, s2);
@@ -55,10 +56,10 @@
 TEST(SequenceNumbersTest, MidValueUnwrapping) {
   TestSequence::Unwrapper unwrapper;
 
-  TestSequence s0 = unwrapper.Unwrap(0x7FFE);
-  TestSequence s1 = unwrapper.Unwrap(0x7FFF);
-  TestSequence s2 = unwrapper.Unwrap(0x8000);
-  TestSequence s3 = unwrapper.Unwrap(0x8001);
+  TestSequence s0 = unwrapper.Unwrap(Wrapped(0x7FFE));
+  TestSequence s1 = unwrapper.Unwrap(Wrapped(0x7FFF));
+  TestSequence s2 = unwrapper.Unwrap(Wrapped(0x8000));
+  TestSequence s3 = unwrapper.Unwrap(Wrapped(0x8001));
 
   EXPECT_LT(s0, s1);
   EXPECT_LT(s0, s2);
@@ -91,10 +92,10 @@
 TEST(SequenceNumbersTest, WrappedUnwrapping) {
   TestSequence::Unwrapper unwrapper;
 
-  TestSequence s0 = unwrapper.Unwrap(0xFFFE);
-  TestSequence s1 = unwrapper.Unwrap(0xFFFF);
-  TestSequence s2 = unwrapper.Unwrap(0x0000);
-  TestSequence s3 = unwrapper.Unwrap(0x0001);
+  TestSequence s0 = unwrapper.Unwrap(Wrapped(0xFFFE));
+  TestSequence s1 = unwrapper.Unwrap(Wrapped(0xFFFF));
+  TestSequence s2 = unwrapper.Unwrap(Wrapped(0x0000));
+  TestSequence s3 = unwrapper.Unwrap(Wrapped(0x0001));
 
   EXPECT_LT(s0, s1);
   EXPECT_LT(s0, s2);
@@ -127,12 +128,12 @@
 TEST(SequenceNumbersTest, WrapAroundAFewTimes) {
   TestSequence::Unwrapper unwrapper;
 
-  TestSequence s0 = unwrapper.Unwrap(0);
+  TestSequence s0 = unwrapper.Unwrap(Wrapped(0));
   TestSequence prev = s0;
 
   for (uint32_t i = 1; i < 65536 * 3; i++) {
     uint16_t wrapped = static_cast<uint16_t>(i);
-    TestSequence si = unwrapper.Unwrap(wrapped);
+    TestSequence si = unwrapper.Unwrap(Wrapped(wrapped));
 
     EXPECT_LT(s0, si);
     EXPECT_LT(prev, si);
@@ -143,11 +144,11 @@
 TEST(SequenceNumbersTest, IncrementIsSameAsWrapped) {
   TestSequence::Unwrapper unwrapper;
 
-  TestSequence s0 = unwrapper.Unwrap(0);
+  TestSequence s0 = unwrapper.Unwrap(Wrapped(0));
 
   for (uint32_t i = 1; i < 65536 * 2; i++) {
     uint16_t wrapped = static_cast<uint16_t>(i);
-    TestSequence si = unwrapper.Unwrap(wrapped);
+    TestSequence si = unwrapper.Unwrap(Wrapped(wrapped));
 
     s0.Increment();
     EXPECT_EQ(s0, si);
@@ -159,12 +160,12 @@
 
   for (uint32_t i = 1; i < 65536 * 2; i++) {
     uint16_t wrapped = static_cast<uint16_t>(i);
-    TestSequence si = unwrapper.Unwrap(wrapped);
+    TestSequence si = unwrapper.Unwrap(Wrapped(wrapped));
 
-    EXPECT_GT(unwrapper.Unwrap(wrapped + 1), si);
-    EXPECT_GT(unwrapper.Unwrap(wrapped + 5), si);
-    EXPECT_GT(unwrapper.Unwrap(wrapped + 10), si);
-    EXPECT_GT(unwrapper.Unwrap(wrapped + 100), si);
+    EXPECT_GT(unwrapper.Unwrap(Wrapped(wrapped + 1)), si);
+    EXPECT_GT(unwrapper.Unwrap(Wrapped(wrapped + 5)), si);
+    EXPECT_GT(unwrapper.Unwrap(Wrapped(wrapped + 10)), si);
+    EXPECT_GT(unwrapper.Unwrap(Wrapped(wrapped + 100)), si);
   }
 }
 
@@ -173,12 +174,12 @@
 
   for (uint32_t i = 1; i < 65536 * 2; i++) {
     uint16_t wrapped = static_cast<uint16_t>(i);
-    TestSequence si = unwrapper.Unwrap(wrapped);
+    TestSequence si = unwrapper.Unwrap(Wrapped(wrapped));
 
-    EXPECT_LT(unwrapper.Unwrap(wrapped - 1), si);
-    EXPECT_LT(unwrapper.Unwrap(wrapped - 5), si);
-    EXPECT_LT(unwrapper.Unwrap(wrapped - 10), si);
-    EXPECT_LT(unwrapper.Unwrap(wrapped - 100), si);
+    EXPECT_LT(unwrapper.Unwrap(Wrapped(wrapped - 1)), si);
+    EXPECT_LT(unwrapper.Unwrap(Wrapped(wrapped - 5)), si);
+    EXPECT_LT(unwrapper.Unwrap(Wrapped(wrapped - 10)), si);
+    EXPECT_LT(unwrapper.Unwrap(Wrapped(wrapped - 100)), si);
   }
 }