Refactor NatsMsg size and flags handling in tests and class

nats-io · Oct 13, 2024 · 7e5b699 · 7e5b699
1 parent 71ed9d9
commit 7e5b699
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 7 deletions.
diff --git a/src/NATS.Client.Core/NatsMsg.cs b/src/NATS.Client.Core/NatsMsg.cs
@@ -169,8 +169,7 @@ public NatsMsg(
     {
         Subject = subject;
         ReplyTo = replyTo;
-        Size = size;
-        Flags = flags;
+        _flagsAndSize = ((uint)flags << 30) | (uint)(size & 0x3FFFFFFF);
         Headers = headers;
         Data = data;
         Connection = connection;

diff --git a/tests/NATS.Client.CoreUnit.Tests/NatsMsgTests.cs b/tests/NATS.Client.CoreUnit.Tests/NatsMsgTests.cs
@@ -10,13 +10,34 @@ public class NatsMsgTests
     [InlineData(42, NatsMsgFlags.NoResponders, false, true)]
     [InlineData(42, NatsMsgFlags.Empty | NatsMsgFlags.NoResponders, true, true)]
     [InlineData(1024 * 1024 * 128, NatsMsgFlags.Empty, true, false)]
+    [InlineData(1024 * 1024 * 1000, NatsMsgFlags.Empty, true, false)]
+    [InlineData(0b00111111111111111111111111111111, NatsMsgFlags.Empty, true, false)]
     public void Size_and_flags(int size, NatsMsgFlags flags, bool isEmpty, bool hasNoResponders)
     {
-        var msg = new NatsMsg<string> { Size = size, Flags = flags };
-        Assert.Equal(size, msg.Size);
-        Assert.Equal(flags, msg.Flags);
-        Assert.Equal(isEmpty, msg.IsEmpty);
-        Assert.Equal(hasNoResponders, msg.HasNoResponders);
+        AssertSizeAndFlags(new NatsMsg<string>
+        {
+            Size = size,
+            Flags = flags,
+        });
+
+        AssertSizeAndFlags(new NatsMsg<string>(
+            subject: "x",
+            replyTo: null,
+            size: size,
+            headers: null,
+            data: null,
+            connection: null,
+            flags: flags));
+
+        return;
+
+        void AssertSizeAndFlags(NatsMsg<string> msg)
+        {
+            Assert.Equal(size, msg.Size);
+            Assert.Equal(flags, msg.Flags);
+            Assert.Equal(isEmpty, msg.IsEmpty);
+            Assert.Equal(hasNoResponders, msg.HasNoResponders);
+        }
     }
 
     [Fact]