Migrate Int16, Int32, and UInt16 tests to use DataRow

Co-authored-by: josesimoes <[email protected]>

Author: Copilot

Tests/NFUnitTestSystemLib/UnitTestInt16.cs

@@ -35,46 +35,40 @@ public void MinValue()
         }
 
         [TestMethod]
-        public void Equals()
+        [DataRow((short)789, (short)789, true)]
+        [DataRow((short)789, (short)-789, false)]
+        [DataRow((short)789, (short)0, false)]
+        [DataRow((short)0, (short)0, true)]
+        [DataRow((short)-789, (short)-789, true)]
+        [DataRow((short)-789, (short)789, false)]
+        public void Equals_Int16ToInt16(short i1, short obj, bool expected)
         {
-            Int16TestData[] testData = new Int16TestData[]
-            {
-                new Int16TestData((short)789, (short)789, true),
-                new Int16TestData((short)789, (short)-789, false),
-                new Int16TestData((short)789, (short)0, false),
-                new Int16TestData((short)0, (short)0, true),
-                new Int16TestData((short)-789, (short)-789, true),
-                new Int16TestData((short)-789, (short)789, false),
-                new Int16TestData((short)789, null, false),
-                new Int16TestData((short)789, "789", false),
-                new Int16TestData((short)789, 789, false)
-            };
-
-            foreach (var test in testData)
-            {
-                if (test.Obj is short)
-                {
-                    short i2 = (short)test.Obj;
-                    Assert.AreEqual(test.Expected, test.I1.Equals(i2));
-                    Assert.AreEqual(test.Expected, test.I1.GetHashCode().Equals(i2.GetHashCode()));
-                }
+            Assert.AreEqual(expected, i1.Equals(obj));
+            Assert.AreEqual(expected, i1.GetHashCode().Equals(obj.GetHashCode()));
+        }
 
-                Assert.AreEqual(test.Expected, test.I1.Equals(test.Obj));
-            }
+        [TestMethod]
+        public void Equals_Int16ToNull()
+        {
+            short i1 = 789;
+            object obj = null;
+            Assert.AreEqual(false, i1.Equals(obj));
         }
 
-        private sealed class Int16TestData
+        [TestMethod]
+        public void Equals_Int16ToString()
         {
-            public object I1 { get; }
-            public object Obj { get; }
-            public bool Expected { get; }
+            short i1 = 789;
+            object obj = "789";
+            Assert.AreEqual(false, i1.Equals(obj));
+        }
 
-            public Int16TestData(object i1, object obj, bool expected)
-            {
-                I1 = i1;
-                Obj = obj;
-                Expected = expected;
-            }
+        [TestMethod]
+        public void Equals_Int16ToInt()
+        {
+            short i1 = 789;
+            object obj = 789;
+            Assert.AreEqual(false, i1.Equals(obj));
         }
     }
 }

Tests/NFUnitTestSystemLib/UnitTestInt32.cs

@@ -35,45 +35,32 @@ public void MinValue()
         }
 
         [TestMethod]
-        public void Equals()
+        [DataRow(789, 789, true)]
+        [DataRow(789, -789, false)]
+        [DataRow(789, 0, false)]
+        [DataRow(0, 0, true)]
+        [DataRow(-789, -789, true)]
+        [DataRow(-789, 789, false)]
+        public void Equals_Int32ToInt32(int i1, int obj, bool expected)
         {
-            Int32TestData[] testData = new Int32TestData[]
-            {
-                new Int32TestData((int)789, (int)789, true),
-                new Int32TestData((int)789, (int)-789, false),
-                new Int32TestData((int)789, (int)0, false),
-                new Int32TestData((int)0, (int)0, true),
-                new Int32TestData((int)-789, (int)-789, true),
-                new Int32TestData((int)-789, (int)789, false),
-                new Int32TestData((int)789, null, false),
-                new Int32TestData((int)89, "789", false),
-            };
-
-            foreach (var test in testData)
-            {
-                if (test.Obj is int)
-                {
-                    int i2 = (int)test.Obj;
-                    Assert.AreEqual(test.Expected, test.I1.Equals(i2));
-                    Assert.AreEqual(test.Expected, test.I1.GetHashCode().Equals(i2.GetHashCode()));
-                }
-
-                Assert.AreEqual(test.Expected, test.I1.Equals(test.Obj));
-            }
+            Assert.AreEqual(expected, i1.Equals(obj));
+            Assert.AreEqual(expected, i1.GetHashCode().Equals(obj.GetHashCode()));
         }
 
-        private sealed class Int32TestData
+        [TestMethod]
+        public void Equals_Int32ToNull()
         {
-            public object I1 { get; }
-            public object Obj { get; }
-            public bool Expected { get; }
+            int i1 = 789;
+            object obj = null;
+            Assert.AreEqual(false, i1.Equals(obj));
+        }
 
-            public Int32TestData(object i1, object obj, bool expected)
-            {
-                I1 = i1;
-                Obj = obj;
-                Expected = expected;
-            }
+        [TestMethod]
+        public void Equals_Int32ToString()
+        {
+            int i1 = 89;
+            object obj = "789";
+            Assert.AreEqual(false, i1.Equals(obj));
         }
     }
 }

Tests/NFUnitTestSystemLib/UnitTestUInt16.cs

@@ -35,43 +35,38 @@ public void MinValue()
         }
 
         [TestMethod]
-        public void Equals()
+        [DataRow((ushort)789, (ushort)789, true)]
+        [DataRow((ushort)788, (ushort)0, false)]
+        [DataRow((ushort)0, (ushort)0, true)]
+        public void Equals_UInt16ToUInt16(ushort i1, ushort obj, bool expected)
         {
-            UInt16TestData[] testData = new UInt16TestData[]
-            {
-                new UInt16TestData((ushort)789, (ushort)789, true),
-                new UInt16TestData((ushort)788, (ushort)0, false),
-                new UInt16TestData((ushort)0, (ushort)0, true),
-                new UInt16TestData((ushort)789, null, false),
-                new UInt16TestData((ushort)789, "789", false),
-                new UInt16TestData((ushort)789, 789, false)
-            };
-
-            foreach (var test in testData)
-            {
-                if (test.Obj is ushort)
-                {
-                    Assert.AreEqual(test.Expected, test.I1.Equals((ushort)test.Obj));
-                    Assert.AreEqual(test.Expected, test.I1.GetHashCode().Equals(((ushort)test.Obj).GetHashCode()));
-                    Assert.AreEqual((ushort)test.I1, test.I1.GetHashCode());
-                }
+            Assert.AreEqual(expected, i1.Equals(obj));
+            Assert.AreEqual(expected, i1.GetHashCode().Equals(obj.GetHashCode()));
+            Assert.AreEqual(i1, i1.GetHashCode());
+        }
 
-                Assert.AreEqual(test.Expected, test.I1.Equals(test.Obj));
-            }
+        [TestMethod]
+        public void Equals_UInt16ToNull()
+        {
+            ushort i1 = 789;
+            object obj = null;
+            Assert.AreEqual(false, i1.Equals(obj));
         }
 
-        private sealed class UInt16TestData
+        [TestMethod]
+        public void Equals_UInt16ToString()
         {
-            public object I1 { get; }
-            public object Obj { get; }
-            public bool Expected { get; }
+            ushort i1 = 789;
+            object obj = "789";
+            Assert.AreEqual(false, i1.Equals(obj));
+        }
 
-            public UInt16TestData(object i1, object obj, bool expected)
-            {
-                I1 = i1;
-                Obj = obj;
-                Expected = expected;
-            }
+        [TestMethod]
+        public void Equals_UInt16ToInt()
+        {
+            ushort i1 = 789;
+            object obj = 789;
+            Assert.AreEqual(false, i1.Equals(obj));
         }
     }
 }