fixup tests

Author: bollhals

projects/Unit/APIApproval.Approve.verified.txt

@@ -1,3 +1,4 @@
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(@"Benchmarks, PublicKey=00240000048000009400000006020000002400005253413100040000010001008d20ec856aeeb8c3153a77faa2d80e6e43b5db93224a20cc7ae384f65f142e89730e2ff0fcc5d578bbe96fa98a7196c77329efdee4579b3814c0789e5a39b51df6edd75b602a33ceabdfcf19a3feb832f31d8254168cd7ba5700dfbca301fbf8db614ba41ba18474de0a5f4c2d51c995bc3636c641c8cbe76f45717bfcb943b5")]
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo(@"Unit, PublicKey=00240000048000009400000006020000002400005253413100040000010001008d20ec856aeeb8c3153a77faa2d80e6e43b5db93224a20cc7ae384f65f142e89730e2ff0fcc5d578bbe96fa98a7196c77329efdee4579b3814c0789e5a39b51df6edd75b602a33ceabdfcf19a3feb832f31d8254168cd7ba5700dfbca301fbf8db614ba41ba18474de0a5f4c2d51c995bc3636c641c8cbe76f45717bfcb943b5")]
 namespace RabbitMQ.Client
 {

projects/Unit/TestMethodArgumentCodec.cs

@@ -41,18 +41,8 @@
 namespace RabbitMQ.Client.Unit
 {
     [TestFixture]
-    class TestMethodArgumentCodec
+    public class TestMethodArgumentCodec
     {
-        public static MethodArgumentWriter Writer()
-        {
-            return new MethodArgumentWriter(new byte[1024]);
-        }
-
-        public static MethodArgumentReader Reader(byte[] bytes)
-        {
-            return new MethodArgumentReader(bytes);
-        }
-
         public void Check(byte[] actual, byte[] expected)
         {
             try
@@ -81,22 +71,22 @@ public void TestTableLengthWrite()
 
             int bytesNeeded = WireFormatting.GetTableByteCount(t);
             byte[] memory = new byte[bytesNeeded];
-            var writer = new MethodArgumentWriter(memory);
-            writer.WriteTable(t);
-            Assert.AreEqual(bytesNeeded, writer.Offset);
+            int offset = WireFormatting.WriteTable(memory.AsSpan(), t);
+            Assert.AreEqual(bytesNeeded, offset);
             Check(memory, new byte[] { 0x00, 0x00, 0x00, 0x0C,
                                    0x03, 0x61, 0x62, 0x63,
                                    0x53, 0x00, 0x00, 0x00,
                                    0x03, 0x64, 0x65, 0x66 });
         }
 
         [Test]
-        public void TestTableLengthRead()
+        public void TestDictionaryLengthRead()
         {
-            IDictionary t = (IDictionary)Reader(new byte[] { 0x00, 0x00, 0x00, 0x0C,
-                                                             0x03, 0x61, 0x62, 0x63,
-                                                             0x53, 0x00, 0x00, 0x00,
-                                                             0x03, 0x64, 0x65, 0x66 }).ReadTable();
+            WireFormatting.ReadDictionary(new byte[] {
+                0x00, 0x00, 0x00, 0x0C,
+                0x03, 0x61, 0x62, 0x63,
+                0x53, 0x00, 0x00, 0x00,
+                0x03, 0x64, 0x65, 0x66 }, out var t);
             Assert.AreEqual(Encoding.UTF8.GetBytes("def"), t["abc"]);
             Assert.AreEqual(1, t.Count);
         }
@@ -112,9 +102,8 @@ public void TestNestedTableWrite()
             t["x"] = x;
             int bytesNeeded = WireFormatting.GetTableByteCount(t);
             byte[] memory = new byte[bytesNeeded];
-            var writer = new MethodArgumentWriter(memory);
-            writer.WriteTable(t);
-            Assert.AreEqual(bytesNeeded, writer.Offset);
+            int offset = WireFormatting.WriteTable(memory.AsSpan(), t);
+            Assert.AreEqual(bytesNeeded, offset);
             Check(memory, new byte[] { 0x00, 0x00, 0x00, 0x0E,
                                    0x01, 0x78, 0x46, 0x00,
                                    0x00, 0x00, 0x07, 0x01,