diff --git a/src/System.Windows.Forms.Design.Editors/tests/UnitTests/System/ComponentModel/Design/ArrayEditorTests.cs b/src/System.Windows.Forms.Design.Editors/tests/UnitTests/System/ComponentModel/Design/ArrayEditorTests.cs index 6b008dc8017..043b03e4ab8 100644 --- a/src/System.Windows.Forms.Design.Editors/tests/UnitTests/System/ComponentModel/Design/ArrayEditorTests.cs +++ b/src/System.Windows.Forms.Design.Editors/tests/UnitTests/System/ComponentModel/Design/ArrayEditorTests.cs @@ -135,10 +135,10 @@ public void ArrayEditor_GetDisplayText_ValueDoesntMatchCollectionType_ThrowsTarg public static IEnumerable GetItems_TestData() { - yield return new object[] { null, new object[0] }; - yield return new object[] { new object(), new object[0] }; + yield return new object[] { null, Array.Empty() }; + yield return new object[] { new object(), Array.Empty() }; yield return new object[] { new int[] { 1, 2, 3 }, new object[] { 1, 2, 3, } }; - yield return new object[] { new ArrayList { 1, 2, 3 }, new object[0] }; + yield return new object[] { new ArrayList { 1, 2, 3 }, Array.Empty() }; } [Theory] @@ -154,7 +154,7 @@ public void ArrayEditor_GetItems_Invoke_ReturnsExpected(object editValue, object public static IEnumerable SetItems_Array_TestData() { - yield return new object[] { null, new object[0], new object[0] }; + yield return new object[] { null, Array.Empty(), Array.Empty() }; yield return new object[] { null, new object[] { 1, 2, 3 }, new object[] { 1, 2, 3 } }; yield return new object[] { new object[] { 4, 5 }, new object[] { 1, 2, 3 }, new object[] { 1, 2, 3 } }; yield return new object[] { new object[] { 4, 5, 6 }, new object[] { 1, 2, 3 }, new object[] { 1, 2, 3 } }; @@ -175,8 +175,8 @@ public static IEnumerable SetItems_NonArray_TestData() { var editValue = new object(); yield return new object[] { editValue, null, editValue }; - yield return new object[] { editValue, new object[0], editValue }; - yield return new object[] { new object[0], null, null }; + yield return new object[] { editValue, Array.Empty(), editValue }; + yield return new object[] { Array.Empty(), null, null }; yield return new object[] { null, null, null }; } @@ -195,8 +195,8 @@ public void ArrayEditor_SetItems_NullCollectionItemType_ThrowsArgumentNullExcept { var editor = new SubArrayEditor(type); Assert.Null(editor.CollectionItemType); - Assert.Throws("elementType", () => editor.SetItems(null, new object[0])); - Assert.Throws("elementType", () => editor.SetItems(new object[0], new object[0])); + Assert.Throws("elementType", () => editor.SetItems(null, Array.Empty())); + Assert.Throws("elementType", () => editor.SetItems(Array.Empty(), Array.Empty())); } private class SubArrayEditor : ArrayEditor diff --git a/src/System.Windows.Forms.Design.Editors/tests/UnitTests/System/ComponentModel/Design/CollectionEditorTests.cs b/src/System.Windows.Forms.Design.Editors/tests/UnitTests/System/ComponentModel/Design/CollectionEditorTests.cs index c9afebbdd4d..10577e35bec 100644 --- a/src/System.Windows.Forms.Design.Editors/tests/UnitTests/System/ComponentModel/Design/CollectionEditorTests.cs +++ b/src/System.Windows.Forms.Design.Editors/tests/UnitTests/System/ComponentModel/Design/CollectionEditorTests.cs @@ -835,8 +835,8 @@ public void CollectionEditor_GetDisplayText_ValueDoesntMatchCollectionType_Throw public static IEnumerable GetItems_TestData() { - yield return new object[] { null, new object[0] }; - yield return new object[] { new object(), new object[0] }; + yield return new object[] { null, Array.Empty() }; + yield return new object[] { new object(), Array.Empty() }; yield return new object[] { new int[] { 1, 2, 3 }, new object[] { 1, 2, 3, } }; yield return new object[] { new ArrayList { 1, 2, 3 }, new object[] { 1, 2, 3, } }; } @@ -917,20 +917,20 @@ public void CollectionEditor_GetObjectsFromInstance_Invoke_ReturnsExpected(objec public static IEnumerable SetItems_TestData() { yield return new object[] { null, new object[] { 1, 2, 3 }, null }; - yield return new object[] { null, new object[0], null }; + yield return new object[] { null, Array.Empty(), null }; yield return new object[] { null, null, null }; var o = new object(); yield return new object[] { o, new object[] { 1, 2, 3 }, o }; - yield return new object[] { o, new object[0], o }; + yield return new object[] { o, Array.Empty(), o }; yield return new object[] { o, null, o }; - yield return new object[] { new int[] { 1, 2, 3 }, new object[0], new object[] { 0, 0, 0 } }; + yield return new object[] { new int[] { 1, 2, 3 }, Array.Empty(), new object[] { 0, 0, 0 } }; yield return new object[] { new int[] { 1, 2, 3 }, null, new object[] { 0, 0, 0 } }; yield return new object[] { new ArrayList { 1, 2, 3 }, new object[] { 1 }, new object[] { 1 } }; - yield return new object[] { new ArrayList { 1, 2, 3 }, new object[0], new object[0] }; - yield return new object[] { new ArrayList { 1, 2, 3 }, null, new object[0] }; + yield return new object[] { new ArrayList { 1, 2, 3 }, Array.Empty(), Array.Empty() }; + yield return new object[] { new ArrayList { 1, 2, 3 }, null, Array.Empty() }; } [Theory] diff --git a/src/System.Windows.Forms.Design.Editors/tests/UnitTests/System/ComponentModel/Design/CollectionFormTests.cs b/src/System.Windows.Forms.Design.Editors/tests/UnitTests/System/ComponentModel/Design/CollectionFormTests.cs index 49a06a0e400..a8c7896f857 100644 --- a/src/System.Windows.Forms.Design.Editors/tests/UnitTests/System/ComponentModel/Design/CollectionFormTests.cs +++ b/src/System.Windows.Forms.Design.Editors/tests/UnitTests/System/ComponentModel/Design/CollectionFormTests.cs @@ -58,7 +58,7 @@ public void CollectionForm_EditValue_Set_GetReturnsExpected(object value) public static IEnumerable Items_Set_TestData() { yield return new object[] { null }; - yield return new object[] { new object[0] }; + yield return new object[] { Array.Empty() }; yield return new object[] { new object[] { 1, 2, 3 } }; } @@ -205,16 +205,16 @@ public void CollectionForm_Items_SetWithContextWithEditValue_GetReturnsExpected( form.OnEditValueChangedCallCount = 0; form.Items = value; - Assert.Equal(value ?? new object[0], form.EditValue); - Assert.Equal(value ?? new object[0], form.Items); + Assert.Equal(value ?? Array.Empty(), form.EditValue); + Assert.Equal(value ?? Array.Empty(), form.Items); Assert.Equal(0, form.OnEditValueChangedCallCount); mockContext.Verify(c => c.OnComponentChanging(), Times.Once()); mockContext.Verify(c => c.OnComponentChanged(), Times.Once()); // Set same. form.Items = value; - Assert.Equal(value ?? new object[0], form.EditValue); - Assert.Equal(value ?? new object[0], form.Items); + Assert.Equal(value ?? Array.Empty(), form.EditValue); + Assert.Equal(value ?? Array.Empty(), form.Items); Assert.Equal(0, form.OnEditValueChangedCallCount); mockContext.Verify(c => c.OnComponentChanging(), Times.Exactly(2)); mockContext.Verify(c => c.OnComponentChanged(), Times.Exactly(2)); diff --git a/src/System.Windows.Forms.Design.Editors/tests/UnitTests/System/Drawing/Design/ImageEditorTests.cs b/src/System.Windows.Forms.Design.Editors/tests/UnitTests/System/Drawing/Design/ImageEditorTests.cs index df69ac59f16..c668cceefcb 100644 --- a/src/System.Windows.Forms.Design.Editors/tests/UnitTests/System/Drawing/Design/ImageEditorTests.cs +++ b/src/System.Windows.Forms.Design.Editors/tests/UnitTests/System/Drawing/Design/ImageEditorTests.cs @@ -17,7 +17,7 @@ public class ImageEditorTests public static IEnumerable CreateExtensionsString_TestData() { yield return new object[] { null, ",", null }; - yield return new object[] { new string[0], ",", null }; + yield return new object[] { Array.Empty(), ",", null }; yield return new object[] { new string[] { "a", "b", "c" }, ",", "*.a,*.b,*.c" }; yield return new object[] { new string[] { "a", "b", "c" }, "", "*.a*.b*.c" }; yield return new object[] { new string[] { "a", "b", "c" }, null, "*.a*.b*.c" }; diff --git a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/ComponentDesigner.cs b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/ComponentDesigner.cs index 3471a0336e8..18fadbcac96 100644 --- a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/ComponentDesigner.cs +++ b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/ComponentDesigner.cs @@ -48,7 +48,7 @@ public virtual DesignerActionListCollection ActionLists /// public virtual ICollection AssociatedComponents { - get => new IComponent[0]; + get => Array.Empty(); } internal virtual bool CanBeAssociatedWith(IDesigner parentDesigner) => true; @@ -258,7 +258,7 @@ void IDesignerFilter.PreFilterProperties(IDictionary properties) { if (properties[SettingsKeyName] is PropertyDescriptor prop) { - properties[SettingsKeyName] = TypeDescriptor.CreateProperty(typeof(ComponentDesigner), prop, new Attribute[0]); + properties[SettingsKeyName] = TypeDescriptor.CreateProperty(typeof(ComponentDesigner), prop, Array.Empty()); } } } @@ -318,7 +318,7 @@ ICollection ITreeDesigner.Children return designers; } - return new object[0]; + return Array.Empty(); } } @@ -873,7 +873,7 @@ protected virtual void PreFilterProperties(IDictionary properties) { if (properties[SettingsKeyName] is PropertyDescriptor prop) { - properties[SettingsKeyName] = TypeDescriptor.CreateProperty(typeof(ComponentDesigner), prop, new Attribute[0]); + properties[SettingsKeyName] = TypeDescriptor.CreateProperty(typeof(ComponentDesigner), prop, Array.Empty()); } } } diff --git a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignSurface.cs b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignSurface.cs index 9e2a637ca04..fcdc2f91a6c 100644 --- a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignSurface.cs +++ b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignSurface.cs @@ -106,7 +106,7 @@ public ICollection LoadErrors { return _loadErrors; } - return new object[0]; + return Array.Empty(); } } @@ -325,10 +325,10 @@ protected internal virtual object CreateInstance(Type type) // Locate an appropriate constructor for IComponents. object instance = null; - ConstructorInfo ctor = TypeDescriptor.GetReflectionType(type).GetConstructor(new Type[0]); + ConstructorInfo ctor = TypeDescriptor.GetReflectionType(type).GetConstructor(Array.Empty()); if (ctor != null) { - instance = TypeDescriptor.CreateInstance(this, type, new Type[0], new object[0]); + instance = TypeDescriptor.CreateInstance(this, type, Array.Empty(), Array.Empty()); } else { diff --git a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/ExtenderProviderService.cs b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/ExtenderProviderService.cs index 640354668dc..4a09849052e 100644 --- a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/ExtenderProviderService.cs +++ b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/ExtenderProviderService.cs @@ -30,7 +30,7 @@ IExtenderProvider[] IExtenderListService.GetExtenderProviders() _providers.CopyTo(providers, 0); return providers; } - return new IExtenderProvider[0]; + return Array.Empty(); } /// diff --git a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/SelectionService.cs b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/SelectionService.cs index 3c7b5f1fd7a..e3a1c7df10c 100644 --- a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/SelectionService.cs +++ b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/SelectionService.cs @@ -363,7 +363,7 @@ ICollection ISelectionService.GetSelectedComponents() _selection.CopyTo(selectedValues, 0); return selectedValues; } - return new object[0]; + return Array.Empty(); } /// @@ -389,7 +389,7 @@ void ISelectionService.SetSelectedComponents(ICollection components, SelectionTy // We always want to allow NULL arrays coming in. if (components == null) { - components = new object[0]; + components = Array.Empty(); } // If toggle, replace, remove or add are not specifically specified, infer them from the state of the modifer keys. This creates the "Auto" selection type for us by default. if (fAuto) diff --git a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/CodeDomComponentSerializationService.cs b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/CodeDomComponentSerializationService.cs index daee0a5ac01..a8751574a5f 100644 --- a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/CodeDomComponentSerializationService.cs +++ b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/CodeDomComponentSerializationService.cs @@ -307,7 +307,7 @@ public override ICollection Errors { if (_errors == null) { - _errors = new object[0]; + _errors = Array.Empty(); } object[] errors = new object[_errors.Count]; diff --git a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/CodeDomSerializerBase.cs b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/CodeDomSerializerBase.cs index b15fdd9643a..e8c648f5efe 100644 --- a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/CodeDomSerializerBase.cs +++ b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/CodeDomSerializerBase.cs @@ -2367,11 +2367,11 @@ protected CodeExpression SerializeCreationExpression(IDesignerSerializationManag } // No instance descriptor. See if we can get to a public constructor that takes no arguments - ConstructorInfo ctor = GetReflectionTypeHelper(manager, value).GetConstructor(new Type[0]); + ConstructorInfo ctor = GetReflectionTypeHelper(manager, value).GetConstructor(Array.Empty()); if (ctor != null) { isComplete = false; - return new CodeObjectCreateExpression(TypeDescriptor.GetClassName(value), new CodeExpression[0]); + return new CodeObjectCreateExpression(TypeDescriptor.GetClassName(value), Array.Empty()); } // Nothing worked. return null; diff --git a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/CollectionCodeDomSerializer.cs b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/CollectionCodeDomSerializer.cs index e9aff90b619..2574d2bad17 100644 --- a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/CollectionCodeDomSerializer.cs +++ b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/CollectionCodeDomSerializer.cs @@ -725,7 +725,7 @@ private bool ShouldClearCollection(IDesignerSerializationManager manager, IColle if (shouldClear) { - MethodInfo clearMethod = TypeDescriptor.GetReflectionType(collection).GetMethod("Clear", BindingFlags.Public | BindingFlags.Instance, null, new Type[0], null); + MethodInfo clearMethod = TypeDescriptor.GetReflectionType(collection).GetMethod("Clear", BindingFlags.Public | BindingFlags.Instance, null, Array.Empty(), null); if (clearMethod == null || !MethodSupportsSerialization(clearMethod)) { shouldClear = false; diff --git a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/ComponentTypeCodeDomSerializer.cs b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/ComponentTypeCodeDomSerializer.cs index 181ae872347..da04b6996d1 100644 --- a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/ComponentTypeCodeDomSerializer.cs +++ b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/ComponentTypeCodeDomSerializer.cs @@ -105,7 +105,7 @@ protected override CodeMemberMethod[] GetInitializeMethods(IDesignerSerializatio } } - return new CodeMemberMethod[0]; + return Array.Empty(); } } } diff --git a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/DesignerSerializationManager.cs b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/DesignerSerializationManager.cs index cd4acde1bdb..0560b2454e0 100644 --- a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/DesignerSerializationManager.cs +++ b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/DesignerSerializationManager.cs @@ -646,7 +646,7 @@ PropertyDescriptorCollection IDesignerSerializationManager.Properties PropertyDescriptor[] propArray; if (propObject == null) { - propArray = new PropertyDescriptor[0]; + propArray = Array.Empty(); } else { diff --git a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/TypeCodeDomSerializer.cs b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/TypeCodeDomSerializer.cs index 30bf2d7fc82..f94b37ff048 100644 --- a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/TypeCodeDomSerializer.cs +++ b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/TypeCodeDomSerializer.cs @@ -397,7 +397,7 @@ protected virtual CodeMemberMethod[] GetInitializeMethods(IDesignerSerialization return new CodeMemberMethod[] { ctor }; } } - return new CodeMemberMethod[0]; + return Array.Empty(); } /// diff --git a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/Behavior/DragAssistanceManager.cs b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/Behavior/DragAssistanceManager.cs index 60db5abacd8..45d2d35c047 100644 --- a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/Behavior/DragAssistanceManager.cs +++ b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/Behavior/DragAssistanceManager.cs @@ -40,8 +40,8 @@ internal sealed class DragAssistanceManager //T hese are cleared and populated on every mouse move. These lists contain all the new vertical and horizontal lines we need to draw. At the end of each mouse move - these lines are stored off in the vertLines and horzLines arrays. This way - we can keep track of old snap lines and can avoid erasing and redrawing the same line. HA. private readonly ArrayList _tempVertLines = new ArrayList(); private readonly ArrayList _tempHorzLines = new ArrayList(); - private Line[] _vertLines = new Line[0]; - private Line[] _horzLines = new Line[0]; + private Line[] _vertLines = Array.Empty(); + private Line[] _horzLines = Array.Empty(); // When we draw snap lines - we only draw lines from the targetControl to the control we're snapping to. To do this, we'll keep a hashtable... format: snapLineToBounds[SnapLine]=ControlBounds. private readonly Hashtable _snapLineToBounds = new Hashtable(); // We remember the last set of (vert & horz) lines we draw so that we can push them to the beh. svc. From there, if we receive a test hook message requesting these - we got 'em @@ -315,7 +315,7 @@ private Line[] EraseOldSnapLines(Line[] lines, ArrayList tempLines) } else { - lines = new Line[0]; + lines = Array.Empty(); } return lines; } @@ -335,7 +335,7 @@ internal Line[] GetRecentLines() { return _recentLines; } - return new Line[0]; + return Array.Empty(); } private void IdentifyAndStoreValidLines(ArrayList snapLines, int[] distances, Rectangle dragBounds, int smallestDistance) diff --git a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/CommandSet.cs b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/CommandSet.cs index 5d7f3a51e35..643602963bb 100644 --- a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/CommandSet.cs +++ b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/CommandSet.cs @@ -315,7 +315,7 @@ private object[] FilterSelection(object[] components, SelectionRules selectionRu object[] selection = null; if (components == null) { - return new object[0]; + return Array.Empty(); } // Mask off any selection object that doesn't adhere to the given ruleset. We can ignore this if the ruleset is zero, as all components would be accepted. if (selectionRules != SelectionRules.None) @@ -334,7 +334,7 @@ private object[] FilterSelection(object[] components, SelectionRules selectionRu selection = list.ToArray(); } } - return selection ?? (new object[0]); + return selection ?? (Array.Empty()); } /// @@ -1326,7 +1326,7 @@ protected void OnMenuCut(object sender, EventArgs e) { trans = host.CreateTransaction(string.Format(SR.CommandSetCutMultiple, cutCount)); // clear the selected components so we aren't browsing them - SelectionService.SetSelectedComponents(new object[0], SelectionTypes.Replace); + SelectionService.SetSelectedComponents(Array.Empty(), SelectionTypes.Replace); object[] selComps = new object[selectedComponents.Count]; selectedComponents.CopyTo(selComps, 0); for (int i = 0; i < selComps.Length; i++) @@ -1463,7 +1463,7 @@ protected void OnMenuDelete(object sender, EventArgs e) try { trans = host.CreateTransaction(desc); - SelectionService.SetSelectedComponents(new object[0], SelectionTypes.Replace); + SelectionService.SetSelectedComponents(Array.Empty(), SelectionTypes.Replace); foreach (object obj in comps) { if (!(obj is IComponent comp) || comp.Site == null) @@ -2030,7 +2030,7 @@ protected void OnMenuSelectAll(object sender, EventArgs e) object[] selComps; if (components == null || components.Count == 0) { - selComps = new IComponent[0]; + selComps = Array.Empty(); } else { diff --git a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ComponentTray.cs b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ComponentTray.cs index 87e323e091a..428f65647bd 100644 --- a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ComponentTray.cs +++ b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ComponentTray.cs @@ -1353,7 +1353,7 @@ protected override void OnMouseUp(MouseEventArgs e) } else { - comps = new object[0]; + comps = Array.Empty(); } if (comps.Length == 0) diff --git a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ControlDesigner.cs b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ControlDesigner.cs index 07e27f6b799..04d565f6ca1 100644 --- a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ControlDesigner.cs +++ b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ControlDesigner.cs @@ -1601,7 +1601,7 @@ protected override void PreFilterProperties(IDictionary properties) // Handle shadowed properties string[] shadowProps = new string[] { "Visible", "Enabled", "ContextMenu", "AllowDrop", "Location", "Name" }; - Attribute[] empty = new Attribute[0]; + Attribute[] empty = Array.Empty(); for (int i = 0; i < shadowProps.Length; i++) { prop = (PropertyDescriptor)properties[shadowProps[i]]; diff --git a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/FormDocumentDesigner.cs b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/FormDocumentDesigner.cs index 4909e9bf54a..a01fd9d08ac 100644 --- a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/FormDocumentDesigner.cs +++ b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/FormDocumentDesigner.cs @@ -642,7 +642,7 @@ protected override void PreFilterProperties(IDictionary properties) base.PreFilterProperties(properties); // Handle shadowed properties string[] shadowProps = new string[] { "Opacity", "Menu", "IsMdiContainer", "Size", "ShowInTaskBar", "WindowState", "AutoSize", "AcceptButton", "CancelButton" }; - Attribute[] empty = new Attribute[0]; + Attribute[] empty = Array.Empty(); for (int i = 0; i < shadowProps.Length; i++) { prop = (PropertyDescriptor)properties[shadowProps[i]]; diff --git a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/SelectionUIService.cs b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/SelectionUIService.cs index 9de7e5b260c..66383a900a5 100644 --- a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/SelectionUIService.cs +++ b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/SelectionUIService.cs @@ -1146,7 +1146,7 @@ object[] ISelectionUIService.FilterSelection(object[] components, SelectionRules object[] selection = null; if (components == null) { - return new object[0]; + return Array.Empty(); } // Mask off any selection object that doesn't adhere to the given ruleset. We can ignore this if the ruleset is zero, as all components would be accepted. if (selectionRules != SelectionRules.None) @@ -1165,7 +1165,7 @@ object[] ISelectionUIService.FilterSelection(object[] components, SelectionRules } selection = (object[])list.ToArray(); } - return selection ?? (new object[0]); + return selection ?? (Array.Empty()); } /// diff --git a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ToolStripDesigner.cs b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ToolStripDesigner.cs index 728468d6845..5ba8251a067 100644 --- a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ToolStripDesigner.cs +++ b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ToolStripDesigner.cs @@ -2224,7 +2224,7 @@ protected override void PreFilterProperties(IDictionary properties) "AllowDrop", "AllowItemReorder" }; - Attribute[] empty = new Attribute[0]; + Attribute[] empty = Array.Empty(); for (int i = 0; i < shadowProps.Length; i++) { prop = (PropertyDescriptor)properties[shadowProps[i]]; diff --git a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ToolStripDesignerUtils.cs b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ToolStripDesignerUtils.cs index 3d34cac65c8..609ff2fac84 100644 --- a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ToolStripDesignerUtils.cs +++ b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ToolStripDesignerUtils.cs @@ -276,7 +276,7 @@ public static Type[] GetCustomItemTypes(IComponent component, ITypeDiscoveryServ continue; } // Check if we have public constructor... - ConstructorInfo ctor = t.GetConstructor(new Type[0]); + ConstructorInfo ctor = t.GetConstructor(Array.Empty()); if (ctor == null) { continue; @@ -313,7 +313,7 @@ public static Type[] GetCustomItemTypes(IComponent component, ITypeDiscoveryServ } } s_customToolStripItemCount = 0; - return new Type[0]; + return Array.Empty(); } /// diff --git a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ToolStripDropDownDesigner.cs b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ToolStripDropDownDesigner.cs index bbb457a779a..2a898a3217c 100644 --- a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ToolStripDropDownDesigner.cs +++ b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ToolStripDropDownDesigner.cs @@ -566,7 +566,7 @@ protected override void PreFilterProperties(IDictionary properties) base.PreFilterProperties(properties); PropertyDescriptor prop; string[] shadowProps = new string[] { "AutoClose", SettingsKeyName, "RightToLeft", "AllowDrop" }; - Attribute[] empty = new Attribute[0]; + Attribute[] empty = Array.Empty(); for (int i = 0; i < shadowProps.Length; i++) { prop = (PropertyDescriptor)properties[shadowProps[i]]; diff --git a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ToolStripItemDesigner.cs b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ToolStripItemDesigner.cs index b0c6c498888..e49669a238c 100644 --- a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ToolStripItemDesigner.cs +++ b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ToolStripItemDesigner.cs @@ -1078,7 +1078,7 @@ protected override void PreFilterProperties(IDictionary properties) string[] shadowProps = new string[] { "AutoSize", "AccessibleName", "Visible", "Overflow" }; PropertyDescriptor prop; - Attribute[] empty = new Attribute[0]; + Attribute[] empty = Array.Empty(); for (int i = 0; i < shadowProps.Length; i++) { prop = (PropertyDescriptor)properties[shadowProps[i]]; diff --git a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ToolStripMenuItemDesigner.cs b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ToolStripMenuItemDesigner.cs index 54add07913d..f95b77c8f35 100644 --- a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ToolStripMenuItemDesigner.cs +++ b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ToolStripMenuItemDesigner.cs @@ -2233,7 +2233,7 @@ protected override void PreFilterProperties(IDictionary properties) // Handle shadowed properties string[] shadowProps = new string[] { "Visible", "DoubleClickEnabled", "CheckOnClick", "DropDown" }; PropertyDescriptor prop; - Attribute[] empty = new Attribute[0]; + Attribute[] empty = Array.Empty(); for (int i = 0; i < shadowProps.Length; i++) { prop = (PropertyDescriptor)properties[shadowProps[i]]; diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerActionListCollectionTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerActionListCollectionTests.cs index 4c7a284520d..453afee142d 100644 --- a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerActionListCollectionTests.cs +++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerActionListCollectionTests.cs @@ -19,7 +19,7 @@ public void DesignerActionListCollection_Ctor_Default() public static IEnumerable Ctor_DesignerActionListArray_TestData() { - yield return new object[] { new DesignerActionList[0] }; + yield return new object[] { Array.Empty() }; yield return new object[] { new DesignerActionList[] { new DesignerActionList(null), null } }; } diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerCommandSetTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerCommandSetTests.cs index a2a1c93d2a0..df93d6a8d2b 100644 --- a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerCommandSetTests.cs +++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerCommandSetTests.cs @@ -43,7 +43,7 @@ public void DesignerCommandSet_Verbs_InvalidOverridenGetCommands_ThrowsInvalidCa var mockSet = new Mock(MockBehavior.Strict); mockSet .Setup(s => s.GetCommands("Verbs")) - .Returns(new object[0]); + .Returns(Array.Empty()); Assert.Throws(() => mockSet.Object.Verbs); } @@ -64,7 +64,7 @@ public void DesignerCommandSet_ActionLists_InvalidOverridenGetCommands_ThrowsInv var mockSet = new Mock(MockBehavior.Strict); mockSet .Setup(s => s.GetCommands("ActionLists")) - .Returns(new object[0]); + .Returns(Array.Empty()); Assert.Throws(() => mockSet.Object.ActionLists); } } diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerHostTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerHostTests.cs index a02a92c7f8c..c78ebb2045d 100644 --- a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerHostTests.cs +++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerHostTests.cs @@ -1801,7 +1801,7 @@ public void DesignerHost_GetComponents_Invoke_ReturnsFiltered() var collection = new ComponentCollection(new Component[] { new Component() }); var mockFilterService = new Mock(MockBehavior.Strict); mockFilterService - .Setup(f => f.FilterComponents(new ComponentCollection(new IComponent[0]))) + .Setup(f => f.FilterComponents(new ComponentCollection(Array.Empty()))) .Returns(collection); var mockServiceProvider = new Mock(MockBehavior.Strict); mockServiceProvider @@ -2681,7 +2681,7 @@ public void DesignerHost_IReflect_GetMethod_Success() var surface = new SubDesignSurface(); IReflect reflect = Assert.IsAssignableFrom(surface.Host); Assert.Equal(typeof(IDesignerHost).GetMethod(nameof(IDesignerHost.Activate)), reflect.GetMethod(nameof(IDesignerHost.Activate), BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public)); - Assert.Equal(typeof(IDesignerHost).GetMethod(nameof(IDesignerHost.Activate)), reflect.GetMethod(nameof(IDesignerHost.Activate), BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public, null, new Type[0], new ParameterModifier[0])); + Assert.Equal(typeof(IDesignerHost).GetMethod(nameof(IDesignerHost.Activate)), reflect.GetMethod(nameof(IDesignerHost.Activate), BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public, null, Array.Empty(), Array.Empty())); } [Fact] @@ -2698,7 +2698,7 @@ public void DesignerHost_IReflect_GetProperty_Success() var surface = new SubDesignSurface(); IReflect reflect = Assert.IsAssignableFrom(surface.Host); Assert.Equal(typeof(IDesignerHost).GetProperty(nameof(IDesignerHost.Container)), reflect.GetProperty(nameof(IDesignerHost.Container), BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public)); - Assert.Equal(typeof(IDesignerHost).GetProperty(nameof(IDesignerHost.Container)), reflect.GetProperty(nameof(IDesignerHost.Container), BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public, null, typeof(IContainer), new Type[0], new ParameterModifier[0])); + Assert.Equal(typeof(IDesignerHost).GetProperty(nameof(IDesignerHost.Container)), reflect.GetProperty(nameof(IDesignerHost.Container), BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public, null, typeof(IContainer), Array.Empty(), Array.Empty())); } [Fact] @@ -2714,7 +2714,7 @@ public void DesignerHost_IReflect_InvokeMember_ReturnsExpected() { var surface = new SubDesignSurface(); IReflect reflect = Assert.IsAssignableFrom(surface.Host); - Assert.Equal(surface.Host.Container, reflect.InvokeMember(nameof(IDesignerHost.Container), BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public | BindingFlags.GetProperty, null, surface.Host, new object[0], new ParameterModifier[0], null, new string[0])); + Assert.Equal(surface.Host.Container, reflect.InvokeMember(nameof(IDesignerHost.Container), BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public | BindingFlags.GetProperty, null, surface.Host, Array.Empty(), Array.Empty(), null, Array.Empty())); } private class SubDesignSurface : DesignSurface diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/LoadedEventArgsTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/LoadedEventArgsTests.cs index b9851ec8627..46d21d372b8 100644 --- a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/LoadedEventArgsTests.cs +++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/LoadedEventArgsTests.cs @@ -13,7 +13,7 @@ public class LoadedEventArgsTests public static IEnumerable Ctor_Bool_ICollection_TestData() { yield return new object[] { true, null }; - yield return new object[] { false, new object[0] }; + yield return new object[] { false, Array.Empty() }; yield return new object[] { true, new object[] { null } }; } diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/ToolboxComponentsCreatedEventArgsTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/ToolboxComponentsCreatedEventArgsTests.cs index 4a4679e5fd3..9cf7d0f2398 100644 --- a/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/ToolboxComponentsCreatedEventArgsTests.cs +++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/ToolboxComponentsCreatedEventArgsTests.cs @@ -13,7 +13,7 @@ public class ToolboxComponentsCreatedEventArgsTests public static IEnumerable Ctor_IComponentArray_TestData() { yield return new object[] { null }; - yield return new object[] { new IComponent[0] }; + yield return new object[] { Array.Empty() }; yield return new object[] { new IComponent[] { null } }; } diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/ToolboxItemTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/ToolboxItemTests.cs index dccca92c705..adfcbd48e95 100644 --- a/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/ToolboxItemTests.cs +++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/ToolboxItemTests.cs @@ -159,7 +159,7 @@ public void ToolboxItem_Company_SetWithInvalidPropertyType_ThrowsArgumentExcepti public static IEnumerable DependentAssemblies_Set_TestData() { yield return new object[] { null }; - yield return new object[] { new AssemblyName[0] }; + yield return new object[] { Array.Empty() }; yield return new object[] { new AssemblyName[] { null } }; yield return new object[] { new AssemblyName[] { new AssemblyName() } }; } @@ -258,9 +258,9 @@ public void ToolboxItem_DisplayName_SetWithInvalidPropertyType_ThrowsArgumentExc public static IEnumerable Filter_Set_TestData() { - yield return new object[] { null, new object[0] }; - yield return new object[] { new object[0], new object[0] }; - yield return new object[] { new object[] { null }, new object[0] }; + yield return new object[] { null, Array.Empty() }; + yield return new object[] { Array.Empty(), Array.Empty() }; + yield return new object[] { new object[] { null }, Array.Empty() }; yield return new object[] { new object[] { new object(), new ToolboxItemFilterAttribute("filterString") }, new object[] { new ToolboxItemFilterAttribute("filterString") } }; } @@ -1146,7 +1146,7 @@ public static IEnumerable FilterPropertyValue_TestData() yield return new object[] { "typename", null, null, true }; yield return new object[] { "Filter", null, Array.Empty(), false }; - yield return new object[] { "Filter", new ToolboxItemFilterAttribute[0], new ToolboxItemFilterAttribute[0], true }; + yield return new object[] { "Filter", Array.Empty(), Array.Empty(), true }; yield return new object[] { "Filter", o, o, true }; yield return new object[] { "filter", null, null, true }; @@ -1555,8 +1555,8 @@ public static IEnumerable ValidatePropertyValue_TestData() yield return new object[] { "TypeName", "value", "value" }; var filter = new ToolboxItemFilterAttribute("filter"); - yield return new object[] { "Filter", null, new ToolboxItemFilterAttribute[0] }; - yield return new object[] { "Filter", new ToolboxItemFilterAttribute[0], new ToolboxItemFilterAttribute[0] }; + yield return new object[] { "Filter", null, Array.Empty() }; + yield return new object[] { "Filter", Array.Empty(), Array.Empty() }; yield return new object[] { "Filter", new object[] { null, "value", filter, filter }, new ToolboxItemFilterAttribute[] { filter, filter } }; yield return new object[] { "NoSuchProperty", null, null }; diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/Windows/Forms/Design/Behavior/BehaviorDragDropEventArgsTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/Windows/Forms/Design/Behavior/BehaviorDragDropEventArgsTests.cs index bc9db5ef906..139ebe431a1 100644 --- a/src/System.Windows.Forms.Design/tests/UnitTests/System/Windows/Forms/Design/Behavior/BehaviorDragDropEventArgsTests.cs +++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/Windows/Forms/Design/Behavior/BehaviorDragDropEventArgsTests.cs @@ -13,7 +13,7 @@ public class BehaviorDragDropEventArgsTests public static IEnumerable Ctor_ICollection_TestData() { yield return new object[] { null }; - yield return new object[] { new object[0] }; + yield return new object[] { Array.Empty() }; yield return new object[] { new object[] { null } }; } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/AxHost.cs b/src/System.Windows.Forms/src/System/Windows/Forms/AxHost.cs index f85d6f412e2..ca68281e0a3 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/AxHost.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/AxHost.cs @@ -4279,7 +4279,7 @@ MethodInfo IReflect.GetMethod(string name, BindingFlags bindingAttr) MethodInfo[] IReflect.GetMethods(BindingFlags bindingAttr) { - return new MethodInfo[0]; + return Array.Empty(); } FieldInfo IReflect.GetField(string name, BindingFlags bindingAttr) @@ -4289,7 +4289,7 @@ FieldInfo IReflect.GetField(string name, BindingFlags bindingAttr) FieldInfo[] IReflect.GetFields(BindingFlags bindingAttr) { - return new FieldInfo[0]; + return Array.Empty(); } PropertyInfo IReflect.GetProperty(string name, BindingFlags bindingAttr) @@ -4304,17 +4304,17 @@ PropertyInfo IReflect.GetProperty(string name, BindingFlags bindingAttr, Binder PropertyInfo[] IReflect.GetProperties(BindingFlags bindingAttr) { - return new PropertyInfo[0]; + return Array.Empty(); } MemberInfo[] IReflect.GetMember(string name, BindingFlags bindingAttr) { - return new MemberInfo[0]; + return Array.Empty(); } MemberInfo[] IReflect.GetMembers(BindingFlags bindingAttr) { - return new MemberInfo[0]; + return Array.Empty(); } object IReflect.InvokeMember(string name, BindingFlags invokeAttr, Binder binder, @@ -5778,7 +5778,7 @@ MethodInfo IReflect.GetMethod(string name, BindingFlags bindingAttr) MethodInfo[] IReflect.GetMethods(BindingFlags bindingAttr) { - return new MethodInfo[0]; + return Array.Empty(); } FieldInfo IReflect.GetField(string name, BindingFlags bindingAttr) @@ -5788,7 +5788,7 @@ FieldInfo IReflect.GetField(string name, BindingFlags bindingAttr) FieldInfo[] IReflect.GetFields(BindingFlags bindingAttr) { - return new FieldInfo[0]; + return Array.Empty(); } PropertyInfo IReflect.GetProperty(string name, BindingFlags bindingAttr) @@ -5803,17 +5803,17 @@ PropertyInfo IReflect.GetProperty(string name, BindingFlags bindingAttr, Binder PropertyInfo[] IReflect.GetProperties(BindingFlags bindingAttr) { - return new PropertyInfo[0]; + return Array.Empty(); } MemberInfo[] IReflect.GetMember(string name, BindingFlags bindingAttr) { - return new MemberInfo[0]; + return Array.Empty(); } MemberInfo[] IReflect.GetMembers(BindingFlags bindingAttr) { - return new MemberInfo[0]; + return Array.Empty(); } object IReflect.InvokeMember(string name, BindingFlags invokeAttr, Binder binder, @@ -6008,7 +6008,7 @@ internal UnsafeNativeMethods.IEnumUnknown EnumControls(Control ctl, int dwOleCon } else { - ctls = new Control[0]; + ctls = Array.Empty(); } ctl = null; break; @@ -6992,7 +6992,7 @@ FieldInfo IReflect.GetField(string name, BindingFlags bindingAttr) FieldInfo[] IReflect.GetFields(BindingFlags bindingAttr) { - return new FieldInfo[0]; + return Array.Empty(); } PropertyInfo IReflect.GetProperty(string name, BindingFlags bindingAttr) @@ -7182,7 +7182,7 @@ public override object ConvertTo(ITypeDescriptorContext context, CultureInfo cul } else { - return new byte[0]; + return Array.Empty(); } } @@ -8160,7 +8160,7 @@ private class AxPerPropertyBrowsingEnum : Com2Enum private Int32CAMarshaler valueMarshaller; private bool arraysFetched; - public AxPerPropertyBrowsingEnum(AxPropertyDescriptor targetObject, AxHost owner, OleStrCAMarshaler names, Int32CAMarshaler values, bool allowUnknowns) : base(new string[0], new object[0], allowUnknowns) + public AxPerPropertyBrowsingEnum(AxPropertyDescriptor targetObject, AxHost owner, OleStrCAMarshaler names, Int32CAMarshaler values, bool allowUnknowns) : base(Array.Empty(), Array.Empty(), allowUnknowns) { target = targetObject; nameMarshaller = names; diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/BindingSource.cs b/src/System.Windows.Forms/src/System/Windows/Forms/BindingSource.cs index af555a6d164..fb12aa0ecf5 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/BindingSource.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/BindingSource.cs @@ -1229,7 +1229,7 @@ private void SetList(IList list, bool metaDataChanged, bool applySortAndFilter) _itemConstructor = _itemType.GetConstructor(BindingFlags.Public | BindingFlags.Instance | BindingFlags.CreateInstance, - null, new Type[0], null); + null, Array.Empty(), null); } // Wire stuff up to the new list diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ColumnHeaderConverter.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ColumnHeaderConverter.cs index 537d573279b..63822f839d2 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ColumnHeaderConverter.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ColumnHeaderConverter.cs @@ -78,10 +78,10 @@ public override object ConvertTo(ITypeDescriptorContext context, CultureInfo cul if (id == null) { - ctor = t.GetConstructor(new Type[0]); + ctor = t.GetConstructor(Array.Empty()); if (ctor != null) { - return new InstanceDescriptor(ctor, new object[0], false); + return new InstanceDescriptor(ctor, Array.Empty(), false); } else { diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.cs index da83bd667c0..bf38826fde6 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.cs @@ -1096,7 +1096,7 @@ private string[] GetStringsForAutoComplete(IList collection) return strings; } - return new string[0]; + return Array.Empty(); } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/COM2IManagedPerPropertyBrowsingHandler.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/COM2IManagedPerPropertyBrowsingHandler.cs index 0bcb2788632..876f2431777 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/COM2IManagedPerPropertyBrowsingHandler.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/COM2IManagedPerPropertyBrowsingHandler.cs @@ -67,7 +67,7 @@ internal static Attribute[] GetComponentAttributes(NativeMethods.IManagedPerProp if (hr != NativeMethods.S_OK || cItems == 0) { - return new Attribute[0]; + return Array.Empty(); } ArrayList attrs = new ArrayList(); @@ -78,7 +78,7 @@ internal static Attribute[] GetComponentAttributes(NativeMethods.IManagedPerProp Debug.Assert(attrTypeNames.Length == varParams.Length, "Mismatched parameter and attribute name length"); if (attrTypeNames.Length != varParams.Length) { - return new Attribute[0]; + return Array.Empty(); } // get the types @@ -266,7 +266,7 @@ private static string[] GetStringsFromPtr(IntPtr ptr, int cStrings) } else { - return new string[0]; + return Array.Empty(); } } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/COM2IPerPropertyBrowsingHandler.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/COM2IPerPropertyBrowsingHandler.cs index 413f3dbe4c9..aec1c55a311 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/COM2IPerPropertyBrowsingHandler.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/COM2IPerPropertyBrowsingHandler.cs @@ -244,7 +244,7 @@ private class Com2IPerPropertyBrowsingEnum : Com2Enum internal bool arraysFetched; //private bool standardValuesQueried; - public Com2IPerPropertyBrowsingEnum(Com2PropertyDescriptor targetObject, Com2IPerPropertyBrowsingHandler handler, OleStrCAMarshaler names, Int32CAMarshaler values, bool allowUnknowns) : base(new string[0], new object[0], allowUnknowns) + public Com2IPerPropertyBrowsingEnum(Com2PropertyDescriptor targetObject, Com2IPerPropertyBrowsingHandler handler, OleStrCAMarshaler names, Int32CAMarshaler values, bool allowUnknowns) : base(Array.Empty(), Array.Empty(), allowUnknowns) { target = targetObject; nameMarshaller = names; @@ -379,7 +379,7 @@ private void EnsureArrays() } catch (Exception ex) { - base.PopulateArrays(new string[0], new object[0]); + base.PopulateArrays(Array.Empty(), Array.Empty()); Debug.Fail("Failed to build IPerPropertyBrowsing editor. " + ex.GetType().Name + ", " + ex.Message); } } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/COM2PropertyDescriptor.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/COM2PropertyDescriptor.cs index 18dfb89c20a..61a91272a9f 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/COM2PropertyDescriptor.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/COM2PropertyDescriptor.cs @@ -232,7 +232,7 @@ protected Attribute[] BaseAttributes } else { - baseAttrs = new Attribute[0]; + baseAttrs = Array.Empty(); } } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs index 50670717851..b1a733b0cab 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs @@ -16719,7 +16719,7 @@ private IList GetOwnNeighboringToolsRectangles() } else { - return new Rectangle[0]; + return Array.Empty(); } } @@ -18854,7 +18854,7 @@ internal void SetClientSite(UnsafeNativeMethods.IOleClientSite value) MethodInfo method = typeof(SystemEvents).GetMethod("Shutdown", BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.InvokeMethod, - null, new Type[0], new ParameterModifier[0]); + null, Array.Empty(), Array.Empty()); Debug.Assert(method != null, "No Shutdown method on SystemEvents"); if (method != null) { @@ -18924,7 +18924,7 @@ internal void SetClientSite(UnsafeNativeMethods.IOleClientSite value) MethodInfo method = typeof(SystemEvents).GetMethod("Startup", BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.InvokeMethod, - null, new Type[0], new ParameterModifier[0]); + null, Array.Empty(), Array.Empty()); Debug.Assert(method != null, "No Startup method on SystemEvents"); if (method != null) { diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/CursorConverter.cs b/src/System.Windows.Forms/src/System/Windows/Forms/CursorConverter.cs index b76ba5a5fa3..1f7c85e8f4f 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/CursorConverter.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/CursorConverter.cs @@ -157,7 +157,7 @@ public override object ConvertTo(ITypeDescriptorContext context, CultureInfo cul } else { - return new byte[0]; + return Array.Empty(); } } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGrid.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGrid.cs index b8bc9c5fcd9..6eb7a236fb8 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGrid.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGrid.cs @@ -131,7 +131,7 @@ public class DataGrid : Control, ISupportInitialize, IDataGridEditingService // ui state // // Don't use dataGridRows, use the accessor!!! - private DataGridRow[] dataGridRows = new DataGridRow[0]; + private DataGridRow[] dataGridRows = Array.Empty(); private int dataGridRowsLength = 0; // for toolTip @@ -1502,7 +1502,7 @@ private void CreateDataGridRows() if (listManager == null) { - SetDataGridRows(new DataGridRow[0], 0); + SetDataGridRows(Array.Empty(), 0); return; } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridState.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridState.cs index 2e6f017914b..38839bc2b41 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridState.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridState.cs @@ -26,7 +26,7 @@ internal sealed class DataGridState : ICloneable public object DataSource = null; public string DataMember = null; public CurrencyManager ListManager = null; - public DataGridRow[] DataGridRows = new DataGridRow[0]; + public DataGridRow[] DataGridRows = Array.Empty(); public DataGrid DataGrid; public int DataGridRowsLength = 0; public GridColumnStylesCollection GridColumnStyles = null; diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewCellConverter.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewCellConverter.cs index cff1c3a8f57..9861e061aee 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewCellConverter.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewCellConverter.cs @@ -34,10 +34,10 @@ public override object ConvertTo(ITypeDescriptorContext context, CultureInfo cul if (destinationType == typeof(InstanceDescriptor) && value is DataGridViewCell cell) { - ConstructorInfo ctor = cell.GetType().GetConstructor(new Type[0]); + ConstructorInfo ctor = cell.GetType().GetConstructor(Array.Empty()); if (ctor != null) { - return new InstanceDescriptor(ctor, new object[0], false); + return new InstanceDescriptor(ctor, Array.Empty(), false); } } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewCellStyleConverter.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewCellStyleConverter.cs index e5ac3ac0a06..b712167534d 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewCellStyleConverter.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewCellStyleConverter.cs @@ -50,8 +50,8 @@ public override object ConvertTo(ITypeDescriptorContext context, CultureInfo cul if (destinationType == typeof(InstanceDescriptor) && value is DataGridViewCellStyle) { - ConstructorInfo ctor = value.GetType().GetConstructor(new Type[0]); - return new InstanceDescriptor(ctor, new object[0], false); + ConstructorInfo ctor = value.GetType().GetConstructor(Array.Empty()); + return new InstanceDescriptor(ctor, Array.Empty(), false); } return base.ConvertTo(context, culture, value, destinationType); diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewColumnConverter.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewColumnConverter.cs index a6753476f66..ae3c686956f 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewColumnConverter.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewColumnConverter.cs @@ -60,10 +60,10 @@ public override object ConvertTo(ITypeDescriptorContext context, CultureInfo cul // public DataGridViewColumn() // - ctor = dataGridViewColumn.GetType().GetConstructor(new Type[0]); + ctor = dataGridViewColumn.GetType().GetConstructor(Array.Empty()); if (ctor != null) { - return new InstanceDescriptor(ctor, new object[0], false); + return new InstanceDescriptor(ctor, Array.Empty(), false); } } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Form.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Form.cs index 355e1af46fd..17189f1ec91 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/Form.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/Form.cs @@ -1744,7 +1744,7 @@ public Form[] MdiChildren } else { - return new Form[0]; + return Array.Empty
(); } } } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ImageIndexConverter.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ImageIndexConverter.cs index f63b594f5d5..f9bd756293b 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ImageIndexConverter.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ImageIndexConverter.cs @@ -174,7 +174,7 @@ public override StandardValuesCollection GetStandardValues(ITypeDescriptorContex } else { - return new StandardValuesCollection(new object[0]); + return new StandardValuesCollection(Array.Empty()); } } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ImageKeyConverter.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ImageKeyConverter.cs index 24790d094ab..51f5b3f819f 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ImageKeyConverter.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ImageKeyConverter.cs @@ -197,7 +197,7 @@ public override StandardValuesCollection GetStandardValues(ITypeDescriptorContex } else { - return new StandardValuesCollection(new object[0]); + return new StandardValuesCollection(Array.Empty()); } } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Layout/TableLayout.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Layout/TableLayout.cs index e9c5244ec5b..10dc7f55fc7 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/Layout/TableLayout.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/Layout/TableLayout.cs @@ -1679,7 +1679,7 @@ internal static ContainerInfo GetContainerInfo(IArrangedElement container) /// internal sealed class ContainerInfo { - private static readonly Strip[] emptyStrip = new Strip[0]; + private static readonly Strip[] emptyStrip = Array.Empty(); private static readonly int stateValid = BitVector32.CreateMask(); private static readonly int stateChildInfoValid = BitVector32.CreateMask(stateValid); @@ -1970,7 +1970,7 @@ public LayoutInfo[] ChildrenInfo } _state[stateChildInfoValid] = true; } - return _childInfo ?? (new LayoutInfo[0]); + return _childInfo ?? (Array.Empty()); } } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/LinkLabel.cs b/src/System.Windows.Forms/src/System/Windows/Forms/LinkLabel.cs index 85cbbcf6a03..7df63491517 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/LinkLabel.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/LinkLabel.cs @@ -2560,7 +2560,7 @@ public IEnumerator GetEnumerator() } else { - return new Link[0].GetEnumerator(); + return Array.Empty().GetEnumerator(); } } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ListView.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ListView.cs index 032e004201f..e7b95884283 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ListView.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ListView.cs @@ -7150,7 +7150,7 @@ public IEnumerator GetEnumerator() } else { - return new int[0].GetEnumerator(); + return Array.Empty().GetEnumerator(); } } } @@ -7487,7 +7487,7 @@ public IEnumerator GetEnumerator() } else { - return new ListViewItem[0].GetEnumerator(); + return Array.Empty().GetEnumerator(); } } @@ -7784,7 +7784,7 @@ public IEnumerator GetEnumerator() } else { - return new int[0].GetEnumerator(); + return Array.Empty().GetEnumerator(); } } @@ -7871,7 +7871,7 @@ private ListViewItem[] SelectedItemArray } else { - return new ListViewItem[0]; + return Array.Empty(); } } } @@ -8144,7 +8144,7 @@ public IEnumerator GetEnumerator() } else { - return new ListViewItem[0].GetEnumerator(); + return Array.Empty().GetEnumerator(); } } @@ -8826,7 +8826,7 @@ public IEnumerator GetEnumerator() } else { - return new ColumnHeader[0].GetEnumerator(); + return Array.Empty().GetEnumerator(); } } } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.cs index 095c030904d..f861cb26068 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.cs @@ -1986,7 +1986,7 @@ public IEnumerator GetEnumerator() } else { - return new ListViewSubItem[0].GetEnumerator(); + return Array.Empty().GetEnumerator(); } } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItemStateImageIndexConverter.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItemStateImageIndexConverter.cs index 86ee376a1f2..e9dae1c6555 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItemStateImageIndexConverter.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItemStateImageIndexConverter.cs @@ -98,7 +98,7 @@ public override StandardValuesCollection GetStandardValues(ITypeDescriptorContex } else { - return new StandardValuesCollection(new object[0]); + return new StandardValuesCollection(Array.Empty()); } } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/MenuItem.cs b/src/System.Windows.Forms/src/System/Windows/Forms/MenuItem.cs index ed2b82798a7..9c4cd1cfbda 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/MenuItem.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/MenuItem.cs @@ -1079,7 +1079,7 @@ internal Form[] FindMdiForms() } if (forms == null) { - forms = new Form[0]; + forms = Array.Empty(); } return forms; diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/OpenFileDialog.cs b/src/System.Windows.Forms/src/System/Windows/Forms/OpenFileDialog.cs index b7d9fe0b801..9aa639d2d40 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/OpenFileDialog.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/OpenFileDialog.cs @@ -229,7 +229,7 @@ public string[] SafeFileNames { string[] fullPaths = FileNames; if (null == fullPaths || 0 == fullPaths.Length) - { return new string[0]; } + { return Array.Empty(); } string[] safePaths = new string[fullPaths.Length]; for (int i = 0; i < safePaths.Length; ++i) { diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Printing/PrintPreviewControl.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Printing/PrintPreviewControl.cs index 4193198fd21..6423ebbb4d1 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/Printing/PrintPreviewControl.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/Printing/PrintPreviewControl.cs @@ -474,7 +474,7 @@ private void ComputePreview() if (document == null) { - pageInfo = new PreviewPageInfo[0]; + pageInfo = Array.Empty(); } else { diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGrid.cs b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGrid.cs index d020c191991..972c0a47291 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGrid.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGrid.cs @@ -47,8 +47,8 @@ public class PropertyGrid : ContainerControl, IComPropertyBrowser, UnsafeNativeM // our array of viewTabs private bool viewTabsDirty = true; private bool drawFlatToolBar = false; - private PropertyTab[] viewTabs = new PropertyTab[0]; - private PropertyTabScope[] viewTabScopes = new PropertyTabScope[0]; + private PropertyTab[] viewTabs = Array.Empty(); + private PropertyTabScope[] viewTabScopes = Array.Empty(); private Hashtable viewTabProps; // the tab view buttons @@ -1220,7 +1220,7 @@ public object SelectedObject { if (value == null) { - SelectedObjects = new object[0]; + SelectedObjects = Array.Empty(); } else { @@ -1325,7 +1325,7 @@ public object[] SelectedObjects if (value == null) { - currentObjects = new object[0]; + currentObjects = Array.Empty(); } else { @@ -1501,7 +1501,7 @@ public object[] SelectedObjects { if (currentObjects == null) { - return new object[0]; + return Array.Empty(); } return (object[])currentObjects.Clone(); } @@ -2694,7 +2694,7 @@ private static Type[] GetCommonTabs(object[] objs, PropertyTabScope tabScope) if (objs == null || objs.Length == 0) { - return new Type[0]; + return Array.Empty(); } Type[] tabTypes = new Type[5]; @@ -2704,7 +2704,7 @@ private static Type[] GetCommonTabs(object[] objs, PropertyTabScope tabScope) if (tabAttr == null) { - return new Type[0]; + return Array.Empty(); } // filter out all the types of the current scope @@ -2726,7 +2726,7 @@ private static Type[] GetCommonTabs(object[] objs, PropertyTabScope tabScope) if (types == 0) { - return new Type[0]; + return Array.Empty(); } bool found; @@ -2740,7 +2740,7 @@ private static Type[] GetCommonTabs(object[] objs, PropertyTabScope tabScope) if (tabAttr == null) { // if this guy has no tabs at all, we can fail right now - return new Type[0]; + return Array.Empty(); } // make sure this guy has all the items in the array, @@ -4408,7 +4408,7 @@ internal void RemoveTabs(PropertyTabScope classification, bool setupToolbar) // clear the component refs of the tabs for (int i = 0; i < viewTabs.Length; i++) { - viewTabs[i].Components = new object[0]; + viewTabs[i].Components = Array.Empty(); } } } @@ -5162,7 +5162,7 @@ internal void UpdateSelection() if (peMain == null) { - currentPropEntries = new GridEntryCollection(null, new GridEntry[0]); + currentPropEntries = new GridEntryCollection(null, Array.Empty()); gridView.ClearProps(); return; } @@ -5652,7 +5652,7 @@ public IEnumerator GetEnumerator() { if (owner == null) { - return new PropertyTab[0].GetEnumerator(); + return Array.Empty().GetEnumerator(); } return owner.viewTabs.GetEnumerator(); diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/GridEntry.cs b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/GridEntry.cs index 976c1ccaca4..b05882923ed 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/GridEntry.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/GridEntry.cs @@ -1386,7 +1386,7 @@ protected virtual bool CreateChildren(bool diffOldChildren) } else { - childCollection = new GridEntryCollection(this, new GridEntry[0]); + childCollection = new GridEntryCollection(this, Array.Empty()); } return false; } @@ -1441,7 +1441,7 @@ protected virtual bool CreateChildren(bool diffOldChildren) } else { - childCollection = new GridEntryCollection(this, new GridEntry[0]); + childCollection = new GridEntryCollection(this, Array.Empty()); } if (InternalExpanded) @@ -2039,7 +2039,7 @@ public virtual object[] GetPropertyValueList() values.CopyTo(valueArray, 0); return valueArray; } - return new object[0]; + return Array.Empty(); } public override int GetHashCode() diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/MergePropertyDescriptor.cs b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/MergePropertyDescriptor.cs index 5609fdbddc4..0a024e57f59 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/MergePropertyDescriptor.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/MergePropertyDescriptor.cs @@ -553,7 +553,7 @@ public IEnumerator GetEnumerator() } else { - return new object[0].GetEnumerator(); + return Array.Empty().GetEnumerator(); } } @@ -571,7 +571,7 @@ public bool MergeCollection(ICollection newCollection) if (items.Length != newCollection.Count) { - items = new object[0]; + items = Array.Empty(); return false; } @@ -582,7 +582,7 @@ public bool MergeCollection(ICollection newCollection) if (((newItems[i] == null) != (items[i] == null)) || (items[i] != null && !items[i].Equals(newItems[i]))) { - items = new object[0]; + items = Array.Empty(); return false; } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/RichTextBox.cs b/src/System.Windows.Forms/src/System/Windows/Forms/RichTextBox.cs index 413fa1d4381..52b5f7b57b5 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/RichTextBox.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/RichTextBox.cs @@ -1422,7 +1422,7 @@ public int[] SelectionTabs { get { - int[] selTabs = new int[0]; + int[] selTabs = Array.Empty(); ForceHandleCreate(); NativeMethods.PARAFORMAT pf = new NativeMethods.PARAFORMAT diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/StatusBar.cs b/src/System.Windows.Forms/src/System/Windows/Forms/StatusBar.cs index 6bfcdc0f9f1..167be354688 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/StatusBar.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/StatusBar.cs @@ -1744,7 +1744,7 @@ public IEnumerator GetEnumerator() } else { - return new StatusBarPanel[0].GetEnumerator(); + return Array.Empty().GetEnumerator(); } } } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/TabControl.cs b/src/System.Windows.Forms/src/System/Windows/Forms/TabControl.cs index 610126f2c72..24e25149c6e 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/TabControl.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/TabControl.cs @@ -2746,7 +2746,7 @@ public IEnumerator GetEnumerator() } else { - return new TabPage[0].GetEnumerator(); + return Array.Empty().GetEnumerator(); } } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/TableLayoutPanel.cs b/src/System.Windows.Forms/src/System/Windows/Forms/TableLayoutPanel.cs index 2432d69b262..00e15b35e40 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/TableLayoutPanel.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/TableLayoutPanel.cs @@ -335,7 +335,7 @@ public int[] GetColumnWidths() TableLayout.ContainerInfo containerInfo = TableLayout.GetContainerInfo(this); if (containerInfo.Columns == null) { - return new int[0]; + return Array.Empty(); } int[] cw = new int[containerInfo.Columns.Length]; @@ -355,7 +355,7 @@ public int[] GetRowHeights() TableLayout.ContainerInfo containerInfo = TableLayout.GetContainerInfo(this); if (containerInfo.Rows == null) { - return new int[0]; + return Array.Empty(); } int[] rh = new int[containerInfo.Rows.Length]; diff --git a/src/System.Windows.Forms/tests/UnitTests/ContextMenuTests.cs b/src/System.Windows.Forms/tests/UnitTests/ContextMenuTests.cs index 45a7f83e1cd..3c2485b2bff 100644 --- a/src/System.Windows.Forms/tests/UnitTests/ContextMenuTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/ContextMenuTests.cs @@ -30,7 +30,7 @@ public void ContextMenu_Ctor_Default() public static IEnumerable Ctor_MenuItemArray_TestData() { yield return new object[] { null, false }; - yield return new object[] { new MenuItem[0], false }; + yield return new object[] { Array.Empty(), false }; yield return new object[] { new MenuItem[] { new MenuItem() }, true }; } @@ -39,7 +39,7 @@ public static IEnumerable Ctor_MenuItemArray_TestData() public void ContextMenu_Ctor_MenuItemArray(MenuItem[] items, bool expectedIsParent) { var menu = new ContextMenu(items); - Assert.Equal(items ?? new MenuItem[0], menu.MenuItems.Cast()); + Assert.Equal(items ?? Array.Empty(), menu.MenuItems.Cast()); for (int i = 0; i < (items?.Length ?? 0); i++) { Assert.Equal(i, menu.MenuItems[i].Index); diff --git a/src/System.Windows.Forms/tests/UnitTests/MainMenuTestsTests.cs b/src/System.Windows.Forms/tests/UnitTests/MainMenuTestsTests.cs index 4e9ad8d92be..6c18df30787 100644 --- a/src/System.Windows.Forms/tests/UnitTests/MainMenuTestsTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/MainMenuTestsTests.cs @@ -51,7 +51,7 @@ public void MainMenu_Ctor_NullContainer_ThrowsArgumentNullException() public static IEnumerable Ctor_MenuItemArray_TestData() { yield return new object[] { null, false }; - yield return new object[] { new MenuItem[0], false }; + yield return new object[] { Array.Empty(), false }; yield return new object[] { new MenuItem[] { new MenuItem() }, true }; } @@ -60,7 +60,7 @@ public static IEnumerable Ctor_MenuItemArray_TestData() public void MainMenu_Ctor_MenuItemArray(MenuItem[] items, bool expectedIsParent) { var menu = new MainMenu(items); - Assert.Equal(items ?? new MenuItem[0], menu.MenuItems.Cast()); + Assert.Equal(items ?? Array.Empty(), menu.MenuItems.Cast()); for (int i = 0; i < (items?.Length ?? 0); i++) { Assert.Equal(i, menu.MenuItems[i].Index); @@ -170,7 +170,7 @@ public void MainMenu_OnCollapse_Invoke_Success() public static IEnumerable CloneMenu_TestData() { - yield return new object[] { new MenuItem[0] }; + yield return new object[] { Array.Empty() }; yield return new object[] { new MenuItem[] { new MenuItem("text") } }; } diff --git a/src/System.Windows.Forms/tests/UnitTests/MenuItemCollectionTests.cs b/src/System.Windows.Forms/tests/UnitTests/MenuItemCollectionTests.cs index 384a3e2ea7e..521a3aa9bde 100644 --- a/src/System.Windows.Forms/tests/UnitTests/MenuItemCollectionTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/MenuItemCollectionTests.cs @@ -24,7 +24,7 @@ public void MenuItemCollection_Ctor_Menu() [Fact] public void MenuItemCollection_IList_Properties_ReturnsExpected() { - var menu = new SubMenu(new MenuItem[0]); + var menu = new SubMenu(Array.Empty()); IList collection = new Menu.MenuItemCollection(menu); Assert.False(collection.IsFixedSize); Assert.False(collection.IsReadOnly); @@ -36,7 +36,7 @@ public void MenuItemCollection_IList_Properties_ReturnsExpected() [CommonMemberData(nameof(CommonTestHelper.GetStringNormalizedTheoryData))] public void MenuItemCollection_Add_String_Success(string caption, string expectedText) { - var menu = new SubMenu(new MenuItem[0]); + var menu = new SubMenu(Array.Empty()); var collection = new Menu.MenuItemCollection(menu); MenuItem menuItem = collection.Add(caption); Assert.Same(menuItem, Assert.Single(collection)); @@ -58,7 +58,7 @@ public static IEnumerable Add_StringEventHandler_TestData() [MemberData(nameof(Add_StringEventHandler_TestData))] public void MenuItemCollection_Add_StringEventHandler_Success(string caption, EventHandler onClick, string expectedText) { - var menu = new SubMenu(new MenuItem[0]); + var menu = new SubMenu(Array.Empty()); var collection = new Menu.MenuItemCollection(menu); MenuItem menuItem = collection.Add(caption, onClick); Assert.Same(menuItem, Assert.Single(collection)); @@ -71,7 +71,7 @@ public void MenuItemCollection_Add_StringEventHandler_Success(string caption, Ev public static IEnumerable Add_StringMenuItemArray_TestData() { yield return new object[] { null, null, string.Empty }; - yield return new object[] { string.Empty, new MenuItem[0], string.Empty }; + yield return new object[] { string.Empty, Array.Empty(), string.Empty }; yield return new object[] { "caption", new MenuItem[] { new MenuItem() }, "caption" }; } @@ -79,12 +79,12 @@ public static IEnumerable Add_StringMenuItemArray_TestData() [MemberData(nameof(Add_StringMenuItemArray_TestData))] public void MenuItemCollection_Add_StringMenuItemArray_Success(string caption, MenuItem[] items, string expectedText) { - var menu = new SubMenu(new MenuItem[0]); + var menu = new SubMenu(Array.Empty()); var collection = new Menu.MenuItemCollection(menu); MenuItem menuItem = collection.Add(caption, items); Assert.Same(menuItem, Assert.Single(collection)); Assert.Same(expectedText, menuItem.Text); - Assert.Equal(items ?? new MenuItem[0], menuItem.MenuItems.Cast()); + Assert.Equal(items ?? Array.Empty(), menuItem.MenuItems.Cast()); Assert.Equal(menu, menuItem.Parent); Assert.Equal(0, menuItem.Index); } @@ -92,7 +92,7 @@ public void MenuItemCollection_Add_StringMenuItemArray_Success(string caption, M [Fact] public void MenuItemCollection_Add_MenuItem_Success() { - var menu = new SubMenu(new MenuItem[0]); + var menu = new SubMenu(Array.Empty()); var collection = new Menu.MenuItemCollection(menu); var menuItem1 = new MenuItem("text1"); @@ -115,7 +115,7 @@ public void MenuItemCollection_Add_MenuItem_Success() [Fact] public void MenuItemCollection_Add_IndexMenuItem_Success() { - var menu = new SubMenu(new MenuItem[0]); + var menu = new SubMenu(Array.Empty()); var collection = new Menu.MenuItemCollection(menu); var menuItem1 = new MenuItem("text1"); @@ -138,7 +138,7 @@ public void MenuItemCollection_Add_IndexMenuItem_Success() [Fact] public void MenuItemCollection_Add_SelfMenuItem_Nop() { - var menuItem = new MenuItem("text", new MenuItem[0]); + var menuItem = new MenuItem("text", Array.Empty()); var collection = new Menu.MenuItemCollection(menuItem); Assert.Empty(collection); } @@ -148,7 +148,7 @@ public void MenuItemCollection_Add_AlreadyInSameCollection_Success() { var menuItem1 = new MenuItem(); var menuItem2 = new MenuItem(); - var parent = new MenuItem("text", new MenuItem[0]); + var parent = new MenuItem("text", Array.Empty()); var collection = new Menu.MenuItemCollection(parent) { menuItem1, @@ -177,9 +177,9 @@ public void MenuItemCollection_Add_AlreadyInSameCollection_Success() [Fact] public void MenuItemCollection_Add_AlreadyInDifferentCollection_Success() { - var oldParent = new MenuItem("text", new MenuItem[0]); + var oldParent = new MenuItem("text", Array.Empty()); var oldCollection = new Menu.MenuItemCollection(oldParent); - var newParent = new MenuItem("text", new MenuItem[0]); + var newParent = new MenuItem("text", Array.Empty()); var newCollection = new Menu.MenuItemCollection(newParent); var menuItem = new MenuItem(); @@ -195,7 +195,7 @@ public void MenuItemCollection_Add_AlreadyInDifferentCollection_Success() [Fact] public void MenuItemCollection_Add_MenuItemToCreatedMenu_Success() { - using (var menu = new SubMenu(new MenuItem[0])) + using (var menu = new SubMenu(Array.Empty())) { Assert.NotEqual(IntPtr.Zero, menu.Handle); @@ -227,7 +227,7 @@ public void MenuItemCollection_Add_CreatedMenuItemToMenu_Success() { Assert.NotEqual(IntPtr.Zero, otherMenu.Handle); - var menu = new SubMenu(new MenuItem[0]); + var menu = new SubMenu(Array.Empty()); var collection = new Menu.MenuItemCollection(menu); Assert.Equal(0, collection.Add(menuItem)); @@ -240,7 +240,7 @@ public void MenuItemCollection_Add_CreatedMenuItemToMenu_Success() [Fact] public void MenuItemCollection_Add_NullMenuItem_ThrowsArgumentNullException() { - var menu = new SubMenu(new MenuItem[0]); + var menu = new SubMenu(Array.Empty()); var collection = new Menu.MenuItemCollection(menu); Assert.Throws("item", () => collection.Add((MenuItem)null)); Assert.Throws("item", () => collection.Add(0, null)); @@ -249,7 +249,7 @@ public void MenuItemCollection_Add_NullMenuItem_ThrowsArgumentNullException() [Fact] public void MenuItemCollection_Add_SelfWithParent_ThrowsArgumentException() { - var menuItem = new MenuItem("text", new MenuItem[0]); + var menuItem = new MenuItem("text", Array.Empty()); var parent = new MenuItem("parent", new MenuItem[] { menuItem }); var collection = new Menu.MenuItemCollection(menuItem); Assert.Throws("item", () => collection.Add(menuItem)); @@ -271,7 +271,7 @@ public void MenuItemCollection_Add_ParentWithGrandparent_ThrowsArgumentException [InlineData(1)] public void MenuItemCollection_Add_InvalidIndex_ThrowsArgumentOutOfRangeException(int index) { - var menu = new SubMenu(new MenuItem[0]); + var menu = new SubMenu(Array.Empty()); var collection = new Menu.MenuItemCollection(menu); Assert.Throws("index", () => collection.Add(index, new MenuItem())); } @@ -282,7 +282,7 @@ public void MenuItemCollection_Add_InvalidIndex_ThrowsArgumentOutOfRangeExceptio public void MenuItemCollection_Add_AlreadyInCollection_InvalidIndex_ThrowsArgumentOutOfRangeException(int index) { var menuItem = new MenuItem(); - var parent = new MenuItem("text", new MenuItem[0]); + var parent = new MenuItem("text", Array.Empty()); var collection = new Menu.MenuItemCollection(parent) { menuItem @@ -293,7 +293,7 @@ public void MenuItemCollection_Add_AlreadyInCollection_InvalidIndex_ThrowsArgume [Fact] public void MenuItemCollection_Add_IListMenuItem_Success() { - var menu = new SubMenu(new MenuItem[0]); + var menu = new SubMenu(Array.Empty()); IList collection = new Menu.MenuItemCollection(menu); var menuItem1 = new MenuItem("text1"); @@ -318,14 +318,14 @@ public void MenuItemCollection_Add_IListMenuItem_Success() [InlineData(null)] public void MenuItemCollection_Add_IListNotMenuItem_ThrowsArgumentException(object value) { - var menu = new SubMenu(new MenuItem[0]); + var menu = new SubMenu(Array.Empty()); IList collection = new Menu.MenuItemCollection(menu); Assert.Throws("value", () => collection.Add(value)); } public static IEnumerable AddRange_TestData() { - yield return new object[] { new MenuItem[0] }; + yield return new object[] { Array.Empty() }; yield return new object[] { new MenuItem[] { new MenuItem(), new MenuItem() } }; } @@ -333,7 +333,7 @@ public static IEnumerable AddRange_TestData() [MemberData(nameof(AddRange_TestData))] public void MenuItemCollection_AddRange_Invoke_Success(MenuItem[] items) { - var menu = new SubMenu(new MenuItem[0]); + var menu = new SubMenu(Array.Empty()); var collection = new Menu.MenuItemCollection(menu); collection.AddRange(items); Assert.Equal(items.Length, collection.Count); @@ -343,7 +343,7 @@ public void MenuItemCollection_AddRange_Invoke_Success(MenuItem[] items) [Fact] public void MenuItemCollection_AddRange_NullItems_ThrowsArgumentNullException() { - var menu = new SubMenu(new MenuItem[0]); + var menu = new SubMenu(Array.Empty()); var collection = new Menu.MenuItemCollection(menu); Assert.Throws("items", () => collection.AddRange(null)); } @@ -351,7 +351,7 @@ public void MenuItemCollection_AddRange_NullItems_ThrowsArgumentNullException() [Fact] public void MenuItemCollection_AddRange_NullValueInItems_ThrowsArgumentNullException() { - var menu = new SubMenu(new MenuItem[0]); + var menu = new SubMenu(Array.Empty()); var collection = new Menu.MenuItemCollection(menu); Assert.Throws("item", () => collection.AddRange(new MenuItem[] { null })); } @@ -390,7 +390,7 @@ public void MenuItemCollection_Clear_InvokeOnMenuItem_Success() public void MenuItemCollection_CopyTo_NotEmpty_Success() { var menuItem = new MenuItem(); - var menu = new SubMenu(new MenuItem[0]); + var menu = new SubMenu(Array.Empty()); var collection = new Menu.MenuItemCollection(menu) { menuItem @@ -403,7 +403,7 @@ public void MenuItemCollection_CopyTo_NotEmpty_Success() [Fact] public void MenuItemCollection_CopyTo_Empty_Nop() { - var menu = new SubMenu(new MenuItem[0]); + var menu = new SubMenu(Array.Empty()); var collection = new Menu.MenuItemCollection(menu); var array = new object[] { 1, 2, 3 }; collection.CopyTo(array, 1); @@ -437,7 +437,7 @@ public void MenuItemCollection_Contains_IListInvoke_ReturnsExpected(Menu menu, M [Fact] public void MenuItemCollection_Contains_IListNotMenuItem_ReturnsMinusOne() { - var menu = new SubMenu(new MenuItem[0]); + var menu = new SubMenu(Array.Empty()); IList collection = new Menu.MenuItemCollection(menu); Assert.False(collection.Contains("value")); } @@ -457,8 +457,8 @@ public void MenuItemCollection_ContainsKey_Invoke_ReturnsExpected(string key, bo public static IEnumerable Find_TestData() { - yield return new object[] { new MenuItem[] { new MenuItem() }, "noSuchKey", false, new MenuItem[0] }; - yield return new object[] { new MenuItem[] { new MenuItem() }, "noSuchKey", true, new MenuItem[0] }; + yield return new object[] { new MenuItem[] { new MenuItem() }, "noSuchKey", false, Array.Empty() }; + yield return new object[] { new MenuItem[] { new MenuItem() }, "noSuchKey", true, Array.Empty() }; foreach (bool searchAllChildren in new bool[] { true, false }) { @@ -469,14 +469,14 @@ public static IEnumerable Find_TestData() yield return new object[] { new MenuItem[] { menuItem1, menuItem2, menuItem3 }, "name", searchAllChildren, new MenuItem[] { menuItem1, menuItem2 } }; } - yield return new object[] { new MenuItem[] { new MenuItem { Name = "name" } }, "noSuchName", true, new MenuItem[0] }; - yield return new object[] { new MenuItem[] { new MenuItem { Name = "name" } }, "noSuchName", false, new MenuItem[0] }; - yield return new object[] { new MenuItem[] { new MenuItem("text", new MenuItem[] { new MenuItem { Name = "name2" } }) { Name = "name" }, }, "noSuchName", true, new MenuItem[0] }; - yield return new object[] { new MenuItem[] { new MenuItem("text", new MenuItem[] { new MenuItem { Name = "name2" } }) { Name = "name" }, }, "noSuchName", false, new MenuItem[0] }; + yield return new object[] { new MenuItem[] { new MenuItem { Name = "name" } }, "noSuchName", true, Array.Empty() }; + yield return new object[] { new MenuItem[] { new MenuItem { Name = "name" } }, "noSuchName", false, Array.Empty() }; + yield return new object[] { new MenuItem[] { new MenuItem("text", new MenuItem[] { new MenuItem { Name = "name2" } }) { Name = "name" }, }, "noSuchName", true, Array.Empty() }; + yield return new object[] { new MenuItem[] { new MenuItem("text", new MenuItem[] { new MenuItem { Name = "name2" } }) { Name = "name" }, }, "noSuchName", false, Array.Empty() }; var menuItemChild = new MenuItem { Name = "name" }; yield return new object[] { new MenuItem[] { new MenuItem("text", new MenuItem[] { menuItemChild }) }, "name", true, new MenuItem[] { menuItemChild } }; - yield return new object[] { new MenuItem[] { new MenuItem("text", new MenuItem[] { new MenuItem { Name = "name" } }) }, "name", false, new MenuItem[0] }; + yield return new object[] { new MenuItem[] { new MenuItem("text", new MenuItem[] { new MenuItem { Name = "name" } }) }, "name", false, Array.Empty() }; } [Theory] @@ -493,7 +493,7 @@ public void MenuItemCollection_Find_Invoke_ReturnsExpected(MenuItem[] items, str [InlineData("")] public void MenuItemCollection_Find_NullOrEmptyKey_ThrowsArgumentNullException(string key) { - var menu = new SubMenu(new MenuItem[0]); + var menu = new SubMenu(Array.Empty()); var collection = new Menu.MenuItemCollection(menu); Assert.Throws("key", () => collection.Find(key, searchAllChildren: false)); } @@ -525,7 +525,7 @@ public void MenuItemCollection_IndexOf_IListInvoke_ReturnsExpected(Menu menu, Me [Fact] public void MenuItemCollection_IndexOf_IListNotMenuItem_ReturnsMinusOne() { - var menu = new SubMenu(new MenuItem[0]); + var menu = new SubMenu(Array.Empty()); IList collection = new Menu.MenuItemCollection(menu); Assert.Equal(-1, collection.IndexOf("value")); } @@ -550,7 +550,7 @@ public void MenuItemCollection_IndexOfKey_Invoke_ReturnsExpected(string key, int [Fact] public void MenuItemCollection_Insert_IListInvoke_Success() { - var menu = new SubMenu(new MenuItem[0]); + var menu = new SubMenu(Array.Empty()); IList collection = new Menu.MenuItemCollection(menu); var menuItem1 = new MenuItem("text1"); @@ -575,7 +575,7 @@ public void MenuItemCollection_Insert_IListInvoke_Success() [InlineData(null)] public void MenuItemCollection_Insert_IListNotMenuItem_ThrowsArgumentException(object value) { - var menu = new SubMenu(new MenuItem[0]); + var menu = new SubMenu(Array.Empty()); IList collection = new Menu.MenuItemCollection(menu); Assert.Throws("value", () => collection.Insert(0, value)); } diff --git a/src/System.Windows.Forms/tests/UnitTests/MenuItemTests.cs b/src/System.Windows.Forms/tests/UnitTests/MenuItemTests.cs index d7fc91e47f6..4089c535e6a 100644 --- a/src/System.Windows.Forms/tests/UnitTests/MenuItemTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/MenuItemTests.cs @@ -181,7 +181,7 @@ public void MenuItem_Ctor_String_EventHandler_Shortcut_OnClick() public static IEnumerable Ctor_String_MenuItemArray_TestData() { yield return new object[] { null, null, false, string.Empty }; - yield return new object[] { string.Empty, new MenuItem[0], false, string.Empty }; + yield return new object[] { string.Empty, Array.Empty(), false, string.Empty }; yield return new object[] { "text", new MenuItem[] { new MenuItem() }, true, "text" }; } @@ -198,7 +198,7 @@ public void MenuItem_Ctor_String_MenuItemArray(string text, MenuItem[] items, bo Assert.Equal(-1, menuItem.Index); Assert.Equal(expectedIsParent, menuItem.IsParent); Assert.False(menuItem.MdiList); - Assert.Equal(items ?? new MenuItem[0], menuItem.MenuItems.Cast()); + Assert.Equal(items ?? Array.Empty(), menuItem.MenuItems.Cast()); Assert.Equal(0, menuItem.MergeOrder); Assert.Equal(MenuMerge.Add, menuItem.MergeType); Assert.Equal('\0', menuItem.Mnemonic); @@ -222,7 +222,7 @@ public static IEnumerable Ctor_MergeType_Int_Shortcut_String_EventHand EventHandler onSelect = (sender, e) => { }; yield return new object[] { (MenuMerge)(MenuMerge.Add - 1), -1, (Shortcut)(Shortcut.None - 1), null, null, null, null, null, false, string.Empty }; - yield return new object[] { MenuMerge.Add, 0, Shortcut.None, string.Empty, onClick, onPopup, onSelect, new MenuItem[0], false, string.Empty }; + yield return new object[] { MenuMerge.Add, 0, Shortcut.None, string.Empty, onClick, onPopup, onSelect, Array.Empty(), false, string.Empty }; yield return new object[] { MenuMerge.MergeItems, 1, Shortcut.CtrlA, "text", onClick, onPopup, onSelect, new MenuItem[] { new MenuItem() }, true, "text" }; } @@ -239,7 +239,7 @@ public void MenuItem_Ctor_MenuMerge_Int_Shortcut_String_EventHandler_EventHandle Assert.Equal(-1, menuItem.Index); Assert.Equal(expectedIsParent, menuItem.IsParent); Assert.False(menuItem.MdiList); - Assert.Equal(items ?? new MenuItem[0], menuItem.MenuItems.Cast()); + Assert.Equal(items ?? Array.Empty(), menuItem.MenuItems.Cast()); Assert.Equal(mergeOrder, menuItem.MergeOrder); Assert.Equal(mergeType, menuItem.MergeType); Assert.Equal('\0', menuItem.Mnemonic); @@ -266,7 +266,7 @@ public void MenuItem_Ctor_MenuMerge_Int_Shortcut_String_EventHandler_EventHandle Assert.Same(menuItem, sender); callCount++; }; - menuItem = new SubMenuItem(MenuMerge.Add, 0, Shortcut.None, string.Empty, onClick, null, null, new MenuItem[0]); + menuItem = new SubMenuItem(MenuMerge.Add, 0, Shortcut.None, string.Empty, onClick, null, null, Array.Empty()); menuItem.OnClick(null); Assert.Equal(1, callCount); } @@ -281,7 +281,7 @@ public void MenuItem_Ctor_MenuMerge_Int_Shortcut_String_EventHandler_EventHandle Assert.Same(menuItem, sender); callCount++; }; - menuItem = new SubMenuItem(MenuMerge.Add, 0, Shortcut.None, string.Empty, null, onPopup, null, new MenuItem[0]); + menuItem = new SubMenuItem(MenuMerge.Add, 0, Shortcut.None, string.Empty, null, onPopup, null, Array.Empty()); menuItem.OnPopup(null); Assert.Equal(1, callCount); } @@ -296,7 +296,7 @@ public void MenuItem_Ctor_MenuMerge_Int_Shortcut_String_EventHandler_EventHandle Assert.Same(menuItem, sender); callCount++; }; - menuItem = new SubMenuItem(MenuMerge.Add, 0, Shortcut.None, string.Empty, null, null, onSelect, new MenuItem[0]); + menuItem = new SubMenuItem(MenuMerge.Add, 0, Shortcut.None, string.Empty, null, null, onSelect, Array.Empty()); menuItem.OnSelect(null); Assert.Equal(1, callCount); } @@ -510,7 +510,7 @@ public static IEnumerable IsParent_TestData() yield return new object[] { new MenuItem("text", new MenuItem[] { new MenuItem() }) { MdiList = mdiList }, null, true }; } - var disposedItem = new MenuItem("text", new MenuItem[0]); + var disposedItem = new MenuItem("text", Array.Empty()); disposedItem.Dispose(); yield return new object[] { disposedItem, new SubMenu(), false }; @@ -1114,14 +1114,14 @@ public static IEnumerable OnPopup_MdiChildren_TestData() var formWithNoMdiChildren = new Form { Menu = new MainMenu() }; formWithNoMdiChildren.Controls.Add(new MdiClient()); yield return new object[] { new SubMenuItem("text", new MenuItem[] { new MenuItem("child") }) { MdiList = true }, new MainMenu(), new string[] { "child" } }; - yield return new object[] { new SubMenuItem("text") { MdiList = true }, formWithNoMdiChildren.Menu, new string[0] }; + yield return new object[] { new SubMenuItem("text") { MdiList = true }, formWithNoMdiChildren.Menu, Array.Empty() }; var formWithNoVisibleMdiChildren = new Form { Menu = new MainMenu() }; var formWithNoVisibleMdiChildrenClient = new MdiClient(); formWithNoVisibleMdiChildren.Controls.Add(formWithNoVisibleMdiChildrenClient); formWithNoVisibleMdiChildrenClient.Controls.Add(new Form { MdiParent = formWithNoVisibleMdiChildren }); yield return new object[] { new SubMenuItem("text", new MenuItem[] { new MenuItem("child") }) { MdiList = true }, formWithNoVisibleMdiChildren.Menu, new string[] { "child", "-" } }; - yield return new object[] { new SubMenuItem("text"), formWithNoVisibleMdiChildren.Menu, new string[0] }; + yield return new object[] { new SubMenuItem("text"), formWithNoVisibleMdiChildren.Menu, Array.Empty() }; var formWithMdiChildren = new Form { Menu = new MainMenu(), Visible = true }; var formWithMdiChildrenClient = new MdiClient(); @@ -1311,7 +1311,7 @@ public void MenuItem_PerformSelect_Invoke_Success() public static IEnumerable CloneMenu_TestData() { - yield return new object[] { new MenuItem[0] }; + yield return new object[] { Array.Empty() }; yield return new object[] { new MenuItem[] { new MenuItem("text") } }; } @@ -1725,7 +1725,7 @@ public void MenuItem_ToString_Invoke_ReturnsExpected(string text) [Fact] public void MenuItem_Dispose_NoParentOrChildren_Success() { - var menuItem = new MenuItem("text", new MenuItem[0]); + var menuItem = new MenuItem("text", Array.Empty()); menuItem.Dispose(); menuItem.Dispose(); } diff --git a/src/System.Windows.Forms/tests/UnitTests/MenuTests.cs b/src/System.Windows.Forms/tests/UnitTests/MenuTests.cs index fb85dc93571..9eff1938932 100644 --- a/src/System.Windows.Forms/tests/UnitTests/MenuTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/MenuTests.cs @@ -16,7 +16,7 @@ public class MenuTests public static IEnumerable Ctor_MenuItemArray_TestData() { yield return new object[] { null, false }; - yield return new object[] { new MenuItem[0], false }; + yield return new object[] { Array.Empty(), false }; yield return new object[] { new MenuItem[] { new MenuItem() }, true }; } @@ -25,7 +25,7 @@ public static IEnumerable Ctor_MenuItemArray_TestData() public void Menu_Ctor_MenuItemArray(MenuItem[] items, bool expectedIsParent) { var menu = new SubMenu(items); - Assert.Equal(items ?? new MenuItem[0], menu.MenuItems.Cast()); + Assert.Equal(items ?? Array.Empty(), menu.MenuItems.Cast()); for (int i = 0; i < (items?.Length ?? 0); i++) { Assert.Equal(i, menu.MenuItems[i].Index); @@ -58,7 +58,7 @@ public void Menu_FindShortcut_Get_ReturnsExpected() public static IEnumerable HandleMenuItems_TestData() { - yield return new object[] { new MenuItem[0] }; + yield return new object[] { Array.Empty() }; yield return new object[] { new MenuItem[] @@ -138,7 +138,7 @@ public void Menu_Handle_GetWithRightToLeftItem_ReturnsExpected() [CommonMemberData(nameof(CommonTestHelper.GetStringNormalizedTheoryData))] public void Menu_Name_GetWithSite_ReturnsExpected(string name, string expected) { - var menu = new SubMenu(new MenuItem[0]) + var menu = new SubMenu(Array.Empty()) { Site = Mock.Of(s => s.Name == name) }; @@ -149,7 +149,7 @@ public void Menu_Name_GetWithSite_ReturnsExpected(string name, string expected) [CommonMemberData(nameof(CommonTestHelper.GetStringNormalizedTheoryData))] public void Menu_Name_SetWithoutSite_GetReturnsExpected(string value, string expected) { - var menu = new SubMenu(new MenuItem[0]) + var menu = new SubMenu(Array.Empty()) { Name = value }; @@ -164,7 +164,7 @@ public void Menu_Name_SetWithoutSite_GetReturnsExpected(string value, string exp [CommonMemberData(nameof(CommonTestHelper.GetStringNormalizedTheoryData))] public void Menu_Name_SetWithSite_GetReturnsExpected(string value, string expected) { - var menu = new SubMenu(new MenuItem[0]) + var menu = new SubMenu(Array.Empty()) { Site = Mock.Of(), Name = value @@ -178,7 +178,7 @@ public static IEnumerable MdiListItem_TestData() var listItem1 = new MenuItem { MdiList = true }; var listItem2 = new MenuItem { MdiList = true }; - yield return new object[] { new MenuItem[0], null }; + yield return new object[] { Array.Empty(), null }; yield return new object[] { new MenuItem[] { listItem1 }, listItem1 }; yield return new object[] { new MenuItem[] { new MenuItem() }, null }; yield return new object[] { new MenuItem[] { new MenuItem("parent", new MenuItem[] { listItem2 }) }, listItem2 }; @@ -197,7 +197,7 @@ public void Menu_MdiListItem_Get_ReturnsExpected(MenuItem[] items, MenuItem expe [CommonMemberData(nameof(CommonTestHelper.GetStringWithNullTheoryData))] public void Menu_Tag_Set_GetReturnsExpected(object value) { - var menu = new SubMenu(new MenuItem[0]) + var menu = new SubMenu(Array.Empty()) { Tag = value }; @@ -210,9 +210,9 @@ public void Menu_Tag_Set_GetReturnsExpected(object value) public static IEnumerable FindMenuItem_TestData() { - yield return new object[] { new MenuItem[0], MenuItem.FindHandle, IntPtr.Zero, null }; - yield return new object[] { new MenuItem[0], MenuItem.FindShortcut, IntPtr.Zero, null }; - yield return new object[] { new MenuItem[0], 2, IntPtr.Zero, null }; + yield return new object[] { Array.Empty(), MenuItem.FindHandle, IntPtr.Zero, null }; + yield return new object[] { Array.Empty(), MenuItem.FindShortcut, IntPtr.Zero, null }; + yield return new object[] { Array.Empty(), 2, IntPtr.Zero, null }; var menuItem1 = new MenuItem(); var menuItem2 = new MenuItem(); @@ -369,7 +369,7 @@ public void Menu_ProcessCmdKey_NoSuchShortcutKey_ReturnsFalse() [Fact] public void Menu_Dispose_NoChildren_Success() { - var menu = new SubMenu(new MenuItem[0]); + var menu = new SubMenu(Array.Empty()); menu.Dispose(); menu.Dispose(); } @@ -424,7 +424,7 @@ public void Menu_Dispose_ItemHasSiteWithContainer_Success() public static IEnumerable FindMergePosition_TestData() { - yield return new object[] { new MenuItem[0], -1, 0 }; + yield return new object[] { Array.Empty(), -1, 0 }; yield return new object[] { new MenuItem[] { new MenuItem { MergeOrder = 10 }, new MenuItem { MergeOrder = 12 }, new MenuItem(), new MenuItem(), new MenuItem() }, 12, 5 }; yield return new object[] { new MenuItem[] { new MenuItem { MergeOrder = 10 }, new MenuItem { MergeOrder = 12 }, new MenuItem(), new MenuItem(), new MenuItem() }, 11, 5 }; yield return new object[] { new MenuItem[] { new MenuItem { MergeOrder = 10 }, new MenuItem { MergeOrder = 12 }, new MenuItem(), new MenuItem(), new MenuItem() }, -1, 0 }; @@ -443,7 +443,7 @@ public void Menu_FindMergePosition_Invoke_ReturnsExpected(MenuItem[] items, int public static IEnumerable GetContextMenu_TestData() { - yield return new object[] { new SubMenu(new MenuItem[0]), null }; + yield return new object[] { new SubMenu(Array.Empty()), null }; yield return new object[] { new MenuItem(), null }; var menuItem1 = new MenuItem(); @@ -466,7 +466,7 @@ public void Menu_GetContextMenu_Invoke_ReturnsExpected(Menu menu, ContextMenu ex public static IEnumerable GetMainMenu_TestData() { - yield return new object[] { new SubMenu(new MenuItem[0]), null }; + yield return new object[] { new SubMenu(Array.Empty()), null }; yield return new object[] { new MenuItem(), null }; var menuItem1 = new MenuItem(); @@ -631,7 +631,7 @@ public static IEnumerable MergeMenu_TestData() { null, null, - new MenuItem[0] + Array.Empty() }; } } @@ -649,20 +649,20 @@ public void Menu_MergeMenu_Invoke_ReturnsExpected(MenuItem[] destinationItems, M [Fact] public void Menu_MergeMenu_SameSourceAndDestination_ThrowsArgumentException() { - var menu = new SubMenu(new MenuItem[0]); + var menu = new SubMenu(Array.Empty()); Assert.Throws("menuSrc", () => menu.MergeMenu(menu)); } [Fact] public void Menu_MergeMenu_NullSource_ThrowsArgumentNullException() { - var menu = new SubMenu(new MenuItem[0]); + var menu = new SubMenu(Array.Empty()); Assert.Throws("menuSrc", () => menu.MergeMenu(null)); } public static IEnumerable CloneMenu_TestData() { - yield return new object[] { new MenuItem[0] }; + yield return new object[] { Array.Empty() }; yield return new object[] { new MenuItem[] { new MenuItem("text") } }; } @@ -683,7 +683,7 @@ public void Menu_CloneMenu_Invoke_Success(MenuItem[] items) [Fact] public void Menu_CloneMenu_NullMenuSource_ThrowsArgumentNullException() { - var menu = new SubMenu(new MenuItem[0]); + var menu = new SubMenu(Array.Empty()); Assert.Throws("menuSrc", () => menu.CloneMenu(null)); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/BaseCollectionTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/BaseCollectionTests.cs index 45cb23c8947..5dde994a012 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/BaseCollectionTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/BaseCollectionTests.cs @@ -46,7 +46,7 @@ public void CopyTo_InvokeWithList_Success() public void CopyTo_InvokeDefault_ThrowsNullReferenceException() { var collection = new BaseCollection(); - Assert.Throws(() => collection.CopyTo(new object[0], 0)); + Assert.Throws(() => collection.CopyTo(Array.Empty(), 0)); } [Fact] @@ -62,7 +62,7 @@ public void GetEnumerator_InvokeWithList_Success() public void GetEnumerator_InvokeDefault_ThrowsNullReferenceException() { var collection = new BaseCollection(); - Assert.Throws(() => collection.CopyTo(new object[0], 0)); + Assert.Throws(() => collection.CopyTo(Array.Empty(), 0)); } private class SubCollection : BaseCollection diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/BindingSourceTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/BindingSourceTests.cs index a7ce709eb54..1c8777587ae 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/BindingSourceTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/BindingSourceTests.cs @@ -127,7 +127,7 @@ public static IEnumerable Ctor_Object_String_Empty_TestData() var emptyList = new List { }; yield return new object[] { emptyList, dataMember, true, false, emptyList }; - var emptyArray = new int[0]; + var emptyArray = Array.Empty(); yield return new object[] { emptyArray, dataMember, false, true, emptyArray }; var mockEmptyListSource = new Mock(MockBehavior.Strict); diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ColumnHeaderConverterTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ColumnHeaderConverterTests.cs index 180e6228b5c..817491436e4 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ColumnHeaderConverterTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ColumnHeaderConverterTests.cs @@ -53,8 +53,8 @@ public static IEnumerable ConvertTo_InstanceDescriptor_TestData() yield return new object[] { new ColumnHeader(), - new Type[0], - new object[0] + Array.Empty(), + Array.Empty() }; yield return new object[] { @@ -71,14 +71,14 @@ public static IEnumerable ConvertTo_InstanceDescriptor_TestData() yield return new object[] { new PrivateIntConstructor() { ImageIndex = 1 }, - new Type[0], - new object[0] + Array.Empty(), + Array.Empty() }; yield return new object[] { new PrivateStringConstructor() { ImageKey = "imageKey" }, - new Type[0], - new object[0] + Array.Empty(), + Array.Empty() }; yield return new object[] { diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBoxTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBoxTests.cs index 7c2900868ea..1ec1d7ee3bc 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBoxTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBoxTests.cs @@ -262,7 +262,7 @@ public static IEnumerable DataSource_Set_TestData() { yield return new object[] { null }; yield return new object[] { new List() }; - yield return new object[] { new int[0] }; + yield return new object[] { Array.Empty() }; var mockSource = new Mock(MockBehavior.Strict); mockSource diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewAutoSizeColumnsModeEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewAutoSizeColumnsModeEventArgsTests.cs index 9949d8addec..62a665bdf73 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewAutoSizeColumnsModeEventArgsTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewAutoSizeColumnsModeEventArgsTests.cs @@ -13,7 +13,7 @@ public class DataGridViewAutoSizeColumnsModeEventArgsTests public static IEnumerable Ctor_DataGridViewAutoSizeColumnModeArray_TestData() { yield return new object[] { null }; - yield return new object[] { new DataGridViewAutoSizeColumnMode[0] }; + yield return new object[] { Array.Empty() }; yield return new object[] { new DataGridViewAutoSizeColumnMode[] { DataGridViewAutoSizeColumnMode.AllCells, (DataGridViewAutoSizeColumnMode)(DataGridViewAutoSizeColumnMode.None - 1) } }; } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewRowTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewRowTests.cs index 7debec4462a..c4c0a149eaa 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewRowTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewRowTests.cs @@ -2585,7 +2585,7 @@ public void DataGridViewRow_CreateCells_NullDataGridView_ThrowsArgumentNullExcep { var row = new DataGridViewRow(); Assert.Throws("dataGridView", () => row.CreateCells(null)); - Assert.Throws("dataGridView", () => row.CreateCells(null, new object[0])); + Assert.Throws("dataGridView", () => row.CreateCells(null, Array.Empty())); } [Fact] @@ -2595,7 +2595,7 @@ public void DataGridViewRow_CreateCells_HasDataGridView_ThrowsInvalidOperationEx dataGridView.Rows.Add(new DataGridViewRow()); DataGridViewRow row = dataGridView.Rows[0]; Assert.Throws(() => row.CreateCells(new DataGridView())); - Assert.Throws(() => row.CreateCells(new DataGridView(), new object[0])); + Assert.Throws(() => row.CreateCells(new DataGridView(), Array.Empty())); } [Fact] @@ -2606,7 +2606,7 @@ public void DataGridViewRow_CreateCells_ColumnHasNoCellTemplate_ThrowsInvalidOpe dataGridView.Columns[0].CellTemplate = null; var row = new DataGridViewRow(); Assert.Throws(() => row.CreateCells(dataGridView)); - Assert.Throws(() => row.CreateCells(dataGridView, new object[0])); + Assert.Throws(() => row.CreateCells(dataGridView, Array.Empty())); } [Fact] @@ -3471,14 +3471,14 @@ public void DataGridViewRow_SetValues_VirtualDataGridView_ThrowsInvalidOperation var dataGridView = new DataGridView { ColumnCount = 1, VirtualMode = true }; dataGridView.Rows.Add(new DataGridViewRow()); DataGridViewRow row = dataGridView.Rows[0]; - Assert.Throws(() => row.SetValues(new object[0])); + Assert.Throws(() => row.SetValues(Array.Empty())); } [Theory] [MemberData(nameof(SharedRow_TestData))] public void DataGridViewRow_SetValues_Shared_ThrowsInvalidOperationException(DataGridViewRow row) { - Assert.Throws(() => row.SetValues(new object[0])); + Assert.Throws(() => row.SetValues(Array.Empty())); } private class SubDataGridViewCell : DataGridViewCell diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Design/PropertyTabTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Design/PropertyTabTests.cs index b6a74c55f55..063746ddd57 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Design/PropertyTabTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Design/PropertyTabTests.cs @@ -149,7 +149,7 @@ public static IEnumerable GetProperties_Attributes_TestData() { yield return new object[] { null, null, null }; var mockContext = new Mock(MockBehavior.Strict); - yield return new object[] { mockContext.Object, new object(), new Attribute[0] }; + yield return new object[] { mockContext.Object, new object(), Array.Empty() }; } [Theory] diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Layout/TableLayoutSettingsTypeConverterTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Layout/TableLayoutSettingsTypeConverterTests.cs index 6d372e7cd09..2a5937ca6b4 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Layout/TableLayoutSettingsTypeConverterTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Layout/TableLayoutSettingsTypeConverterTests.cs @@ -317,7 +317,7 @@ public override ICustomTypeDescriptor GetTypeDescriptor(Type objectType, object var mockDescriptor = new Mock(MockBehavior.Strict); mockDescriptor .Setup(c => c.GetProperties()) - .Returns(new PropertyDescriptorCollection(new PropertyDescriptor[0])); + .Returns(new PropertyDescriptorCollection(Array.Empty())); return mockDescriptor.Object; } } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListBindingHelperTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListBindingHelperTests.cs index 4e3dd4b0c5b..1c30c94f9ea 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListBindingHelperTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListBindingHelperTests.cs @@ -78,8 +78,8 @@ public void ListBindingHelper_GetList_InvokeObjectString_ReturnsExpected(object public static IEnumerable GetList_NoSuchDataMember_TestData() { yield return new object[] { new DataClass(), "NoSuchProperty" }; - yield return new object[] { new IEnumerableWrapper(new object[0]), "NoSuchProperty" }; - yield return new object[] { new IEnumerableWrapper(new object[0]), "Property" }; + yield return new object[] { new IEnumerableWrapper(Array.Empty()), "NoSuchProperty" }; + yield return new object[] { new IEnumerableWrapper(Array.Empty()), "Property" }; } [Theory] @@ -160,7 +160,7 @@ public static IEnumerable GetListItemType_Object_TestData() // Type that wraps an enumerable but ONLY implements non-generic IEnumerable. yield return new object[] { new IEnumerableWrapper(null), typeof(object) }; - yield return new object[] { new IEnumerableWrapper(new object[0]), typeof(object) }; + yield return new object[] { new IEnumerableWrapper(Array.Empty()), typeof(object) }; yield return new object[] { new IEnumerableWrapper(new int[] { 1 }), typeof(int) }; yield return new object[] { new IEnumerableWrapper(new object[] { 1 }), typeof(int) }; yield return new object[] { new IEnumerableWrapper(new object[] { 1, string.Empty }), typeof(int) }; @@ -237,9 +237,9 @@ public void ListBindingHelper_GetListItemType_InvalidIListSourceType_ThrowsNotSu public static IEnumerable GetListItemProperties_Object_TestData() { // Simple objects. - yield return new object[] { null, new string[0] }; - yield return new object[] { 1, new string[0] }; - yield return new object[] { typeof(int), new string[0] }; + yield return new object[] { null, Array.Empty() }; + yield return new object[] { 1, Array.Empty() }; + yield return new object[] { typeof(int), Array.Empty() }; yield return new object[] { string.Empty, new string[] { "Length" } }; yield return new object[] { typeof(string), new string[] { "Length" } }; @@ -251,26 +251,26 @@ public static IEnumerable GetListItemProperties_Object_TestData() yield return new object[] { new List(), new string[] { "Property" } }; yield return new object[] { typeof(IList), new string[] { "Property" } }; - yield return new object[] { new List(), new string[0] }; - yield return new object[] { typeof(IList), new string[0] }; + yield return new object[] { new List(), Array.Empty() }; + yield return new object[] { typeof(IList), Array.Empty() }; // Array. - yield return new object[] { new DataClass[0], new string[] { "Property" } }; + yield return new object[] { Array.Empty(), new string[] { "Property" } }; yield return new object[] { typeof(DataClass[]), new string[] { "Property" } }; - yield return new object[] { new object[0], new string[0] }; - yield return new object[] { new object[] { new DataClass() }, new string[0] }; + yield return new object[] { Array.Empty(), Array.Empty() }; + yield return new object[] { new object[] { new DataClass() }, Array.Empty() }; // Only implements IEnumerable. - yield return new object[] { new IEnumerableWrapper(new object[0]), new string[0] }; + yield return new object[] { new IEnumerableWrapper(Array.Empty()), Array.Empty() }; yield return new object[] { new IEnumerableWrapper(new object[] { new DataClass() }), new string[] { "Property" } }; yield return new object[] { new IEnumerableWrapper(new object[] { 1 }), new string[] { "Property" } }; - yield return new object[] { new IEnumerableWrapper(new object[] { null }), new string[0] }; + yield return new object[] { new IEnumerableWrapper(new object[] { null }), Array.Empty() }; // Only implements IList. - yield return new object[] { new ArrayList(), new string[0] }; + yield return new object[] { new ArrayList(), Array.Empty() }; yield return new object[] { new ArrayList { new DataClass() }, new string[] { "Property" } }; - yield return new object[] { new ArrayList { 1 }, new string[0] }; - yield return new object[] { new ArrayList { null }, new string[0] }; + yield return new object[] { new ArrayList { 1 }, Array.Empty() }; + yield return new object[] { new ArrayList { null }, Array.Empty() }; // ITypedList. var mockTypedList = new Mock(MockBehavior.Strict); @@ -300,24 +300,24 @@ public void ListBindingHelper_GetListItemProperties_InvokeObject_ReturnsExpected Assert.Equal(expected, properties?.Select(p => p.Name)); // Empty list accessors. - properties = ListBindingHelper.GetListItemProperties(list, new PropertyDescriptor[0])?.Cast(); + properties = ListBindingHelper.GetListItemProperties(list, Array.Empty())?.Cast(); Assert.Equal(expected, properties?.Select(p => p.Name)); // Null data member. - properties = ListBindingHelper.GetListItemProperties(list, null, new PropertyDescriptor[0])?.Cast(); + properties = ListBindingHelper.GetListItemProperties(list, null, Array.Empty())?.Cast(); Assert.Equal(expected, properties?.Select(p => p.Name)); // Empty data member. - properties = ListBindingHelper.GetListItemProperties(list, string.Empty, new PropertyDescriptor[0])?.Cast(); + properties = ListBindingHelper.GetListItemProperties(list, string.Empty, Array.Empty())?.Cast(); Assert.Equal(expected, properties?.Select(p => p.Name)); } public static IEnumerable GetListItemProperties_Object_PropertyDescriptorArray_TestData() { - yield return new object[] { null, TypeDescriptor.GetProperties(typeof(DataClass)).Cast().ToArray(), new string[0] }; + yield return new object[] { null, TypeDescriptor.GetProperties(typeof(DataClass)).Cast().ToArray(), Array.Empty() }; - yield return new object[] { new DataClass(), TypeDescriptor.GetProperties(typeof(DataClass)).Cast().ToArray(), new string[0] }; - yield return new object[] { typeof(DataClass), TypeDescriptor.GetProperties(typeof(DataClass)).Cast().ToArray(), new string[0] }; + yield return new object[] { new DataClass(), TypeDescriptor.GetProperties(typeof(DataClass)).Cast().ToArray(), Array.Empty() }; + yield return new object[] { typeof(DataClass), TypeDescriptor.GetProperties(typeof(DataClass)).Cast().ToArray(), Array.Empty() }; yield return new object[] { new ListDataClass(), TypeDescriptor.GetProperties(typeof(ListDataClass)).Cast().ToArray(), new string[] { "Property" } }; yield return new object[] { new ListDataClass() { ListProperty = new List { new DataClass() } }, TypeDescriptor.GetProperties(typeof(ListDataClass)).Cast().ToArray(), new string[] { "Property" } }; @@ -331,12 +331,12 @@ public static IEnumerable GetListItemProperties_Object_PropertyDescrip yield return new object[] { typeof(MultiListDataClass), TypeDescriptor.GetProperties(typeof(MultiListDataClass)).Cast().ToArray(), new string[] { "ListProperty" } }; yield return new object[] { typeof(DataClass), TypeDescriptor.GetProperties(typeof(ListDataClass)).Cast().ToArray(), new string[] { "Property" } }; - yield return new object[] { new DataClass(), new PropertyDescriptor[] { null }, new string[0] }; - yield return new object[] { typeof(DataClass), new PropertyDescriptor[] { null }, new string[0] }; + yield return new object[] { new DataClass(), new PropertyDescriptor[] { null }, Array.Empty() }; + yield return new object[] { typeof(DataClass), new PropertyDescriptor[] { null }, Array.Empty() }; // Only implements IEnumerable. PropertyDescriptor[] descriptors = TypeDescriptor.GetProperties(typeof(ListDataClass)).Cast().ToArray(); - yield return new object[] { new IEnumerableWrapper(new object[0]), descriptors, new string[] { "Property" } }; + yield return new object[] { new IEnumerableWrapper(Array.Empty()), descriptors, new string[] { "Property" } }; yield return new object[] { new IEnumerableWrapper(new object[] { new ListDataClass() }), descriptors, new string[] { "Property" } }; yield return new object[] { new IEnumerableWrapper(new object[] { new MultiListDataClass() }), inner.Take(2).ToArray(), new string[] { "Property" } }; yield return new object[] { new IEnumerableWrapper(new object[] { null }), descriptors, new string[] { "Property" } }; @@ -351,7 +351,7 @@ public static IEnumerable GetListItemProperties_Object_PropertyDescrip yield return new object[] { new ArrayList { new MultiListDataClass { ParentListProperty = new List() } }, inner.Take(2).ToArray(), new string[] { "Property" } }; yield return new object[] { new ArrayList { new MultiListDataClass { ParentListProperty = new List { new ListDataClass { ListProperty = new List { new DataClass() } } } } }, inner.Take(0).ToArray(), new string[] { "ParentListProperty" } }; yield return new object[] { new ArrayList { new MultiListDataClass { ParentListProperty = new List { new ListDataClass { ListProperty = new List { new DataClass() } } } } }, inner.Take(2).ToArray(), new string[] { "Property" } }; - yield return new object[] { new ArrayList { new MultiListDataClass { ParentListProperty = new List { new ListDataClass { ListProperty = new List { new DataClass() } } } } }, inner.Take(3).ToArray(), new string[0] }; + yield return new object[] { new ArrayList { new MultiListDataClass { ParentListProperty = new List { new ListDataClass { ListProperty = new List { new DataClass() } } } } }, inner.Take(3).ToArray(), Array.Empty() }; yield return new object[] { new ArrayList { null }, descriptors, new string[] { "Property" } }; // ITypedList. @@ -365,18 +365,18 @@ public static IEnumerable GetListItemProperties_Object_PropertyDescrip yield return new object[] { new EnumerableITypedListImplementor(), descriptors, new string[] { "Property" } }; yield return new object[] { typeof(EnumerableITypedListImplementor), descriptors, new string[] { "Property" } }; - yield return new object[] { new EnumerableITypedListImplementor[] { new EnumerableITypedListImplementor() }, TypeDescriptor.GetProperties(typeof(EnumerableITypedListImplementor)).Cast().ToArray(), new string[0] }; - yield return new object[] { new List { new EnumerableITypedListImplementor() }, TypeDescriptor.GetProperties(typeof(EnumerableITypedListImplementor)).Cast().ToArray(), new string[0] }; - yield return new object[] { new ArrayList { new EnumerableITypedListImplementor() }, TypeDescriptor.GetProperties(typeof(EnumerableITypedListImplementor)).Cast().ToArray(), new string[0] }; - yield return new object[] { new IEnumerableWrapper(new object[] { new EnumerableITypedListImplementor() }), TypeDescriptor.GetProperties(typeof(EnumerableITypedListImplementor)).Cast().ToArray(), new string[0] }; + yield return new object[] { new EnumerableITypedListImplementor[] { new EnumerableITypedListImplementor() }, TypeDescriptor.GetProperties(typeof(EnumerableITypedListImplementor)).Cast().ToArray(), Array.Empty() }; + yield return new object[] { new List { new EnumerableITypedListImplementor() }, TypeDescriptor.GetProperties(typeof(EnumerableITypedListImplementor)).Cast().ToArray(), Array.Empty() }; + yield return new object[] { new ArrayList { new EnumerableITypedListImplementor() }, TypeDescriptor.GetProperties(typeof(EnumerableITypedListImplementor)).Cast().ToArray(), Array.Empty() }; + yield return new object[] { new IEnumerableWrapper(new object[] { new EnumerableITypedListImplementor() }), TypeDescriptor.GetProperties(typeof(EnumerableITypedListImplementor)).Cast().ToArray(), Array.Empty() }; yield return new object[] { typeof(EnumerableITypedListImplementor[]), descriptors, new string[] { "Property" } }; yield return new object[] { new NonEnumerableITypedListImplementor(), descriptors, new string[] { "Property" } }; yield return new object[] { typeof(NonEnumerableITypedListImplementor), descriptors, new string[] { "Property" } }; - yield return new object[] { new NonEnumerableITypedListImplementor[] { new NonEnumerableITypedListImplementor() }, TypeDescriptor.GetProperties(typeof(NonEnumerableITypedListImplementor)).Cast().ToArray(), new string[0] }; - yield return new object[] { new List { new NonEnumerableITypedListImplementor() }, TypeDescriptor.GetProperties(typeof(NonEnumerableITypedListImplementor)).Cast().ToArray(), new string[0] }; - yield return new object[] { new ArrayList { new NonEnumerableITypedListImplementor() }, TypeDescriptor.GetProperties(typeof(NonEnumerableITypedListImplementor)).Cast().ToArray(), new string[0] }; - yield return new object[] { new IEnumerableWrapper(new object[] { new NonEnumerableITypedListImplementor() }), TypeDescriptor.GetProperties(typeof(NonEnumerableITypedListImplementor)).Cast().ToArray(), new string[0] }; + yield return new object[] { new NonEnumerableITypedListImplementor[] { new NonEnumerableITypedListImplementor() }, TypeDescriptor.GetProperties(typeof(NonEnumerableITypedListImplementor)).Cast().ToArray(), Array.Empty() }; + yield return new object[] { new List { new NonEnumerableITypedListImplementor() }, TypeDescriptor.GetProperties(typeof(NonEnumerableITypedListImplementor)).Cast().ToArray(), Array.Empty() }; + yield return new object[] { new ArrayList { new NonEnumerableITypedListImplementor() }, TypeDescriptor.GetProperties(typeof(NonEnumerableITypedListImplementor)).Cast().ToArray(), Array.Empty() }; + yield return new object[] { new IEnumerableWrapper(new object[] { new NonEnumerableITypedListImplementor() }), TypeDescriptor.GetProperties(typeof(NonEnumerableITypedListImplementor)).Cast().ToArray(), Array.Empty() }; yield return new object[] { typeof(NonEnumerableITypedListImplementor[]), descriptors, new string[] { "Property" } }; var typedListDataClass = new ITypedListDataClass { ListProperty = new List() { new EnumerableITypedListImplementor() } }; @@ -425,10 +425,10 @@ public void ListBindingHelper_GetListItemProperties_InvokeObjectPropertyDescript public static IEnumerable GetListItemProperties_Object_String_PropertyDescriptorArray_TestData() { yield return new object[] { new ListDataClass(), "ListProperty", null, new string[] { "Property" } }; - yield return new object[] { new ListDataClass(), "listproperty", new PropertyDescriptor[0], new string[] { "Property" } }; + yield return new object[] { new ListDataClass(), "listproperty", Array.Empty(), new string[] { "Property" } }; yield return new object[] { new MultiListDataClass(), "ParentListProperty", TypeDescriptor.GetProperties(typeof(ListDataClass)).Cast().ToArray(), new string[] { "Property" } }; yield return new object[] { typeof(ListDataClass), "ListProperty", null, new string[] { "Property" } }; - yield return new object[] { typeof(ListDataClass), "listproperty", new PropertyDescriptor[0], new string[] { "Property" } }; + yield return new object[] { typeof(ListDataClass), "listproperty", Array.Empty(), new string[] { "Property" } }; yield return new object[] { typeof(MultiListDataClass), "ParentListProperty", TypeDescriptor.GetProperties(typeof(ListDataClass)).Cast().ToArray(), new string[] { "Property" } }; } @@ -472,14 +472,14 @@ public static IEnumerable GetListName_TestData() yield return new object[] { 1, null, "Int32" }; yield return new object[] { typeof(int), null, "Int32" }; - yield return new object[] { 1, new PropertyDescriptor[0], "Int32" }; - yield return new object[] { typeof(int), new PropertyDescriptor[0], "Int32" }; + yield return new object[] { 1, Array.Empty(), "Int32" }; + yield return new object[] { typeof(int), Array.Empty(), "Int32" }; yield return new object[] { 1, new PropertyDescriptor[] { null }, "Int32" }; yield return new object[] { typeof(int), new PropertyDescriptor[] { null }, "Int32" }; - yield return new object[] { new int[0], null, "Int32" }; + yield return new object[] { Array.Empty(), null, "Int32" }; yield return new object[] { typeof(int[]), null, "Int32" }; - yield return new object[] { new object[0], null, "Object" }; + yield return new object[] { Array.Empty(), null, "Object" }; yield return new object[] { typeof(object[]), null, "Object" }; yield return new object[] { new List(), null, "Int32" }; diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListBoxTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListBoxTests.cs index 8afc7457d52..27aec80ea73 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListBoxTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListBoxTests.cs @@ -263,7 +263,7 @@ public static IEnumerable DataSource_Set_TestData() { yield return new object[] { null }; yield return new object[] { new List() }; - yield return new object[] { new int[0] }; + yield return new object[] { Array.Empty() }; var mockSource = new Mock(MockBehavior.Strict); mockSource diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListControlTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListControlTests.cs index c7f56bd8ac4..eb4abb90392 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListControlTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListControlTests.cs @@ -455,7 +455,7 @@ public static IEnumerable DataSource_Set_TestData() { yield return new object[] { null }; yield return new object[] { new List() }; - yield return new object[] { new int[0] }; + yield return new object[] { Array.Empty() }; var mockSource = new Mock(MockBehavior.Strict); mockSource @@ -945,7 +945,7 @@ public void DataSource_SetInsideDataSourceChanged_Nop() int callCount = 0; EventHandler handler = (sender, e) => { - control.DataSource = new int[0]; + control.DataSource = Array.Empty(); callCount++; }; control.DataSourceChanged += handler; diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewItemTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewItemTests.cs index 2feaf1aa62b..31e59e98945 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewItemTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewItemTests.cs @@ -50,7 +50,7 @@ public void ListViewItem_Ctor_Default() public static IEnumerable Ctor_StringArray_String_Color_Color_Font_ListViewGroup_TestData() { yield return new object[] { null, null, Color.Empty, Color.Empty, null, null, string.Empty, SystemColors.WindowText, SystemColors.Window, string.Empty }; - yield return new object[] { new string[0], null, Color.Empty, Color.Empty, null, null, string.Empty, SystemColors.WindowText, SystemColors.Window, string.Empty }; + yield return new object[] { Array.Empty(), null, Color.Empty, Color.Empty, null, null, string.Empty, SystemColors.WindowText, SystemColors.Window, string.Empty }; yield return new object[] { new string[] { null }, string.Empty, Color.Empty, Color.Empty, null, new ListViewGroup(), string.Empty, SystemColors.WindowText, SystemColors.Window, string.Empty }; yield return new object[] { new string[] { "text" }, "imageKey", Color.Blue, Color.Red, SystemFonts.MenuFont, new ListViewGroup(), "imageKey", Color.Blue, Color.Red, "text" }; } @@ -88,7 +88,7 @@ public void ListViewItem_Ctor_StringArray_String_Color_Color_Font_ListViewGroup( public static IEnumerable Ctor_StringArray_Int_Color_Color_Font_ListViewGroup_TestData() { yield return new object[] { null, -1, Color.Empty, Color.Empty, null, null, SystemColors.WindowText, SystemColors.Window, string.Empty }; - yield return new object[] { new string[0], 0, Color.Empty, Color.Empty, null, null, SystemColors.WindowText, SystemColors.Window, string.Empty }; + yield return new object[] { Array.Empty(), 0, Color.Empty, Color.Empty, null, null, SystemColors.WindowText, SystemColors.Window, string.Empty }; yield return new object[] { new string[] { null }, 1, Color.Empty, Color.Empty, null, new ListViewGroup(), SystemColors.WindowText, SystemColors.Window, string.Empty }; yield return new object[] { new string[] { "text" }, 2, Color.Blue, Color.Red, SystemFonts.MenuFont, new ListViewGroup(), Color.Blue, Color.Red, "text" }; } @@ -126,7 +126,7 @@ public void ListViewItem_Ctor_StringArray_Int_Color_Color_Font_ListViewGroup(str public static IEnumerable Ctor_StringArray_String_Color_Color_Font_TestData() { yield return new object[] { null, null, Color.Empty, Color.Empty, null, string.Empty, SystemColors.WindowText, SystemColors.Window, string.Empty }; - yield return new object[] { new string[0], null, Color.Empty, Color.Empty, null, string.Empty, SystemColors.WindowText, SystemColors.Window, string.Empty }; + yield return new object[] { Array.Empty(), null, Color.Empty, Color.Empty, null, string.Empty, SystemColors.WindowText, SystemColors.Window, string.Empty }; yield return new object[] { new string[] { null }, string.Empty, Color.Empty, Color.Empty, null, string.Empty, SystemColors.WindowText, SystemColors.Window, string.Empty }; yield return new object[] { new string[] { "text" }, "imageKey", Color.Blue, Color.Red, SystemFonts.MenuFont, "imageKey", Color.Blue, Color.Red, "text" }; } @@ -164,7 +164,7 @@ public void ListViewItem_Ctor_StringArray_String_Color_Color_Font(string[] subIt public static IEnumerable Ctor_StringArray_Int_Color_Color_Font_TestData() { yield return new object[] { null, -1, Color.Empty, Color.Empty, null, SystemColors.WindowText, SystemColors.Window, string.Empty }; - yield return new object[] { new string[0], 0, Color.Empty, Color.Empty, null, SystemColors.WindowText, SystemColors.Window, string.Empty }; + yield return new object[] { Array.Empty(), 0, Color.Empty, Color.Empty, null, SystemColors.WindowText, SystemColors.Window, string.Empty }; yield return new object[] { new string[] { null }, 1, Color.Empty, Color.Empty, null, SystemColors.WindowText, SystemColors.Window, string.Empty }; yield return new object[] { new string[] { "text" }, 2, Color.Blue, Color.Red, SystemFonts.MenuFont, Color.Blue, Color.Red, "text" }; } @@ -276,7 +276,7 @@ public void ListViewItem_Ctor_ListViewSubItemArray_Int_ListViewGroup(ListViewIte public static IEnumerable Ctor_StringArray_String_ListViewGroup_TestData() { yield return new object[] { null, null, null, string.Empty, string.Empty }; - yield return new object[] { new string[0], null, null, string.Empty, string.Empty }; + yield return new object[] { Array.Empty(), null, null, string.Empty, string.Empty }; yield return new object[] { new string[] { null }, string.Empty, new ListViewGroup(), string.Empty, string.Empty }; yield return new object[] { new string[] { "text" }, "imageKey", new ListViewGroup(), "imageKey", "text" }; } @@ -314,7 +314,7 @@ public void ListViewItem_Ctor_StringArray_String_ListViewGroup(string[] subItems public static IEnumerable Ctor_StringArray_Int_ListViewGroup_TestData() { yield return new object[] { null, -1, null, string.Empty }; - yield return new object[] { new string[0], 0, null, string.Empty }; + yield return new object[] { Array.Empty(), 0, null, string.Empty }; yield return new object[] { new string[] { null }, 1, new ListViewGroup(), string.Empty }; yield return new object[] { new string[] { "text" }, 2, new ListViewGroup(), "text" }; } @@ -502,7 +502,7 @@ public void ListViewItem_Ctor_ListViewSubItemArray_Int(ListViewItem.ListViewSubI public static IEnumerable Ctor_StringArray_ListViewGroup_TestData() { yield return new object[] { null, null, string.Empty }; - yield return new object[] { new string[0], null, string.Empty }; + yield return new object[] { Array.Empty(), null, string.Empty }; yield return new object[] { new string[] { null }, new ListViewGroup(), string.Empty }; yield return new object[] { new string[] { "text" }, new ListViewGroup(), "text" }; } @@ -540,7 +540,7 @@ public void ListViewItem_Ctor_StringArray_ListViewGroup(string[] subItems, ListV public static IEnumerable Ctor_StringArray_String_TestData() { yield return new object[] { null, null, string.Empty, string.Empty }; - yield return new object[] { new string[0], null, string.Empty, string.Empty }; + yield return new object[] { Array.Empty(), null, string.Empty, string.Empty }; yield return new object[] { new string[] { null }, string.Empty, string.Empty, string.Empty }; yield return new object[] { new string[] { "text" }, "imageKey", "imageKey", "text" }; } @@ -578,7 +578,7 @@ public void ListViewItem_Ctor_StringArray_String(string[] subItems, string image public static IEnumerable Ctor_StringArray_Int_TestData() { yield return new object[] { null, -1, string.Empty }; - yield return new object[] { new string[0], 0, string.Empty }; + yield return new object[] { Array.Empty(), 0, string.Empty }; yield return new object[] { new string[] { null }, 1, string.Empty }; yield return new object[] { new string[] { "text" }, 2, "text" }; } @@ -767,7 +767,7 @@ public void ListViewItem_Ctor_ListViewGroup(ListViewGroup group) public static IEnumerable Ctor_StringArray_TestData() { yield return new object[] { null, string.Empty }; - yield return new object[] { new string[0], string.Empty }; + yield return new object[] { Array.Empty(), string.Empty }; yield return new object[] { new string[] { null }, string.Empty }; yield return new object[] { new string[] { "text" }, "text" }; } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PropertyManagerTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PropertyManagerTests.cs index 6dd5121bb56..221e82c8be5 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PropertyManagerTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PropertyManagerTests.cs @@ -55,7 +55,7 @@ public void PropertyManager_GetListName_NoDataSource_ThrowsArgumentException() /* public static IEnumerable GetItemProperties_Parameterless_TestData() { - yield return new object[] { new PropertyManager(), new string[0] }; + yield return new object[] { new PropertyManager(), Array.Empty() }; var singleContext = new BindingContext(); yield return new object[] { singleContext[new DataSource()], new string[] { "Property" } }; @@ -74,8 +74,8 @@ public void PropertyManager_GetItemProperties_InvokeParameterless_ReturnsExpecte public static IEnumerable GetItemProperties_DataSourcesAndListAccessors_TestData() { - yield return new object[] { new PropertyManager(), null, null, new string[0] }; - yield return new object[] { new PropertyManager(), new ArrayList(), new ArrayList(), new string[0] }; + yield return new object[] { new PropertyManager(), null, null, Array.Empty() }; + yield return new object[] { new PropertyManager(), new ArrayList(), new ArrayList(), Array.Empty() }; var singleContext = new BindingContext(); yield return new object[] { singleContext[new DataSource()], null, null, new string[] { "Property" } }; diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TableLayoutPanelTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TableLayoutPanelTests.cs index bd571705efe..89469c1befb 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TableLayoutPanelTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TableLayoutPanelTests.cs @@ -949,7 +949,7 @@ public override ICustomTypeDescriptor GetTypeDescriptor(Type objectType, object var mockDescriptor = new Mock(MockBehavior.Strict); mockDescriptor .Setup(c => c.GetProperties()) - .Returns(new PropertyDescriptorCollection(new PropertyDescriptor[0])); + .Returns(new PropertyDescriptorCollection(Array.Empty())); return mockDescriptor.Object; } } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TableLayoutStyleTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TableLayoutStyleTests.cs index f235e59bdb3..0bb5b1782e3 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TableLayoutStyleTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TableLayoutStyleTests.cs @@ -59,10 +59,10 @@ public void TableLayoutStyle_ConverterCanConvertTo_Invoke_ReturnsExpected(Type d public static IEnumerable ConvertTo_TestData() { - yield return new object[] { new RowStyle(SizeType.AutoSize, 1), typeof(RowStyle).GetConstructor(new Type[0]), new object[0] }; + yield return new object[] { new RowStyle(SizeType.AutoSize, 1), typeof(RowStyle).GetConstructor(Array.Empty()), Array.Empty() }; yield return new object[] { new RowStyle(SizeType.Absolute, 1), typeof(RowStyle).GetConstructor(new Type[] { typeof(SizeType), typeof(int) }), new object[] { SizeType.Absolute, 1f } }; yield return new object[] { new RowStyle(SizeType.Percent, 1), typeof(RowStyle).GetConstructor(new Type[] { typeof(SizeType), typeof(int) }), new object[] { SizeType.Percent, 1f } }; - yield return new object[] { new ColumnStyle(SizeType.AutoSize, 1), typeof(ColumnStyle).GetConstructor(new Type[0]), new object[0] }; + yield return new object[] { new ColumnStyle(SizeType.AutoSize, 1), typeof(ColumnStyle).GetConstructor(Array.Empty()), Array.Empty() }; yield return new object[] { new ColumnStyle(SizeType.Absolute, 1), typeof(ColumnStyle).GetConstructor(new Type[] { typeof(SizeType), typeof(int) }), new object[] { SizeType.Absolute, 1f } }; yield return new object[] { new ColumnStyle(SizeType.Percent, 1), typeof(ColumnStyle).GetConstructor(new Type[] { typeof(SizeType), typeof(int) }), new object[] { SizeType.Percent, 1f } }; }