Refactor SNMP table classes and improve unit test assertions

Author: lextm

Samples/CSharpCore/snmpd/IP-MIB.Generated.cs

@@ -428,12 +428,10 @@ protected override IEnumerable<ScalarObject> Objects
         {
             get { return _elements; }
         }
-    }
-    partial class ipAddrTable
-    {
-        public ipAddrTable()
+
+        public ipAddrTable() : base("1.3.6.1.2.1.4.20")
         {
-            // TODO: add rows and columns here.
+            OnCreate();
         }
     }
 
@@ -563,28 +561,33 @@ protected override IEnumerable<ScalarObject> Objects
         {
             get { return _elements; }
         }
+
+        public ipNetToMediaTable() : base("1.3.6.1.2.1.4.22")
+        {
+            OnCreate();
+        }
     }
 
     /// <remarks>
-    /// * ID:
-    ///   1.3.6.1.2.1.4.22.1.1
-    /// * Max access:
-    ///   read-create
-    /// * Status:
-    ///   br
-    /// * Description:
-    ///   "The interface on which this entry's equivalence is
-    ///         effective. The interface identified by a particular value
-    ///         of this index is the same interface as identified by the
-    ///         same value of RFC 1573's ifIndex."
-    /// </remarks>
-    public sealed partial class ipNetToMediaIfIndex : ScalarObject
-    {
-        public ipNetToMediaIfIndex(params string[] indexes) : base("1.3.6.1.2.1.4.22.1.1.{0}", string.Join('.', indexes))
+        /// * ID:
+        ///   1.3.6.1.2.1.4.22.1.1
+        /// * Max access:
+        ///   read-create
+        /// * Status:
+        ///   br
+        /// * Description:
+        ///   "The interface on which this entry's equivalence is
+        ///         effective. The interface identified by a particular value
+        ///         of this index is the same interface as identified by the
+        ///         same value of RFC 1573's ifIndex."
+        /// </remarks>
+        public sealed partial class ipNetToMediaIfIndex : ScalarObject
         {
+            public ipNetToMediaIfIndex(params string[] indexes) : base("1.3.6.1.2.1.4.22.1.1.{0}", string.Join('.', indexes))
+            {
 
+            }
         }
-    }
 
     /// <remarks>
     /// * ID:

Samples/CSharpCore/snmpd/IP-MIB.cs

@@ -902,9 +902,15 @@ public override ISnmpData Data
         }
     }
 
+    partial class ipAddrTable
+    {
+        public void OnCreate()
+        {}
+    }
+
     partial class ipNetToMediaTable
     {
-        public ipNetToMediaTable()
+        public void OnCreate()
         {
             // TODO: add rows and columns here.
             NetworkChange.NetworkAddressChanged +=

Tests/CSharpCore/Integration/DaemonTestFixture.cs

@@ -97,7 +97,7 @@ private SnmpEngine CreateEngine(bool timeout = false, bool max255chars = false)
 
             var pipelineFactory = new SnmpApplicationFactory(store, membership, handlerFactory);
             var listener = new Listener { Users = users };
-            listener.ExceptionRaised += (sender, e) => { Assert.True(false, "unexpected exception"); };
+            listener.ExceptionRaised += (sender, e) => { Assert.Fail("unexpected exception"); };
             return new SnmpEngine(pipelineFactory, listener, new EngineGroup(idEngine161));
         }
 
@@ -1374,7 +1374,7 @@ public void TestResponsesFromSingleSourceWithMultipleThreadsFromManager(int coun
                         {
                             var result = Messenger.Get(VersionCode.V2, serverEndPoint, new OctetString(communityPublic),
                                 new List<Variable> { new Variable(new ObjectIdentifier(oidIdentifier)) }, timeout);
-                            Assert.Equal(1, result.Count);
+                            Assert.Single(result);
                         }
                         catch (Exception)
                         {

Tests/CSharpCore/Integration/TrapDaemonTestFixture.cs

@@ -59,7 +59,7 @@ public async Task TestTrapV2HandlerWithV2Message()
             var engine = new SnmpEngine(pipelineFactory, new Listener {Users = users}, new EngineGroup(engineId));
             var daemonEndPoint = new IPEndPoint(IPAddress.Loopback, port.NextId);
             engine.Listener.AddBinding(daemonEndPoint);
-            engine.Listener.ExceptionRaised += (sender, e) => { Assert.True(false, "unhandled exception"); };
+            engine.Listener.ExceptionRaised += (sender, e) => { Assert.Fail("unhandled exception"); };
             engine.Listener.MessageReceived += (sender, e) => { Console.WriteLine(e.Message); };
             engine.Start();
 
@@ -359,7 +359,7 @@ public async Task TestInformV2HandlerWithV2Message()
             var engine = new SnmpEngine(pipelineFactory, new Listener { Users = users }, new EngineGroup(engineId));
             var daemonEndPoint = new IPEndPoint(IPAddress.Loopback, port.NextId);
             engine.Listener.AddBinding(daemonEndPoint);
-            engine.Listener.ExceptionRaised += (sender, e) => { Assert.True(false, "unhandled exception"); };
+            engine.Listener.ExceptionRaised += (sender, e) => { Assert.Fail("unhandled exception"); };
             engine.Listener.MessageReceived += (sender, e) => { Console.WriteLine(e.Message); };
             engine.Start();
 
@@ -431,7 +431,7 @@ public async Task TestInformV2HandlerWithV3Message()
             var engine = new SnmpEngine(pipelineFactory, new Listener { Users = users }, new EngineGroup(engineId));
             var daemonEndPoint = new IPEndPoint(IPAddress.Loopback, port.NextId);
             engine.Listener.AddBinding(daemonEndPoint);
-            engine.Listener.ExceptionRaised += (sender, e) => { Assert.True(false, "unhandled exception"); };
+            engine.Listener.ExceptionRaised += (sender, e) => { Assert.Fail("unhandled exception"); };
             engine.Listener.MessageReceived += (sender, e) => { Console.WriteLine(e.Message); };
             engine.Start();
 
@@ -508,7 +508,7 @@ public async Task TestInformV2HandlerWithV3MessageDES()
             var engine = new SnmpEngine(pipelineFactory, new Listener { Users = users }, new EngineGroup(engineId));
             var daemonEndPoint = new IPEndPoint(IPAddress.Loopback, port.NextId);
             engine.Listener.AddBinding(daemonEndPoint);
-            engine.Listener.ExceptionRaised += (sender, e) => { Assert.True(false, "unhandled exception"); };
+            engine.Listener.ExceptionRaised += (sender, e) => { Assert.Fail("unhandled exception"); };
             engine.Listener.MessageReceived += (sender, e) => { Console.WriteLine(e.Message); };
             engine.Start();
 

Tests/CSharpCore/Unit/Objects/SysORTableTestFixture.cs

@@ -19,7 +19,7 @@ public class SysORTableTestFixture
         public void Test()
         {
             var table = new SysORTable();
-            Assert.Equal(null, table.MatchGet(new ObjectIdentifier("1.3.6")));
+            Assert.Null(table.MatchGet(new ObjectIdentifier("1.3.6")));
             var id = new ObjectIdentifier("1.3.6.1.2.1.1.9.1.1.1");
             Assert.Equal(id, table.MatchGet(id).Variable.Id);
             Assert.Equal(new ObjectIdentifier("1.3.6.1.2.1.1.9.1.1.2"), table.MatchGetNext(id).Variable.Id);

Tests/CSharpCore/Unit/Pipeline/ListenerBindingTestFixture.cs

@@ -25,7 +25,7 @@ public void AddBindingDuplicate()
             var listener = new Listener();
             listener.AddBinding(new IPEndPoint(IPAddress.Parse("127.0.0.1"), 21));
             listener.AddBinding(new IPEndPoint(IPAddress.Parse("127.0.0.1"), 21));
-            Assert.Equal(1, listener.Bindings.Count);
+            Assert.Single(listener.Bindings);
         }
 
         [Fact]
@@ -35,7 +35,7 @@ public void RemoveBinding()
             var listener = new Listener();
             listener.AddBinding(new IPEndPoint(IPAddress.Parse("127.0.0.1"), 21));
             listener.RemoveBinding(new IPEndPoint(IPAddress.Parse("127.0.0.1"), 21));
-            Assert.Equal(0, listener.Bindings.Count);
+            Assert.Empty(listener.Bindings);
         }
     }
 }