Add BindingMemberInfo tests and cleanup

src/System.Windows.Forms/src/System/Windows/Forms/BindingMemberInfo.cs

@@ -2,74 +2,56 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace System.Windows.Forms {
+namespace System.Windows.Forms
+{
+    public struct BindingMemberInfo
+    {
+        private string _dataList;
+        private string _dataField;
 
-    using System;
-    using System.Globalization;
-
-    /// <include file='doc\DataMemberInfo.uex' path='docs/doc[@for="BindingMemberInfo"]/*' />
-    public struct BindingMemberInfo {
-        private string dataList;
-        private string dataField;
-
-        /// <include file='doc\DataMemberInfo.uex' path='docs/doc[@for="BindingMemberInfo.BindingMemberInfo"]/*' />
-        public BindingMemberInfo(string dataMember) {
+        public BindingMemberInfo(string dataMember)
+        {
             if (dataMember == null)
-                dataMember = "";
-
-            int lastDot = dataMember.LastIndexOf(".");
-            if (lastDot != -1) {
-                dataList = dataMember.Substring(0,lastDot);
-                dataField = dataMember.Substring(lastDot+1);
+            {
+                dataMember = string.Empty;
             }
-            else {
-                dataList = "";
-                dataField = dataMember;
-            }
-        }
-
-        /// <include file='doc\DataMemberInfo.uex' path='docs/doc[@for="BindingMemberInfo.BindingPath"]/*' />
-        public string BindingPath {
-            get {
-                return (dataList != null ? dataList : "");
+
+            int lastDot = dataMember.LastIndexOf('.');
+            if (lastDot != -1)
+            {
+                _dataList = dataMember.Substring(0, lastDot);
+                _dataField = dataMember.Substring(lastDot + 1);
             }
-        }
-
-        /// <include file='doc\DataMemberInfo.uex' path='docs/doc[@for="BindingMemberInfo.BindingField"]/*' />
-        public string BindingField {
-            get {
-                return (dataField != null ? dataField : "");
+            else
+            {
+                _dataList = string.Empty;
+                _dataField = dataMember;
             }
         }
-
-        /// <include file='doc\DataMemberInfo.uex' path='docs/doc[@for="BindingMemberInfo.BindingMember"]/*' />
-        public string BindingMember {
-            get {
-                return (BindingPath.Length > 0 ? BindingPath + "." + BindingField : BindingField);
-            }
+
+        public string BindingPath => _dataList != null ? _dataList : string.Empty;
+
+        public string BindingField => _dataField != null ? _dataField : string.Empty;
+
+        public string BindingMember
+        {
+            get => BindingPath.Length > 0 ? BindingPath + "." + BindingField : BindingField;
         }
-            
-        /// <include file='doc\DataMemberInfo.uex' path='docs/doc[@for="BindingMemberInfo.Equals"]/*' />
-        public override bool Equals(object otherObject) {
-            if (otherObject is BindingMemberInfo) {
-                BindingMemberInfo otherMember = (BindingMemberInfo) otherObject;
-                return (string.Equals(this.BindingMember, otherMember.BindingMember, StringComparison.OrdinalIgnoreCase));
+
+        public override bool Equals(object otherObject)
+        {
+            if (!(otherObject is BindingMemberInfo otherMember))
+            {
+                return false;
             }
-            return false;
-        }
 
-        public static bool operator ==(BindingMemberInfo a, BindingMemberInfo b) {            
-            return a.Equals(b);
+            return string.Equals(BindingMember, otherMember.BindingMember, StringComparison.OrdinalIgnoreCase);
         }
 
-        public static bool operator !=(BindingMemberInfo a, BindingMemberInfo b) {
-            return !a.Equals(b);
-        }
-
-        /// <include file='doc\DataMemberInfo.uex' path='docs/doc[@for="BindingMemberInfo.GetHashCode"]/*' />
-        public override int GetHashCode() {
-            return base.GetHashCode();
-        }
+        public static bool operator ==(BindingMemberInfo a, BindingMemberInfo b) => a.Equals(b);
+
+        public static bool operator !=(BindingMemberInfo a, BindingMemberInfo b) => !a.Equals(b);
+
+        public override int GetHashCode() => base.GetHashCode();
     }
 }
-

src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/BindingMemberInfoTests.cs

@@ -0,0 +1,87 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Collections.Generic;
+using Xunit;
+
+namespace System.Windows.Forms.Tests
+{
+    public class BindingMemberInfoTests
+    {
+        [Fact]
+        public void Ctor_Default()
+        {
+            var info = new BindingMemberInfo();
+            Assert.Empty(info.BindingPath);
+            Assert.Empty(info.BindingField);
+            Assert.Empty(info.BindingMember);
+        }
+
+        [Theory]
+        [InlineData(null, "", "", "")]
+        [InlineData("", "", "", "")]
+        [InlineData("Some", "", "Some", "Some")]
+        [InlineData("Some.More.Other", "Some.More", "Other", "Some.More.Other")]
+        [InlineData("Some.Other", "Some", "Other", "Some.Other")]
+        [InlineData("Some.", "Some", "", "Some.")]
+        [InlineData(".Other", "", "Other", "Other")]
+        [InlineData(".", "", "", "")]
+        public void Ctor_String(string dataMember, string expectedPath, string expectedField, string expectedMember)
+        {
+            var info = new BindingMemberInfo(dataMember);
+            Assert.Equal(expectedPath, info.BindingPath);
+            Assert.Equal(expectedField, info.BindingField);
+            Assert.Equal(expectedMember, info.BindingMember);
+        }
+
+        public static IEnumerable<object[]> Equals_TestData()
+        {
+            yield return new object[] { new BindingMemberInfo("Some.Other"), new BindingMemberInfo("Some.Other"), true };
+            yield return new object[] { new BindingMemberInfo("Some.Other"), new BindingMemberInfo("some.other"), true };
+            yield return new object[] { new BindingMemberInfo("Some.Other"), new BindingMemberInfo("Some2.Other"), false };
+            yield return new object[] { new BindingMemberInfo("Some.Other"), new BindingMemberInfo("Some.Other2"), false };
+            yield return new object[] { new BindingMemberInfo("Some.Other"), new BindingMemberInfo("Some"), false };
+            yield return new object[] { new BindingMemberInfo("Some.Other"), new BindingMemberInfo(), false };
+
+            yield return new object[] { new BindingMemberInfo("Some"), new BindingMemberInfo("Some"), true };
+            yield return new object[] { new BindingMemberInfo("Some"), new BindingMemberInfo("Some2"), false };
+            yield return new object[] { new BindingMemberInfo("Some"), new BindingMemberInfo("Some.Other"), false };
+            yield return new object[] { new BindingMemberInfo("Some.Other"), new BindingMemberInfo(), false };
+
+            yield return new object[] { new BindingMemberInfo(), new BindingMemberInfo(), true };
+            yield return new object[] { new BindingMemberInfo(), new BindingMemberInfo(""), true };
+            yield return new object[] { new BindingMemberInfo(), new BindingMemberInfo("Some.Other"), false };
+
+            yield return new object[] { new BindingMemberInfo("Some.Other"), new object(), false };
+            yield return new object[] { new BindingMemberInfo("Some.Other"), null, false };
+        }
+
+        [Theory]
+        [MemberData(nameof(Equals_TestData))]
+        public void Equals_Invoke_ReturnsExpected(BindingMemberInfo info, object other, bool expected)
+        {
+            if (other is BindingMemberInfo otherInfo)
+            {
+                Assert.Equal(expected, info == otherInfo);
+                Assert.Equal(!expected, info != otherInfo);
+            }
+
+            Assert.Equal(expected, info.Equals(other));
+        }
+
+        public static IEnumerable<object[]> GetHashCode_TestData()
+        {
+            yield return new object[] { new BindingMemberInfo() };
+            yield return new object[] { new BindingMemberInfo("Some") };
+            yield return new object[] { new BindingMemberInfo("Some.Other") };
+        }
+
+        [Theory]
+        [MemberData(nameof(GetHashCode_TestData))]
+        public void GetHashCode_Invoke_ReturnsExpected(BindingMemberInfo info)
+        {
+            Assert.Equal(info.GetHashCode(), info.GetHashCode());
+        }
+    }
+}