diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ExpandCollapseState.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ExpandCollapseState.cs deleted file mode 100644 index 0fbdfa0f97f..00000000000 --- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ExpandCollapseState.cs +++ /dev/null @@ -1,31 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -internal static partial class Interop -{ - internal static partial class UiaCore - { - public enum ExpandCollapseState - { - /// - /// No children are showing - /// - Collapsed, - - /// - /// All children are showing - /// - Expanded, - - /// - /// Not all children are showing - /// - PartiallyExpanded, - - /// - /// Does not expand or collapse - /// - LeafNode - } - } -} diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IExpandCollapseProvider.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IExpandCollapseProvider.cs index fd4f04de7af..5c3636e4465 100644 --- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IExpandCollapseProvider.cs +++ b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IExpandCollapseProvider.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Runtime.InteropServices; +using Windows.Win32.UI.Accessibility; internal static partial class Interop { diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IRawElementProviderFragment.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IRawElementProviderFragment.cs index 50fc53fc447..ec836194f70 100644 --- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IRawElementProviderFragment.cs +++ b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IRawElementProviderFragment.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Runtime.InteropServices; +using Windows.Win32.UI.Accessibility; internal static partial class Interop { diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ITableProvider.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ITableProvider.cs index 3ca452f09ae..6064b6220a8 100644 --- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ITableProvider.cs +++ b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ITableProvider.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Runtime.InteropServices; +using Windows.Win32.UI.Accessibility; internal static partial class Interop { diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IToggleProvider.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IToggleProvider.cs index 2c8d6755659..ec089d62590 100644 --- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IToggleProvider.cs +++ b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IToggleProvider.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Runtime.InteropServices; +using UIA = Windows.Win32.UI.Accessibility; internal static partial class Interop { @@ -17,7 +18,7 @@ public interface IToggleProvider /// /// Indicates an element's current on or off state /// - ToggleState ToggleState { get; } + UIA.ToggleState ToggleState { get; } } } } diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.NavigateDirection.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.NavigateDirection.cs deleted file mode 100644 index 2a8dd722a1f..00000000000 --- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.NavigateDirection.cs +++ /dev/null @@ -1,35 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -internal static partial class Interop -{ - internal static partial class UiaCore - { - /// - /// Directions for navigation the UIAutomation tree - /// - public enum NavigateDirection - { - /// - /// Navigate to parent - /// - Parent, - /// - /// Navigate to next sibling - /// - NextSibling, - /// - /// Navigate to previous sibling - /// - PreviousSibling, - /// - /// Navigate to first child - /// - FirstChild, - /// - /// Navigate to last child - /// - LastChild, - } - } -} diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ProviderOptions.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ProviderOptions.cs deleted file mode 100644 index 64b6bf2608e..00000000000 --- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ProviderOptions.cs +++ /dev/null @@ -1,47 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -internal static partial class Interop -{ - internal static partial class UiaCore - { - [Flags] - public enum ProviderOptions - { - /// - /// Indicates that this is a client-side provider - /// - ClientSideProvider = 0x0001, - - /// - /// Indicates that this is a server-side provider - /// - ServerSideProvider = 0x0002, - - /// - /// Indicates that this is a non-client-area provider - /// - NonClientAreaProvider = 0x0004, - - /// - /// Indicates that this is an override provider - /// - OverrideProvider = 0x0008, - - /// - /// Indicates that this provider handles its own focus, and does not want - /// UIA to set focus to the nearest HWND on its behalf when AutomationElement.SetFocus - /// is used. This option is typically used by providers for HWNDs that appear to take - /// focus without actually receiving actual Win32 focus, such as menus and dropdowns - /// - ProviderOwnsSetFocus = 0x0010, - - /// - /// Indicates that this provider expects to be called according to COM threading rules: - /// if the provider is in a Single-Threaded Apartment, it will be called only on the apartment - /// thread. Only Server-side providers can use this option. - /// - UseComThreading = 0x0020 - } - } -} diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.RowOrColumnMajor.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.RowOrColumnMajor.cs deleted file mode 100644 index e368aa664c4..00000000000 --- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.RowOrColumnMajor.cs +++ /dev/null @@ -1,16 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -internal static partial class Interop -{ - internal static partial class UiaCore - { - [Flags] - public enum RowOrColumnMajor - { - RowMajor = 0, - ColumnMajor = 1, - Indeterminate = 2 - } - } -} diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.StructureChangeType.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.StructureChangeType.cs deleted file mode 100644 index 10aab277e26..00000000000 --- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.StructureChangeType.cs +++ /dev/null @@ -1,43 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -internal static partial class Interop -{ - internal static partial class UiaCore - { - /// - /// Logical structure change flags - /// - public enum StructureChangeType - { - /// - /// Logical child added - /// - ChildAdded, - - /// - /// Logical child removed - /// - ChildRemoved, - - /// - /// Logical children invalidated - /// - ChildrenInvalidated, - - /// - /// Logical children were bulk added - /// - ChildrenBulkAdded, - - /// - /// Logical children were bulk removed - /// - ChildrenBulkRemoved, - /// - /// The order of the children below their parent has changed - /// - ChildrenReordered, - } - } -} diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.TextPatternRangeEndpoint.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.TextPatternRangeEndpoint.cs deleted file mode 100644 index 52c03f4d3ce..00000000000 --- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.TextPatternRangeEndpoint.cs +++ /dev/null @@ -1,14 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -internal static partial class Interop -{ - internal static partial class UiaCore - { - public enum TextPatternRangeEndpoint - { - Start = 0, - End = 1 - } - } -} diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.TextUnit.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.TextUnit.cs deleted file mode 100644 index 67237850eaf..00000000000 --- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.TextUnit.cs +++ /dev/null @@ -1,19 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -internal static partial class Interop -{ - internal static partial class UiaCore - { - public enum TextUnit - { - Character = 0, - Format = 1, - Word = 2, - Line = 3, - Paragraph = 4, - Page = 5, - Document = 6 - } - } -} diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ToggleState.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ToggleState.cs deleted file mode 100644 index 1e51d95ffe8..00000000000 --- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ToggleState.cs +++ /dev/null @@ -1,16 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -internal static partial class Interop -{ - internal static partial class UiaCore - { - [Flags] - public enum ToggleState - { - Off = 0, - On = 1, - Indeterminate = 2 - } - } -} diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.UiaClientsAreListening.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.UiaClientsAreListening.cs deleted file mode 100644 index ce322bcc29c..00000000000 --- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.UiaClientsAreListening.cs +++ /dev/null @@ -1,27 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -using System.Runtime.InteropServices; - -internal partial class Interop -{ - internal static partial class UiaCore - { - // Unfortunately UiaClientsAreListening() can't be used to specifically learn whether an assistive technology - // (AT) like Narrator, Windows Magnifier, or Windows On-Screen Keyboard is running, (those 3 products are all - // UIA clients). - // Other UIA clients which aren't AT will also result in UiaClientsAreListening() returning true. - // UiaClientsAreListening() was first majorly impacted when the touch keyboard was introduced for Windows touch - // devices. The touch keyboard used UIA and so UiaClientsAreListening() returned true, regardless of whether any - // AT is running. - // - // There is no known or supported way in Windows to determine that AT is running, or that a specific type of AT - // like a screen reader is running. - // (Don't even think about trying to achieve this with the SystemParameterInfo SPI_GETSCREENREADER flag!) - // - // Importing and using this method just in case one day it starts working. - - [DllImport(Libraries.UiaCore, ExactSpelling = true)] - public static extern BOOL UiaClientsAreListening(); - } -} diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.UiaRaiseStructureChangedEvent.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.UiaRaiseStructureChangedEvent.cs index 5d5ab123fd1..67f372e257c 100644 --- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.UiaRaiseStructureChangedEvent.cs +++ b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.UiaRaiseStructureChangedEvent.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Runtime.InteropServices; +using Windows.Win32.UI.Accessibility; internal partial class Interop { diff --git a/src/System.Windows.Forms.Primitives/src/NativeMethods.txt b/src/System.Windows.Forms.Primitives/src/NativeMethods.txt index 2f91c082f21..37fa3b87cdb 100644 --- a/src/System.Windows.Forms.Primitives/src/NativeMethods.txt +++ b/src/System.Windows.Forms.Primitives/src/NativeMethods.txt @@ -177,6 +177,7 @@ EnumThreadWindows EnumWindows ES_* EVENTMSG +ExpandCollapseState EXTLOGFONTW ExtTextOut FDAP @@ -558,6 +559,7 @@ MoveToEx MSFTEDIT_CLASS MsgWaitForMultipleObjectsEx MultiByteToWideChar +NavigateDirection NIN_* NFR_* NM_* @@ -631,6 +633,7 @@ PRINTDLGEX_FLAGS PROGRESS_CLASS PROPERTYKEY PropVariantClear +ProviderOptions ReadClassStg READYSTATE RealizePalette @@ -649,6 +652,7 @@ RevokeDragDrop REGDB_E_CLASSNOTREG RICH_EDIT_GET_CONTEXT_MENU_SEL_TYPE RoundRect +RowOrColumnMajor RPC_E_CHANGED_MODE SAFEARRAY SafeArrayGetRecordInfo @@ -750,6 +754,7 @@ STGC STGTY STILL_ACTIVE StretchDIBits +StructureChangeType SYSBUTTONSTATES SystemParametersInfo SystemParametersInfoForDpi @@ -770,6 +775,7 @@ TCN_* TCS_* THEME_PROPERTY_SYMBOL_ID TILE_WINDOWS_HOW +ToggleState TOOLTIP_FLAGS TOOLTIPS_CLASS TRACKBAR_CLASS @@ -796,6 +802,7 @@ TYPEDESC TYPEKIND UIA_EVENT_ID UiaAppendRuntimeId +UiaClientsAreListening UiaGetReservedNotSupportedValue UiaRootObjectId UIS_* diff --git a/src/System.Windows.Forms.Primitives/tests/UnitTests/System/Windows/Forms/Automation/UiaTextRangeTests.cs b/src/System.Windows.Forms.Primitives/tests/UnitTests/System/Windows/Forms/Automation/UiaTextRangeTests.cs index db75632cdb2..1638758fc0c 100644 --- a/src/System.Windows.Forms.Primitives/tests/UnitTests/System/Windows/Forms/Automation/UiaTextRangeTests.cs +++ b/src/System.Windows.Forms.Primitives/tests/UnitTests/System/Windows/Forms/Automation/UiaTextRangeTests.cs @@ -8,7 +8,6 @@ using Windows.Win32.System.Variant; using Windows.Win32.UI.Accessibility; using InteropUiaIRawElementProviderSimple = Interop.UiaCore.IRawElementProviderSimple; -using ProviderOptions = Interop.UiaCore.ProviderOptions; namespace System.Windows.Forms.Primitives.Tests.Automation; diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/AccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/AccessibleObject.cs index 2f0b0f84a58..6154ac78fee 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/AccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/AccessibleObject.cs @@ -425,7 +425,7 @@ internal virtual int[] RuntimeId } internal virtual int ProviderOptions - => (int)(UiaCore.ProviderOptions.ServerSideProvider | UiaCore.ProviderOptions.UseComThreading); + => (int)(UIA.ProviderOptions.ProviderOptions_ServerSideProvider | UIA.ProviderOptions.ProviderOptions_UseComThreading); internal virtual UiaCore.IRawElementProviderSimple? HostRawElementProvider => null; @@ -538,7 +538,7 @@ private bool IsInvokePatternAvailable /// /// Indicates the direction in which to navigate. /// The element in the specified direction if it exists. - internal virtual UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) => null; + internal virtual UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) => null; internal virtual UiaCore.IRawElementProviderSimple[]? GetEmbeddedFragmentRoots() => null; @@ -571,13 +571,13 @@ internal virtual void Collapse() { } - internal virtual UiaCore.ExpandCollapseState ExpandCollapseState => UiaCore.ExpandCollapseState.Collapsed; + internal virtual UIA.ExpandCollapseState ExpandCollapseState => UIA.ExpandCollapseState.ExpandCollapseState_Collapsed; internal virtual void Toggle() { } - internal virtual UiaCore.ToggleState ToggleState => UiaCore.ToggleState.Indeterminate; + internal virtual ToggleState ToggleState => ToggleState.ToggleState_Indeterminate; private protected virtual UiaCore.IRawElementProviderFragmentRoot? ToolStripFragmentRoot => null; @@ -585,7 +585,7 @@ internal virtual void Toggle() internal virtual UiaCore.IRawElementProviderSimple[]? GetColumnHeaders() => null; - internal virtual UiaCore.RowOrColumnMajor RowOrColumnMajor => UiaCore.RowOrColumnMajor.RowMajor; + internal virtual RowOrColumnMajor RowOrColumnMajor => RowOrColumnMajor.RowOrColumnMajor_RowMajor; internal virtual UiaCore.IRawElementProviderSimple[]? GetRowHeaderItems() => null; @@ -766,7 +766,7 @@ unsafe HRESULT UiaCore.IAccessibleEx.ConvertReturnedElement(UiaCore.IRawElementP return HRESULT.E_NOTIMPL; } - UiaCore.ProviderOptions UiaCore.IRawElementProviderSimple.ProviderOptions => (UiaCore.ProviderOptions)ProviderOptions; + ProviderOptions UiaCore.IRawElementProviderSimple.ProviderOptions => (ProviderOptions)ProviderOptions; UiaCore.IRawElementProviderSimple? UiaCore.IRawElementProviderSimple.HostRawElementProvider => HostRawElementProvider; @@ -801,7 +801,7 @@ unsafe HRESULT UiaCore.IAccessibleEx.ConvertReturnedElement(UiaCore.IRawElementP return value; } - object? UiaCore.IRawElementProviderFragment.Navigate(UiaCore.NavigateDirection direction) => FragmentNavigate(direction); + object? UiaCore.IRawElementProviderFragment.Navigate(NavigateDirection direction) => FragmentNavigate(direction); int[]? UiaCore.IRawElementProviderFragment.GetRuntimeId() => RuntimeId; @@ -887,7 +887,7 @@ UiaCore.IRawElementProviderSimple[] UiaCore.ILegacyIAccessibleProvider.GetSelect void UiaCore.IExpandCollapseProvider.Collapse() => Collapse(); - UiaCore.ExpandCollapseState UiaCore.IExpandCollapseProvider.ExpandCollapseState => ExpandCollapseState; + UIA.ExpandCollapseState UiaCore.IExpandCollapseProvider.ExpandCollapseState => ExpandCollapseState; void UiaCore.IInvokeProvider.Invoke() => Invoke(); @@ -932,13 +932,13 @@ HRESULT ITextProvider2.Interface.RangeFromAnnotation(IRawElementProviderSimple* void UiaCore.IToggleProvider.Toggle() => Toggle(); - UiaCore.ToggleState UiaCore.IToggleProvider.ToggleState => ToggleState; + ToggleState UiaCore.IToggleProvider.ToggleState => ToggleState; object[]? UiaCore.ITableProvider.GetRowHeaders() => GetRowHeaders(); object[]? UiaCore.ITableProvider.GetColumnHeaders() => GetColumnHeaders(); - UiaCore.RowOrColumnMajor UiaCore.ITableProvider.RowOrColumnMajor => RowOrColumnMajor; + RowOrColumnMajor UiaCore.ITableProvider.RowOrColumnMajor => RowOrColumnMajor; object[]? UiaCore.ITableItemProvider.GetRowHeaderItems() => GetRowHeaderItems(); @@ -2230,7 +2230,7 @@ public virtual bool RaiseLiveRegionChanged() internal virtual bool RaiseAutomationEvent(UIA_EVENT_ID eventId) { - if (UiaCore.UiaClientsAreListening() && CanNotifyClients) + if (PInvoke.UiaClientsAreListening() && CanNotifyClients) { HRESULT result = UiaCore.UiaRaiseAutomationEvent(this, eventId); return result == HRESULT.S_OK; @@ -2241,7 +2241,7 @@ internal virtual bool RaiseAutomationEvent(UIA_EVENT_ID eventId) internal virtual bool RaiseAutomationPropertyChangedEvent(UIA_PROPERTY_ID propertyId, object? oldValue, object? newValue) { - if (UiaCore.UiaClientsAreListening() && CanNotifyClients) + if (PInvoke.UiaClientsAreListening() && CanNotifyClients) { HRESULT result = UiaCore.UiaRaiseAutomationPropertyChangedEvent(this, propertyId, oldValue, newValue); return result == HRESULT.S_OK; @@ -2255,7 +2255,7 @@ internal virtual bool InternalRaiseAutomationNotification( AutomationNotificationProcessing notificationProcessing, string notificationText) { - if (UiaCore.UiaClientsAreListening()) + if (PInvoke.UiaClientsAreListening()) { return RaiseAutomationNotification(notificationKind, notificationProcessing, notificationText); } @@ -2263,9 +2263,9 @@ internal virtual bool InternalRaiseAutomationNotification( return s_notificationEventAvailable; } - internal bool RaiseStructureChangedEvent(UiaCore.StructureChangeType structureChangeType, int[] runtimeId) + internal bool RaiseStructureChangedEvent(StructureChangeType structureChangeType, int[] runtimeId) { - if (UiaCore.UiaClientsAreListening() && CanNotifyClients) + if (PInvoke.UiaClientsAreListening() && CanNotifyClients) { HRESULT result = UiaCore.UiaRaiseStructureChangedEvent(this, structureChangeType, runtimeId, runtimeId is null ? 0 : runtimeId.Length); return result == HRESULT.S_OK; diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/CheckBox.CheckBoxAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/CheckBox.CheckBoxAccessibleObject.cs index d5e5469ecc6..8b0a0462329 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/CheckBox.CheckBoxAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/CheckBox.CheckBoxAccessibleObject.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using Windows.Win32.UI.Accessibility; -using static Interop; namespace System.Windows.Forms; @@ -32,15 +31,15 @@ public override AccessibleStates State _ => base.State }; - internal override UiaCore.ToggleState ToggleState + internal override ToggleState ToggleState => this.TryGetOwnerAs(out CheckBox? owner) ? owner.CheckState switch { - CheckState.Checked => UiaCore.ToggleState.On, - CheckState.Unchecked => UiaCore.ToggleState.Off, - _ => UiaCore.ToggleState.Indeterminate, + CheckState.Checked => ToggleState.ToggleState_On, + CheckState.Unchecked => ToggleState.ToggleState_Off, + _ => ToggleState.ToggleState_Indeterminate, } - : UiaCore.ToggleState.Off; + : ToggleState.ToggleState_Off; internal override bool IsPatternSupported(UIA_PATTERN_ID patternId) => patternId switch diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/CheckedListBox.CheckedListBoxItemAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/CheckedListBox.CheckedListBoxItemAccessibleObject.cs index b6a1a7a052b..41c596beeb6 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/CheckedListBox.CheckedListBoxItemAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/CheckedListBox.CheckedListBoxItemAccessibleObject.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using Windows.Win32.UI.Accessibility; -using static Interop; namespace System.Windows.Forms; @@ -107,18 +106,18 @@ public override AccessibleStates State internal override void Toggle() => DoDefaultAction(); - internal override UiaCore.ToggleState ToggleState + internal override ToggleState ToggleState { get { - UiaCore.ToggleState toggleState= UiaCore.ToggleState.Off; + ToggleState toggleState= ToggleState.ToggleState_Off; switch (_owningCheckedListBox.GetItemCheckState(CurrentIndex)) { case CheckState.Checked: - toggleState = UiaCore.ToggleState.On; + toggleState = ToggleState.ToggleState_On; break; case CheckState.Indeterminate: - toggleState = UiaCore.ToggleState.Indeterminate; + toggleState = ToggleState.ToggleState_Indeterminate; break; } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxAccessibleObject.cs index b0f55f1ec0d..32062995ecc 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxAccessibleObject.cs @@ -59,10 +59,10 @@ internal override int[] RuntimeId internal override void Collapse() => ComboBoxDefaultAction(false); - internal override UiaCore.ExpandCollapseState ExpandCollapseState + internal override ExpandCollapseState ExpandCollapseState => this.IsOwnerHandleCreated(out ComboBox? owner) && owner.DroppedDown - ? UiaCore.ExpandCollapseState.Expanded - : UiaCore.ExpandCollapseState.Collapsed; + ? ExpandCollapseState.ExpandCollapseState_Expanded + : ExpandCollapseState.ExpandCollapseState_Collapsed; internal override string? get_accNameInternal(object childID) { @@ -98,7 +98,7 @@ internal override UiaCore.ExpandCollapseState ExpandCollapseState public ComboBoxChildDropDownButtonUiaProvider? DropDownButtonUiaProvider => _dropDownButtonUiaProvider ??= this.TryGetOwnerAs(out ComboBox? owner) ? new ComboBoxChildDropDownButtonUiaProvider(owner) : null; - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { if (!this.IsOwnerHandleCreated(out ComboBox? _)) { @@ -107,9 +107,9 @@ public ComboBoxChildDropDownButtonUiaProvider? DropDownButtonUiaProvider switch (direction) { - case UiaCore.NavigateDirection.FirstChild: + case NavigateDirection.NavigateDirection_FirstChild: return GetFirstChild(); - case UiaCore.NavigateDirection.LastChild: + case NavigateDirection.NavigateDirection_LastChild: return GetLastChild(); default: return base.FragmentNavigate(direction); diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxChildDropDownButtonUiaProvider.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxChildDropDownButtonUiaProvider.cs index 428735a3e86..26bff9f4d3f 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxChildDropDownButtonUiaProvider.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxChildDropDownButtonUiaProvider.cs @@ -43,7 +43,7 @@ public ComboBoxChildDropDownButtonUiaProvider(ComboBox owner) public override unsafe string? DefaultAction => SystemIAccessible.TryGetDefaultAction(GetChildId()); - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { if (!_owner.IsHandleCreated) { @@ -52,13 +52,13 @@ public ComboBoxChildDropDownButtonUiaProvider(ComboBox owner) return direction switch { - UiaCore.NavigateDirection.Parent => _owner.AccessibilityObject, - UiaCore.NavigateDirection.PreviousSibling => + NavigateDirection.NavigateDirection_Parent => _owner.AccessibilityObject, + NavigateDirection.NavigateDirection_PreviousSibling => _owner.DropDownStyle == ComboBoxStyle.DropDownList ? _owner.ChildTextAccessibleObject : _owner.ChildEditAccessibleObject, // We should return null for NextSibling because it is always the last item in the tree - UiaCore.NavigateDirection.NextSibling => null, + NavigateDirection.NavigateDirection_NextSibling => null, _ => base.FragmentNavigate(direction) }; } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxChildEditUiaProvider.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxChildEditUiaProvider.cs index 62034bb9a1c..bcadec73ee8 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxChildEditUiaProvider.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxChildEditUiaProvider.cs @@ -40,7 +40,7 @@ public ComboBoxChildEditUiaProvider(ComboBox owner, IntPtr childEditControlhandl /// /// Indicates the direction in which to navigate. /// Returns the element in the specified direction. - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { if (!_owningComboBox.IsHandleCreated || // Created is set to false in WM_DESTROY, but the window Handle is released on NCDESTROY, which comes after DESTROY. @@ -52,13 +52,13 @@ public ComboBoxChildEditUiaProvider(ComboBox owner, IntPtr childEditControlhandl switch (direction) { - case UiaCore.NavigateDirection.Parent: + case NavigateDirection.NavigateDirection_Parent: return _owningComboBox.AccessibilityObject; - case UiaCore.NavigateDirection.PreviousSibling: + case NavigateDirection.NavigateDirection_PreviousSibling: return _owningComboBox.DroppedDown ? _owningComboBox.ChildListAccessibleObject : null; - case UiaCore.NavigateDirection.NextSibling: + case NavigateDirection.NavigateDirection_NextSibling: return _owningComboBox.DropDownStyle != ComboBoxStyle.Simple && _owningComboBox.AccessibilityObject is ComboBoxAccessibleObject comboBoxAccessibleObject ? comboBoxAccessibleObject.DropDownButtonUiaProvider diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxChildListUiaProvider.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxChildListUiaProvider.cs index 08107b99d2b..8a6841dc7d4 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxChildListUiaProvider.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxChildListUiaProvider.cs @@ -59,7 +59,7 @@ internal override Rectangle BoundingRectangle return base.ElementProviderFromPoint(x, y); } - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { if (!_owningComboBox.IsHandleCreated || // Created is set to false in WM_DESTROY, but the window Handle is released on NCDESTROY, which comes after DESTROY. @@ -71,11 +71,11 @@ internal override Rectangle BoundingRectangle switch (direction) { - case UiaCore.NavigateDirection.Parent: + case NavigateDirection.NavigateDirection_Parent: return _owningComboBox.AccessibilityObject; - case UiaCore.NavigateDirection.FirstChild: + case NavigateDirection.NavigateDirection_FirstChild: return GetChildFragment(0); - case UiaCore.NavigateDirection.LastChild: + case NavigateDirection.NavigateDirection_LastChild: var childFragmentCount = GetChildFragmentCount(); if (childFragmentCount > 0) { @@ -83,11 +83,11 @@ internal override Rectangle BoundingRectangle } return null; - case UiaCore.NavigateDirection.NextSibling: + case NavigateDirection.NavigateDirection_NextSibling: return _owningComboBox.DropDownStyle == ComboBoxStyle.DropDownList ? _owningComboBox.ChildTextAccessibleObject : _owningComboBox.ChildEditAccessibleObject; - case UiaCore.NavigateDirection.PreviousSibling: + case NavigateDirection.NavigateDirection_PreviousSibling: // A workaround for an issue with an Inspect not responding. It also simulates native control behavior. return _owningComboBox.DropDownStyle == ComboBoxStyle.Simple ? _owningComboBox.ChildListAccessibleObject diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxChildTextUiaProvider.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxChildTextUiaProvider.cs index aefcf637e17..92bda080c5d 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxChildTextUiaProvider.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxChildTextUiaProvider.cs @@ -68,7 +68,7 @@ public override string Name /// /// Indicates the direction in which to navigate. /// Returns the element in the specified direction. - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { if (!_owner.IsHandleCreated) { @@ -77,13 +77,13 @@ public override string Name switch (direction) { - case UiaCore.NavigateDirection.Parent: + case NavigateDirection.NavigateDirection_Parent: return _owner.AccessibilityObject; - case UiaCore.NavigateDirection.NextSibling: + case NavigateDirection.NavigateDirection_NextSibling: return _owner.AccessibilityObject is ComboBoxAccessibleObject comboBoxAccessibleObject ? comboBoxAccessibleObject.DropDownButtonUiaProvider : null; - case UiaCore.NavigateDirection.PreviousSibling: + case NavigateDirection.NavigateDirection_PreviousSibling: return _owner.DroppedDown ? _owner.ChildListAccessibleObject : null; diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxItemAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxItemAccessibleObject.cs index 9064eae8987..9e78ce732cf 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxItemAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxItemAccessibleObject.cs @@ -58,9 +58,9 @@ public override Rectangle Bounds public override string? DefaultAction => _owningComboBox.ChildListAccessibleObject.SystemIAccessible.TryGetDefaultAction(GetChildId()); - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { - if (direction == UiaCore.NavigateDirection.Parent) + if (direction == NavigateDirection.NavigateDirection_Parent) { return _owningComboBox.ChildListAccessibleObject; } @@ -72,7 +72,7 @@ public override string? DefaultAction switch (direction) { - case UiaCore.NavigateDirection.NextSibling: + case NavigateDirection.NavigateDirection_NextSibling: int currentIndex = GetCurrentIndex(); int itemsCount = comboBoxChildListUiaProvider.GetChildFragmentCount(); int nextItemIndex = currentIndex + 1; @@ -82,7 +82,7 @@ public override string? DefaultAction } break; - case UiaCore.NavigateDirection.PreviousSibling: + case NavigateDirection.NavigateDirection_PreviousSibling: currentIndex = GetCurrentIndex(); int previousItemIndex = currentIndex - 1; if (previousItemIndex >= 0) 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 77790c98f58..63afd4fbf04 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.cs @@ -2566,8 +2566,8 @@ protected virtual void OnDropDown(EventArgs e) { AccessibilityObject.RaiseAutomationPropertyChangedEvent( UIA_PROPERTY_ID.UIA_ExpandCollapseExpandCollapseStatePropertyId, - UiaCore.ExpandCollapseState.Collapsed, - UiaCore.ExpandCollapseState.Expanded); + ExpandCollapseState.ExpandCollapseState_Collapsed, + ExpandCollapseState.ExpandCollapseState_Expanded); if (AccessibilityObject is ComboBoxAccessibleObject accessibleObject) { @@ -3057,8 +3057,8 @@ protected virtual void OnDropDownClosed(EventArgs e) // Notify Collapsed/expanded property change. AccessibilityObject.RaiseAutomationPropertyChangedEvent( UIA_PROPERTY_ID.UIA_ExpandCollapseExpandCollapseStatePropertyId, - UiaCore.ExpandCollapseState.Expanded, - UiaCore.ExpandCollapseState.Collapsed); + ExpandCollapseState.ExpandCollapseState_Expanded, + ExpandCollapseState.ExpandCollapseState_Collapsed); } // Collapsing the DropDown, so reset the flag. diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Control.ControlAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Control.ControlAccessibleObject.cs index b6b7a2bfc74..7cd1b7ca3fd 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/Control.ControlAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/Control.ControlAccessibleObject.cs @@ -60,16 +60,16 @@ private protected override string AutomationId // If the control is used as an item of a ToolStrip via ToolStripControlHost, // its accessible object should provide info about the owning ToolStrip and items-siblings // to build a correct ToolStrip accessibility tree. - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { if (!this.TryGetOwnerAs(out Control? owner) || owner.ToolStripControlHost is not ToolStripControlHost host) { return base.FragmentNavigate(direction); } - if (direction == UiaCore.NavigateDirection.Parent - || direction == UiaCore.NavigateDirection.PreviousSibling - || direction == UiaCore.NavigateDirection.NextSibling) + if (direction == NavigateDirection.NavigateDirection_Parent + || direction == NavigateDirection.NavigateDirection_PreviousSibling + || direction == NavigateDirection.NavigateDirection_NextSibling) { return host.AccessibilityObject.FragmentNavigate(direction); } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridView.AccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridView.AccessibleObject.cs index fcfb67ad31e..6b53cd85055 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridView.AccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridView.AccessibleObject.cs @@ -342,11 +342,11 @@ internal override bool IsPatternSupported(UIA_PATTERN_ID patternId) return result; } - internal override UiaCore.RowOrColumnMajor RowOrColumnMajor + internal override RowOrColumnMajor RowOrColumnMajor { get { - return UiaCore.RowOrColumnMajor.RowMajor; + return RowOrColumnMajor.RowOrColumnMajor_RowMajor; } } @@ -394,11 +394,11 @@ internal override UiaCore.IRawElementProviderFragmentRoot FragmentRoot } } - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { switch (direction) { - case UiaCore.NavigateDirection.FirstChild: + case NavigateDirection.NavigateDirection_FirstChild: int childCount = GetChildCount(); if (childCount > 0) { @@ -406,7 +406,7 @@ internal override UiaCore.IRawElementProviderFragmentRoot FragmentRoot } break; - case UiaCore.NavigateDirection.LastChild: + case NavigateDirection.NavigateDirection_LastChild: childCount = GetChildCount(); if (childCount > 0) { diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridView.DataGridViewEditingPanelAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridView.DataGridViewEditingPanelAccessibleObject.cs index 59ce652bf1e..037335a2c06 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridView.DataGridViewEditingPanelAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridView.DataGridViewEditingPanelAccessibleObject.cs @@ -30,7 +30,7 @@ internal override UiaCore.IRawElementProviderFragmentRoot FragmentRoot internal override int[] RuntimeId => _runtimeId ??= this.TryGetOwnerAs(out Panel? owner) ? owner.AccessibilityObject.RuntimeId : base.RuntimeId; - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { if (!_ownerDataGridView.TryGetTarget(out var owner)) { @@ -39,7 +39,7 @@ internal override int[] RuntimeId switch (direction) { - case UiaCore.NavigateDirection.Parent: + case NavigateDirection.NavigateDirection_Parent: DataGridViewCell? currentCell = owner.CurrentCell; if (currentCell is not null && owner.IsCurrentCellInEditMode) { @@ -47,8 +47,8 @@ internal override int[] RuntimeId } break; - case UiaCore.NavigateDirection.FirstChild: - case UiaCore.NavigateDirection.LastChild: + case NavigateDirection.NavigateDirection_FirstChild: + case NavigateDirection.NavigateDirection_LastChild: return owner.EditingControlAccessibleObject; } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridView.Methods.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridView.Methods.cs index 9f3d67e5a64..fa10862b7d0 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridView.Methods.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridView.Methods.cs @@ -11,6 +11,7 @@ using System.Windows.Forms.Layout; using System.Windows.Forms.VisualStyles; using Microsoft.Win32; +using Windows.Win32.UI.Accessibility; using static Interop; namespace System.Windows.Forms; @@ -28039,7 +28040,7 @@ internal void SetAccessibleObjectParent(AccessibleObject editingControlAccessibl editingControlAccessibleObject.SetParent(CurrentCell.AccessibilityObject); CurrentCell.AccessibilityObject.SetDetachableChild(editingControlAccessibleObject); - CurrentCell.AccessibilityObject.RaiseStructureChangedEvent(UiaCore.StructureChangeType.ChildAdded, editingControlAccessibleObject.RuntimeId); + CurrentCell.AccessibilityObject.RaiseStructureChangedEvent(StructureChangeType.StructureChangeType_ChildAdded, editingControlAccessibleObject.RuntimeId); } private bool SetAndSelectCurrentCellAddress(int columnIndex, diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridView.TopRowAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridView.TopRowAccessibleObject.cs index 320e0e742d7..a6a387be1a9 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridView.TopRowAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridView.TopRowAccessibleObject.cs @@ -210,13 +210,13 @@ internal override UiaCore.IRawElementProviderFragmentRoot FragmentRoot } [return: MarshalAs(UnmanagedType.IUnknown)] - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { switch (direction) { - case UiaCore.NavigateDirection.Parent: + case NavigateDirection.NavigateDirection_Parent: return Parent; - case UiaCore.NavigateDirection.NextSibling: + case NavigateDirection.NavigateDirection_NextSibling: if (Parent.GetChildCount() > 1) { if (_ownerDataGridView is null) @@ -228,14 +228,14 @@ internal override UiaCore.IRawElementProviderFragmentRoot FragmentRoot } break; - case UiaCore.NavigateDirection.FirstChild: + case NavigateDirection.NavigateDirection_FirstChild: if (GetChildCount() > 0) { return GetChild(0); } break; - case UiaCore.NavigateDirection.LastChild: + case NavigateDirection.NavigateDirection_LastChild: if (GetChildCount() > 0) { return GetChild(GetChildCount() - 1); diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewCell.DataGridViewCellAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewCell.DataGridViewCellAccessibleObject.cs index f6a44bfc3a0..06682b122e5 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewCell.DataGridViewCellAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewCell.DataGridViewCellAccessibleObject.cs @@ -623,7 +623,7 @@ private protected override string AutomationId internal override UiaCore.IRawElementProviderFragmentRoot? FragmentRoot => _owner?.DataGridView?.AccessibilityObject; - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { if (_owner is null) { @@ -637,17 +637,17 @@ internal override UiaCore.IRawElementProviderFragmentRoot? FragmentRoot switch (direction) { - case UiaCore.NavigateDirection.Parent: + case NavigateDirection.NavigateDirection_Parent: return _owner.OwningRow.AccessibilityObject; - case UiaCore.NavigateDirection.NextSibling: + case NavigateDirection.NavigateDirection_NextSibling: return NavigateForward(wrapAround: false); - case UiaCore.NavigateDirection.PreviousSibling: + case NavigateDirection.NavigateDirection_PreviousSibling: return NavigateBackward(wrapAround: false); - case UiaCore.NavigateDirection.FirstChild: - case UiaCore.NavigateDirection.LastChild: + case NavigateDirection.NavigateDirection_FirstChild: + case NavigateDirection.NavigateDirection_LastChild: if (_owner.DataGridView.CurrentCell == _owner && _owner.DataGridView.IsCurrentCellInEditMode && _owner.DataGridView.EditingControl is not null) diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewCell.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewCell.cs index dff0895b503..c8386968960 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewCell.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewCell.cs @@ -5,6 +5,7 @@ using System.Drawing; using System.Globalization; using System.Text; +using Windows.Win32.UI.Accessibility; using static Interop; namespace System.Windows.Forms; @@ -1131,7 +1132,7 @@ public virtual void DetachEditingControl() dataGridView.EditingControlAccessibleObject!.SetParent(null); AccessibilityObject.SetDetachableChild(null); - AccessibilityObject.RaiseStructureChangedEvent(UiaCore.StructureChangeType.ChildRemoved, dataGridView.EditingControlAccessibleObject.RuntimeId); + AccessibilityObject.RaiseStructureChangedEvent(StructureChangeType.StructureChangeType_ChildRemoved, dataGridView.EditingControlAccessibleObject.RuntimeId); } } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewCheckBoxCell.DataGridViewCheckBoxCellAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewCheckBoxCell.DataGridViewCheckBoxCellAccessibleObject.cs index 3db3bc39243..b93f26d02fc 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewCheckBoxCell.DataGridViewCheckBoxCellAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewCheckBoxCell.DataGridViewCheckBoxCellAccessibleObject.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using Windows.Win32.UI.Accessibility; -using static Interop; namespace System.Windows.Forms; @@ -149,7 +148,7 @@ public override void DoDefaultAction() internal override void Toggle() => DoDefaultAction(); - internal override UiaCore.ToggleState ToggleState + internal override ToggleState ToggleState { get { @@ -160,9 +159,9 @@ internal override UiaCore.ToggleState ToggleState return ((Owner as DataGridViewCheckBoxCell)?.CheckState) switch { - CheckState.Checked => UiaCore.ToggleState.On, - CheckState.Unchecked => UiaCore.ToggleState.Off, - _ => UiaCore.ToggleState.Indeterminate, + CheckState.Checked => ToggleState.ToggleState_On, + CheckState.Unchecked => ToggleState.ToggleState_Off, + _ => ToggleState.ToggleState_Indeterminate, }; } } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewColumnHeaderCell.DataGridViewColumnHeaderCellAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewColumnHeaderCell.DataGridViewColumnHeaderCellAccessibleObject.cs index 479db717525..3e5d3856d25 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewColumnHeaderCell.DataGridViewColumnHeaderCellAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewColumnHeaderCell.DataGridViewColumnHeaderCellAccessibleObject.cs @@ -242,7 +242,7 @@ public override void Select(AccessibleSelection flags) #region IRawElementProviderFragment Implementation - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { if (Owner is null) { @@ -251,9 +251,9 @@ public override void Select(AccessibleSelection flags) return direction switch { - UiaCore.NavigateDirection.Parent => Parent, - UiaCore.NavigateDirection.NextSibling => NavigateForward(), - UiaCore.NavigateDirection.PreviousSibling => NavigateBackward(), + NavigateDirection.NavigateDirection_Parent => Parent, + NavigateDirection.NavigateDirection_NextSibling => NavigateForward(), + NavigateDirection.NavigateDirection_PreviousSibling => NavigateBackward(), _ => null }; } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewComboBoxCell.DataGridViewComboBoxCellAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewComboBoxCell.DataGridViewComboBoxCellAccessibleObject.cs index 9df2c91a46c..238d966dd39 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewComboBoxCell.DataGridViewComboBoxCellAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewComboBoxCell.DataGridViewComboBoxCellAccessibleObject.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using Windows.Win32.UI.Accessibility; -using static Interop; namespace System.Windows.Forms; @@ -35,7 +34,7 @@ internal override bool IsPatternSupported(UIA_PATTERN_ID patternId) _ => base.IsPatternSupported(patternId) }; - internal override UiaCore.ExpandCollapseState ExpandCollapseState + internal override ExpandCollapseState ExpandCollapseState { get { @@ -46,10 +45,10 @@ internal override UiaCore.ExpandCollapseState ExpandCollapseState if (Owner.Properties.GetObject(s_propComboBoxCellEditingComboBox) is DataGridViewComboBoxEditingControl comboBox && comboBox.IsHandleCreated) { - return comboBox.DroppedDown ? UiaCore.ExpandCollapseState.Expanded : UiaCore.ExpandCollapseState.Collapsed; + return comboBox.DroppedDown ? ExpandCollapseState.ExpandCollapseState_Expanded : ExpandCollapseState.ExpandCollapseState_Collapsed; } - return UiaCore.ExpandCollapseState.Collapsed; + return ExpandCollapseState.ExpandCollapseState_Collapsed; } } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewComboBoxEditingControl.DataGridViewComboBoxEditingControlAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewComboBoxEditingControl.DataGridViewComboBoxEditingControlAccessibleObject.cs index fe8c57d7bb5..0e704f4fb82 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewComboBoxEditingControl.DataGridViewComboBoxEditingControlAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewComboBoxEditingControl.DataGridViewComboBoxEditingControlAccessibleObject.cs @@ -27,11 +27,11 @@ public DataGridViewComboBoxEditingControlAccessibleObject(DataGridViewComboBoxEd public override AccessibleObject? Parent => _parentAccessibleObject; - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { switch (direction) { - case UiaCore.NavigateDirection.Parent: + case NavigateDirection.NavigateDirection_Parent: if (this.TryGetOwnerAs(out Control? owner) && owner is IDataGridViewEditingControl editingControl && editingControl.EditingControlDataGridView?.EditingControl == owner && owner.ToolStripControlHost is null) @@ -57,10 +57,10 @@ UIA_PATTERN_ID.UIA_ExpandCollapsePatternId when this.TryGetOwnerAs(out DataGridV _ => base.IsPatternSupported(patternId) }; - internal override UiaCore.ExpandCollapseState ExpandCollapseState + internal override ExpandCollapseState ExpandCollapseState => this.TryGetOwnerAs(out DataGridViewComboBoxEditingControl? owner) && owner.DroppedDown - ? UiaCore.ExpandCollapseState.Expanded - : UiaCore.ExpandCollapseState.Collapsed; + ? ExpandCollapseState.ExpandCollapseState_Expanded + : ExpandCollapseState.ExpandCollapseState_Collapsed; /// /// Sets the parent accessible object for the node which can be added or removed to/from hierarchy nodes. diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewRow.DataGridViewRowAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewRow.DataGridViewRowAccessibleObject.cs index 49e462b3b26..f6bf6c45507 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewRow.DataGridViewRowAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewRow.DataGridViewRowAccessibleObject.cs @@ -441,7 +441,7 @@ public override void Select(AccessibleSelection flags) } } - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { { if (Owner is null) @@ -451,15 +451,15 @@ public override void Select(AccessibleSelection flags) switch (direction) { - case UiaCore.NavigateDirection.Parent: + case NavigateDirection.NavigateDirection_Parent: return Parent; - case UiaCore.NavigateDirection.NextSibling: + case NavigateDirection.NavigateDirection_NextSibling: return Navigate(AccessibleNavigation.Next); - case UiaCore.NavigateDirection.PreviousSibling: + case NavigateDirection.NavigateDirection_PreviousSibling: return Navigate(AccessibleNavigation.Previous); - case UiaCore.NavigateDirection.FirstChild: + case NavigateDirection.NavigateDirection_FirstChild: return Navigate(AccessibleNavigation.FirstChild); - case UiaCore.NavigateDirection.LastChild: + case NavigateDirection.NavigateDirection_LastChild: return Navigate(AccessibleNavigation.LastChild); default: return null; diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewRowHeaderCell.DataGridViewRowHeaderCellAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewRowHeaderCell.DataGridViewRowHeaderCellAccessibleObject.cs index 2d8993a0bec..2fef9fe4e30 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewRowHeaderCell.DataGridViewRowHeaderCellAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewRowHeaderCell.DataGridViewRowHeaderCellAccessibleObject.cs @@ -242,7 +242,7 @@ public override void Select(AccessibleSelection flags) #region IRawElementProviderFragment Implementation - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { if (Owner is null) { @@ -256,8 +256,8 @@ public override void Select(AccessibleSelection flags) return direction switch { - UiaCore.NavigateDirection.Parent => Owner.OwningRow.AccessibilityObject, - UiaCore.NavigateDirection.NextSibling => + NavigateDirection.NavigateDirection_Parent => Owner.OwningRow.AccessibilityObject, + NavigateDirection.NavigateDirection_NextSibling => (Owner.DataGridView is not null && Owner.DataGridView.Columns.GetColumnCount(DataGridViewElementStates.Visible) > 0) ? Owner.OwningRow.AccessibilityObject.GetChild(1) // go to the next sibling : null, diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewTextBoxEditingControl.DataGridViewTextBoxEditingControlAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewTextBoxEditingControl.DataGridViewTextBoxEditingControlAccessibleObject.cs index ecc2518eb58..dd3cdc5b2ae 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewTextBoxEditingControl.DataGridViewTextBoxEditingControlAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewTextBoxEditingControl.DataGridViewTextBoxEditingControlAccessibleObject.cs @@ -30,11 +30,11 @@ internal void ClearParent() public override string Name => this.GetOwnerAccessibleName(SR.DataGridView_AccEditingControlAccName); - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { switch (direction) { - case UiaCore.NavigateDirection.Parent: + case NavigateDirection.NavigateDirection_Parent: if (this.TryGetOwnerAs(out Control? owner) && owner is IDataGridViewEditingControl editingControl && editingControl.EditingControlDataGridView?.EditingControl == owner && owner.ToolStripControlHost is null) diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewTopLeftHeaderCell.DataGridViewTopLeftHeaderCellAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewTopLeftHeaderCell.DataGridViewTopLeftHeaderCellAccessibleObject.cs index bb3119be6a4..3eef24d9d46 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewTopLeftHeaderCell.DataGridViewTopLeftHeaderCellAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewTopLeftHeaderCell.DataGridViewTopLeftHeaderCellAccessibleObject.cs @@ -259,7 +259,7 @@ public override void Select(AccessibleSelection flags) } #region IRawElementProviderFragment Implementation - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { if (Owner is null) { @@ -275,11 +275,11 @@ public override void Select(AccessibleSelection flags) switch (direction) { - case UiaCore.NavigateDirection.Parent: + case NavigateDirection.NavigateDirection_Parent: return dataGridView.AccessibilityObject.GetChild(0); - case UiaCore.NavigateDirection.PreviousSibling: + case NavigateDirection.NavigateDirection_PreviousSibling: return null; - case UiaCore.NavigateDirection.NextSibling: + case NavigateDirection.NavigateDirection_NextSibling: if (dataGridView.Columns.GetColumnCount(DataGridViewElementStates.Visible) == 0) { return null; diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DateTimePicker.DateTimePickerAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DateTimePicker.DateTimePickerAccessibleObject.cs index d8760dfec7f..1e328fe8688 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/DateTimePicker.DateTimePickerAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/DateTimePicker.DateTimePickerAccessibleObject.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using Windows.Win32.UI.Accessibility; -using static Interop; namespace System.Windows.Forms; @@ -93,8 +92,8 @@ UIA_PATTERN_ID.UIA_TogglePatternId when this.TryGetOwnerAs(out DateTimePicker? o public override string DefaultAction => ExpandCollapseState switch { - UiaCore.ExpandCollapseState.Collapsed => SR.AccessibleActionExpand, - UiaCore.ExpandCollapseState.Expanded => SR.AccessibleActionCollapse, + ExpandCollapseState.ExpandCollapseState_Collapsed => SR.AccessibleActionExpand, + ExpandCollapseState.ExpandCollapseState_Expanded => SR.AccessibleActionCollapse, _ => string.Empty }; @@ -102,17 +101,17 @@ public override void DoDefaultAction() { switch (ExpandCollapseState) { - case UiaCore.ExpandCollapseState.Collapsed: + case ExpandCollapseState.ExpandCollapseState_Collapsed: Expand(); break; - case UiaCore.ExpandCollapseState.Expanded: + case ExpandCollapseState.ExpandCollapseState_Expanded: Collapse(); break; } } - internal override UiaCore.ToggleState ToggleState - => this.TryGetOwnerAs(out DateTimePicker? owner) && owner.Checked ? UiaCore.ToggleState.On : UiaCore.ToggleState.Off; + internal override ToggleState ToggleState + => this.TryGetOwnerAs(out DateTimePicker? owner) && owner.Checked ? ToggleState.ToggleState_On : ToggleState.ToggleState_Off; internal override void Toggle() { @@ -125,7 +124,7 @@ internal override void Toggle() internal override void Expand() { if (this.IsOwnerHandleCreated(out DateTimePicker? owner) - && ExpandCollapseState == UiaCore.ExpandCollapseState.Collapsed) + && ExpandCollapseState == ExpandCollapseState.ExpandCollapseState_Collapsed) { PInvoke.SendMessage(owner, PInvoke.WM_SYSKEYDOWN, (WPARAM)(int)Keys.Down); } @@ -134,15 +133,15 @@ internal override void Expand() internal override void Collapse() { if (this.IsOwnerHandleCreated(out DateTimePicker? owner) - && ExpandCollapseState == UiaCore.ExpandCollapseState.Expanded) + && ExpandCollapseState == ExpandCollapseState.ExpandCollapseState_Expanded) { PInvoke.SendMessage(owner, PInvoke.DTM_CLOSEMONTHCAL); } } - internal override UiaCore.ExpandCollapseState ExpandCollapseState + internal override ExpandCollapseState ExpandCollapseState => this.TryGetOwnerAs(out DateTimePicker? owner) ? owner._expandCollapseState - : UiaCore.ExpandCollapseState.Collapsed; + : ExpandCollapseState.ExpandCollapseState_Collapsed; } } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DateTimePicker.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DateTimePicker.cs index d4374a6c48b..e3ae43273f9 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/DateTimePicker.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/DateTimePicker.cs @@ -8,7 +8,6 @@ using Microsoft.Win32; using SourceGenerated; using Windows.Win32.UI.Accessibility; -using static Interop; namespace System.Windows.Forms; @@ -52,7 +51,7 @@ public partial class DateTimePicker : Control private EventHandler? _onValueChanged; private EventHandler? _onRightToLeftLayoutChanged; - private UiaCore.ExpandCollapseState _expandCollapseState; + private ExpandCollapseState _expandCollapseState; // We need to restrict the available dates because of limitations in the comctl DateTime and MonthCalendar controls @@ -1059,15 +1058,15 @@ protected override bool IsInputKey(Keys keyData) protected virtual void OnCloseUp(EventArgs eventargs) { _onCloseUp?.Invoke(this, eventargs); - _expandCollapseState = UiaCore.ExpandCollapseState.Collapsed; + _expandCollapseState = ExpandCollapseState.ExpandCollapseState_Collapsed; // Raise automation event to annouce new state. if (IsAccessibilityObjectCreated) { AccessibilityObject.RaiseAutomationPropertyChangedEvent( UIA_PROPERTY_ID.UIA_ExpandCollapseExpandCollapseStatePropertyId, - oldValue: UiaCore.ExpandCollapseState.Expanded, - newValue: UiaCore.ExpandCollapseState.Collapsed); + oldValue: ExpandCollapseState.ExpandCollapseState_Expanded, + newValue: ExpandCollapseState.ExpandCollapseState_Collapsed); } } @@ -1077,15 +1076,15 @@ protected virtual void OnCloseUp(EventArgs eventargs) protected virtual void OnDropDown(EventArgs eventargs) { _onDropDown?.Invoke(this, eventargs); - _expandCollapseState = UiaCore.ExpandCollapseState.Expanded; + _expandCollapseState = ExpandCollapseState.ExpandCollapseState_Expanded; - // Raise automation event to annouce new state. + // Raise automation event to announce new state. if (IsAccessibilityObjectCreated) { AccessibilityObject.RaiseAutomationPropertyChangedEvent( UIA_PROPERTY_ID.UIA_ExpandCollapseExpandCollapseStatePropertyId, - oldValue: UiaCore.ExpandCollapseState.Collapsed, - newValue: UiaCore.ExpandCollapseState.Expanded); + oldValue: ExpandCollapseState.ExpandCollapseState_Collapsed, + newValue: ExpandCollapseState.ExpandCollapseState_Expanded); } } @@ -1104,7 +1103,7 @@ protected override void OnGotFocus(EventArgs e) // Raise automation event to annouce the control. if (IsAccessibilityObjectCreated) { - _expandCollapseState = UiaCore.ExpandCollapseState.Collapsed; + _expandCollapseState = ExpandCollapseState.ExpandCollapseState_Collapsed; AccessibilityObject.RaiseAutomationEvent(UIA_EVENT_ID.UIA_AutomationFocusChangedEventId); } } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ErrorProvider.ControlItem.ControlItemAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ErrorProvider.ControlItem.ControlItemAccessibleObject.cs index facde683880..8d5b875c386 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ErrorProvider.ControlItem.ControlItemAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ErrorProvider.ControlItem.ControlItemAccessibleObject.cs @@ -44,15 +44,15 @@ public override Rectangle Bounds /// /// Indicates the direction in which to navigate. /// Returns the element in the specified direction. - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { switch (direction) { - case UiaCore.NavigateDirection.Parent: + case NavigateDirection.NavigateDirection_Parent: return Parent; - case UiaCore.NavigateDirection.NextSibling: + case NavigateDirection.NavigateDirection_NextSibling: return GetNextSibling(); - case UiaCore.NavigateDirection.PreviousSibling: + case NavigateDirection.NavigateDirection_PreviousSibling: return GetPreviousSibling(); default: return base.FragmentNavigate(direction); diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ErrorProvider.ErrorWindow.ErrorWindowAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ErrorProvider.ErrorWindow.ErrorWindowAccessibleObject.cs index 74141213680..c1e69ffa809 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ErrorProvider.ErrorWindow.ErrorWindowAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ErrorProvider.ErrorWindow.ErrorWindowAccessibleObject.cs @@ -43,13 +43,13 @@ public ErrorWindowAccessibleObject(ErrorWindow owner) /// /// Indicates the direction in which to navigate. /// Returns the element in the specified direction. - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { switch (direction) { - case UiaCore.NavigateDirection.FirstChild: + case NavigateDirection.NavigateDirection_FirstChild: return GetChild(0); - case UiaCore.NavigateDirection.LastChild: + case NavigateDirection.NavigateDirection_LastChild: return GetChild(GetChildCount() - 1); } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ErrorProvider.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ErrorProvider.cs index 52629193d2d..a3f0770442d 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ErrorProvider.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ErrorProvider.cs @@ -4,7 +4,6 @@ using System.ComponentModel; using System.ComponentModel.Design; using System.Drawing; -using static Interop; namespace System.Windows.Forms; @@ -786,7 +785,7 @@ public void SetError(Control control, string? value) { EnsureControlItem(control).Error = value; - if (UiaCore.UiaClientsAreListening()) + if (PInvoke.UiaClientsAreListening()) { control.AccessibilityObject.RaiseAutomationNotification( Automation.AutomationNotificationKind.ActionAborted, diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/LabelEditAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/LabelEditAccessibleObject.cs index 7b577ead0c3..97ccd9ad2a0 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/LabelEditAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/LabelEditAccessibleObject.cs @@ -22,10 +22,10 @@ public LabelEditAccessibleObject(Control owningControl, LabelEditNativeWindow la _textProvider = new(owningControl, labelEdit, this); } - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) => direction switch { - UiaCore.NavigateDirection.Parent => Parent, + NavigateDirection.NavigateDirection_Parent => Parent, _ => base.FragmentNavigate(direction) }; diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/LabelEditNativeWindow.cs b/src/System.Windows.Forms/src/System/Windows/Forms/LabelEditNativeWindow.cs index 32a7f46b697..36f8d578d2e 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/LabelEditNativeWindow.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/LabelEditNativeWindow.cs @@ -37,7 +37,7 @@ public LabelEditNativeWindow(Control owningControl) private unsafe void InstallWinEventHooks() { - if (!UiaCore.UiaClientsAreListening()) + if (!PInvoke.UiaClientsAreListening()) { return; } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/LinkLabel.Link.LinkAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/LinkLabel.Link.LinkAccessibleObject.cs index fecb92d31e0..518aa2aec74 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/LinkLabel.Link.LinkAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/LinkLabel.Link.LinkAccessibleObject.cs @@ -71,12 +71,12 @@ public override void DoDefaultAction() _owningLinkLabel.OnLinkClicked(new LinkLabelLinkClickedEventArgs(_owningLink)); } - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) => direction switch { - UiaCore.NavigateDirection.Parent => _linkLabelAccessibleObject, - UiaCore.NavigateDirection.NextSibling => _linkLabelAccessibleObject.GetChild(CurrentIndex + 1), - UiaCore.NavigateDirection.PreviousSibling => _linkLabelAccessibleObject.GetChild(CurrentIndex - 1), + NavigateDirection.NavigateDirection_Parent => _linkLabelAccessibleObject, + NavigateDirection.NavigateDirection_NextSibling => _linkLabelAccessibleObject.GetChild(CurrentIndex + 1), + NavigateDirection.NavigateDirection_PreviousSibling => _linkLabelAccessibleObject.GetChild(CurrentIndex - 1), _ => base.FragmentNavigate(direction), }; diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/LinkLabel.LinkLabelAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/LinkLabel.LinkLabelAccessibleObject.cs index 6f08ee2f461..f02cf1a3471 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/LinkLabel.LinkLabelAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/LinkLabel.LinkLabelAccessibleObject.cs @@ -22,14 +22,14 @@ public LinkLabelAccessibleObject(LinkLabel owner) : base(owner) ? base.ElementProviderFromPoint(x, y) : HitTest((int)x, (int)y) ?? base.ElementProviderFromPoint(x, y); - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) => direction switch { - UiaCore.NavigateDirection.FirstChild + NavigateDirection.NavigateDirection_FirstChild => !this.TryGetOwnerAs(out LinkLabel? owner) ? null : owner.Links.Count != 0 ? owner.Links[0].AccessibleObject : null, - UiaCore.NavigateDirection.LastChild + NavigateDirection.NavigateDirection_LastChild => !this.TryGetOwnerAs(out LinkLabel? owner) ? null : owner.Links.Count != 0 ? owner.Links[^1].AccessibleObject : null, diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ListBox.AccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ListBox.AccessibleObject.cs index 2c1467d752f..cf16aaf0c3d 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ListBox.AccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ListBox.AccessibleObject.cs @@ -96,7 +96,7 @@ private protected virtual ListBoxItemAccessibleObject CreateItemAccessibleObject /// /// Indicates the direction in which to navigate. /// Returns the element in the specified direction. - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { int childCount = this.TryGetOwnerAs(out ListBox? owner) ? owner.Items.Count : 0; @@ -107,8 +107,8 @@ private protected virtual ListBoxItemAccessibleObject CreateItemAccessibleObject return direction switch { - UiaCore.NavigateDirection.FirstChild => GetChild(0), - UiaCore.NavigateDirection.LastChild => GetChild(childCount - 1), + NavigateDirection.NavigateDirection_FirstChild => GetChild(0), + NavigateDirection.NavigateDirection_LastChild => GetChild(childCount - 1), _ => base.FragmentNavigate(direction), }; } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ListBox.ItemAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ListBox.ItemAccessibleObject.cs index 60145fd5613..230cfb7ff77 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ListBox.ItemAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ListBox.ItemAccessibleObject.cs @@ -128,7 +128,7 @@ public override void DoDefaultAction() } } - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { int firstItemIndex = 0; int lastItemIndex = _owningListBox.Items.Count - 1; @@ -136,16 +136,16 @@ public override void DoDefaultAction() switch (direction) { - case UiaCore.NavigateDirection.Parent: + case NavigateDirection.NavigateDirection_Parent: return _owningListBox.AccessibilityObject; - case UiaCore.NavigateDirection.PreviousSibling: + case NavigateDirection.NavigateDirection_PreviousSibling: if (currentIndex > firstItemIndex && currentIndex <= lastItemIndex) { return _owningAccessibleObject.GetChild(currentIndex - 1); } return null; - case UiaCore.NavigateDirection.NextSibling: + case NavigateDirection.NavigateDirection_NextSibling: if (currentIndex >= firstItemIndex && currentIndex < lastItemIndex) { return _owningAccessibleObject.GetChild(currentIndex + 1); diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ListView.ListViewAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ListView.ListViewAccessibleObject.cs index 685bd422346..afa1a8c222c 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ListView.ListViewAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ListView.ListViewAccessibleObject.cs @@ -64,8 +64,8 @@ internal bool OwnerHasDefaultGroup internal override int RowCount => this.TryGetOwnerAs(out ListView? owningListView) ? owningListView.Items.Count : base.RowCount; - internal override UiaCore.RowOrColumnMajor RowOrColumnMajor - => UiaCore.RowOrColumnMajor.RowMajor; + internal override RowOrColumnMajor RowOrColumnMajor + => RowOrColumnMajor.RowOrColumnMajor_RowMajor; internal override UiaCore.IRawElementProviderFragment? ElementProviderFromPoint(double x, double y) { @@ -74,7 +74,7 @@ internal override UiaCore.RowOrColumnMajor RowOrColumnMajor return element ?? base.ElementProviderFromPoint(x, y); } - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { if (!this.IsOwnerHandleCreated(out ListView? _)) { @@ -83,8 +83,8 @@ internal override UiaCore.RowOrColumnMajor RowOrColumnMajor return direction switch { - UiaCore.NavigateDirection.FirstChild => GetChild(0), - UiaCore.NavigateDirection.LastChild => GetLastChild(), + NavigateDirection.NavigateDirection_FirstChild => GetChild(0), + NavigateDirection.NavigateDirection_LastChild => GetLastChild(), _ => base.FragmentNavigate(direction) }; } 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 f45752b4203..837c6da6aee 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ListView.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ListView.cs @@ -4847,8 +4847,8 @@ protected virtual void OnItemChecked(ItemCheckedEventArgs e) if (IsAccessibilityObjectCreated) { ListViewItem item = e.Item; - UiaCore.ToggleState oldValue = item.Checked ? UiaCore.ToggleState.Off : UiaCore.ToggleState.On; - UiaCore.ToggleState newValue = item.Checked ? UiaCore.ToggleState.On : UiaCore.ToggleState.Off; + ToggleState oldValue = item.Checked ? ToggleState.ToggleState_Off : ToggleState.ToggleState_On; + ToggleState newValue = item.Checked ? ToggleState.ToggleState_On : ToggleState.ToggleState_Off; item.AccessibilityObject.RaiseAutomationPropertyChangedEvent(UIA_PROPERTY_ID.UIA_ToggleToggleStatePropertyId, oldValue, newValue); } } @@ -6048,7 +6048,7 @@ private unsafe bool WmNotify(ref Message m) { NMHDR* nmhdr = (NMHDR*)(nint)m.LParamInternal; - if (nmhdr->code == PInvoke.NM_CUSTOMDRAW && UiaCore.UiaClientsAreListening()) + if (nmhdr->code == PInvoke.NM_CUSTOMDRAW && PInvoke.UiaClientsAreListening()) { // Checking that mouse buttons are not pressed is necessary to avoid // multiple annotation of the column header when resizing the column with the mouse @@ -6780,20 +6780,20 @@ private unsafe void WmReflectNotify(ref Message m) { AccessibleObject accessibleObject = SelectedItems[0].AccessibilityObject; if (lvkd->wVKey == (short)Keys.Down - && accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling) is null) + && accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling) is null) { - ListViewGroupAccessibleObject? groupAccObj = (ListViewGroupAccessibleObject?)accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent); + ListViewGroupAccessibleObject? groupAccObj = (ListViewGroupAccessibleObject?)accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent); if (groupAccObj is not null) { - ListViewGroupAccessibleObject? nextGroupAccObj = (ListViewGroupAccessibleObject?)groupAccObj.FragmentNavigate(UiaCore.NavigateDirection.NextSibling); + ListViewGroupAccessibleObject? nextGroupAccObj = (ListViewGroupAccessibleObject?)groupAccObj.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); nextGroupAccObj?.SetFocus(); } } if (lvkd->wVKey == (short)Keys.Up - && accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling) is null) + && accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling) is null) { - ListViewGroupAccessibleObject? groupAccObj = (ListViewGroupAccessibleObject?)accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent); + ListViewGroupAccessibleObject? groupAccObj = (ListViewGroupAccessibleObject?)accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent); groupAccObj?.SetFocus(); } } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ListViewGroup.ListViewGroupAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ListViewGroup.ListViewGroupAccessibleObject.cs index 38d309bcf30..ec6a0963721 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ListViewGroup.ListViewGroupAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ListViewGroup.ListViewGroupAccessibleObject.cs @@ -88,10 +88,10 @@ internal int CurrentIndex public override string DefaultAction => SR.AccessibleActionDoubleClick; - internal override UiaCore.ExpandCollapseState ExpandCollapseState + internal override ExpandCollapseState ExpandCollapseState => _owningGroup.CollapsedState == ListViewGroupCollapsedState.Collapsed - ? UiaCore.ExpandCollapseState.Collapsed - : UiaCore.ExpandCollapseState.Expanded; + ? ExpandCollapseState.ExpandCollapseState_Collapsed + : ExpandCollapseState.ExpandCollapseState_Expanded; internal override UiaCore.IRawElementProviderFragmentRoot FragmentRoot => _owningListView.AccessibilityObject; @@ -218,7 +218,7 @@ internal IReadOnlyList GetVisibleItems() return visibleItems; } - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { if (!_owningListView.IsHandleCreated || !_owningListView.GroupsDisplayed || IsEmpty) { @@ -227,18 +227,18 @@ internal IReadOnlyList GetVisibleItems() switch (direction) { - case UiaCore.NavigateDirection.Parent: + case NavigateDirection.NavigateDirection_Parent: return _owningListViewAccessibilityObject; - case UiaCore.NavigateDirection.NextSibling: + case NavigateDirection.NavigateDirection_NextSibling: int childIndex = _owningListViewAccessibilityObject.GetChildIndex(this); return childIndex == InvalidIndex ? null : _owningListViewAccessibilityObject.GetChild(childIndex + 1); - case UiaCore.NavigateDirection.PreviousSibling: + case NavigateDirection.NavigateDirection_PreviousSibling: return _owningListViewAccessibilityObject.GetChild(_owningListViewAccessibilityObject.GetChildIndex(this) - 1); - case UiaCore.NavigateDirection.FirstChild: + case NavigateDirection.NavigateDirection_FirstChild: return GetChild(0); - case UiaCore.NavigateDirection.LastChild: + case NavigateDirection.NavigateDirection_LastChild: IReadOnlyList visibleItems = GetVisibleItems(); return visibleItems.Count > 0 ? visibleItems[visibleItems.Count - 1].AccessibilityObject : null; diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemBaseAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemBaseAccessibleObject.cs index 2d081ff2f2f..fbc69b01c2d 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemBaseAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemBaseAccessibleObject.cs @@ -124,21 +124,21 @@ public override void DoDefaultAction() SetFocus(); } - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { AccessibleObject _parentInternal = OwningGroup?.AccessibilityObject ?? _owningListView.AccessibilityObject; switch (direction) { - case UiaCore.NavigateDirection.Parent: + case NavigateDirection.NavigateDirection_Parent: return _parentInternal; - case UiaCore.NavigateDirection.NextSibling: + case NavigateDirection.NavigateDirection_NextSibling: int childIndex = _parentInternal.GetChildIndex(this); return childIndex == InvalidIndex ? null : _parentInternal.GetChild(childIndex + 1); - case UiaCore.NavigateDirection.PreviousSibling: + case NavigateDirection.NavigateDirection_PreviousSibling: return _parentInternal.GetChild(_parentInternal.GetChildIndex(this) - 1); - case UiaCore.NavigateDirection.FirstChild: - case UiaCore.NavigateDirection.LastChild: + case NavigateDirection.NavigateDirection_FirstChild: + case NavigateDirection.NavigateDirection_LastChild: return null; } @@ -209,10 +209,10 @@ internal override int[] RuntimeId } } - internal override UiaCore.ToggleState ToggleState + internal override ToggleState ToggleState => _owningItem.Checked - ? UiaCore.ToggleState.On - : UiaCore.ToggleState.Off; + ? ToggleState.ToggleState_On + : ToggleState.ToggleState_Off; /// /// Indicates whether specified pattern is supported. diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemDetailsAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemDetailsAccessibleObject.cs index d67b23e68c7..2160ebbd6c5 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemDetailsAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemDetailsAccessibleObject.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Drawing; +using Windows.Win32.UI.Accessibility; using static Interop; namespace System.Windows.Forms; @@ -33,13 +34,13 @@ private int AccessibleChildToSubItemIndex(int accessibleChildIndex) => HasImage ? _owningListView.Columns[accessibleChildIndex - 1]._correspondingListViewSubItemIndex : _owningListView.Columns[accessibleChildIndex]._correspondingListViewSubItemIndex; - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { switch (direction) { - case UiaCore.NavigateDirection.FirstChild: + case NavigateDirection.NavigateDirection_FirstChild: return GetChild(0); - case UiaCore.NavigateDirection.LastChild: + case NavigateDirection.NavigateDirection_LastChild: return GetChild(LastChildIndex); } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemImageAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemImageAccessibleObject.cs index 648138167bd..687053eef8f 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemImageAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemImageAccessibleObject.cs @@ -66,12 +66,12 @@ internal override int[] RuntimeId _ => base.GetPropertyValue(propertyID) }; - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) => direction switch { - UiaCore.NavigateDirection.Parent => Parent, - UiaCore.NavigateDirection.NextSibling => Parent.GetChild(1), - UiaCore.NavigateDirection.PreviousSibling => null, + NavigateDirection.NavigateDirection_Parent => Parent, + NavigateDirection.NavigateDirection_NextSibling => Parent.GetChild(1), + NavigateDirection.NavigateDirection_PreviousSibling => null, _ => base.FragmentNavigate(direction) }; } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemListAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemListAccessibleObject.cs index c8685e32b83..fd7c6d5c75b 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemListAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemListAccessibleObject.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Drawing; +using Windows.Win32.UI.Accessibility; using static Interop; namespace System.Windows.Forms; @@ -25,18 +26,18 @@ public override Rectangle Bounds protected override View View => View.List; - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { AccessibleObject _parentInternal = _owningListView.AccessibilityObject; switch (direction) { - case UiaCore.NavigateDirection.Parent: + case NavigateDirection.NavigateDirection_Parent: return _parentInternal; - case UiaCore.NavigateDirection.NextSibling: + case NavigateDirection.NavigateDirection_NextSibling: int childIndex = _parentInternal.GetChildIndex(this); return childIndex == InvalidIndex ? null : _parentInternal.GetChild(childIndex + 1); - case UiaCore.NavigateDirection.PreviousSibling: + case NavigateDirection.NavigateDirection_PreviousSibling: return _parentInternal.GetChild(_parentInternal.GetChildIndex(this) - 1); } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemTileAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemTileAccessibleObject.cs index 4c16631f737..8d943425570 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemTileAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemTileAccessibleObject.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Drawing; +using Windows.Win32.UI.Accessibility; using static Interop; namespace System.Windows.Forms; @@ -22,15 +23,15 @@ private ListViewLabelEditAccessibleObject? LabelEditAccessibleObject ? null : new(_owningListView, _owningListView._labelEdit); - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { switch (direction) { - case UiaCore.NavigateDirection.FirstChild: + case NavigateDirection.NavigateDirection_FirstChild: return _owningListView._labelEdit is not null ? LabelEditAccessibleObject : GetChildInternal(1); - case UiaCore.NavigateDirection.LastChild: + case NavigateDirection.NavigateDirection_LastChild: return GetChildInternal(GetLastChildIndex()); } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemWithImageAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemWithImageAccessibleObject.cs index a5e2d2a73d6..0d288cfb808 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemWithImageAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemWithImageAccessibleObject.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Drawing; +using Windows.Win32.UI.Accessibility; using static Interop; namespace System.Windows.Forms; @@ -28,13 +29,13 @@ private ListViewLabelEditAccessibleObject? LabelEditAccessibleObject ? null : new(_owningListView, _owningListView._labelEdit); - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { switch (direction) { - case UiaCore.NavigateDirection.FirstChild: + case NavigateDirection.NavigateDirection_FirstChild: return GetChildCount() > 0 ? GetChild(0) : null; - case UiaCore.NavigateDirection.LastChild: + case NavigateDirection.NavigateDirection_LastChild: return GetChildCount() > 0 ? GetChild(GetChildCount() - 1) : null; } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewSubItem.ListViewSubItemAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewSubItem.ListViewSubItemAccessibleObject.cs index 38db4b08571..8a93f4a19cd 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewSubItem.ListViewSubItemAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewSubItem.ListViewSubItemAccessibleObject.cs @@ -68,17 +68,17 @@ public override Rectangle Bounds } } - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) => direction switch { - UiaCore.NavigateDirection.Parent + NavigateDirection.NavigateDirection_Parent => ParentInternal, - UiaCore.NavigateDirection.NextSibling + NavigateDirection.NavigateDirection_NextSibling => ParentInternal.GetChildInternal(ParentInternal.GetChildIndex(this) + 1), - UiaCore.NavigateDirection.PreviousSibling + NavigateDirection.NavigateDirection_PreviousSibling => ParentInternal.GetChildInternal(ParentInternal.GetChildIndex(this) - 1), - UiaCore.NavigateDirection.FirstChild => GetChild(), - UiaCore.NavigateDirection.LastChild => GetChild(), + NavigateDirection.NavigateDirection_FirstChild => GetChild(), + NavigateDirection.NavigateDirection_LastChild => GetChild(), _ => base.FragmentNavigate(direction) }; diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ListViewLabelEditAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ListViewLabelEditAccessibleObject.cs index e31ddde4c7a..60cb7ea1c23 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ListViewLabelEditAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ListViewLabelEditAccessibleObject.cs @@ -53,10 +53,10 @@ public override AccessibleObject? Parent _ => base.GetPropertyValue(propertyID) }; - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) => direction switch { - UiaCore.NavigateDirection.NextSibling + NavigateDirection.NavigateDirection_NextSibling => _owningListView.TryGetTarget(out ListView? target) && target.View == View.Tile ? target._selectedItem?.SubItems[1].AccessibilityObject : null, _ => base.FragmentNavigate(direction) }; diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarAccessibleObject.cs index 6bafd36d789..daa856bcb28 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarAccessibleObject.cs @@ -103,20 +103,20 @@ internal SelectionRange? DateRange } } - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) => direction switch { - UiaCore.NavigateDirection.NextSibling + NavigateDirection.NavigateDirection_NextSibling => _monthCalendarAccessibleObject.CalendarsAccessibleObjects?.Find(this)?.Next?.Value ?? (_monthCalendarAccessibleObject.ShowToday ? (AccessibleObject)_monthCalendarAccessibleObject.TodayLinkAccessibleObject : null), - UiaCore.NavigateDirection.PreviousSibling + NavigateDirection.NavigateDirection_PreviousSibling => _calendarIndex == 0 ? _monthCalendarAccessibleObject.NextButtonAccessibleObject : _monthCalendarAccessibleObject.CalendarsAccessibleObjects?.Find(this)?.Previous?.Value, - UiaCore.NavigateDirection.FirstChild => CalendarHeaderAccessibleObject, - UiaCore.NavigateDirection.LastChild => CalendarBodyAccessibleObject, + NavigateDirection.NavigateDirection_FirstChild => CalendarHeaderAccessibleObject, + NavigateDirection.NavigateDirection_LastChild => CalendarBodyAccessibleObject, _ => base.FragmentNavigate(direction), }; diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarBodyAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarBodyAccessibleObject.cs index 4d43b55d955..aa00c3471d8 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarBodyAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarBodyAccessibleObject.cs @@ -72,13 +72,13 @@ internal void DisconnectChildren() /// internal override int ColumnCount => _monthCalendarAccessibleObject.CalendarView == MONTH_CALDENDAR_MESSAGES_VIEW.MCMV_MONTH ? 7 : 4; - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) => direction switch { - UiaCore.NavigateDirection.NextSibling => null, - UiaCore.NavigateDirection.PreviousSibling => _calendarAccessibleObject.CalendarHeaderAccessibleObject, - UiaCore.NavigateDirection.FirstChild => RowsAccessibleObjects?.First?.Value, - UiaCore.NavigateDirection.LastChild => RowsAccessibleObjects?.Last?.Value, + NavigateDirection.NavigateDirection_NextSibling => null, + NavigateDirection.NavigateDirection_PreviousSibling => _calendarAccessibleObject.CalendarHeaderAccessibleObject, + NavigateDirection.NavigateDirection_FirstChild => RowsAccessibleObjects?.First?.Value, + NavigateDirection.NavigateDirection_LastChild => RowsAccessibleObjects?.Last?.Value, _ => base.FragmentNavigate(direction), }; @@ -203,7 +203,7 @@ internal override bool IsPatternSupported(UIA_PATTERN_ID patternId) internal override int RowCount => RowsAccessibleObjects?.Count ?? -1; - internal override UiaCore.RowOrColumnMajor RowOrColumnMajor => UiaCore.RowOrColumnMajor.RowMajor; + internal override RowOrColumnMajor RowOrColumnMajor => RowOrColumnMajor.RowOrColumnMajor_RowMajor; // Use a LinkedList instead a List for the following reasons: // 1. We don't require an access to items by indices. diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarCellAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarCellAccessibleObject.cs index f67f842c0c2..7b12c6e7dfd 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarCellAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarCellAccessibleObject.cs @@ -93,12 +93,12 @@ public override string? Description } } - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) => direction switch { - UiaCore.NavigateDirection.NextSibling + NavigateDirection.NavigateDirection_NextSibling => _calendarRowAccessibleObject.CellsAccessibleObjects?.Find(this)?.Next?.Value, - UiaCore.NavigateDirection.PreviousSibling + NavigateDirection.NavigateDirection_PreviousSibling => _columnIndex == 0 ? _calendarRowAccessibleObject.WeekNumberCellAccessibleObject : _calendarRowAccessibleObject.CellsAccessibleObjects?.Find(this)?.Previous?.Value, diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarDayOfWeekCellAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarDayOfWeekCellAccessibleObject.cs index d2a57955790..8d93eeef764 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarDayOfWeekCellAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarDayOfWeekCellAccessibleObject.cs @@ -36,11 +36,11 @@ public CalendarDayOfWeekCellAccessibleObject(CalendarRowAccessibleObject calenda public override string? Description => null; - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) => + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) => direction switch { - UiaCore.NavigateDirection.NextSibling => _calendarRowAccessibleObject.CellsAccessibleObjects?.Find(this)?.Next?.Value, - UiaCore.NavigateDirection.PreviousSibling => _calendarRowAccessibleObject.CellsAccessibleObjects?.Find(this)?.Previous?.Value, + NavigateDirection.NavigateDirection_NextSibling => _calendarRowAccessibleObject.CellsAccessibleObjects?.Find(this)?.Next?.Value, + NavigateDirection.NavigateDirection_PreviousSibling => _calendarRowAccessibleObject.CellsAccessibleObjects?.Find(this)?.Previous?.Value, _ => base.FragmentNavigate(direction) }; diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarHeaderAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarHeaderAccessibleObject.cs index 6ba632fbcdc..a7f2ef6efb2 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarHeaderAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarHeaderAccessibleObject.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Drawing; +using Windows.Win32.UI.Accessibility; using static Interop; namespace System.Windows.Forms; @@ -47,11 +48,11 @@ public CalendarHeaderAccessibleObject(CalendarAccessibleObject calendarAccessibl public override Rectangle Bounds => _monthCalendarAccessibleObject.GetCalendarPartRectangle(MCGRIDINFO_PART.MCGIP_CALENDARHEADER, _calendarIndex); - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) => direction switch { - UiaCore.NavigateDirection.PreviousSibling => null, - UiaCore.NavigateDirection.NextSibling => _calendarAccessibleObject.CalendarBodyAccessibleObject, + NavigateDirection.NavigateDirection_PreviousSibling => null, + NavigateDirection.NavigateDirection_NextSibling => _calendarAccessibleObject.CalendarBodyAccessibleObject, _ => base.FragmentNavigate(direction) }; diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarNextButtonAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarNextButtonAccessibleObject.cs index 2c9aa9ed099..c37644db309 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarNextButtonAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarNextButtonAccessibleObject.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Drawing; +using Windows.Win32.UI.Accessibility; using static Interop; namespace System.Windows.Forms; @@ -30,11 +31,11 @@ public override Rectangle Bounds public override string Description => SR.CalendarNextButtonAccessibleObjectDescription; - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) => direction switch { - UiaCore.NavigateDirection.PreviousSibling => _monthCalendarAccessibleObject.PreviousButtonAccessibleObject, - UiaCore.NavigateDirection.NextSibling => _monthCalendarAccessibleObject.CalendarsAccessibleObjects?.First?.Value, + NavigateDirection.NavigateDirection_PreviousSibling => _monthCalendarAccessibleObject.PreviousButtonAccessibleObject, + NavigateDirection.NavigateDirection_NextSibling => _monthCalendarAccessibleObject.CalendarsAccessibleObjects?.First?.Value, _ => base.FragmentNavigate(direction) }; diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarPreviousButtonAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarPreviousButtonAccessibleObject.cs index e5a3c7554e5..35b94a6db16 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarPreviousButtonAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarPreviousButtonAccessibleObject.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Drawing; +using Windows.Win32.UI.Accessibility; using static Interop; namespace System.Windows.Forms; @@ -62,10 +63,10 @@ private protected override bool IsEnabled } } - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) => direction switch { - UiaCore.NavigateDirection.NextSibling => _monthCalendarAccessibleObject.NextButtonAccessibleObject, + NavigateDirection.NavigateDirection_NextSibling => _monthCalendarAccessibleObject.NextButtonAccessibleObject, _ => base.FragmentNavigate(direction) }; diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarRowAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarRowAccessibleObject.cs index 5e361e062ac..1c11ea022bb 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarRowAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarRowAccessibleObject.cs @@ -142,18 +142,18 @@ public override string? Description } } - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) => direction switch { - UiaCore.NavigateDirection.NextSibling + NavigateDirection.NavigateDirection_NextSibling => _calendarBodyAccessibleObject.RowsAccessibleObjects?.Find(this)?.Next?.Value, - UiaCore.NavigateDirection.PreviousSibling + NavigateDirection.NavigateDirection_PreviousSibling => _calendarBodyAccessibleObject.RowsAccessibleObjects?.Find(this)?.Previous?.Value, - UiaCore.NavigateDirection.FirstChild + NavigateDirection.NavigateDirection_FirstChild => _monthCalendarAccessibleObject.ShowWeekNumbers && _rowIndex != -1 ? WeekNumberCellAccessibleObject : CellsAccessibleObjects?.First?.Value, - UiaCore.NavigateDirection.LastChild => CellsAccessibleObjects?.Last?.Value, + NavigateDirection.NavigateDirection_LastChild => CellsAccessibleObjects?.Last?.Value, _ => base.FragmentNavigate(direction) }; diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarTodayLinkAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarTodayLinkAccessibleObject.cs index ccd3f4a5f86..e1122191351 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarTodayLinkAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarTodayLinkAccessibleObject.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Drawing; +using Windows.Win32.UI.Accessibility; using static Interop; namespace System.Windows.Forms; @@ -31,10 +32,10 @@ public override Rectangle Bounds public override string Description => SR.CalendarTodayLinkAccessibleObjectDescription; - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) => direction switch { - UiaCore.NavigateDirection.PreviousSibling + NavigateDirection.NavigateDirection_PreviousSibling => _monthCalendarAccessibleObject.CalendarsAccessibleObjects?.Last?.Value, _ => base.FragmentNavigate(direction) }; diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarWeekNumberCellAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarWeekNumberCellAccessibleObject.cs index df9d7eeff42..4a109fb1387 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarWeekNumberCellAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarWeekNumberCellAccessibleObject.cs @@ -41,11 +41,11 @@ public CalendarWeekNumberCellAccessibleObject(CalendarRowAccessibleObject calend public override string? Description => null; - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) => direction switch { - UiaCore.NavigateDirection.NextSibling => _calendarRowAccessibleObject.CellsAccessibleObjects?.First?.Value, - UiaCore.NavigateDirection.PreviousSibling => null, + NavigateDirection.NavigateDirection_NextSibling => _calendarRowAccessibleObject.CellsAccessibleObjects?.First?.Value, + NavigateDirection.NavigateDirection_PreviousSibling => null, _ => base.FragmentNavigate(direction) }; diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.MonthCalendarAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.MonthCalendarAccessibleObject.cs index 8fd76937e62..1846139f5a7 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.MonthCalendarAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.MonthCalendarAccessibleObject.cs @@ -204,11 +204,11 @@ or MCHITTESTINFO_HIT_FLAGS.MCHT_CALENDARDATEPREV or MCHITTESTINFO_HIT_FLAGS.MCHT internal CalendarCellAccessibleObject? FocusedCell => _focusedCellAccessibleObject ??= this.TryGetOwnerAs(out MonthCalendar? owner) ? GetCellByDate(owner._focusedDate) : null; - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) => direction switch { - UiaCore.NavigateDirection.FirstChild => PreviousButtonAccessibleObject, - UiaCore.NavigateDirection.LastChild => ShowToday + NavigateDirection.NavigateDirection_FirstChild => PreviousButtonAccessibleObject, + NavigateDirection.NavigateDirection_LastChild => ShowToday ? TodayLinkAccessibleObject : CalendarsAccessibleObjects?.Last?.Value, _ => base.FragmentNavigate(direction), @@ -533,7 +533,7 @@ internal override int RowCount ? (int)Math.Ceiling((double)CalendarsAccessibleObjects.Count / ColumnCount) : 0; - internal override UiaCore.RowOrColumnMajor RowOrColumnMajor => UiaCore.RowOrColumnMajor.RowMajor; + internal override RowOrColumnMajor RowOrColumnMajor => RowOrColumnMajor.RowOrColumnMajor_RowMajor; internal SelectionRange SelectionRange => this.TryGetOwnerAs(out MonthCalendar? owner) ? owner.SelectionRange : new SelectionRange(); diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.MonthCalendarChildAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.MonthCalendarChildAccessibleObject.cs index 6cb727695c9..c022912d970 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.MonthCalendarChildAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.MonthCalendarChildAccessibleObject.cs @@ -42,10 +42,10 @@ internal override bool IsPatternSupported(UIA_PATTERN_ID patternId) internal override UiaCore.IRawElementProviderFragmentRoot FragmentRoot => _monthCalendarAccessibleObject; - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) => direction switch { - UiaCore.NavigateDirection.Parent => Parent, + NavigateDirection.NavigateDirection_Parent => Parent, _ => base.FragmentNavigate(direction) }; diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Printing/PrintPreviewControl.PrintPreviewControlAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Printing/PrintPreviewControl.PrintPreviewControlAccessibleObject.cs index 64806a52004..00b42ed067c 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/Printing/PrintPreviewControl.PrintPreviewControlAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/Printing/PrintPreviewControl.PrintPreviewControlAccessibleObject.cs @@ -66,7 +66,7 @@ internal override bool IsPatternSupported(UIA_PATTERN_ID patternId) internal override UiaCore.IRawElementProviderFragmentRoot FragmentRoot => this; - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { if (!this.TryGetOwnerAs(out PrintPreviewControl? owner)) { @@ -75,12 +75,12 @@ internal override UiaCore.IRawElementProviderFragmentRoot FragmentRoot switch (direction) { - case UiaCore.NavigateDirection.FirstChild: + case NavigateDirection.NavigateDirection_FirstChild: return owner._vScrollBar.Visible ? owner._vScrollBar.AccessibilityObject : owner._hScrollBar.Visible ? owner._hScrollBar.AccessibilityObject : null; - case UiaCore.NavigateDirection.LastChild: + case NavigateDirection.NavigateDirection_LastChild: return owner._hScrollBar.Visible ? owner._hScrollBar.AccessibilityObject : owner._vScrollBar.Visible ? owner._vScrollBar.AccessibilityObject : null; diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Printing/PrintPreviewControl.ScrollBarAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Printing/PrintPreviewControl.ScrollBarAccessibleObject.cs index ffa53b78e17..4f05eafa35e 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/Printing/PrintPreviewControl.ScrollBarAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/Printing/PrintPreviewControl.ScrollBarAccessibleObject.cs @@ -1,6 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Windows.Win32.UI.Accessibility; using static Interop; namespace System.Windows.Forms; @@ -17,7 +18,7 @@ public override AccessibleObject? Parent => this.TryGetOwnerAs(out ScrollBar? scrollBar) && scrollBar.Parent is PrintPreviewControl printPreviewControl ? printPreviewControl.AccessibilityObject : base.Parent; - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { if (!this.TryGetOwnerAs(out ScrollBar? scrollBar) || scrollBar.Parent is not PrintPreviewControl printPreviewControl) { @@ -26,16 +27,16 @@ public override AccessibleObject? Parent switch (direction) { - case UiaCore.NavigateDirection.Parent: + case NavigateDirection.NavigateDirection_Parent: return printPreviewControl.AccessibilityObject; - case UiaCore.NavigateDirection.NextSibling: + case NavigateDirection.NavigateDirection_NextSibling: return printPreviewControl._vScrollBar.Visible && printPreviewControl._hScrollBar.Visible && scrollBar == printPreviewControl._vScrollBar ? printPreviewControl._hScrollBar.AccessibilityObject : null; - case UiaCore.NavigateDirection.PreviousSibling: + case NavigateDirection.NavigateDirection_PreviousSibling: return printPreviewControl._hScrollBar.Visible && printPreviewControl._vScrollBar.Visible && scrollBar == printPreviewControl._hScrollBar 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 b48a0166526..21f8865d2a6 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 @@ -5,6 +5,7 @@ using System.Drawing; using System.Drawing.Printing; using System.Runtime.InteropServices; +using Windows.Win32.UI.Accessibility; namespace System.Windows.Forms; @@ -893,7 +894,7 @@ private void LayoutScrollBars() IsAccessibilityObjectCreated && AccessibilityObject is PrintPreviewControlAccessibleObject ao) { - ao.RaiseStructureChangedEvent(Interop.UiaCore.StructureChangeType.ChildrenInvalidated, Array.Empty()); + ao.RaiseStructureChangedEvent(StructureChangeType.StructureChangeType_ChildrenInvalidated, Array.Empty()); } (bool horizontal, bool vertical) IsScrollNeeded(Size displaySize) diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGrid.PropertyGridAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGrid.PropertyGridAccessibleObject.cs index ad3dbf2407c..da026c674e9 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGrid.PropertyGridAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGrid.PropertyGridAccessibleObject.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Drawing; +using Windows.Win32.UI.Accessibility; using static Interop; namespace System.Windows.Forms; @@ -54,13 +55,13 @@ public PropertyGridAccessibleObject(PropertyGrid owningPropertyGrid) : base(owni /// /// Indicates the direction in which to navigate. /// Returns the element in the specified direction. - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { switch (direction) { - case UiaCore.NavigateDirection.FirstChild: + case NavigateDirection.NavigateDirection_FirstChild: return GetChildFragment(0); - case UiaCore.NavigateDirection.LastChild: + case NavigateDirection.NavigateDirection_LastChild: var childFragmentCount = GetChildFragmentCount(); if (childFragmentCount > 0) { @@ -79,13 +80,13 @@ public PropertyGridAccessibleObject(PropertyGrid owningPropertyGrid) : base(owni /// The child element regarding which the target element is searched. /// Indicates the direction in which to navigate. /// Returns the element in the specified direction. - internal UiaCore.IRawElementProviderFragment? ChildFragmentNavigate(AccessibleObject childFragment, UiaCore.NavigateDirection direction) + internal UiaCore.IRawElementProviderFragment? ChildFragmentNavigate(AccessibleObject childFragment, NavigateDirection direction) { switch (direction) { - case UiaCore.NavigateDirection.Parent: + case NavigateDirection.NavigateDirection_Parent: return this; - case UiaCore.NavigateDirection.NextSibling: + case NavigateDirection.NavigateDirection_NextSibling: int fragmentCount = GetChildFragmentCount(); int childFragmentIndex = GetChildFragmentIndex(childFragment); int nextChildFragmentIndex = childFragmentIndex + 1; @@ -95,7 +96,7 @@ public PropertyGridAccessibleObject(PropertyGrid owningPropertyGrid) : base(owni } return null; - case UiaCore.NavigateDirection.PreviousSibling: + case NavigateDirection.NavigateDirection_PreviousSibling: fragmentCount = GetChildFragmentCount(); childFragmentIndex = GetChildFragmentIndex(childFragment); if (childFragmentIndex > 0) diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/CategoryGridEntry.CategoryGridEntryAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/CategoryGridEntry.CategoryGridEntryAccessibleObject.cs index 73b338e93da..9e5393054f9 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/CategoryGridEntry.CategoryGridEntryAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/CategoryGridEntry.CategoryGridEntryAccessibleObject.cs @@ -72,7 +72,7 @@ internal override int Row /// /// Indicates the direction in which to navigate. /// Returns the element in the specified direction. - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { if (Parent is not PropertyGridView.PropertyGridViewAccessibleObject parent || !this.TryGetOwnerAs(out CategoryGridEntry? owner)) @@ -82,11 +82,11 @@ internal override int Row return direction switch { - UiaCore.NavigateDirection.Parent => Parent, - UiaCore.NavigateDirection.NextSibling => parent.GetNextCategory(owner), - UiaCore.NavigateDirection.PreviousSibling => parent.GetPreviousCategory(owner), - UiaCore.NavigateDirection.FirstChild => parent.GetFirstChildProperty(owner), - UiaCore.NavigateDirection.LastChild => parent.GetLastChildProperty(owner), + NavigateDirection.NavigateDirection_Parent => Parent, + NavigateDirection.NavigateDirection_NextSibling => parent.GetNextCategory(owner), + NavigateDirection.NavigateDirection_PreviousSibling => parent.GetPreviousCategory(owner), + NavigateDirection.NavigateDirection_FirstChild => parent.GetFirstChildProperty(owner), + NavigateDirection.NavigateDirection_LastChild => parent.GetLastChildProperty(owner), _ => base.FragmentNavigate(direction), }; } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/CommandsPane.CommandsPaneAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/CommandsPane.CommandsPaneAccessibleObject.cs index 407a2e3b5d6..73076391f02 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/CommandsPane.CommandsPaneAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/CommandsPane.CommandsPaneAccessibleObject.cs @@ -25,7 +25,7 @@ public CommandsPaneAccessibleObject(CommandsPane owningCommandsPane, PropertyGri _parentPropertyGrid = new(parentPropertyGrid); } - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { if (_parentPropertyGrid.TryGetTarget(out PropertyGrid? target) && target.AccessibilityObject is PropertyGrid.PropertyGridAccessibleObject propertyGridAccessibleObject) diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/DetailsButton.DetailsButtonAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/DetailsButton.DetailsButtonAccessibleObject.cs index 396df8c2bb6..f58a098588a 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/DetailsButton.DetailsButtonAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/DetailsButton.DetailsButtonAccessibleObject.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using Windows.Win32.UI.Accessibility; -using static Interop; namespace System.Windows.Forms.PropertyGridInternal; @@ -31,10 +30,10 @@ internal override bool IsIAccessibleExSupported() internal override bool IsPatternSupported(UIA_PATTERN_ID patternId) => patternId == UIA_PATTERN_ID.UIA_ExpandCollapsePatternId || base.IsPatternSupported(patternId); - internal override UiaCore.ExpandCollapseState ExpandCollapseState + internal override ExpandCollapseState ExpandCollapseState => _ownerItem.Expanded - ? UiaCore.ExpandCollapseState.Expanded - : UiaCore.ExpandCollapseState.Collapsed; + ? ExpandCollapseState.ExpandCollapseState_Expanded + : ExpandCollapseState.ExpandCollapseState_Collapsed; internal override void Expand() { diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/DropDownButton.DropDownButtonAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/DropDownButton.DropDownButtonAccessibleObject.cs index 1722c5e9e54..90c539a8e50 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/DropDownButton.DropDownButtonAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/DropDownButton.DropDownButtonAccessibleObject.cs @@ -46,7 +46,7 @@ public override void DoDefaultAction() /// /// Indicates the direction in which to navigate. /// Returns the element in the specified direction. - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { if (!_owningDropDownButton.Visible || _owningPropertyGrid?.SelectedGridEntry?.AccessibilityObject is not PropertyDescriptorGridEntryAccessibleObject parent) @@ -56,9 +56,9 @@ public override void DoDefaultAction() return direction switch { - UiaCore.NavigateDirection.Parent => parent, - UiaCore.NavigateDirection.NextSibling => parent.GetNextChild(this), - UiaCore.NavigateDirection.PreviousSibling => parent.GetPreviousChild(this), + NavigateDirection.NavigateDirection_Parent => parent, + NavigateDirection.NavigateDirection_NextSibling => parent.GetNextChild(this), + NavigateDirection.NavigateDirection_PreviousSibling => parent.GetPreviousChild(this), _ => base.FragmentNavigate(direction), }; } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/GridEntry.GridEntryAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/GridEntry.GridEntryAccessibleObject.cs index 286207783bb..e0311141541 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/GridEntry.GridEntryAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/GridEntry.GridEntryAccessibleObject.cs @@ -52,10 +52,10 @@ public override string? DefaultAction public override string Description => this.TryGetOwnerAs(out GridEntry? owner) ? owner.PropertyDescription : string.Empty; - internal override UiaCore.ExpandCollapseState ExpandCollapseState - => !this.TryGetOwnerAs(out GridEntry? owner) ? UiaCore.ExpandCollapseState.Collapsed : owner.Expandable - ? owner.Expanded ? UiaCore.ExpandCollapseState.Expanded : UiaCore.ExpandCollapseState.Collapsed - : UiaCore.ExpandCollapseState.LeafNode; + internal override ExpandCollapseState ExpandCollapseState + => !this.TryGetOwnerAs(out GridEntry? owner) ? ExpandCollapseState.ExpandCollapseState_Collapsed : owner.Expandable + ? owner.Expanded ? ExpandCollapseState.ExpandCollapseState_Expanded : ExpandCollapseState.ExpandCollapseState_Collapsed + : ExpandCollapseState.ExpandCollapseState_LeafNode; public override string Help => this.TryGetOwnerAs(out GridEntry? owner) ? owner.PropertyDescription : string.Empty; @@ -311,11 +311,11 @@ internal override void Expand() /// /// Indicates the direction in which to navigate. /// Returns the element in the specified direction. - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { switch (direction) { - case UiaCore.NavigateDirection.Parent: + case NavigateDirection.NavigateDirection_Parent: if (this.TryGetOwnerAs(out GridEntry? owner) && owner.ParentGridEntry is { } parentGridEntry) { return parentGridEntry is SingleSelectRootGridEntry @@ -324,9 +324,9 @@ internal override void Expand() } return Parent; - case UiaCore.NavigateDirection.PreviousSibling: + case NavigateDirection.NavigateDirection_PreviousSibling: return Navigate(AccessibleNavigation.Previous); - case UiaCore.NavigateDirection.NextSibling: + case NavigateDirection.NavigateDirection_NextSibling: return Navigate(AccessibleNavigation.Next); } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/HelpPane.HelpPaneAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/HelpPane.HelpPaneAccessibleObject.cs index 1d1ef1a8958..8c006092223 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/HelpPane.HelpPaneAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/HelpPane.HelpPaneAccessibleObject.cs @@ -25,7 +25,7 @@ public HelpPaneAccessibleObject(HelpPane owningHelpPane, PropertyGrid parentProp _parentPropertyGrid = new(parentPropertyGrid); } - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { if (_parentPropertyGrid.TryGetTarget(out PropertyGrid? target) && target.AccessibilityObject is PropertyGrid.PropertyGridAccessibleObject propertyGridAccessibleObject) diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyDescriptorGridEntry.PropertyDescriptorGridEntryAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyDescriptorGridEntry.PropertyDescriptorGridEntryAccessibleObject.cs index 5c48ad9b63a..0532e8056b9 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyDescriptorGridEntry.PropertyDescriptorGridEntryAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyDescriptorGridEntry.PropertyDescriptorGridEntryAccessibleObject.cs @@ -14,13 +14,13 @@ public PropertyDescriptorGridEntryAccessibleObject(PropertyDescriptorGridEntry o { } - internal override UiaCore.ExpandCollapseState ExpandCollapseState + internal override ExpandCollapseState ExpandCollapseState => GetPropertyGridView() is { } propertyGridView && this.TryGetOwnerAs(out PropertyDescriptorGridEntry? owner) && owner == propertyGridView.SelectedGridEntry && (owner.InternalExpanded || propertyGridView.DropDownVisible) - ? UiaCore.ExpandCollapseState.Expanded - : UiaCore.ExpandCollapseState.Collapsed; + ? ExpandCollapseState.ExpandCollapseState_Expanded + : ExpandCollapseState.ExpandCollapseState_Collapsed; public override AccessibleObject? GetChild(int index) { @@ -134,7 +134,7 @@ public override int GetChildCount() internal override void Collapse() { - if (ExpandCollapseState == UiaCore.ExpandCollapseState.Expanded) + if (ExpandCollapseState == ExpandCollapseState.ExpandCollapseState_Expanded) { ExpandOrCollapse(); } @@ -142,7 +142,7 @@ internal override void Collapse() internal override void Expand() { - if (ExpandCollapseState == UiaCore.ExpandCollapseState.Collapsed) + if (ExpandCollapseState == ExpandCollapseState.ExpandCollapseState_Collapsed) { ExpandOrCollapse(); } @@ -153,13 +153,13 @@ internal override void Expand() /// /// Indicates the direction in which to navigate. /// Returns the element in the specified direction. - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) => direction switch { - UiaCore.NavigateDirection.NextSibling => GetNextSibling(), - UiaCore.NavigateDirection.PreviousSibling => GetPreviousSibling(), - UiaCore.NavigateDirection.FirstChild => GetFirstChild(), - UiaCore.NavigateDirection.LastChild => GetLastChild(), + NavigateDirection.NavigateDirection_NextSibling => GetNextSibling(), + NavigateDirection.NavigateDirection_PreviousSibling => GetPreviousSibling(), + NavigateDirection.NavigateDirection_FirstChild => GetFirstChild(), + NavigateDirection.NavigateDirection_LastChild => GetLastChild(), _ => base.FragmentNavigate(direction), }; diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.DropDownHolder.DropDownHolderAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.DropDownHolder.DropDownHolderAccessibleObject.cs index 6bdddf17aef..ea5ded50f78 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.DropDownHolder.DropDownHolderAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.DropDownHolder.DropDownHolderAccessibleObject.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using static System.Windows.Forms.PropertyGridInternal.PropertyDescriptorGridEntry; +using Windows.Win32.UI.Accessibility; using static Interop; namespace System.Windows.Forms.PropertyGridInternal; @@ -19,7 +20,7 @@ public DropDownHolderAccessibleObject(DropDownHolder dropDownHolder) : base(drop _owningDropDownHolder = dropDownHolder; } - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { if (!ExistsInAccessibleTree) { @@ -35,10 +36,10 @@ public DropDownHolderAccessibleObject(DropDownHolder dropDownHolder) : base(drop return direction switch { - UiaCore.NavigateDirection.Parent => parent, - UiaCore.NavigateDirection.NextSibling => parent.GetNextChild(this), - UiaCore.NavigateDirection.PreviousSibling => parent.GetPreviousChild(this), - UiaCore.NavigateDirection.FirstChild or UiaCore.NavigateDirection.LastChild + NavigateDirection.NavigateDirection_Parent => parent, + NavigateDirection.NavigateDirection_NextSibling => parent.GetNextChild(this), + NavigateDirection.NavigateDirection_PreviousSibling => parent.GetPreviousChild(this), + NavigateDirection.NavigateDirection_FirstChild or NavigateDirection.NavigateDirection_LastChild when selectedEntry.Enumerable && _owningDropDownHolder.Component == gridView!.DropDownListBox => gridView.DropDownListBoxAccessibleObject, _ => base.FragmentNavigate(direction), diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.GridViewListBoxAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.GridViewListBoxAccessibleObject.cs index 98f5afa535f..5a6873d5f1a 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.GridViewListBoxAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.GridViewListBoxAccessibleObject.cs @@ -1,6 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Windows.Win32.UI.Accessibility; using static Interop; namespace System.Windows.Forms.PropertyGridInternal; @@ -24,7 +25,7 @@ public GridViewListBoxAccessibleObject(GridViewListBox owningGridViewListBox) : } } - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { if (!this.TryGetOwnerAs(out GridViewListBox? owner) || !owner.OwningPropertyGridView.DropDownVisible @@ -39,7 +40,7 @@ public GridViewListBoxAccessibleObject(GridViewListBox owningGridViewListBox) : return direction switch { - UiaCore.NavigateDirection.Parent => owner.OwningPropertyGridView.DropDownControlHolder.AccessibilityObject, + NavigateDirection.NavigateDirection_Parent => owner.OwningPropertyGridView.DropDownControlHolder.AccessibilityObject, _ => base.FragmentNavigate(direction) }; } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.GridViewTextBox.GridViewTextBoxAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.GridViewTextBox.GridViewTextBoxAccessibleObject.cs index 1bb3b16db8c..c34cd73e4c3 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.GridViewTextBox.GridViewTextBoxAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.GridViewTextBox.GridViewTextBoxAccessibleObject.cs @@ -37,7 +37,7 @@ public override AccessibleStates State } } - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { if (!this.TryGetOwnerAs(out GridViewTextBox? owner) || !owner.PropertyGridView.IsEditTextBoxCreated @@ -51,9 +51,9 @@ public override AccessibleStates State return direction switch { - UiaCore.NavigateDirection.Parent => parent, - UiaCore.NavigateDirection.NextSibling => parent.GetNextChild(this), - UiaCore.NavigateDirection.PreviousSibling => parent.GetPreviousChild(this), + NavigateDirection.NavigateDirection_Parent => parent, + NavigateDirection.NavigateDirection_NextSibling => parent.GetNextChild(this), + NavigateDirection.NavigateDirection_PreviousSibling => parent.GetPreviousChild(this), _ => base.FragmentNavigate(direction), }; } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.PropertyGridViewAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.PropertyGridViewAccessibleObject.cs index e66b0e68b99..51a22e3a9fa 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.PropertyGridViewAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.PropertyGridViewAccessibleObject.cs @@ -25,7 +25,7 @@ public PropertyGridViewAccessibleObject(PropertyGridView owner, PropertyGrid par internal override UiaCore.IRawElementProviderFragment? ElementProviderFromPoint(double x, double y) => this.IsOwnerHandleCreated(out Control? _) ? HitTest((int)x, (int)y) : null; - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { if (!_parentPropertyGrid.TryGetTarget(out PropertyGrid? target)) { @@ -47,8 +47,8 @@ public PropertyGridViewAccessibleObject(PropertyGridView owner, PropertyGrid par return direction switch { - UiaCore.NavigateDirection.FirstChild => IsSortedByCategories ? GetCategory(0) : GetChild(0), - UiaCore.NavigateDirection.LastChild => IsSortedByCategories ? GetLastCategory() : GetLastChild(), + NavigateDirection.NavigateDirection_FirstChild => IsSortedByCategories ? GetCategory(0) : GetChild(0), + NavigateDirection.NavigateDirection_LastChild => IsSortedByCategories ? GetLastCategory() : GetLastChild(), _ => base.FragmentNavigate(direction) }; } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.cs b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.cs index 234c586879a..8bbf7ac5432 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.cs @@ -813,8 +813,8 @@ private void CloseDropDownInternal(bool resetFocus) gridEntry.AccessibilityObject.RaiseAutomationEvent(UIA_EVENT_ID.UIA_AutomationFocusChangedEventId); gridEntry.AccessibilityObject.RaiseAutomationPropertyChangedEvent( UIA_PROPERTY_ID.UIA_ExpandCollapseExpandCollapseStatePropertyId, - UiaCore.ExpandCollapseState.Expanded, - UiaCore.ExpandCollapseState.Collapsed); + ExpandCollapseState.ExpandCollapseState_Expanded, + ExpandCollapseState.ExpandCollapseState_Collapsed); } } } @@ -4658,8 +4658,8 @@ internal void SetExpand(GridEntry entry, bool value) if (_selectedGridEntry is not null && IsAccessibilityObjectCreated) { - var oldExpandedState = value ? UiaCore.ExpandCollapseState.Collapsed : UiaCore.ExpandCollapseState.Expanded; - var newExpandedState = value ? UiaCore.ExpandCollapseState.Expanded : UiaCore.ExpandCollapseState.Collapsed; + var oldExpandedState = value ? ExpandCollapseState.ExpandCollapseState_Collapsed : ExpandCollapseState.ExpandCollapseState_Expanded; + var newExpandedState = value ? ExpandCollapseState.ExpandCollapseState_Expanded : ExpandCollapseState.ExpandCollapseState_Collapsed; _selectedGridEntry.AccessibilityObject.RaiseAutomationPropertyChangedEvent( UIA_PROPERTY_ID.UIA_ExpandCollapseExpandCollapseStatePropertyId, oldExpandedState, diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridToolStrip.PropertyGridToolStripAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridToolStrip.PropertyGridToolStripAccessibleObject.cs index ce082edb568..ecf844016e2 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridToolStrip.PropertyGridToolStripAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridToolStrip.PropertyGridToolStripAccessibleObject.cs @@ -30,7 +30,7 @@ public PropertyGridToolStripAccessibleObject(PropertyGridToolStrip owningPropert /// /// Indicates the direction in which to navigate. /// Returns the element in the specified direction. - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { if (_parentPropertyGrid.TryGetTarget(out PropertyGrid? target) && target.IsHandleCreated diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarAccessibleObject.cs index 44d8f7902e3..cd2e8f62199 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarAccessibleObject.cs @@ -124,11 +124,11 @@ public override int GetChildCount() return element ?? base.ElementProviderFromPoint(x, y); } - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) => direction switch { - UiaCore.NavigateDirection.FirstChild => FirstLineButtonAccessibleObject, - UiaCore.NavigateDirection.LastChild => LastLineButtonAccessibleObject, + NavigateDirection.NavigateDirection_FirstChild => FirstLineButtonAccessibleObject, + NavigateDirection.NavigateDirection_LastChild => LastLineButtonAccessibleObject, _ => base.FragmentNavigate(direction) }; diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarChildAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarChildAccessibleObject.cs index c9f135b68d2..4343f8c13fd 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarChildAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarChildAccessibleObject.cs @@ -63,10 +63,10 @@ internal override int[] RuntimeId GetChildId() }; - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) => direction switch { - UiaCore.NavigateDirection.Parent => ParentInternal, + NavigateDirection.NavigateDirection_Parent => ParentInternal, _ => base.FragmentNavigate(direction) }; diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarFirstLineButtonAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarFirstLineButtonAccessibleObject.cs index 5868052c7d0..1ea4e76ca8d 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarFirstLineButtonAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarFirstLineButtonAccessibleObject.cs @@ -1,6 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Windows.Win32.UI.Accessibility; using static Interop.UiaCore; namespace System.Windows.Forms; @@ -22,8 +23,8 @@ public ScrollBarFirstLineButtonAccessibleObject(ScrollBar owningScrollBar) : bas return direction switch { - NavigateDirection.PreviousSibling => null, - NavigateDirection.NextSibling + NavigateDirection.NavigateDirection_PreviousSibling => null, + NavigateDirection.NavigateDirection_NextSibling => ParentInternal.FirstPageButtonAccessibleObject?.IsDisplayed == true ? ParentInternal.FirstPageButtonAccessibleObject : ParentInternal.ThumbAccessibleObject, diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarFirstPageButtonAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarFirstPageButtonAccessibleObject.cs index 82ede37c394..e60ea4f7fbc 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarFirstPageButtonAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarFirstPageButtonAccessibleObject.cs @@ -1,6 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Windows.Win32.UI.Accessibility; using static Interop.UiaCore; namespace System.Windows.Forms; @@ -43,8 +44,8 @@ internal override bool IsDisplayed return direction switch { - NavigateDirection.PreviousSibling => IsDisplayed ? ParentInternal.FirstLineButtonAccessibleObject : null, - NavigateDirection.NextSibling => IsDisplayed ? ParentInternal.ThumbAccessibleObject : null, + NavigateDirection.NavigateDirection_PreviousSibling => IsDisplayed ? ParentInternal.FirstLineButtonAccessibleObject : null, + NavigateDirection.NavigateDirection_NextSibling => IsDisplayed ? ParentInternal.ThumbAccessibleObject : null, _ => base.FragmentNavigate(direction) }; } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarLastLineButtonAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarLastLineButtonAccessibleObject.cs index d261a011cd4..eb08705d969 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarLastLineButtonAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarLastLineButtonAccessibleObject.cs @@ -1,6 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Windows.Win32.UI.Accessibility; using static Interop.UiaCore; namespace System.Windows.Forms; @@ -22,8 +23,8 @@ public ScrollBarLastLineButtonAccessibleObject(ScrollBar owningScrollBar) : base return direction switch { - NavigateDirection.NextSibling => null, - NavigateDirection.PreviousSibling + NavigateDirection.NavigateDirection_NextSibling => null, + NavigateDirection.NavigateDirection_PreviousSibling => ParentInternal.LastPageButtonAccessibleObject?.IsDisplayed == true ? ParentInternal.LastPageButtonAccessibleObject : ParentInternal.ThumbAccessibleObject, diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarLastPageButtonAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarLastPageButtonAccessibleObject.cs index ac45f42c092..4b27c86c77c 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarLastPageButtonAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarLastPageButtonAccessibleObject.cs @@ -1,6 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Windows.Win32.UI.Accessibility; using static Interop.UiaCore; namespace System.Windows.Forms; @@ -43,8 +44,8 @@ internal override bool IsDisplayed return direction switch { - NavigateDirection.PreviousSibling => IsDisplayed ? ParentInternal.ThumbAccessibleObject : null, - NavigateDirection.NextSibling => IsDisplayed ? ParentInternal.LastLineButtonAccessibleObject : null, + NavigateDirection.NavigateDirection_PreviousSibling => IsDisplayed ? ParentInternal.ThumbAccessibleObject : null, + NavigateDirection.NavigateDirection_NextSibling => IsDisplayed ? ParentInternal.LastLineButtonAccessibleObject : null, _ => base.FragmentNavigate(direction) }; } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarThumbAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarThumbAccessibleObject.cs index 53bc755946f..571f7528528 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarThumbAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarThumbAccessibleObject.cs @@ -25,11 +25,11 @@ public ScrollBarThumbAccessibleObject(ScrollBar owningScrollBar) : base(owningSc return direction switch { - NavigateDirection.PreviousSibling + NavigateDirection.NavigateDirection_PreviousSibling => ParentInternal.FirstPageButtonAccessibleObject?.IsDisplayed == true ? ParentInternal.FirstPageButtonAccessibleObject : ParentInternal.FirstLineButtonAccessibleObject, - NavigateDirection.NextSibling + NavigateDirection.NavigateDirection_NextSibling => ParentInternal.LastPageButtonAccessibleObject?.IsDisplayed == true ? ParentInternal.LastPageButtonAccessibleObject : ParentInternal.LastLineButtonAccessibleObject, diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/TabControl.TabControlAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/TabControl.TabControlAccessibleObject.cs index b181becf3d6..e0da7e00c99 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/TabControl.TabControlAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/TabControl.TabControlAccessibleObject.cs @@ -116,8 +116,8 @@ public override int GetChildCount() return direction switch { - NavigateDirection.FirstChild => owner.SelectedTab?.AccessibilityObject, - NavigateDirection.LastChild => owner.TabPages.Count > 0 + NavigateDirection.NavigateDirection_FirstChild => owner.SelectedTab?.AccessibilityObject, + NavigateDirection.NavigateDirection_LastChild => owner.TabPages.Count > 0 ? owner.TabPages[^1].TabAccessibilityObject : null, _ => base.FragmentNavigate(direction) diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/TabPage.TabAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/TabPage.TabAccessibleObject.cs index 9a3a215383e..d459080a28a 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/TabPage.TabAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/TabPage.TabAccessibleObject.cs @@ -83,7 +83,7 @@ public override void DoDefaultAction() internal override void AddToSelection() => DoDefaultAction(); - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { if (OwningTabControl is null || !OwningTabControl.IsHandleCreated) { @@ -92,9 +92,9 @@ public override void DoDefaultAction() return direction switch { - UiaCore.NavigateDirection.Parent => OwningTabControl.AccessibilityObject, - UiaCore.NavigateDirection.NextSibling => OwningTabControl.AccessibilityObject.GetChild(GetChildId() + 1), - UiaCore.NavigateDirection.PreviousSibling => OwningTabControl.AccessibilityObject.GetChild(GetChildId() - 1), + NavigateDirection.NavigateDirection_Parent => OwningTabControl.AccessibilityObject, + NavigateDirection.NavigateDirection_NextSibling => OwningTabControl.AccessibilityObject.GetChild(GetChildId() + 1), + NavigateDirection.NavigateDirection_PreviousSibling => OwningTabControl.AccessibilityObject.GetChild(GetChildId() - 1), _ => null }; } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/TabPage.TabPageAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/TabPage.TabPageAccessibleObject.cs index ccb45734f0b..d3102fb2240 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/TabPage.TabPageAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/TabPage.TabPageAccessibleObject.cs @@ -53,7 +53,7 @@ public override Rectangle Bounds public override int GetChildCount() => this.IsOwnerHandleCreated(out TabPage? owningTabPage) ? owningTabPage.Controls.Count : -1; - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { if (!this.IsOwnerHandleCreated(out TabPage? _) || OwningTabControl is null) { @@ -62,9 +62,9 @@ public override int GetChildCount() return direction switch { - UiaCore.NavigateDirection.Parent => OwningTabControl?.AccessibilityObject, - UiaCore.NavigateDirection.NextSibling => GetNextSibling(), - UiaCore.NavigateDirection.PreviousSibling => null, + NavigateDirection.NavigateDirection_Parent => OwningTabControl?.AccessibilityObject, + NavigateDirection.NavigateDirection_NextSibling => GetNextSibling(), + NavigateDirection.NavigateDirection_PreviousSibling => null, _ => base.FragmentNavigate(direction) }; } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/TextBoxBase.cs b/src/System.Windows.Forms/src/System/Windows/Forms/TextBoxBase.cs index db1b1d236e2..498daabea34 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/TextBoxBase.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/TextBoxBase.cs @@ -1573,7 +1573,7 @@ protected override void OnTextChanged(EventArgs e) CommonProperties.xClearPreferredSizeCache(this); base.OnTextChanged(e); - if (UiaCore.UiaClientsAreListening()) + if (PInvoke.UiaClientsAreListening()) { RaiseAccessibilityTextChangedEvent(); } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStrip.ToolStripAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStrip.ToolStripAccessibleObject.cs index 667e14dfffc..448cbbd9e0f 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStrip.ToolStripAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStrip.ToolStripAccessibleObject.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Drawing; +using Windows.Win32.UI.Accessibility; using static Interop; namespace System.Windows.Forms; @@ -147,7 +148,7 @@ public override int GetChildCount() return count; } - internal AccessibleObject? GetChildFragment(int fragmentIndex, UiaCore.NavigateDirection direction, bool getOverflowItem = false) + internal AccessibleObject? GetChildFragment(int fragmentIndex, NavigateDirection direction, bool getOverflowItem = false) { if (!this.TryGetOwnerAs(out ToolStrip? owner) || fragmentIndex < 0) { @@ -202,15 +203,15 @@ bool ShouldItemBeSkipped(Control hostedControl) // items that are native controls (their accessible objects are provided by Windows), // from the accessibility tree. It's necessary, because hosted native controls internally add accessible objects // to the accessibility tree, and thus create duplicated. To avoid duplicates, remove hosted items with native accessibility objects from the tree. - AccessibleObject? GetFollowingChildFragment(int index, ToolStripItemCollection items, UiaCore.NavigateDirection direction) + AccessibleObject? GetFollowingChildFragment(int index, ToolStripItemCollection items, NavigateDirection direction) { switch (direction) { // "direction" is not used for navigation. This method is helper only. // FirstChild, LastChild are used when searching non-native hosted child items of the ToolStrip. // NextSibling, PreviousSibling are used when searching an item siblings. - case UiaCore.NavigateDirection.FirstChild: - case UiaCore.NavigateDirection.NextSibling: + case NavigateDirection.NavigateDirection_FirstChild: + case NavigateDirection.NavigateDirection_NextSibling: for (int i = index + 1; i < items.Count; i++) { ToolStripItem item = items[i]; @@ -229,8 +230,8 @@ bool ShouldItemBeSkipped(Control hostedControl) break; - case UiaCore.NavigateDirection.LastChild: - case UiaCore.NavigateDirection.PreviousSibling: + case NavigateDirection.NavigateDirection_LastChild: + case NavigateDirection.NavigateDirection_PreviousSibling: for (int i = index - 1; i >= 0; i--) { ToolStripItem item = items[i]; @@ -377,7 +378,7 @@ internal int GetChildIndex(ToolStripItem.ToolStripItemAccessibleObject child) internal override UiaCore.IRawElementProviderFragmentRoot FragmentRoot => this; - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { if (!this.IsOwnerHandleCreated(out ToolStrip? _)) { @@ -386,7 +387,7 @@ internal int GetChildIndex(ToolStripItem.ToolStripItemAccessibleObject child) switch (direction) { - case UiaCore.NavigateDirection.FirstChild: + case NavigateDirection.NavigateDirection_FirstChild: int childCount = GetChildFragmentCount(); if (childCount > 0) { @@ -394,7 +395,7 @@ internal int GetChildIndex(ToolStripItem.ToolStripItemAccessibleObject child) } break; - case UiaCore.NavigateDirection.LastChild: + case NavigateDirection.NavigateDirection_LastChild: childCount = GetChildFragmentCount(); if (childCount > 0) { diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripButton.ToolStripButtonAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripButton.ToolStripButtonAccessibleObject.cs index f2e4ae99089..5de84e14d68 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripButton.ToolStripButtonAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripButton.ToolStripButtonAccessibleObject.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using Windows.Win32.UI.Accessibility; -using static Interop; namespace System.Windows.Forms; @@ -76,7 +75,7 @@ internal override void Toggle() } } - internal override UiaCore.ToggleState ToggleState + internal override ToggleState ToggleState => CheckStateToToggleState(_ownerItem.CheckState); internal void OnCheckStateChanged(CheckState oldValue, CheckState newValue) @@ -87,12 +86,12 @@ internal void OnCheckStateChanged(CheckState oldValue, CheckState newValue) CheckStateToToggleState(newValue)); } - private static UiaCore.ToggleState CheckStateToToggleState(CheckState checkState) + private static ToggleState CheckStateToToggleState(CheckState checkState) => checkState switch { - CheckState.Checked => UiaCore.ToggleState.On, - CheckState.Unchecked => UiaCore.ToggleState.Off, - _ => UiaCore.ToggleState.Indeterminate + CheckState.Checked => ToggleState.ToggleState_On, + CheckState.Unchecked => ToggleState.ToggleState_Off, + _ => ToggleState.ToggleState_Indeterminate }; #endregion diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripComboBox.ToolStripComboBoxControl.ToolStripComboBoxControlAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripComboBox.ToolStripComboBoxControl.ToolStripComboBoxControlAccessibleObject.cs index 346a0c00fcf..ed748266f31 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripComboBox.ToolStripComboBoxControl.ToolStripComboBoxControlAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripComboBox.ToolStripComboBoxControl.ToolStripComboBoxControlAccessibleObject.cs @@ -17,13 +17,13 @@ public ToolStripComboBoxControlAccessibleObject(ToolStripComboBoxControl toolStr { } - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { switch (direction) { - case UiaCore.NavigateDirection.Parent: - case UiaCore.NavigateDirection.PreviousSibling: - case UiaCore.NavigateDirection.NextSibling: + case NavigateDirection.NavigateDirection_Parent: + case NavigateDirection.NavigateDirection_PreviousSibling: + case NavigateDirection.NavigateDirection_NextSibling: if (this.TryGetOwnerAs(out ToolStripComboBoxControl? owner)) { return owner.Owner?.AccessibilityObject.FragmentNavigate(direction); diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripControlHost.ToolStripControlHostAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripControlHost.ToolStripControlHostAccessibleObject.cs index 17d1c7726a5..a487e0030e1 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripControlHost.ToolStripControlHostAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripControlHost.ToolStripControlHostAccessibleObject.cs @@ -1,6 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Windows.Win32.UI.Accessibility; using static Interop; namespace System.Windows.Forms; @@ -67,10 +68,10 @@ public override AccessibleRole Role /// /// Indicates the direction in which to navigate. /// Returns the element in the specified direction. - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { - if (direction == UiaCore.NavigateDirection.FirstChild || - direction == UiaCore.NavigateDirection.LastChild) + if (direction == NavigateDirection.NavigateDirection_FirstChild || + direction == NavigateDirection.NavigateDirection_LastChild) { return _ownerItem.Control.AccessibilityObject; } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripControlHost.ToolStripHostedControlAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripControlHost.ToolStripHostedControlAccessibleObject.cs index 4257d77940b..51854689649 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripControlHost.ToolStripHostedControlAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripControlHost.ToolStripHostedControlAccessibleObject.cs @@ -44,16 +44,16 @@ internal override UiaCore.IRawElementProviderFragmentRoot? FragmentRoot } } - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { if (_toolStripHostedControl is not null && _toolStripControlHost is not null) { switch (direction) { - case UiaCore.NavigateDirection.Parent: - case UiaCore.NavigateDirection.PreviousSibling: - case UiaCore.NavigateDirection.NextSibling: + case NavigateDirection.NavigateDirection_Parent: + case NavigateDirection.NavigateDirection_PreviousSibling: + case NavigateDirection.NavigateDirection_NextSibling: return _toolStripControlHost.AccessibilityObject.FragmentNavigate(direction); } } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripDropDownItem.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripDropDownItem.cs index 8170e558648..5429b739e60 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripDropDownItem.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripDropDownItem.cs @@ -5,7 +5,6 @@ using System.Drawing; using System.Windows.Forms.Layout; using Windows.Win32.UI.Accessibility; -using static Interop; namespace System.Windows.Forms; @@ -505,8 +504,8 @@ protected internal virtual void OnDropDownOpened(EventArgs e) { accessibleObject.RaiseAutomationPropertyChangedEvent( UIA_PROPERTY_ID.UIA_ExpandCollapseExpandCollapseStatePropertyId, - UiaCore.ExpandCollapseState.Collapsed, - UiaCore.ExpandCollapseState.Expanded); + ExpandCollapseState.ExpandCollapseState_Collapsed, + ExpandCollapseState.ExpandCollapseState_Expanded); } } @@ -534,8 +533,8 @@ protected internal virtual void OnDropDownClosed(EventArgs e) { accessibleObject.RaiseAutomationPropertyChangedEvent( UIA_PROPERTY_ID.UIA_ExpandCollapseExpandCollapseStatePropertyId, - UiaCore.ExpandCollapseState.Expanded, - UiaCore.ExpandCollapseState.Collapsed); + ExpandCollapseState.ExpandCollapseState_Expanded, + ExpandCollapseState.ExpandCollapseState_Collapsed); } } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripDropDownItemAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripDropDownItemAccessibleObject.cs index 36856eeb50d..27036b95380 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripDropDownItemAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripDropDownItemAccessibleObject.cs @@ -79,11 +79,11 @@ internal override void Collapse() } } - internal override UiaCore.ExpandCollapseState ExpandCollapseState + internal override ExpandCollapseState ExpandCollapseState { get { - return _owner.DropDown.Visible ? UiaCore.ExpandCollapseState.Expanded : UiaCore.ExpandCollapseState.Collapsed; + return _owner.DropDown.Visible ? ExpandCollapseState.ExpandCollapseState_Expanded : ExpandCollapseState.ExpandCollapseState_Collapsed; } } @@ -107,7 +107,7 @@ public override int GetChildCount() // Do not expose child items when the submenu is collapsed to prevent Narrator from announcing // invisible menu items when Narrator is in item's mode (CAPSLOCK + Arrow Left/Right) or // in scan mode (CAPSLOCK + Space) - if (ExpandCollapseState == UiaCore.ExpandCollapseState.Collapsed) + if (ExpandCollapseState == ExpandCollapseState.ExpandCollapseState_Collapsed) { return 0; } @@ -161,7 +161,7 @@ internal int GetChildFragmentCount() return count; } - internal AccessibleObject? GetChildFragment(int index, UiaCore.NavigateDirection direction) + internal AccessibleObject? GetChildFragment(int index, NavigateDirection direction) { if (_owner.DropDown.AccessibilityObject is ToolStrip.ToolStripAccessibleObject toolStripAccessibleObject) { @@ -171,12 +171,12 @@ internal int GetChildFragmentCount() return null; } - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { switch (direction) { - case UiaCore.NavigateDirection.NextSibling: - case UiaCore.NavigateDirection.PreviousSibling: + case NavigateDirection.NavigateDirection_NextSibling: + case NavigateDirection.NavigateDirection_PreviousSibling: if (_owner.Owner is not ToolStripDropDown dropDown) { break; @@ -190,7 +190,7 @@ internal int GetChildFragmentCount() return null; } - index += direction == UiaCore.NavigateDirection.NextSibling ? 1 : -1; + index += direction == NavigateDirection.NavigateDirection_NextSibling ? 1 : -1; if (index >= 0 && index < dropDown.DisplayedItems.Count) { @@ -204,8 +204,8 @@ internal int GetChildFragmentCount() } return null; - case UiaCore.NavigateDirection.FirstChild: - case UiaCore.NavigateDirection.LastChild: + case NavigateDirection.NavigateDirection_FirstChild: + case NavigateDirection.NavigateDirection_LastChild: // Don't add invisible items to the accessibility tree, // they might not have been created yet. return _owner.DropDown.Visible diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripDropDownMenu.ToolStripDropDownMenuAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripDropDownMenu.ToolStripDropDownMenuAccessibleObject.cs index 5eddd9a3ccf..0cd4a6ea40c 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripDropDownMenu.ToolStripDropDownMenuAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripDropDownMenu.ToolStripDropDownMenuAccessibleObject.cs @@ -13,10 +13,10 @@ internal class ToolStripDropDownMenuAccessibleObject : ToolStripDropDownAccessib public ToolStripDropDownMenuAccessibleObject(ToolStripDropDownMenu owner) : base(owner) { } - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) => direction switch { - UiaCore.NavigateDirection.Parent when this.TryGetOwnerAs(out ToolStripDropDownMenu? owner) + NavigateDirection.NavigateDirection_Parent when this.TryGetOwnerAs(out ToolStripDropDownMenu? owner) => owner.OwnerItem?.AccessibilityObject, _ => base.FragmentNavigate(direction) }; diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripItem.ToolStripItemAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripItem.ToolStripItemAccessibleObject.cs index 2f3dcf4cc5c..67d30368e74 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripItem.ToolStripItemAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripItem.ToolStripItemAccessibleObject.cs @@ -332,14 +332,14 @@ internal override UiaCore.IRawElementProviderFragmentRoot? FragmentRoot /// /// Indicates the direction in which to navigate. /// Returns the element in the specified direction. - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { switch (direction) { - case UiaCore.NavigateDirection.Parent: + case NavigateDirection.NavigateDirection_Parent: return Parent; - case UiaCore.NavigateDirection.NextSibling: - case UiaCore.NavigateDirection.PreviousSibling: + case NavigateDirection.NavigateDirection_NextSibling: + case NavigateDirection.NavigateDirection_PreviousSibling: int index = GetChildFragmentIndex(); if (index == -1) { @@ -348,7 +348,7 @@ internal override UiaCore.IRawElementProviderFragmentRoot? FragmentRoot } AccessibleObject? sibling = null; - index += direction == UiaCore.NavigateDirection.NextSibling ? 1 : -1; + index += direction == NavigateDirection.NavigateDirection_NextSibling ? 1 : -1; int itemsCount = GetChildFragmentCount(); if (index >= 0 && index < itemsCount) { @@ -361,7 +361,7 @@ internal override UiaCore.IRawElementProviderFragmentRoot? FragmentRoot return base.FragmentNavigate(direction); } - private AccessibleObject? GetChildFragment(int index, UiaCore.NavigateDirection direction) + private AccessibleObject? GetChildFragment(int index, NavigateDirection direction) { if (Parent is ToolStrip.ToolStripAccessibleObject toolStripParent) { diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripMenuItem.ToolStripMenuItemAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripMenuItem.ToolStripMenuItemAccessibleObject.cs index 3a41c9f1e17..601ad302f8a 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripMenuItem.ToolStripMenuItemAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripMenuItem.ToolStripMenuItemAccessibleObject.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using Windows.Win32.UI.Accessibility; -using static Interop; namespace System.Windows.Forms; @@ -141,12 +140,12 @@ internal override void Toggle() } } - internal override UiaCore.ToggleState ToggleState => + internal override ToggleState ToggleState => _owningToolStripMenuItem.CheckState switch { - CheckState.Checked => UiaCore.ToggleState.On, - CheckState.Unchecked => UiaCore.ToggleState.Off, - _ => UiaCore.ToggleState.Indeterminate + CheckState.Checked => ToggleState.ToggleState_On, + CheckState.Unchecked => ToggleState.ToggleState_Off, + _ => ToggleState.ToggleState_Indeterminate }; #endregion diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripOverflow.ToolStripOverflowAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripOverflow.ToolStripOverflowAccessibleObject.cs index a5e2bfa3b90..cfc1d89ac01 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripOverflow.ToolStripOverflowAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripOverflow.ToolStripOverflowAccessibleObject.cs @@ -26,7 +26,7 @@ public override int GetChildCount() internal override IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) => direction switch { - NavigateDirection.Parent when this.TryGetOwnerAs(out ToolStripOverflow? owner) + NavigateDirection.NavigateDirection_Parent when this.TryGetOwnerAs(out ToolStripOverflow? owner) => owner.OwnerItem?.AccessibilityObject, _ => base.FragmentNavigate(direction), }; diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripOverflowButton.ToolStripOverflowButtonAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripOverflowButton.ToolStripOverflowButtonAccessibleObject.cs index 4047686b34d..fab6777407a 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripOverflowButton.ToolStripOverflowButtonAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripOverflowButton.ToolStripOverflowButtonAccessibleObject.cs @@ -1,6 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Windows.Win32.UI.Accessibility; using static Interop; namespace System.Windows.Forms; @@ -23,12 +24,12 @@ public override string Name set => base.Name = value; } - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { switch (direction) { - case UiaCore.NavigateDirection.FirstChild: - case UiaCore.NavigateDirection.LastChild: + case NavigateDirection.NavigateDirection_FirstChild: + case NavigateDirection.NavigateDirection_LastChild: // Don't show the inner menu while it is invisible. // Otherwise it will affect accessibility tree, // especially for items-controls that have not been created yet. diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripProgressBar.ToolStripProgressBarControlAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripProgressBar.ToolStripProgressBarControlAccessibleObject.cs index 9f9713e833f..57a7f2d7347 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripProgressBar.ToolStripProgressBarControlAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripProgressBar.ToolStripProgressBarControlAccessibleObject.cs @@ -25,13 +25,13 @@ internal override UiaCore.IRawElementProviderFragmentRoot? FragmentRoot } } - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { switch (direction) { - case UiaCore.NavigateDirection.Parent: - case UiaCore.NavigateDirection.PreviousSibling: - case UiaCore.NavigateDirection.NextSibling: + case NavigateDirection.NavigateDirection_Parent: + case NavigateDirection.NavigateDirection_PreviousSibling: + case NavigateDirection.NavigateDirection_NextSibling: return _ownerToolStripProgressBarControl.Owner?.AccessibilityObject.FragmentNavigate(direction); } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripScrollButton.StickyLabelAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripScrollButton.StickyLabelAccessibleObject.cs index 48043d645d0..489c7f0f80d 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripScrollButton.StickyLabelAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripScrollButton.StickyLabelAccessibleObject.cs @@ -17,7 +17,7 @@ public StickyLabelAccessibleObject(StickyLabel owner) : base(owner) _owner = owner; } - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { if (_owner.OwnerScrollButton?.Parent is not ToolStripDropDownMenu toolStripDropDownMenu) { @@ -26,12 +26,12 @@ public StickyLabelAccessibleObject(StickyLabel owner) : base(owner) return direction switch { - UiaCore.NavigateDirection.Parent => toolStripDropDownMenu.AccessibilityObject, - UiaCore.NavigateDirection.NextSibling + NavigateDirection.NavigateDirection_Parent => toolStripDropDownMenu.AccessibilityObject, + NavigateDirection.NavigateDirection_NextSibling => _owner.UpDirection && toolStripDropDownMenu.Items.Count > 0 ? toolStripDropDownMenu.Items[0].AccessibilityObject : null, - UiaCore.NavigateDirection.PreviousSibling + NavigateDirection.NavigateDirection_PreviousSibling => !_owner.UpDirection && toolStripDropDownMenu.Items.Count > 0 ? toolStripDropDownMenu.Items[^1].AccessibilityObject : null, diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripSplitButton.ToolStripSplitButtonExAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripSplitButton.ToolStripSplitButtonExAccessibleObject.cs index c462e121669..81553afd066 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripSplitButton.ToolStripSplitButtonExAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripSplitButton.ToolStripSplitButtonExAccessibleObject.cs @@ -67,21 +67,21 @@ internal override void Collapse() } } - internal override UiaCore.ExpandCollapseState ExpandCollapseState + internal override ExpandCollapseState ExpandCollapseState { get { - return _owningToolStripSplitButton.DropDown.Visible ? UiaCore.ExpandCollapseState.Expanded : UiaCore.ExpandCollapseState.Collapsed; + return _owningToolStripSplitButton.DropDown.Visible ? ExpandCollapseState.ExpandCollapseState_Expanded : ExpandCollapseState.ExpandCollapseState_Collapsed; } } - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { switch (direction) { - case UiaCore.NavigateDirection.FirstChild: + case NavigateDirection.NavigateDirection_FirstChild: return DropDownItemsCount > 0 ? _owningToolStripSplitButton.DropDown.Items[0].AccessibilityObject : null; - case UiaCore.NavigateDirection.LastChild: + case NavigateDirection.NavigateDirection_LastChild: return DropDownItemsCount > 0 ? _owningToolStripSplitButton.DropDown.Items[_owningToolStripSplitButton.DropDown.Items.Count - 1].AccessibilityObject : null; } @@ -95,7 +95,7 @@ private int DropDownItemsCount // Do not expose child items when the drop-down is collapsed to prevent Narrator from announcing // invisible menu items when Narrator is in item's mode (CAPSLOCK + Arrow Left/Right) or // in scan mode (CAPSLOCK + Space) - if (ExpandCollapseState == UiaCore.ExpandCollapseState.Collapsed) + if (ExpandCollapseState == ExpandCollapseState.ExpandCollapseState_Collapsed) { return 0; } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripSplitButton.ToolStripSplitButtonUiaProvider.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripSplitButton.ToolStripSplitButtonUiaProvider.cs index 48e76cab6c8..da930e2acb9 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripSplitButton.ToolStripSplitButtonUiaProvider.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripSplitButton.ToolStripSplitButtonUiaProvider.cs @@ -40,8 +40,8 @@ internal override ExpandCollapseState ExpandCollapseState internal override IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) => direction switch { - NavigateDirection.FirstChild => base.FragmentNavigate(direction), - NavigateDirection.LastChild => base.FragmentNavigate(direction), + NavigateDirection.NavigateDirection_FirstChild => base.FragmentNavigate(direction), + NavigateDirection.NavigateDirection_LastChild => base.FragmentNavigate(direction), _ => _accessibleObject.FragmentNavigate(direction) }; } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/TrackBar.TrackBarAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/TrackBar.TrackBarAccessibleObject.cs index 6fdaa091370..4e964c9d557 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/TrackBar.TrackBarAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/TrackBar.TrackBarAccessibleObject.cs @@ -126,7 +126,7 @@ public override int GetChildCount() return element ?? base.ElementProviderFromPoint(x, y); } - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { if (!this.IsOwnerHandleCreated(out TrackBar? _)) { @@ -135,8 +135,8 @@ public override int GetChildCount() return direction switch { - UiaCore.NavigateDirection.FirstChild => GetChild(0), - UiaCore.NavigateDirection.LastChild => (LastButtonAccessibleObject?.IsDisplayed ?? false) + NavigateDirection.NavigateDirection_FirstChild => GetChild(0), + NavigateDirection.NavigateDirection_LastChild => (LastButtonAccessibleObject?.IsDisplayed ?? false) ? LastButtonAccessibleObject : ThumbAccessibleObject, _ => base.FragmentNavigate(direction) diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/TrackBar.TrackBarChildAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/TrackBar.TrackBarChildAccessibleObject.cs index 4fa918ade6f..a2efc16cedc 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/TrackBar.TrackBarChildAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/TrackBar.TrackBarChildAccessibleObject.cs @@ -58,10 +58,10 @@ internal override int[] RuntimeId GetChildId() }; - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) => direction switch { - UiaCore.NavigateDirection.Parent => ParentInternal, + NavigateDirection.NavigateDirection_Parent => ParentInternal, _ => base.FragmentNavigate(direction) }; diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/TrackBar.TrackBarFirstButtonAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/TrackBar.TrackBarFirstButtonAccessibleObject.cs index 9c5f7ea5db7..4d9999b64ef 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/TrackBar.TrackBarFirstButtonAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/TrackBar.TrackBarFirstButtonAccessibleObject.cs @@ -1,6 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Windows.Win32.UI.Accessibility; using static Interop; namespace System.Windows.Forms; @@ -38,7 +39,7 @@ internal override bool IsDisplayed } } - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { if (!this.IsOwnerHandleCreated(out TrackBar? _)) { @@ -47,8 +48,8 @@ internal override bool IsDisplayed return direction switch { - UiaCore.NavigateDirection.PreviousSibling => null, - UiaCore.NavigateDirection.NextSibling => IsDisplayed ? ParentInternal?.ThumbAccessibleObject : null, + NavigateDirection.NavigateDirection_PreviousSibling => null, + NavigateDirection.NavigateDirection_NextSibling => IsDisplayed ? ParentInternal?.ThumbAccessibleObject : null, _ => base.FragmentNavigate(direction) }; } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/TrackBar.TrackBarLastButtonAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/TrackBar.TrackBarLastButtonAccessibleObject.cs index 848c7530635..405f87c2b45 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/TrackBar.TrackBarLastButtonAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/TrackBar.TrackBarLastButtonAccessibleObject.cs @@ -1,6 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Windows.Win32.UI.Accessibility; using static Interop; namespace System.Windows.Forms; @@ -47,7 +48,7 @@ internal override bool IsDisplayed } } - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { if (!this.IsOwnerHandleCreated(out TrackBar? _)) { @@ -56,8 +57,8 @@ internal override bool IsDisplayed return direction switch { - UiaCore.NavigateDirection.PreviousSibling => IsDisplayed ? ParentInternal?.ThumbAccessibleObject : null, - UiaCore.NavigateDirection.NextSibling => null, + NavigateDirection.NavigateDirection_PreviousSibling => IsDisplayed ? ParentInternal?.ThumbAccessibleObject : null, + NavigateDirection.NavigateDirection_NextSibling => null, _ => base.FragmentNavigate(direction) }; } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/TrackBar.TrackBarThumbAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/TrackBar.TrackBarThumbAccessibleObject.cs index b5284377e96..d78be755392 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/TrackBar.TrackBarThumbAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/TrackBar.TrackBarThumbAccessibleObject.cs @@ -15,7 +15,7 @@ public TrackBarThumbAccessibleObject(TrackBar owningTrackBar) : base(owningTrack public override string? Name => SR.TrackBarPositionButtonName; - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) { if (!this.IsOwnerHandleCreated(out TrackBar? _)) { @@ -24,11 +24,11 @@ public TrackBarThumbAccessibleObject(TrackBar owningTrackBar) : base(owningTrack return direction switch { - UiaCore.NavigateDirection.PreviousSibling + NavigateDirection.NavigateDirection_PreviousSibling => ParentInternal?.FirstButtonAccessibleObject?.IsDisplayed ?? false ? ParentInternal.FirstButtonAccessibleObject : null, - UiaCore.NavigateDirection.NextSibling + NavigateDirection.NavigateDirection_NextSibling => ParentInternal?.LastButtonAccessibleObject?.IsDisplayed ?? false ? ParentInternal.LastButtonAccessibleObject : null, diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/TreeNode.TreeNodeAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/TreeNode.TreeNodeAccessibleObject.cs index cc73f2a05dd..6bbee80bcfd 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/TreeNode.TreeNodeAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/TreeNode.TreeNodeAccessibleObject.cs @@ -44,13 +44,13 @@ public override string DefaultAction : SR.AccessibleActionCheck; } - UiaCore.ExpandCollapseState expandCollapseState = ExpandCollapseState; - if (expandCollapseState == UiaCore.ExpandCollapseState.LeafNode) + ExpandCollapseState expandCollapseState = ExpandCollapseState; + if (expandCollapseState == ExpandCollapseState.ExpandCollapseState_LeafNode) { return string.Empty; } - return expandCollapseState == UiaCore.ExpandCollapseState.Expanded + return expandCollapseState == ExpandCollapseState.ExpandCollapseState_Expanded ? SR.AccessibleActionCollapse : SR.AccessibleActionExpand; } @@ -78,24 +78,24 @@ public override void DoDefaultAction() internal override UiaCore.IRawElementProviderFragmentRoot FragmentRoot => _owningTreeView.AccessibilityObject; - internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) + internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) => direction switch { - UiaCore.NavigateDirection.Parent + NavigateDirection.NavigateDirection_Parent => Parent ?? _owningTreeView.AccessibilityObject, - UiaCore.NavigateDirection.FirstChild + NavigateDirection.NavigateDirection_FirstChild => _owningTreeNode.IsEditing ? _owningTreeView._labelEdit?.AccessibilityObject : _owningTreeNode.IsExpanded ? _owningTreeNode.FirstNode?.AccessibilityObject : null, - UiaCore.NavigateDirection.LastChild + NavigateDirection.NavigateDirection_LastChild => _owningTreeNode.IsExpanded ? _owningTreeNode.LastNode?.AccessibilityObject : null, - UiaCore.NavigateDirection.NextSibling + NavigateDirection.NavigateDirection_NextSibling => _owningTreeNode.NextNode?.AccessibilityObject, - UiaCore.NavigateDirection.PreviousSibling + NavigateDirection.NavigateDirection_PreviousSibling => _owningTreeNode.PrevNode?.AccessibilityObject, _ => base.FragmentNavigate(direction), }; @@ -160,11 +160,11 @@ public override AccessibleStates State state |= AccessibleStates.Invisible | AccessibleStates.Offscreen; } - if (ExpandCollapseState == UiaCore.ExpandCollapseState.Expanded) + if (ExpandCollapseState == ExpandCollapseState.ExpandCollapseState_Expanded) { state |= AccessibleStates.Expanded; } - else if (ExpandCollapseState == UiaCore.ExpandCollapseState.Collapsed) + else if (ExpandCollapseState == ExpandCollapseState.ExpandCollapseState_Collapsed) { state |= AccessibleStates.Collapsed; } @@ -205,18 +205,18 @@ internal override void Collapse() _owningTreeNode.Collapse(); } - internal override UiaCore.ExpandCollapseState ExpandCollapseState + internal override ExpandCollapseState ExpandCollapseState { get { if (_owningTreeNode.Nodes.Count == 0) { - return UiaCore.ExpandCollapseState.LeafNode; + return ExpandCollapseState.ExpandCollapseState_LeafNode; } return _owningTreeNode.IsExpanded - ? UiaCore.ExpandCollapseState.Expanded - : UiaCore.ExpandCollapseState.Collapsed; + ? ExpandCollapseState.ExpandCollapseState_Expanded + : ExpandCollapseState.ExpandCollapseState_Collapsed; } } @@ -255,8 +255,8 @@ internal override UiaCore.IRawElementProviderSimple? ItemSelectionContainer internal override void Toggle() => _owningTreeNode.Checked = !_owningTreeNode.Checked; - internal override UiaCore.ToggleState ToggleState - => _owningTreeNode.Checked ? UiaCore.ToggleState.On : UiaCore.ToggleState.Off; + internal override ToggleState ToggleState + => _owningTreeNode.Checked ? ToggleState.ToggleState_On : ToggleState.ToggleState_Off; #endregion diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/TreeView.TreeViewAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/TreeView.TreeViewAccessibleObject.cs index 025c77f2680..3af78b49be4 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/TreeView.TreeViewAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/TreeView.TreeViewAccessibleObject.cs @@ -23,8 +23,8 @@ public TreeViewAccessibleObject(TreeView owningTreeView) : base(owningTreeView) internal override IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) => direction switch { - NavigateDirection.FirstChild => GetChild(0), - NavigateDirection.LastChild => GetChild(GetChildCount() - 1), + NavigateDirection.NavigateDirection_FirstChild => GetChild(0), + NavigateDirection.NavigateDirection_LastChild => GetChild(GetChildCount() - 1), _ => base.FragmentNavigate(direction), }; diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/TreeView.cs b/src/System.Windows.Forms/src/System/Windows/Forms/TreeView.cs index 54cd7be973c..565f49b818c 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/TreeView.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/TreeView.cs @@ -2141,10 +2141,10 @@ protected virtual void OnAfterCheck(TreeViewEventArgs e) if (IsAccessibilityObjectCreated) { AccessibleObject nodeAccessibleObject = e.Node!.AccessibilityObject; - UiaCore.ToggleState newState = nodeAccessibleObject.ToggleState; - UiaCore.ToggleState oldState = newState == UiaCore.ToggleState.On - ? UiaCore.ToggleState.Off - : UiaCore.ToggleState.On; + ToggleState newState = nodeAccessibleObject.ToggleState; + ToggleState oldState = newState == ToggleState.ToggleState_On + ? ToggleState.ToggleState_Off + : ToggleState.ToggleState_On; nodeAccessibleObject.RaiseAutomationPropertyChangedEvent( UIA_PROPERTY_ID.UIA_ToggleToggleStatePropertyId, @@ -2173,8 +2173,8 @@ protected internal virtual void OnAfterCollapse(TreeViewEventArgs e) { e.Node!.AccessibilityObject.RaiseAutomationPropertyChangedEvent( UIA_PROPERTY_ID.UIA_ExpandCollapseExpandCollapseStatePropertyId, - oldValue: UiaCore.ExpandCollapseState.Expanded, - newValue: (VARIANT)(uint)UiaCore.ExpandCollapseState.Collapsed); + oldValue: ExpandCollapseState.ExpandCollapseState_Expanded, + newValue: (VARIANT)(uint)ExpandCollapseState.ExpandCollapseState_Collapsed); } } @@ -2198,8 +2198,8 @@ protected virtual void OnAfterExpand(TreeViewEventArgs e) { e.Node!.AccessibilityObject.RaiseAutomationPropertyChangedEvent( UIA_PROPERTY_ID.UIA_ExpandCollapseExpandCollapseStatePropertyId, - oldValue: UiaCore.ExpandCollapseState.Collapsed, - newValue: UiaCore.ExpandCollapseState.Expanded); + oldValue: ExpandCollapseState.ExpandCollapseState_Collapsed, + newValue: ExpandCollapseState.ExpandCollapseState_Expanded); } } diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/UpDownBase.UpDownButtons.UpDownButtonsAccessibleObject.DirectionButtonAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/UpDownBase.UpDownButtons.UpDownButtonsAccessibleObject.DirectionButtonAccessibleObject.cs index 8181ff2c7e3..506f85c25ee 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/UpDownBase.UpDownButtons.UpDownButtonsAccessibleObject.DirectionButtonAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/UpDownBase.UpDownButtons.UpDownButtonsAccessibleObject.DirectionButtonAccessibleObject.cs @@ -61,11 +61,11 @@ public override void DoDefaultAction() } internal override UiaCore.IRawElementProviderFragment? FragmentNavigate( - UiaCore.NavigateDirection direction) => direction switch + NavigateDirection direction) => direction switch { - UiaCore.NavigateDirection.Parent => Parent, - UiaCore.NavigateDirection.NextSibling => _up ? Parent.GetChild(1) : null, - UiaCore.NavigateDirection.PreviousSibling => _up ? null : Parent.GetChild(0), + NavigateDirection.NavigateDirection_Parent => Parent, + NavigateDirection.NavigateDirection_NextSibling => _up ? Parent.GetChild(1) : null, + NavigateDirection.NavigateDirection_PreviousSibling => _up ? null : Parent.GetChild(0), _ => base.FragmentNavigate(direction), }; diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/UpDownBase.UpDownButtons.UpDownButtonsAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/UpDownBase.UpDownButtons.UpDownButtonsAccessibleObject.cs index ea7b811db65..6a36db4e9da 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/UpDownBase.UpDownButtons.UpDownButtonsAccessibleObject.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/UpDownBase.UpDownButtons.UpDownButtonsAccessibleObject.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Runtime.InteropServices; +using Windows.Win32.UI.Accessibility; using static Interop; namespace System.Windows.Forms; @@ -34,10 +35,10 @@ public UpDownButtonsAccessibleObject(UpDownButtons owner) : base(owner) } internal override UiaCore.IRawElementProviderFragment? FragmentNavigate( - UiaCore.NavigateDirection direction) => direction switch + NavigateDirection direction) => direction switch { - UiaCore.NavigateDirection.FirstChild => GetChild(0), - UiaCore.NavigateDirection.LastChild => GetChild(1), + NavigateDirection.NavigateDirection_FirstChild => GetChild(0), + NavigateDirection.NavigateDirection_LastChild => GetChild(1), _ => base.FragmentNavigate(direction), }; diff --git a/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/ListViewTests.cs b/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/ListViewTests.cs index 0102a3fcb03..b34b381f1fb 100644 --- a/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/ListViewTests.cs +++ b/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/ListViewTests.cs @@ -3,6 +3,7 @@ using System.Drawing; using Windows.Win32.UI.Input.KeyboardAndMouse; +using Windows.Win32.UI.Accessibility; using Xunit.Abstractions; using static Interop.UiaCore; @@ -109,11 +110,11 @@ await RunTestAsync(async (form, listView) => } [WinFormsTheory] - [InlineData(2, 2, 150, 150, 0, 1, (int)NavigateDirection.FirstChild)] - [InlineData(4, 3, 150, 150, 0, 3, (int)NavigateDirection.LastChild)] - [InlineData(4, 1, 150, 150, 0, 1, (int)NavigateDirection.LastChild)] - [InlineData(2, 5, 150, 150, 0, 1, (int)NavigateDirection.LastChild)] - [InlineData(10, 10, 100, 100, 0, 5, (int)NavigateDirection.LastChild)] + [InlineData(2, 2, 150, 150, 0, 1, (int)NavigateDirection.NavigateDirection_FirstChild)] + [InlineData(4, 3, 150, 150, 0, 3, (int)NavigateDirection.NavigateDirection_LastChild)] + [InlineData(4, 1, 150, 150, 0, 1, (int)NavigateDirection.NavigateDirection_LastChild)] + [InlineData(2, 5, 150, 150, 0, 1, (int)NavigateDirection.NavigateDirection_LastChild)] + [InlineData(10, 10, 100, 100, 0, 5, (int)NavigateDirection.NavigateDirection_LastChild)] public async Task ListView_Tile_FragmentNavigate_WorksExpectedAsync(int columnCount, int subItemsCount, int width, int height, int itemIndex, int subItemIndex, int direction) { await RunTestAsync((form, listView) => @@ -132,12 +133,12 @@ await RunTestAsync((form, listView) => } [WinFormsTheory] - [InlineData(1, 0, 150, 150, (int)NavigateDirection.FirstChild)] - [InlineData(1, 2, 150, 150, (int)NavigateDirection.FirstChild)] - [InlineData(2, 1, 10, 10, (int)NavigateDirection.FirstChild)] - [InlineData(4, 0, 150, 150, (int)NavigateDirection.LastChild)] - [InlineData(1, 2, 150, 150, (int)NavigateDirection.LastChild)] - [InlineData(2, 1, 10, 10, (int)NavigateDirection.LastChild)] + [InlineData(1, 0, 150, 150, (int)NavigateDirection.NavigateDirection_FirstChild)] + [InlineData(1, 2, 150, 150, (int)NavigateDirection.NavigateDirection_FirstChild)] + [InlineData(2, 1, 10, 10, (int)NavigateDirection.NavigateDirection_FirstChild)] + [InlineData(4, 0, 150, 150, (int)NavigateDirection.NavigateDirection_LastChild)] + [InlineData(1, 2, 150, 150, (int)NavigateDirection.NavigateDirection_LastChild)] + [InlineData(2, 1, 10, 10, (int)NavigateDirection.NavigateDirection_LastChild)] public async Task ListView_Tile_FragmentNavigate_ReturnsNullAsync(int columnCount, int subItemsCount, int width, int height, int direction) { await RunTestAsync((form, listView) => @@ -162,8 +163,8 @@ await RunTestAsync((form, listView) => InitializeTileList(listView, columnCount, subItemsCount, tileSize: new Size(100, 100)); AccessibleObject? accessibleObject = listView.Items[0].SubItems[1].AccessibilityObject; - IRawElementProviderFragment? nextAccessibleObject = accessibleObject?.FragmentNavigate(NavigateDirection.NextSibling); - IRawElementProviderFragment? previousAccessibleObject = accessibleObject?.FragmentNavigate(NavigateDirection.PreviousSibling); + IRawElementProviderFragment? nextAccessibleObject = accessibleObject?.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); + IRawElementProviderFragment? previousAccessibleObject = accessibleObject?.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling); Assert.Null(nextAccessibleObject); Assert.Null(previousAccessibleObject); @@ -262,9 +263,9 @@ await RunTestAsync((form, listView) => Application.DoEvents(); AccessibleObject? accessibleObject1 = listView.Items[0].SubItems[1].AccessibilityObject; - AccessibleObject? accessibleObject2 = (AccessibleObject?)accessibleObject1?.FragmentNavigate(NavigateDirection.NextSibling); - AccessibleObject? accessibleObject3 = (AccessibleObject?)accessibleObject2?.FragmentNavigate(NavigateDirection.NextSibling); - AccessibleObject? accessibleObject4 = (AccessibleObject?)accessibleObject3?.FragmentNavigate(NavigateDirection.NextSibling); + AccessibleObject? accessibleObject2 = (AccessibleObject?)accessibleObject1?.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); + AccessibleObject? accessibleObject3 = (AccessibleObject?)accessibleObject2?.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); + AccessibleObject? accessibleObject4 = (AccessibleObject?)accessibleObject3?.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); Assert.Equal(listView.Items[0].SubItems[2].AccessibilityObject, accessibleObject2); Assert.Equal(listView.Items[0].SubItems[3].AccessibilityObject, accessibleObject3); @@ -308,8 +309,8 @@ await RunTestAsync((form, listView) => InitializeTileList(listView, columnCount: 5, subItemsCount: 5, tileSize: new Size(50, 40)); AccessibleObject? accessibleObject = listView.Items[0].SubItems[1].AccessibilityObject; - IRawElementProviderFragment? nextAccessibleObject = accessibleObject?.FragmentNavigate(NavigateDirection.NextSibling); - IRawElementProviderFragment? previousAccessibleObject = accessibleObject?.FragmentNavigate(NavigateDirection.PreviousSibling); + IRawElementProviderFragment? nextAccessibleObject = accessibleObject?.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); + IRawElementProviderFragment? previousAccessibleObject = accessibleObject?.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling); Assert.Null(nextAccessibleObject); Assert.Null(previousAccessibleObject); @@ -326,10 +327,10 @@ await RunTestAsync((form, listView) => InitializeTileList(listView, columnCount: 5, subItemsCount: 5, tileSize: new Size(50, 40)); Application.DoEvents(); - AccessibleObject accessibleObject = (AccessibleObject)listView.Items[0].AccessibilityObject.FragmentNavigate(NavigateDirection.FirstChild)!; + AccessibleObject accessibleObject = (AccessibleObject)listView.Items[0].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)!; - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); return Task.CompletedTask; }); diff --git a/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/PropertyGridInternal/DropDownButton.DropDownButtonAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/PropertyGridInternal/DropDownButton.DropDownButtonAccessibleObjectTests.cs index 53e64615c79..896eca1929d 100644 --- a/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/PropertyGridInternal/DropDownButton.DropDownButtonAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/PropertyGridInternal/DropDownButton.DropDownButtonAccessibleObjectTests.cs @@ -3,8 +3,8 @@ using System.Windows.Forms.PropertyGridInternal.TestUtilities; using System.Windows.Forms.UITests; +using Windows.Win32.UI.Accessibility; using Xunit.Abstractions; -using static Interop.UiaCore; namespace System.Windows.Forms.PropertyGridInternal.UITests; @@ -22,7 +22,7 @@ await RunSingleControlTestAsync>((form, grid) => grid.SelectedEntry = grid[nameof(Button.AccessibleRole)]; Assert.Equal(grid.SelectedEntry.AccessibilityObject, - grid.GridView.DropDownButton.AccessibilityObject.FragmentNavigate(NavigateDirection.Parent)); + grid.GridView.DropDownButton.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); return Task.CompletedTask; }); @@ -36,7 +36,7 @@ await RunSingleControlTestAsync>((form, grid) => grid.SelectedEntry = grid[nameof(Button.AccessibleRole)]; Assert.Equal(grid.GridView.EditAccessibleObject, - grid.GridView.DropDownButton.AccessibilityObject.FragmentNavigate(NavigateDirection.PreviousSibling)); + grid.GridView.DropDownButton.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); return Task.CompletedTask; }); @@ -49,7 +49,7 @@ await RunSingleControlTestAsync>((form, grid) => { grid.SelectedEntry = grid[nameof(Button.AccessibleRole)]; - Assert.Null(grid.GridView.DropDownButton.AccessibilityObject.FragmentNavigate(NavigateDirection.NextSibling)); + Assert.Null(grid.GridView.DropDownButton.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); return Task.CompletedTask; }); @@ -65,7 +65,7 @@ await RunSingleControlTestAsync>((form, grid) => grid.SelectedEntry.Expanded = true; Assert.Equal(grid.SelectedEntry.Children.First().AccessibilityObject, - grid.GridView.DialogButton.AccessibilityObject.FragmentNavigate(NavigateDirection.NextSibling)); + grid.GridView.DialogButton.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); return Task.CompletedTask; }); diff --git a/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/PropertyGridInternal/PropertyDescriptorGridEntry.PropertyDescriptorGridEntryAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/PropertyGridInternal/PropertyDescriptorGridEntry.PropertyDescriptorGridEntryAccessibleObjectTests.cs index 2f32c08433c..6feab6ef631 100644 --- a/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/PropertyGridInternal/PropertyDescriptorGridEntry.PropertyDescriptorGridEntryAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/PropertyGridInternal/PropertyDescriptorGridEntry.PropertyDescriptorGridEntryAccessibleObjectTests.cs @@ -3,8 +3,8 @@ using System.Windows.Forms.PropertyGridInternal.TestUtilities; using System.Windows.Forms.UITests; +using Windows.Win32.UI.Accessibility; using Xunit.Abstractions; -using static Interop.UiaCore; namespace System.Windows.Forms.PropertyGridInternal.UITests; @@ -24,7 +24,7 @@ await RunSingleControlTestAsync>((form, grid) => entry.Expanded = true; Assert.Equal(entry.AccessibilityObject, - entry.Children.First().AccessibilityObject.FragmentNavigate(NavigateDirection.Parent)); + entry.Children.First().AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); return Task.CompletedTask; }); @@ -38,7 +38,7 @@ await RunSingleControlTestAsync>((form, grid) => GridEntry entry = grid[nameof(Button.Font)]; entry.Expanded = true; - Assert.Null(entry.Children.First().AccessibilityObject.FragmentNavigate(NavigateDirection.PreviousSibling)); + Assert.Null(entry.Children.First().AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); return Task.CompletedTask; }); @@ -53,7 +53,7 @@ await RunSingleControlTestAsync>((form, grid) => entry.Expanded = true; Assert.Equal(entry.Children.First().AccessibilityObject, - entry.Children[1].AccessibilityObject.FragmentNavigate(NavigateDirection.PreviousSibling)); + entry.Children[1].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); return Task.CompletedTask; }); @@ -68,7 +68,7 @@ await RunSingleControlTestAsync>((form, grid) => grid.SelectedEntry.Expanded = true; Assert.Equal(grid.GridView.EditAccessibleObject, - grid.SelectedEntry.Children.First().AccessibilityObject.FragmentNavigate(NavigateDirection.PreviousSibling)); + grid.SelectedEntry.Children.First().AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); return Task.CompletedTask; }); @@ -83,7 +83,7 @@ await RunSingleControlTestAsync>((form, grid) => grid.SelectedEntry.Expanded = true; Assert.Equal(grid.GridView.DialogButton.AccessibilityObject, - grid.SelectedEntry.Children.First().AccessibilityObject.FragmentNavigate(NavigateDirection.PreviousSibling)); + grid.SelectedEntry.Children.First().AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); return Task.CompletedTask; }); @@ -97,7 +97,7 @@ await RunSingleControlTestAsync>((form, grid) => GridEntry entry = grid[nameof(Button.Font)]; entry.Expanded = true; - Assert.Null(entry.Children.Last().AccessibilityObject.FragmentNavigate(NavigateDirection.NextSibling)); + Assert.Null(entry.Children.Last().AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); return Task.CompletedTask; }); @@ -112,7 +112,7 @@ await RunSingleControlTestAsync>((form, grid) => entry.Expanded = true; Assert.Equal(entry.Children[1].AccessibilityObject, - entry.Children.First().AccessibilityObject.FragmentNavigate(NavigateDirection.NextSibling)); + entry.Children.First().AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); return Task.CompletedTask; }); @@ -123,7 +123,7 @@ public async Task PropertyDescriptorGridEntryAccessibleObject_FragmentNavigate_F { await RunSingleControlTestAsync>((form, grid) => { - Assert.Null(grid[nameof(Button.Font)].AccessibilityObject.FragmentNavigate(NavigateDirection.FirstChild)); + Assert.Null(grid[nameof(Button.Font)].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); return Task.CompletedTask; }); @@ -138,7 +138,7 @@ await RunSingleControlTestAsync>((form, grid) => entry.Expanded = true; Assert.Equal(entry.Children.First().AccessibilityObject, - entry.AccessibilityObject.FragmentNavigate(NavigateDirection.FirstChild)); + entry.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); return Task.CompletedTask; }); @@ -154,7 +154,7 @@ await RunSingleControlTestAsync>((form, grid) => entry.Expanded = true; entry.Expanded = false; - Assert.Null(entry.AccessibilityObject.FragmentNavigate(NavigateDirection.FirstChild)); + Assert.Null(entry.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); return Task.CompletedTask; }); @@ -168,7 +168,7 @@ await RunSingleControlTestAsync>((form, grid) => grid.SelectedEntry = grid[nameof(Button.AccessibleRole)]; Assert.Equal(grid.GridView.EditAccessibleObject, - grid.SelectedEntry.AccessibilityObject.FragmentNavigate(NavigateDirection.FirstChild)); + grid.SelectedEntry.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); return Task.CompletedTask; }); @@ -184,7 +184,7 @@ await RunSingleControlTestAsync>((form, grid) => grid.PopupEditorAndClose(() => Assert.Equal( grid.GridView.DropDownControlHolder!.AccessibilityObject, - grid.SelectedEntry.AccessibilityObject.FragmentNavigate(NavigateDirection.FirstChild))); + grid.SelectedEntry.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild))); return Task.CompletedTask; }); @@ -195,7 +195,7 @@ public async Task PropertyDescriptorGridEntryAccessibleObject_FragmentNavigate_L { await RunSingleControlTestAsync>((form, grid) => { - Assert.Null(grid[nameof(Button.Font)].AccessibilityObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Null(grid[nameof(Button.Font)].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); return Task.CompletedTask; }); @@ -210,7 +210,7 @@ await RunSingleControlTestAsync>((form, grid) => entry.Expanded = true; Assert.Equal(entry.Children.Last().AccessibilityObject, - entry.AccessibilityObject.FragmentNavigate(NavigateDirection.LastChild)); + entry.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); return Task.CompletedTask; }); @@ -226,7 +226,7 @@ await RunSingleControlTestAsync>((form, grid) => entry.Expanded = true; entry.Expanded = false; - Assert.Null(entry.AccessibilityObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Null(entry.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); return Task.CompletedTask; }); @@ -240,7 +240,7 @@ await RunSingleControlTestAsync>((form, grid) => grid.SelectedEntry = grid[nameof(Button.Size)]; Assert.Equal(grid.GridView.EditAccessibleObject, - grid.SelectedEntry.AccessibilityObject.FragmentNavigate(NavigateDirection.LastChild)); + grid.SelectedEntry.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); return Task.CompletedTask; }); @@ -254,7 +254,7 @@ await RunSingleControlTestAsync>((form, grid) => grid.SelectedEntry = grid[nameof(Button.AccessibleRole)]; Assert.Equal(grid.GridView.DropDownButton.AccessibilityObject, - grid.SelectedEntry.AccessibilityObject.FragmentNavigate(NavigateDirection.LastChild)); + grid.SelectedEntry.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); return Task.CompletedTask; }); @@ -268,7 +268,7 @@ await RunSingleControlTestAsync>((form, grid) => grid.SelectedEntry = grid[nameof(Button.Font)]; Assert.Equal(grid.GridView.DialogButton.AccessibilityObject, - grid.SelectedEntry.AccessibilityObject.FragmentNavigate(NavigateDirection.LastChild)); + grid.SelectedEntry.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); return Task.CompletedTask; }); diff --git a/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/PropertyGridInternal/PropertyGridView.DropDownHolder.DropDownHolderAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/PropertyGridInternal/PropertyGridView.DropDownHolder.DropDownHolderAccessibleObjectTests.cs index eb145e742d3..cf302af7c25 100644 --- a/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/PropertyGridInternal/PropertyGridView.DropDownHolder.DropDownHolderAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/PropertyGridInternal/PropertyGridView.DropDownHolder.DropDownHolderAccessibleObjectTests.cs @@ -3,8 +3,8 @@ using System.Windows.Forms.PropertyGridInternal.TestUtilities; using System.Windows.Forms.UITests; +using Windows.Win32.UI.Accessibility; using Xunit.Abstractions; -using static Interop.UiaCore; namespace System.Windows.Forms.PropertyGridInternal.UITests; @@ -24,7 +24,7 @@ await RunSingleControlTestAsync>((form, grid) => grid.PopupEditorAndClose(() => Assert.Equal( grid.SelectedEntry.AccessibilityObject, - grid.GridView.DropDownControlHolder!.AccessibilityObject.FragmentNavigate(NavigateDirection.Parent))); + grid.GridView.DropDownControlHolder!.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent))); return Task.CompletedTask; }); @@ -38,7 +38,7 @@ await RunSingleControlTestAsync>((form, grid) => grid.SelectedEntry = grid[nameof(Button.AccessibleRole)]; grid.PopupEditorAndClose(() => - Assert.Null(grid.GridView.DropDownControlHolder!.AccessibilityObject.FragmentNavigate(NavigateDirection.PreviousSibling))); + Assert.Null(grid.GridView.DropDownControlHolder!.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling))); return Task.CompletedTask; }); @@ -54,7 +54,7 @@ await RunSingleControlTestAsync>((form, grid) => grid.PopupEditorAndClose(() => Assert.Equal( grid.GridView.EditAccessibleObject, - grid.GridView.DropDownControlHolder!.AccessibilityObject.FragmentNavigate(NavigateDirection.NextSibling))); + grid.GridView.DropDownControlHolder!.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling))); return Task.CompletedTask; }); @@ -71,10 +71,10 @@ await RunSingleControlTestAsync>((form, grid) => { Assert.Equal( grid.GridView.DropDownListBoxAccessibleObject, - grid.GridView.DropDownControlHolder!.AccessibilityObject.FragmentNavigate(NavigateDirection.FirstChild)); + grid.GridView.DropDownControlHolder!.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); Assert.Equal( grid.GridView.DropDownListBoxAccessibleObject, - grid.GridView.DropDownControlHolder.AccessibilityObject.FragmentNavigate(NavigateDirection.LastChild)); + grid.GridView.DropDownControlHolder.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); }); return Task.CompletedTask; @@ -90,8 +90,8 @@ await RunSingleControlTestAsync>((form, grid) => grid.PopupEditorAndClose(() => { - Assert.Null(grid.GridView.DropDownControlHolder!.AccessibilityObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Null(grid.GridView.DropDownControlHolder.AccessibilityObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Null(grid.GridView.DropDownControlHolder!.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(grid.GridView.DropDownControlHolder.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); }); return Task.CompletedTask; diff --git a/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/PropertyGridInternal/PropertyGridView.GridViewListBox.GridViewListBoxAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/PropertyGridInternal/PropertyGridView.GridViewListBox.GridViewListBoxAccessibleObjectTests.cs index 301faf0bb86..ffce2113841 100644 --- a/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/PropertyGridInternal/PropertyGridView.GridViewListBox.GridViewListBoxAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/PropertyGridInternal/PropertyGridView.GridViewListBox.GridViewListBoxAccessibleObjectTests.cs @@ -3,8 +3,8 @@ using System.Windows.Forms.PropertyGridInternal.TestUtilities; using System.Windows.Forms.UITests; +using Windows.Win32.UI.Accessibility; using Xunit.Abstractions; -using static Interop.UiaCore; namespace System.Windows.Forms.PropertyGridInternal.UITests; @@ -25,7 +25,7 @@ await RunSingleControlTestAsync>((form, grid) => { Assert.Equal( grid.GridView.DropDownControlHolder!.AccessibilityObject, - grid.GridView.DropDownListBoxAccessibleObject!.FragmentNavigate(NavigateDirection.Parent)); + grid.GridView.DropDownListBoxAccessibleObject!.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); }); return Task.CompletedTask; @@ -41,7 +41,7 @@ await RunSingleControlTestAsync>((form, grid) => grid.PopupEditorAndClose(() => { - Assert.Null(grid.GridView.DropDownListBoxAccessibleObject!.FragmentNavigate(NavigateDirection.PreviousSibling)); + Assert.Null(grid.GridView.DropDownListBoxAccessibleObject!.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); }); return Task.CompletedTask; @@ -57,7 +57,7 @@ await RunSingleControlTestAsync>((form, grid) => grid.PopupEditorAndClose(() => { - Assert.Null(grid.GridView.DropDownListBoxAccessibleObject!.FragmentNavigate(NavigateDirection.NextSibling)); + Assert.Null(grid.GridView.DropDownListBoxAccessibleObject!.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); }); return Task.CompletedTask; diff --git a/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/PropertyGridInternal/PropertyGridView.GridViewTextBox.GridViewTextBoxAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/PropertyGridInternal/PropertyGridView.GridViewTextBox.GridViewTextBoxAccessibleObjectTests.cs index 6d3df7255ce..11fc9a1dea6 100644 --- a/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/PropertyGridInternal/PropertyGridView.GridViewTextBox.GridViewTextBoxAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/PropertyGridInternal/PropertyGridView.GridViewTextBox.GridViewTextBoxAccessibleObjectTests.cs @@ -3,8 +3,8 @@ using System.Windows.Forms.PropertyGridInternal.TestUtilities; using System.Windows.Forms.UITests; +using Windows.Win32.UI.Accessibility; using Xunit.Abstractions; -using static Interop.UiaCore; namespace System.Windows.Forms.PropertyGridInternal.UITests; @@ -22,7 +22,7 @@ await RunSingleControlTestAsync>((form, grid) => grid.SelectedEntry = grid[nameof(Button.Size)]; Assert.Equal(grid.SelectedEntry.AccessibilityObject, - grid.GridView.EditAccessibleObject.FragmentNavigate(NavigateDirection.Parent)); + grid.GridView.EditAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); return Task.CompletedTask; }); @@ -35,7 +35,7 @@ await RunSingleControlTestAsync>((form, grid) => { grid.SelectedEntry = grid[nameof(Button.Size)]; - Assert.Null(grid.GridView.EditAccessibleObject.FragmentNavigate(NavigateDirection.PreviousSibling)); + Assert.Null(grid.GridView.EditAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); return Task.CompletedTask; }); @@ -51,7 +51,7 @@ await RunSingleControlTestAsync>((form, grid) => grid.PopupEditorAndClose(onClosingAction: () => Assert.Equal( grid.GridView.DropDownControlHolder!.AccessibilityObject, - grid.GridView.EditAccessibleObject.FragmentNavigate(NavigateDirection.PreviousSibling))); + grid.GridView.EditAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling))); return Task.CompletedTask; }); @@ -64,7 +64,7 @@ await RunSingleControlTestAsync>((form, grid) => { grid.SelectedEntry = grid[nameof(Button.Size)]; - Assert.Null(grid.GridView.EditAccessibleObject.FragmentNavigate(NavigateDirection.NextSibling)); + Assert.Null(grid.GridView.EditAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); return Task.CompletedTask; }); @@ -79,7 +79,7 @@ await RunSingleControlTestAsync>((form, grid) => grid.SelectedEntry.Expanded = true; Assert.Equal(grid.SelectedEntry.Children.First().AccessibilityObject, - grid.GridView.EditAccessibleObject.FragmentNavigate(NavigateDirection.NextSibling)); + grid.GridView.EditAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); return Task.CompletedTask; }); @@ -93,7 +93,7 @@ await RunSingleControlTestAsync>((form, grid) => grid.SelectedEntry = grid[nameof(Button.FlatStyle)]; Assert.Equal(grid.GridView.DropDownButton.AccessibilityObject, - grid.GridView.EditAccessibleObject.FragmentNavigate(NavigateDirection.NextSibling)); + grid.GridView.EditAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); return Task.CompletedTask; }); @@ -107,7 +107,7 @@ await RunSingleControlTestAsync>((form, grid) => grid.SelectedEntry = grid[nameof(Button.Font)]; Assert.Equal(grid.GridView.DialogButton.AccessibilityObject, - grid.GridView.EditAccessibleObject.FragmentNavigate(NavigateDirection.NextSibling)); + grid.GridView.EditAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); return Task.CompletedTask; }); diff --git a/src/System.Windows.Forms/tests/InteropTests/AccessibleObjectTests.cs b/src/System.Windows.Forms/tests/InteropTests/AccessibleObjectTests.cs index 33bec86af2e..b6c2b2a388b 100644 --- a/src/System.Windows.Forms/tests/InteropTests/AccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/InteropTests/AccessibleObjectTests.cs @@ -7,7 +7,6 @@ using Windows.Win32.System.Ole; using Windows.Win32.System.Variant; using Windows.Win32.UI.Accessibility; -using ProviderOptions = Interop.UiaCore.ProviderOptions; using static Interop.UiaCore; namespace System.Windows.Forms.InteropTests; @@ -67,7 +66,7 @@ public void AccessibleObject_IRawElementProviderSimple_GetHostRawElementProvider public void AccessibleObject_IRawElementProviderSimpleProviderOptions_Get_ReturnsExpected() { var o = new AccessibleObject(); - AssertSuccess(Test_IRawElementProviderSimpleProviderOptions(o, ProviderOptions.ServerSideProvider | ProviderOptions.UseComThreading)); + AssertSuccess(Test_IRawElementProviderSimpleProviderOptions(o, ProviderOptions.ProviderOptions_ServerSideProvider | ProviderOptions.ProviderOptions_UseComThreading)); } public static TheoryData GetPatternProvider_TestData() => new() @@ -190,13 +189,13 @@ public unsafe void AccessibleObject_IRawElementProviderFragmentGetRuntimeId_Invo } [WinFormsTheory] - [InlineData((int)NavigateDirection.Parent - 1)] - [InlineData((int)NavigateDirection.Parent)] - [InlineData((int)NavigateDirection.NextSibling)] - [InlineData((int)NavigateDirection.PreviousSibling)] - [InlineData((int)NavigateDirection.FirstChild)] - [InlineData((int)NavigateDirection.LastChild)] - [InlineData((int)NavigateDirection.LastChild + 1)] + [InlineData((int)NavigateDirection.NavigateDirection_Parent - 1)] + [InlineData((int)NavigateDirection.NavigateDirection_Parent)] + [InlineData((int)NavigateDirection.NavigateDirection_NextSibling)] + [InlineData((int)NavigateDirection.NavigateDirection_PreviousSibling)] + [InlineData((int)NavigateDirection.NavigateDirection_FirstChild)] + [InlineData((int)NavigateDirection.NavigateDirection_LastChild)] + [InlineData((int)NavigateDirection.NavigateDirection_LastChild + 1)] public void AccessibleObject_IRawElementProviderFragmentNavigate_Invoke_ReturnsExpected(int direction) { var o = new AccessibleObject(); @@ -266,58 +265,58 @@ public void AccessibleObject_IValueProviderSetValue_Invoke_GetReturnsExpected(st public void AccessibleObject_IValueProviderCollapse_Invoke_Success() { var o = new AccessibleObject(); - AssertSuccess(Test_IExpandCollapseProviderCollapse(o, ExpandCollapseState.Collapsed)); + AssertSuccess(Test_IExpandCollapseProviderCollapse(o, ExpandCollapseState.ExpandCollapseState_Collapsed)); } [WinFormsFact] public void AccessibleObject_IValueProviderCollapse_InvokeAfterExpand_Success() { var o = new AccessibleObject(); - AssertSuccess(Test_IExpandCollapseProviderExpand(o, ExpandCollapseState.Collapsed)); - AssertSuccess(Test_IExpandCollapseProviderCollapse(o, ExpandCollapseState.Collapsed)); + AssertSuccess(Test_IExpandCollapseProviderExpand(o, ExpandCollapseState.ExpandCollapseState_Collapsed)); + AssertSuccess(Test_IExpandCollapseProviderCollapse(o, ExpandCollapseState.ExpandCollapseState_Collapsed)); } [WinFormsFact] public void AccessibleObject_IExpandCollapseProviderExpand_Invoke_Success() { var o = new AccessibleObject(); - AssertSuccess(Test_IExpandCollapseProviderCollapse(o, ExpandCollapseState.Collapsed)); + AssertSuccess(Test_IExpandCollapseProviderCollapse(o, ExpandCollapseState.ExpandCollapseState_Collapsed)); } [WinFormsFact] public void AccessibleObject_IExpandCollapseProviderExpand_InvokeAfterCollapse_Success() { var o = new AccessibleObject(); - AssertSuccess(Test_IExpandCollapseProviderCollapse(o, ExpandCollapseState.Collapsed)); - AssertSuccess(Test_IExpandCollapseProviderCollapse(o, ExpandCollapseState.Collapsed)); + AssertSuccess(Test_IExpandCollapseProviderCollapse(o, ExpandCollapseState.ExpandCollapseState_Collapsed)); + AssertSuccess(Test_IExpandCollapseProviderCollapse(o, ExpandCollapseState.ExpandCollapseState_Collapsed)); } [WinFormsFact] public void AccessibleObject_IExpandCollapseProviderExpandCollapseState_Get_ReturnsExpected() { var o = new AccessibleObject(); - AssertSuccess(Test_IExpandCollapseProviderGetExpandCollapseState(o, ExpandCollapseState.Collapsed)); + AssertSuccess(Test_IExpandCollapseProviderGetExpandCollapseState(o, ExpandCollapseState.ExpandCollapseState_Collapsed)); } [WinFormsFact] public void AccessibleObject_IToggleProviderToggleState_Get_ReturnsExpected() { var o = new AccessibleObject(); - AssertSuccess(Test_IToggleProviderGetToggleState(o, ToggleState.Indeterminate)); + AssertSuccess(Test_IToggleProviderGetToggleState(o, ToggleState.ToggleState_Indeterminate)); } [WinFormsFact] public void AccessibleObject_IToggleProviderToggle_Invoke_Success() { var o = new AccessibleObject(); - AssertSuccess(Test_IToggleProviderToggle(o, ToggleState.Indeterminate)); + AssertSuccess(Test_IToggleProviderToggle(o, ToggleState.ToggleState_Indeterminate)); } [WinFormsFact] public void AccessibleObject_ITableProviderRowOrColumnMajor_Get_ReturnsExpected() { var o = new AccessibleObject(); - AssertSuccess(Test_ITableProviderGetRowOrColumnMajor(o, RowOrColumnMajor.RowMajor)); + AssertSuccess(Test_ITableProviderGetRowOrColumnMajor(o, RowOrColumnMajor.RowOrColumnMajor_RowMajor)); } [WinFormsFact] diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/CategoryGridEntryAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/CategoryGridEntryAccessibleObjectTests.cs index ed9817f7dc7..6d739d98f38 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/CategoryGridEntryAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/CategoryGridEntryAccessibleObjectTests.cs @@ -5,7 +5,6 @@ using Windows.Win32.UI.Accessibility; using static System.Windows.Forms.PropertyGridInternal.CategoryGridEntry; using static System.Windows.Forms.PropertyGridInternal.PropertyGridView; -using static Interop; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -70,7 +69,7 @@ public void CategoryGridEntryAccessibleObject_FragmentNavigate_Parent_ReturnsExp AccessibleObject accessibilityObject = gridView.TopLevelGridEntries[0].AccessibilityObject; - Assert.Equal(gridView.AccessibilityObject, accessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); + Assert.Equal(gridView.AccessibilityObject, accessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); Assert.False(control.IsHandleCreated); Assert.False(button.IsHandleCreated); } @@ -87,8 +86,8 @@ public void CategoryGridEntryAccessibleObject_FragmentNavigate_NextSibling_Retur AccessibleObject accessibilityObjectCategory2 = gridView.TopLevelGridEntries[1].AccessibilityObject; AccessibleObject accessibilityObjectLastCategory = gridView.TopLevelGridEntries[^1].AccessibilityObject; - Assert.Equal(accessibilityObjectCategory2, accessibilityObjectCategory1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibilityObjectLastCategory.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(accessibilityObjectCategory2, accessibilityObjectCategory1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibilityObjectLastCategory.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); Assert.False(control.IsHandleCreated); Assert.False(button.IsHandleCreated); } @@ -104,8 +103,8 @@ public void CategoryGridEntryAccessibleObject_FragmentNavigate_PreviousSibling_R AccessibleObject accessibilityObjectCategory1 = gridView.TopLevelGridEntries[0].AccessibilityObject; AccessibleObject accessibilityObjectCategory2 = gridView.TopLevelGridEntries[1].AccessibilityObject; - Assert.Null(accessibilityObjectCategory1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(accessibilityObjectCategory1, accessibilityObjectCategory2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Null(accessibilityObjectCategory1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(accessibilityObjectCategory1, accessibilityObjectCategory2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(control.IsHandleCreated); Assert.False(button.IsHandleCreated); } @@ -123,7 +122,7 @@ public void CategoryGridEntryAccessibleObject_FragmentNavigate_FirstChild_Return AccessibleObject accessibilityObject = category.AccessibilityObject; AccessibleObject accessibilityObjectFirstItem = gridViewAccessibilityObject.GetFirstChildProperty(category); - Assert.Equal(accessibilityObjectFirstItem, accessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); + Assert.Equal(accessibilityObjectFirstItem, accessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); Assert.False(control.IsHandleCreated); Assert.False(button.IsHandleCreated); } @@ -141,7 +140,7 @@ public void CategoryGridEntryAccessibleObject_FragmentNavigate_LastChild_Returns AccessibleObject accessibilityObject = category.AccessibilityObject; AccessibleObject accessibilityObjectLastItem = gridViewAccessibilityObject.GetLastChildProperty(category); - Assert.Equal(accessibilityObjectLastItem, accessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(accessibilityObjectLastItem, accessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(control.IsHandleCreated); Assert.False(button.IsHandleCreated); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/CheckBox.CheckBoxAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/CheckBox.CheckBoxAccessibleObjectTests.cs index b21445a43e0..0c0a6ab472a 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/CheckBox.CheckBoxAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/CheckBox.CheckBoxAccessibleObjectTests.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using Windows.Win32.UI.Accessibility; -using static Interop.UiaCore; using CheckBoxAccessibleObject = System.Windows.Forms.CheckBox.CheckBoxAccessibleObject; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -94,12 +93,12 @@ public void CheckBoxAccessibleObject_State_ReturnsExpected(bool createControl, A } [WinFormsTheory] - [InlineData(true, CheckState.Checked, (int)ToggleState.On)] - [InlineData(true, CheckState.Unchecked, (int)ToggleState.Off)] - [InlineData(true, CheckState.Indeterminate, (int)ToggleState.Indeterminate)] - [InlineData(false, CheckState.Checked, (int)ToggleState.On)] - [InlineData(false, CheckState.Unchecked, (int)ToggleState.Off)] - [InlineData(false, CheckState.Indeterminate, (int)ToggleState.Indeterminate)] + [InlineData(true, CheckState.Checked, (int)ToggleState.ToggleState_On)] + [InlineData(true, CheckState.Unchecked, (int)ToggleState.ToggleState_Off)] + [InlineData(true, CheckState.Indeterminate, (int)ToggleState.ToggleState_Indeterminate)] + [InlineData(false, CheckState.Checked, (int)ToggleState.ToggleState_On)] + [InlineData(false, CheckState.Unchecked, (int)ToggleState.ToggleState_Off)] + [InlineData(false, CheckState.Indeterminate, (int)ToggleState.ToggleState_Indeterminate)] public void CheckBoxAccessibleObject_ToggleState_ReturnsExpected(bool createControl, CheckState checkState, int toggleState) { using var checkBox = new CheckBox() { CheckState = checkState }; @@ -117,21 +116,21 @@ public void CheckBoxAccessibleObject_ToggleState_ReturnsExpected(bool createCont public static IEnumerable CheckBoxAccessibleObject_DoDefaultAction_Success_Data() { - yield return new object[] { true, false, CheckState.Checked, (int)ToggleState.Off }; - yield return new object[] { true, false, CheckState.Indeterminate, (int)ToggleState.Off }; - yield return new object[] { true, false, CheckState.Unchecked, (int)ToggleState.On }; + yield return new object[] { true, false, CheckState.Checked, (int)ToggleState.ToggleState_Off }; + yield return new object[] { true, false, CheckState.Indeterminate, (int)ToggleState.ToggleState_Off }; + yield return new object[] { true, false, CheckState.Unchecked, (int)ToggleState.ToggleState_On }; - yield return new object[] { true, true, CheckState.Checked, (int)ToggleState.Indeterminate }; - yield return new object[] { true, true, CheckState.Indeterminate, (int)ToggleState.Off }; - yield return new object[] { true, true, CheckState.Unchecked, (int)ToggleState.On }; + yield return new object[] { true, true, CheckState.Checked, (int)ToggleState.ToggleState_Indeterminate }; + yield return new object[] { true, true, CheckState.Indeterminate, (int)ToggleState.ToggleState_Off }; + yield return new object[] { true, true, CheckState.Unchecked, (int)ToggleState.ToggleState_On }; - yield return new object[] { false, true, CheckState.Checked, (int)ToggleState.On }; - yield return new object[] { false, true, CheckState.Indeterminate, (int)ToggleState.Indeterminate }; - yield return new object[] { false, true, CheckState.Unchecked, (int)ToggleState.Off }; + yield return new object[] { false, true, CheckState.Checked, (int)ToggleState.ToggleState_On }; + yield return new object[] { false, true, CheckState.Indeterminate, (int)ToggleState.ToggleState_Indeterminate }; + yield return new object[] { false, true, CheckState.Unchecked, (int)ToggleState.ToggleState_Off }; - yield return new object[] { false, false, CheckState.Checked, (int)ToggleState.On }; - yield return new object[] { false, false, CheckState.Indeterminate, (int)ToggleState.Indeterminate }; - yield return new object[] { false, false, CheckState.Unchecked, (int)ToggleState.Off }; + yield return new object[] { false, false, CheckState.Checked, (int)ToggleState.ToggleState_On }; + yield return new object[] { false, false, CheckState.Indeterminate, (int)ToggleState.ToggleState_Indeterminate }; + yield return new object[] { false, false, CheckState.Unchecked, (int)ToggleState.ToggleState_Off }; } [WinFormsTheory] diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/CheckedListBoxAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/CheckedListBoxAccessibleObjectTests.cs index a42c0c587a6..5af7154b713 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/CheckedListBoxAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/CheckedListBoxAccessibleObjectTests.cs @@ -3,7 +3,6 @@ using System.Drawing; using Windows.Win32.UI.Accessibility; -using static Interop; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -142,7 +141,7 @@ public void CheckedListBoxAccessibleObject_FragmentNavigate_NavigateToFirstChild AccessibleObject expected = accessibleObject.GetChild(0); - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); Assert.False(checkedListBox.IsHandleCreated); } @@ -158,7 +157,7 @@ public void CheckedListBoxAccessibleObject_FragmentNavigate_NavigateToLastChild_ AccessibleObject expected = accessibleObject.GetChild(2); - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(checkedListBox.IsHandleCreated); } } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/CheckedListBoxItemAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/CheckedListBoxItemAccessibleObjectTests.cs index 27a693e433d..e2085518c9b 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/CheckedListBoxItemAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/CheckedListBoxItemAccessibleObjectTests.cs @@ -118,7 +118,7 @@ public void CheckedListBoxItemAccessibleObject_FragmentNavigate_Parent_IsExpecte checkedListBox.Items.Add(2); AccessibleObject itemAccessibleObject = checkedListBox.AccessibilityObject.GetChild(itemIndex); - UiaCore.IRawElementProviderFragment actual = itemAccessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent); + UiaCore.IRawElementProviderFragment actual = itemAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent); Assert.Equal(expected, actual); Assert.False(checkedListBox.IsHandleCreated); @@ -137,9 +137,9 @@ public void CheckedListBoxItemAccessibleObject_FragmentNavigate_NextSibling_IsEx AccessibleObject itemAccessibleObject2 = checkedListBox.AccessibilityObject.GetChild(1); AccessibleObject itemAccessibleObject3 = checkedListBox.AccessibilityObject.GetChild(2); - Assert.Equal(itemAccessibleObject2, itemAccessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(itemAccessibleObject3, itemAccessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(itemAccessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(itemAccessibleObject2, itemAccessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(itemAccessibleObject3, itemAccessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(itemAccessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); Assert.False(checkedListBox.IsHandleCreated); } @@ -156,9 +156,9 @@ public void CheckedListBoxItemAccessibleObject_FragmentNavigate_PreviousSibling_ AccessibleObject itemAccessibleObject2 = checkedListBox.AccessibilityObject.GetChild(1); AccessibleObject itemAccessibleObject3 = checkedListBox.AccessibilityObject.GetChild(2); - Assert.Null(itemAccessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(itemAccessibleObject1, itemAccessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(itemAccessibleObject2, itemAccessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Null(itemAccessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(itemAccessibleObject1, itemAccessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(itemAccessibleObject2, itemAccessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(checkedListBox.IsHandleCreated); } @@ -253,16 +253,16 @@ public void CheckedListBoxItemAccessibleObject_DoDefaultAction_IfHandleIsCreated } [WinFormsTheory] - [InlineData(true, CheckState.Checked, (int)UiaCore.ToggleState.On)] - [InlineData(false, CheckState.Unchecked, (int)UiaCore.ToggleState.Off)] - [InlineData(true, CheckState.Indeterminate, (int)UiaCore.ToggleState.Indeterminate)] + [InlineData(true, CheckState.Checked, (int)ToggleState.ToggleState_On)] + [InlineData(false, CheckState.Unchecked, (int)ToggleState.ToggleState_Off)] + [InlineData(true, CheckState.Indeterminate, (int)ToggleState.ToggleState_Indeterminate)] public void CheckedListBoxItemAccessibleObject_ToggleState_ReturnsExpected(bool checkValue, CheckState checkState, int toggleState) { using CheckedListBox checkedListBox = new(); checkedListBox.Items.Add("A"); checkedListBox.SetItemCheckState(0, checkState); - Assert.Equal((UiaCore.ToggleState)toggleState, checkedListBox.AccessibilityObject.GetChild(0).ToggleState); + Assert.Equal((ToggleState)toggleState, checkedListBox.AccessibilityObject.GetChild(0).ToggleState); Assert.Equal(checkValue.ToString(), checkedListBox.AccessibilityObject.GetChild(0).GetPropertyValue(UIA_PROPERTY_ID.UIA_ValueValuePropertyId)); Assert.False(checkedListBox.IsHandleCreated); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ComboBox.ComboBoxAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ComboBox.ComboBoxAccessibleObjectTests.cs index 578bb32fe67..d703e81ef60 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ComboBox.ComboBoxAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ComboBox.ComboBoxAccessibleObjectTests.cs @@ -86,7 +86,7 @@ public void ComboBoxAccessibleObject_FragmentNavigate_FirstChild_ReturnNull_IfHa }; AccessibleObject accessibleObject = comboBox.AccessibilityObject; - UiaCore.IRawElementProviderFragment firstChild = accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild); + UiaCore.IRawElementProviderFragment firstChild = accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild); Assert.Null(firstChild); Assert.False(comboBox.IsHandleCreated); @@ -155,7 +155,7 @@ public void ComboBoxAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpected } comboBox.DroppedDown = droppedDown; - AccessibleObject firstChild = comboBox.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild) as AccessibleObject; + AccessibleObject firstChild = comboBox.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild) as AccessibleObject; Assert.NotNull(firstChild); Assert.Equal(childListDisplayed, firstChild == comboBox.ChildListAccessibleObject); @@ -191,7 +191,7 @@ public void ComboBoxAccessibleObject_FragmentNavigate_LastChild_ReturnsExpected( } comboBox.DroppedDown = droppedDown; - AccessibleObject lastChild = comboBox.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild) as AccessibleObject; + AccessibleObject lastChild = comboBox.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild) as AccessibleObject; AccessibleObject expectedLastChild = comboBoxStyle == ComboBoxStyle.Simple ? comboBox.ChildEditAccessibleObject : GetComboBoxAccessibleObject(comboBox).DropDownButtonUiaProvider; @@ -213,7 +213,7 @@ public void ComboBoxAccessibleObject_FragmentNavigate_LastChild_ReturnNull_IfHan }; AccessibleObject accessibleObject = comboBox.AccessibilityObject; - UiaCore.IRawElementProviderFragment lastChild = accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild); + UiaCore.IRawElementProviderFragment lastChild = accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild); Assert.Null(lastChild); Assert.False(comboBox.IsHandleCreated); diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ComboBox.ComboBoxItemAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ComboBox.ComboBoxItemAccessibleObjectTests.cs index 264b00038cd..007e47bec12 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ComboBox.ComboBoxItemAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ComboBox.ComboBoxItemAccessibleObjectTests.cs @@ -6,7 +6,6 @@ using Windows.Win32.UI.Accessibility; using static System.Windows.Forms.ComboBox; using static System.Windows.Forms.ComboBox.ObjectCollection; -using static Interop; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -95,20 +94,20 @@ public void ComboBoxItemAccessibleObject_SeveralSameItems_FragmentNavigate_NextS ComboBoxItemAccessibleObjectCollection itemAccessibleObjects = ((ComboBox.ComboBoxAccessibleObject)comboBox.AccessibilityObject).ItemAccessibleObjects; ComboBox.ComboBoxItemAccessibleObject comboBoxItem1 = (ComboBox.ComboBoxItemAccessibleObject)comboBox - .ChildListAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild); + .ChildListAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild); Assert.Equal("aaa", comboBoxItem1.Name); Assert.Equal(comboBoxItem1, itemAccessibleObjects.GetComboBoxItemAccessibleObject(comboBox.Items.InnerList[0])); - // FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling) should return accessible object for second "aaa" item + // FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling) should return accessible object for second "aaa" item ComboBox.ComboBoxItemAccessibleObject comboBoxItem2 = (ComboBox.ComboBoxItemAccessibleObject)comboBoxItem1 - .FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling); + .FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); Assert.NotEqual(comboBoxItem1, comboBoxItem2); Assert.Equal("aaa", comboBoxItem2.Name); Assert.Equal(comboBoxItem2, itemAccessibleObjects.GetComboBoxItemAccessibleObject(comboBox.Items.InnerList[1])); - // FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling) should return accessible object for third "aaa" item + // FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling) should return accessible object for third "aaa" item ComboBox.ComboBoxItemAccessibleObject comboBoxItem3 = (ComboBox.ComboBoxItemAccessibleObject)comboBoxItem2 - .FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling); + .FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); Assert.NotEqual(comboBoxItem3, comboBoxItem2); Assert.NotEqual(comboBoxItem3, comboBoxItem1); Assert.Equal("aaa", comboBoxItem3.Name); @@ -134,30 +133,30 @@ public void ComboBoxItemAccessibleObject_SeveralSameItems_FragmentNavigate_Previ ComboBoxItemAccessibleObjectCollection itemAccessibleObjects = ((ComboBox.ComboBoxAccessibleObject)comboBox.AccessibilityObject).ItemAccessibleObjects; ComboBox.ComboBoxItemAccessibleObject comboBoxItem3 = (ComboBox.ComboBoxItemAccessibleObject)comboBox - .ChildListAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild); + .ChildListAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild); Assert.Equal("aaa", comboBoxItem3.Name); Assert.Equal(comboBoxItem3, itemAccessibleObjects.GetComboBoxItemAccessibleObject(comboBox.Items.InnerList[2])); - // FragmentNavigate(Interop.UiaCore.NavigateDirection.PreviousSibling) should return accessible object for second "aaa" item + // FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling) should return accessible object for second "aaa" item ComboBox.ComboBoxItemAccessibleObject comboBoxItem2 = (ComboBox.ComboBoxItemAccessibleObject)comboBoxItem3 - .FragmentNavigate(Interop.UiaCore.NavigateDirection.PreviousSibling); + .FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling); Assert.NotEqual(comboBoxItem2, comboBoxItem3); Assert.Equal("aaa", comboBoxItem2.Name); Assert.Equal(comboBoxItem2, itemAccessibleObjects.GetComboBoxItemAccessibleObject(comboBox.Items.InnerList[1])); - // FragmentNavigate(Interop.UiaCore.NavigateDirection.PreviousSibling) should return accessible object for first "aaa" item + // FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling) should return accessible object for first "aaa" item ComboBox.ComboBoxItemAccessibleObject comboBoxItem1 = (ComboBox.ComboBoxItemAccessibleObject)comboBoxItem2 - .FragmentNavigate(Interop.UiaCore.NavigateDirection.PreviousSibling); + .FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling); Assert.NotEqual(comboBoxItem1, comboBoxItem2); Assert.NotEqual(comboBoxItem1, comboBoxItem3); Assert.Equal("aaa", comboBoxItem1.Name); Assert.Equal(comboBoxItem1, itemAccessibleObjects.GetComboBoxItemAccessibleObject(comboBox.Items.InnerList[0])); - // FragmentNavigate(Interop.UiaCore.NavigateDirection.PreviousSibling) should return null for first "aaa" item + // FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling) should return null for first "aaa" item ComboBox.ComboBoxItemAccessibleObject comboBoxItemPrevious = (ComboBox.ComboBoxItemAccessibleObject)comboBoxItem1 - .FragmentNavigate(Interop.UiaCore.NavigateDirection.PreviousSibling); + .FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling); Assert.Null(comboBoxItemPrevious); Assert.True(comboBox.IsHandleCreated); } @@ -170,9 +169,9 @@ public void ComboBoxItemAccessibleObject_FragmentNavigate_Parent_ReturnListAcces { using ComboBox comboBox = GetComboBox(comboBoxStyle); AccessibleObject childListAccessibleObject = comboBox.ChildListAccessibleObject; - AccessibleObject comboBoxItem = (AccessibleObject)childListAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild); + AccessibleObject comboBoxItem = (AccessibleObject)childListAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild); - Assert.Equal(childListAccessibleObject, comboBoxItem.FragmentNavigate(UiaCore.NavigateDirection.Parent)); + Assert.Equal(childListAccessibleObject, comboBoxItem.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); } [WinFormsTheory] @@ -183,10 +182,10 @@ public void ComboBoxItemAccessibleObject_FragmentNavigate_Child_ReturnNull(Combo { using ComboBox comboBox = GetComboBox(comboBoxStyle); AccessibleObject childListAccessibleObject = comboBox.ChildListAccessibleObject; - AccessibleObject comboBoxItem = (AccessibleObject)childListAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild); + AccessibleObject comboBoxItem = (AccessibleObject)childListAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild); - Assert.Null(comboBoxItem.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(comboBoxItem.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Null(comboBoxItem.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(comboBoxItem.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } [WinFormsFact] @@ -512,11 +511,11 @@ public void ComboBoxItemAccessibleObject_MaxDropDownItems_State_ReturnExpected(C using ComboBox comboBox = GetComboBoxWithMaxItems(comboBoxStyle); ComboBox.ComboBoxItemAccessibleObject comboBoxItem1 = (ComboBox.ComboBoxItemAccessibleObject)comboBox - .ChildListAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild); + .ChildListAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild); ComboBox.ComboBoxItemAccessibleObject comboBoxItem2 = (ComboBox.ComboBoxItemAccessibleObject)comboBoxItem1 - .FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling); + .FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); ComboBox.ComboBoxItemAccessibleObject comboBoxItem3 = (ComboBox.ComboBoxItemAccessibleObject)comboBoxItem2 - .FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling); + .FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); Assert.Equal(InvisibleItemState, comboBoxItem1.State); // comboBoxItem1 above the visible area Assert.Equal(VisibleItemState, comboBoxItem2.State); // comboBoxItem2 in the visible area @@ -531,11 +530,11 @@ public void ComboBoxItemAccessibleObject_DropDownHeight_State_ReturnExpected(Com using ComboBox comboBox = GetComboBoxWithMaxHeight(comboBoxStyle); ComboBox.ComboBoxItemAccessibleObject comboBoxItem1 = (ComboBox.ComboBoxItemAccessibleObject)comboBox - .ChildListAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild); + .ChildListAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild); ComboBox.ComboBoxItemAccessibleObject comboBoxItem2 = (ComboBox.ComboBoxItemAccessibleObject)comboBoxItem1 - .FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling); + .FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); ComboBox.ComboBoxItemAccessibleObject comboBoxItem3 = (ComboBox.ComboBoxItemAccessibleObject)comboBoxItem2 - .FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling); + .FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); Assert.Equal(InvisibleItemState, comboBoxItem1.State); // comboBoxItem1 above the visible area Assert.Equal(VisibleItemState, comboBoxItem2.State); // comboBoxItem2 in the visible area @@ -550,9 +549,9 @@ public void ComboBoxItemAccessibleObject_DropDownCollapsed_State_ReturnExpected( using ComboBox comboBox = GetComboBox(comboBoxStyle); ComboBox.ComboBoxItemAccessibleObject comboBoxItem1 = (ComboBox.ComboBoxItemAccessibleObject)comboBox - .ChildListAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild); + .ChildListAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild); ComboBox.ComboBoxItemAccessibleObject comboBoxItem2 = (ComboBox.ComboBoxItemAccessibleObject)comboBoxItem1 - .FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling); + .FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); Assert.Equal(InvisibleItemState, comboBoxItem1.State); Assert.Equal(InvisibleItemState, comboBoxItem2.State); @@ -564,11 +563,11 @@ public void ComboBoxItemAccessibleObject_State_ReturnExpected() using ComboBox comboBox = GetComboBoxWithMaxSize(ComboBoxStyle.Simple); ComboBox.ComboBoxItemAccessibleObject comboBoxItem1 = (ComboBox.ComboBoxItemAccessibleObject)comboBox - .ChildListAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild); + .ChildListAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild); ComboBox.ComboBoxItemAccessibleObject comboBoxItem2 = (ComboBox.ComboBoxItemAccessibleObject)comboBoxItem1 - .FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling); + .FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); ComboBox.ComboBoxItemAccessibleObject comboBoxItem3 = (ComboBox.ComboBoxItemAccessibleObject)comboBoxItem2 - .FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling); + .FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); AccessibleStates itemState = AccessibleStates.Invisible | AccessibleStates.Selected | AccessibleStates.Focusable | AccessibleStates.Selectable; @@ -585,11 +584,11 @@ public void ComboBoxItemAccessibleObject_MaxDropDownItems_GetOffScreenProperty_R using ComboBox comboBox = GetComboBoxWithMaxItems(comboBoxStyle); ComboBox.ComboBoxItemAccessibleObject comboBoxItem1 = (ComboBox.ComboBoxItemAccessibleObject)comboBox - .ChildListAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild); + .ChildListAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild); ComboBox.ComboBoxItemAccessibleObject comboBoxItem2 = (ComboBox.ComboBoxItemAccessibleObject)comboBoxItem1 - .FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling); + .FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); ComboBox.ComboBoxItemAccessibleObject comboBoxItem3 = (ComboBox.ComboBoxItemAccessibleObject)comboBoxItem2 - .FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling); + .FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); AssertExtensions.True(comboBoxItem1, UIA_PROPERTY_ID.UIA_IsOffscreenPropertyId); // comboBoxItem1 above the visible area AssertExtensions.False(comboBoxItem2, UIA_PROPERTY_ID.UIA_IsOffscreenPropertyId); // comboBoxItem2 in the visible area @@ -604,11 +603,11 @@ public void ComboBoxItemAccessibleObject_DropDownHeight_GetOffScreenProperty_Ret using ComboBox comboBox = GetComboBoxWithMaxHeight(comboBoxStyle); ComboBox.ComboBoxItemAccessibleObject comboBoxItem1 = (ComboBox.ComboBoxItemAccessibleObject)comboBox - .ChildListAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild); + .ChildListAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild); ComboBox.ComboBoxItemAccessibleObject comboBoxItem2 = (ComboBox.ComboBoxItemAccessibleObject)comboBoxItem1 - .FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling); + .FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); ComboBox.ComboBoxItemAccessibleObject comboBoxItem3 = (ComboBox.ComboBoxItemAccessibleObject)comboBoxItem2 - .FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling); + .FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); AssertExtensions.True(comboBoxItem1, UIA_PROPERTY_ID.UIA_IsOffscreenPropertyId); // comboBoxItem1 above the visible area AssertExtensions.False(comboBoxItem2, UIA_PROPERTY_ID.UIA_IsOffscreenPropertyId); // comboBoxItem2 in the visible area @@ -623,9 +622,9 @@ public void ComboBoxItemAccessibleObject_DropDownCollapsed_GetOffScreenProperty_ using ComboBox comboBox = GetComboBox(comboBoxStyle); ComboBox.ComboBoxItemAccessibleObject comboBoxItem1 = (ComboBox.ComboBoxItemAccessibleObject)comboBox - .ChildListAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild); + .ChildListAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild); ComboBox.ComboBoxItemAccessibleObject comboBoxItem2 = (ComboBox.ComboBoxItemAccessibleObject)comboBoxItem1 - .FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling); + .FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); AssertExtensions.True(comboBoxItem1, UIA_PROPERTY_ID.UIA_IsOffscreenPropertyId); AssertExtensions.True(comboBoxItem2, UIA_PROPERTY_ID.UIA_IsOffscreenPropertyId); @@ -637,11 +636,11 @@ public void ComboBoxItemAccessibleObject_GetOffScreenProperty_ReturnExpected() using ComboBox comboBox = GetComboBoxWithMaxSize(ComboBoxStyle.Simple); ComboBox.ComboBoxItemAccessibleObject comboBoxItem1 = (ComboBox.ComboBoxItemAccessibleObject)comboBox - .ChildListAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild); + .ChildListAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild); ComboBox.ComboBoxItemAccessibleObject comboBoxItem2 = (ComboBox.ComboBoxItemAccessibleObject)comboBoxItem1 - .FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling); + .FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); ComboBox.ComboBoxItemAccessibleObject comboBoxItem3 = (ComboBox.ComboBoxItemAccessibleObject)comboBoxItem2 - .FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling); + .FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); AssertExtensions.True(comboBoxItem1, UIA_PROPERTY_ID.UIA_IsOffscreenPropertyId); // comboBoxItem1 above the visible area AssertExtensions.False(comboBoxItem2, UIA_PROPERTY_ID.UIA_IsOffscreenPropertyId); // comboBoxItem2 in the visible area diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/Control.ControlAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/Control.ControlAccessibleObjectTests.cs index 6fde9e8f687..5b46ac4ffaf 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/Control.ControlAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/Control.ControlAccessibleObjectTests.cs @@ -1426,7 +1426,7 @@ public void ControlAccessibleObject_FragmentNavigate_Parent_IsNull(Type type) Assert.True(control.AccessibilityObject is Control.ControlAccessibleObject); UiaCore.IRawElementProviderFragment parent - = control.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.Parent); + = control.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent); Assert.True(parent is null); Assert.False(control.IsHandleCreated); @@ -1442,9 +1442,9 @@ public void ControlAccessibleObject_FragmentNavigate_Siblings_AreNull(Type type) Assert.True(control.AccessibilityObject is Control.ControlAccessibleObject); UiaCore.IRawElementProviderFragment nextSibling - = control.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling); + = control.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); UiaCore.IRawElementProviderFragment previousSibling - = control.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling); + = control.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling); Assert.True(nextSibling is null); Assert.True(previousSibling is null); @@ -1477,7 +1477,7 @@ public void ControlAccessibleObject_FragmentNavigate_ParentIsToolStrip_IfControl Assert.True(control.AccessibilityObject is Control.ControlAccessibleObject); - UiaCore.IRawElementProviderFragment actual = control.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.Parent); + UiaCore.IRawElementProviderFragment actual = control.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent); AccessibleObject expected = toolStrip.AccessibilityObject; Assert.Equal(expected, actual); @@ -1515,7 +1515,7 @@ public void ControlAccessibleObject_FragmentNavigate_NextSibling_IsNextItem_IfCo Assert.True(control.AccessibilityObject is Control.ControlAccessibleObject); - UiaCore.IRawElementProviderFragment actual = control.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling); + UiaCore.IRawElementProviderFragment actual = control.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); AccessibleObject expected = button.AccessibilityObject; Assert.Equal(expected, actual); @@ -1551,7 +1551,7 @@ public void ControlAccessibleObject_FragmentNavigate_PreviousSibling_IsPreviousI Assert.True(control.AccessibilityObject is Control.ControlAccessibleObject); - UiaCore.IRawElementProviderFragment actual = control.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling); + UiaCore.IRawElementProviderFragment actual = control.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling); AccessibleObject expected = label.AccessibilityObject; Assert.Equal(expected, actual); diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DataGridView.DataGridViewEditingPanelAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DataGridView.DataGridViewEditingPanelAccessibleObjectTests.cs index 8ce1fbbb7c7..8fce010f1f6 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DataGridView.DataGridViewEditingPanelAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DataGridView.DataGridViewEditingPanelAccessibleObjectTests.cs @@ -16,11 +16,11 @@ public void DataGridViewEditingPanelAccessibleObject_FirstAndLastChildren_AreNul AccessibleObject accessibleObject = dataGridView.EditingPanelAccessibleObject; // Exception does not appear when trying to get first Child - UiaCore.IRawElementProviderFragment firstChild = accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild); + UiaCore.IRawElementProviderFragment firstChild = accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild); Assert.Null(firstChild); // Exception does not appear when trying to get last Child - UiaCore.IRawElementProviderFragment lastChild = accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild); + UiaCore.IRawElementProviderFragment lastChild = accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild); Assert.Null(lastChild); } @@ -35,10 +35,10 @@ public void DataGridViewEditingPanelAccessibleObject_EditedState_FirstAndLastChi AccessibleObject accessibleObject = dataGridView.EditingPanelAccessibleObject; - UiaCore.IRawElementProviderFragment firstChild = accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild); + UiaCore.IRawElementProviderFragment firstChild = accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild); Assert.NotNull(firstChild); - UiaCore.IRawElementProviderFragment lastChild = accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild); + UiaCore.IRawElementProviderFragment lastChild = accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild); Assert.NotNull(lastChild); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DataGridViewAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DataGridViewAccessibleObjectTests.cs index 157d8d0e1d6..aae0dd2fa2b 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DataGridViewAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DataGridViewAccessibleObjectTests.cs @@ -276,11 +276,11 @@ public void DataGridViewAccessibleObject_FirstAndLastChildren_AreNotNull() AccessibleObject accessibleObject = dataGridView.AccessibilityObject; // ColumnHeaders - UiaCore.IRawElementProviderFragment firstChild = accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild); + UiaCore.IRawElementProviderFragment firstChild = accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild); Assert.NotNull(firstChild); // New row - UiaCore.IRawElementProviderFragment lastChild = accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild); + UiaCore.IRawElementProviderFragment lastChild = accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild); Assert.NotNull(lastChild); Assert.False(dataGridView.IsHandleCreated); } @@ -881,8 +881,8 @@ public void DataGridViewAccessibleObject_FragmentNavigate_Child_RetrunExpected_I dataGridView.Rows[0].Visible = false; - Assert.Equal(dataGridView.Rows[1].AccessibilityObject, dataGridView.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(dataGridView.Rows[1].AccessibilityObject, dataGridView.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(dataGridView.Rows[1].AccessibilityObject, dataGridView.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(dataGridView.Rows[1].AccessibilityObject, dataGridView.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(dataGridView.IsHandleCreated); } @@ -901,8 +901,8 @@ public void DataGridViewAccessibleObject_FragmentNavigate_Child_RetrunExpected_I dataGridView.Rows[1].Visible = false; - Assert.Equal(dataGridView.Rows[0].AccessibilityObject, dataGridView.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(dataGridView.Rows[0].AccessibilityObject, dataGridView.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(dataGridView.Rows[0].AccessibilityObject, dataGridView.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(dataGridView.Rows[0].AccessibilityObject, dataGridView.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(dataGridView.IsHandleCreated); } @@ -922,8 +922,8 @@ public void DataGridViewAccessibleObject_FragmentNavigate_Child_RetrunNull_IfRow dataGridView.Rows[0].Visible = false; dataGridView.Rows[1].Visible = false; - Assert.Null(dataGridView.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(dataGridView.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Null(dataGridView.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(dataGridView.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(dataGridView.IsHandleCreated); } @@ -942,8 +942,8 @@ public void DataGridViewAccessibleObject_FragmentNavigate_Child_RetrunExpected_I dataGridView.Rows[0].Visible = false; - Assert.Equal(topRowAccessibilityObject, dataGridView.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(dataGridView.Rows[1].AccessibilityObject, dataGridView.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(topRowAccessibilityObject, dataGridView.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(dataGridView.Rows[1].AccessibilityObject, dataGridView.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(dataGridView.IsHandleCreated); } @@ -962,8 +962,8 @@ public void DataGridViewAccessibleObject_FragmentNavigate_Child_RetrunExpected_I dataGridView.Rows[1].Visible = false; - Assert.Equal(topRowAccessibilityObject, dataGridView.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(dataGridView.Rows[0].AccessibilityObject, dataGridView.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(topRowAccessibilityObject, dataGridView.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(dataGridView.Rows[0].AccessibilityObject, dataGridView.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(dataGridView.IsHandleCreated); } @@ -983,8 +983,8 @@ public void DataGridViewAccessibleObject_FragmentNavigate_Child_RetrunExpected_I dataGridView.Rows[0].Visible = false; dataGridView.Rows[1].Visible = false; - Assert.Equal(topRowAccessibilityObject, dataGridView.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(topRowAccessibilityObject, dataGridView.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(topRowAccessibilityObject, dataGridView.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(topRowAccessibilityObject, dataGridView.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(dataGridView.IsHandleCreated); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DataGridViewCellAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DataGridViewCellAccessibleObjectTests.cs index 88f411af614..881737e1dcb 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DataGridViewCellAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DataGridViewCellAccessibleObjectTests.cs @@ -1020,11 +1020,11 @@ public void DataGridViewCellAccessibleObject_FragmentNavigate_Parent_ReturnsExpe if (createControl) { - Assert.Equal(row.AccessibilityObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); + Assert.Equal(row.AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); } else { - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); } Assert.Equal(createControl, dataGridView.IsHandleCreated); @@ -1037,7 +1037,7 @@ public void DataGridViewCellAccessibleObject_FragmentNavigate_Parent_ReturnsNull DataGridViewCellAccessibleObject accessibleObject = new(owner); Assert.Null(accessibleObject.Owner.OwningRow); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); } [WinFormsFact] @@ -1050,13 +1050,13 @@ public void DataGridViewCellAccessibleObject_FragmentNavigate_Sibling_ReturnsExp AccessibleObject cell2 = dataGridView.Rows[0].Cells[1].AccessibilityObject; AccessibleObject cell3 = dataGridView.Rows[0].Cells[2].AccessibilityObject; - Assert.Equal(cell2, cell1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(cell3, cell2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(cell3.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(cell2, cell1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(cell3, cell2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(cell3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(cell2, cell3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(cell1, cell2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(rowHeader, cell1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(cell2, cell3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(cell1, cell2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(rowHeader, cell1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); } [WinFormsFact] @@ -1068,11 +1068,11 @@ public void DataGridViewCellAccessibleObject_FragmentNavigate_Sibling_ReturnsNul AccessibleObject cell1 = row.Cells[0].AccessibilityObject; AccessibleObject cell2 = row.Cells[1].AccessibilityObject; - Assert.Null(cell1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(cell2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Null(cell1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(cell2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Null(cell1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(cell2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Null(cell1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(cell2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(dataGridView.IsHandleCreated); } @@ -1087,13 +1087,13 @@ public void DataGridViewCellAccessibleObject_FragmentNavigate_Sibling_ReturnsExp AccessibleObject cell2 = dataGridView.Rows[0].Cells[1].AccessibilityObject; AccessibleObject cell3 = dataGridView.Rows[0].Cells[2].AccessibilityObject; - Assert.Equal(cell2, cell1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(cell3, cell2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(cell3.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(cell2, cell1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(cell3, cell2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(cell3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(cell2, cell3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(cell1, cell2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(cell1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(cell2, cell3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(cell1, cell2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(cell1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); } [WinFormsFact] @@ -1106,13 +1106,13 @@ public void DataGridViewCellAccessibleObject_FragmentNavigate_Sibling_ReturnsExp AccessibleObject cell2 = dataGridView.Rows[0].Cells[1].AccessibilityObject; AccessibleObject cell3 = dataGridView.Rows[0].Cells[2].AccessibilityObject; - Assert.Equal(cell2, rowHeader.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(cell3, cell2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(cell3.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(cell2, rowHeader.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(cell3, cell2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(cell3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(cell2, cell3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(rowHeader, cell2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(rowHeader.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(cell2, cell3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(rowHeader, cell2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(rowHeader.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); } [WinFormsFact] @@ -1125,13 +1125,13 @@ public void DataGridViewCellAccessibleObject_FragmentNavigate_Sibling_ReturnsExp AccessibleObject cell1 = dataGridView.Rows[0].Cells[0].AccessibilityObject; AccessibleObject cell3 = dataGridView.Rows[0].Cells[2].AccessibilityObject; - Assert.Equal(cell1, rowHeader.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(cell3, cell1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(cell3.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(cell1, rowHeader.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(cell3, cell1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(cell3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(cell1, cell3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(rowHeader, cell1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(rowHeader.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(cell1, cell3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(rowHeader, cell1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(rowHeader.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); } [WinFormsFact] @@ -1144,13 +1144,13 @@ public void DataGridViewCellAccessibleObject_FragmentNavigate_Sibling_ReturnsExp AccessibleObject cell1 = dataGridView.Rows[0].Cells[0].AccessibilityObject; AccessibleObject cell2 = dataGridView.Rows[0].Cells[1].AccessibilityObject; - Assert.Equal(cell1, rowHeader.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(cell2, cell1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(cell2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(cell1, rowHeader.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(cell2, cell1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(cell2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(cell1, cell2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(rowHeader, cell1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(rowHeader.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(cell1, cell2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(rowHeader, cell1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(rowHeader.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); } [WinFormsFact] @@ -1164,13 +1164,13 @@ public void DataGridViewCellAccessibleObject_FragmentNavigate_Sibling_ReturnsExp AccessibleObject cell3 = dataGridView.Rows[0].Cells[2].AccessibilityObject; AccessibleObject cell4 = dataGridView.Rows[0].Cells[3].AccessibilityObject; - Assert.Equal(cell3, cell2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(cell4, cell3.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(cell4.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(cell3, cell2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(cell4, cell3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(cell4.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(cell3, cell4.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(cell2, cell3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(cell2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(cell3, cell4.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(cell2, cell3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(cell2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); } [WinFormsFact] @@ -1184,13 +1184,13 @@ public void DataGridViewCellAccessibleObject_FragmentNavigate_Sibling_ReturnsExp AccessibleObject cell3 = dataGridView.Rows[0].Cells[2].AccessibilityObject; AccessibleObject cell4 = dataGridView.Rows[0].Cells[3].AccessibilityObject; - Assert.Equal(cell3, cell1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(cell4, cell3.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(cell4.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(cell3, cell1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(cell4, cell3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(cell4.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(cell3, cell4.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(cell1, cell3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(cell1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(cell3, cell4.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(cell1, cell3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(cell1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); } [WinFormsFact] @@ -1204,13 +1204,13 @@ public void DataGridViewCellAccessibleObject_FragmentNavigate_Sibling_ReturnsExp AccessibleObject cell2 = dataGridView.Rows[0].Cells[1].AccessibilityObject; AccessibleObject cell3 = dataGridView.Rows[0].Cells[2].AccessibilityObject; - Assert.Equal(cell2, cell1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(cell3, cell2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(cell3.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(cell2, cell1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(cell3, cell2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(cell3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(cell2, cell3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(cell1, cell2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(cell1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(cell2, cell3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(cell1, cell2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(cell1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); } [WinFormsFact] @@ -1226,15 +1226,15 @@ public void DataGridViewCellAccessibleObject_FragmentNavigate_Sibling_ReturnsExp AccessibleObject cell2 = dataGridView.Rows[0].Cells[1].AccessibilityObject; AccessibleObject cell3 = dataGridView.Rows[0].Cells[0].AccessibilityObject; - Assert.Equal(cell1, rowHeader.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(cell2, cell1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(cell3, cell2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(cell3.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(cell1, rowHeader.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(cell2, cell1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(cell3, cell2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(cell3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(cell2, cell3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(cell1, cell2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(rowHeader, cell1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(rowHeader.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(cell2, cell3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(cell1, cell2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(rowHeader, cell1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(rowHeader.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); } [WinFormsFact] @@ -1250,13 +1250,13 @@ public void DataGridViewCellAccessibleObject_FragmentNavigate_Sibling_ReturnsExp AccessibleObject cell1 = dataGridView.Rows[0].Cells[2].AccessibilityObject; AccessibleObject cell2 = dataGridView.Rows[0].Cells[1].AccessibilityObject; - Assert.Equal(cell1, rowHeader.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(cell2, cell1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(cell2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(cell1, rowHeader.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(cell2, cell1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(cell2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(cell1, cell2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(rowHeader, cell1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(rowHeader.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(cell1, cell2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(rowHeader, cell1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(rowHeader.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); } [WinFormsFact] @@ -1272,13 +1272,13 @@ public void DataGridViewCellAccessibleObject_FragmentNavigate_Sibling_ReturnsExp AccessibleObject cell1 = dataGridView.Rows[0].Cells[2].AccessibilityObject; AccessibleObject cell3 = dataGridView.Rows[0].Cells[0].AccessibilityObject; - Assert.Equal(cell1, rowHeader.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(cell3, cell1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(cell3.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(cell1, rowHeader.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(cell3, cell1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(cell3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(cell1, cell3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(rowHeader, cell1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(rowHeader.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(cell1, cell3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(rowHeader, cell1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(rowHeader.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); } [WinFormsFact] @@ -1294,13 +1294,13 @@ public void DataGridViewCellAccessibleObject_FragmentNavigate_Sibling_ReturnsExp AccessibleObject cell2 = dataGridView.Rows[0].Cells[1].AccessibilityObject; AccessibleObject cell3 = dataGridView.Rows[0].Cells[0].AccessibilityObject; - Assert.Equal(cell2, rowHeader.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(cell3, cell2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(cell3.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(cell2, rowHeader.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(cell3, cell2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(cell3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(cell2, cell3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(rowHeader, cell2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(rowHeader.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(cell2, cell3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(rowHeader, cell2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(rowHeader.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); } [WinFormsFact] @@ -1316,13 +1316,13 @@ public void DataGridViewCellAccessibleObject_FragmentNavigate_Sibling_ReturnsExp AccessibleObject cell2 = dataGridView.Rows[0].Cells[1].AccessibilityObject; AccessibleObject cell3 = dataGridView.Rows[0].Cells[0].AccessibilityObject; - Assert.Equal(cell2, cell1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(cell3, cell2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(cell3.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(cell2, cell1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(cell3, cell2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(cell3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(cell2, cell3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(cell1, cell2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(cell1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(cell2, cell3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(cell1, cell2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(cell1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); } [WinFormsFact] @@ -1338,11 +1338,11 @@ public void DataGridViewCellAccessibleObject_FragmentNavigate_Sibling_ReturnsExp AccessibleObject cell1 = dataGridView.Rows[0].Cells[2].AccessibilityObject; AccessibleObject cell2 = dataGridView.Rows[0].Cells[1].AccessibilityObject; - Assert.Equal(cell2, cell1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(cell2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(cell2, cell1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(cell2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(cell1, cell2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(cell1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(cell1, cell2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(cell1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); } [WinFormsFact] @@ -1358,11 +1358,11 @@ public void DataGridViewCellAccessibleObject_FragmentNavigate_Sibling_ReturnsExp AccessibleObject cell1 = dataGridView.Rows[0].Cells[2].AccessibilityObject; AccessibleObject cell3 = dataGridView.Rows[0].Cells[0].AccessibilityObject; - Assert.Equal(cell3, cell1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(cell3.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(cell3, cell1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(cell3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(cell1, cell3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(cell1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(cell1, cell3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(cell1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); } [WinFormsFact] @@ -1378,11 +1378,11 @@ public void DataGridViewCellAccessibleObject_FragmentNavigate_Sibling_ReturnsExp AccessibleObject cell2 = dataGridView.Rows[0].Cells[1].AccessibilityObject; AccessibleObject cell3 = dataGridView.Rows[0].Cells[0].AccessibilityObject; - Assert.Equal(cell3, cell2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(cell3.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(cell3, cell2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(cell3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(cell2, cell3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(cell2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(cell2, cell3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(cell2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); } [WinFormsTheory] @@ -1395,11 +1395,11 @@ public void DataGridViewCellAccessibleObject_FragmentNavigate_Child_ReturnsNull( AccessibleObject cell1 = dataGridView.Rows[0].Cells[0].AccessibilityObject; AccessibleObject cell2 = dataGridView.Rows[0].Cells[1].AccessibilityObject; - Assert.Null(cell1.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(cell1.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Null(cell1.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(cell1.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); - Assert.Null(cell2.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(cell2.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Null(cell2.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(cell2.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.Equal(createControl, dataGridView.IsHandleCreated); } @@ -1412,8 +1412,8 @@ public void DataGridViewCellAccessibleObject_FragmentNavigate_Child_ReturnsNull_ AccessibleObject cell = dataGridView.Rows[0].Cells[0].AccessibilityObject; - Assert.Null(cell.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(cell.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Null(cell.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(cell.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } private DataGridView CreateDataGridView(int columnCount, bool createControl = true) diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DataGridViewCheckBoxCellAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DataGridViewCheckBoxCellAccessibleObjectTests.cs index 1d5491fd5fd..291d90b2867 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DataGridViewCheckBoxCellAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DataGridViewCheckBoxCellAccessibleObjectTests.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using Windows.Win32.UI.Accessibility; -using static Interop; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -18,8 +17,8 @@ public void DataGridViewCheckBoxCellAccessibleObject_Ctor_Default() public static IEnumerable DataGridViewCheckBoxCellAccessibleObject_ToggleState_TestData() { - yield return new object[] { false, (int)UiaCore.ToggleState.Off }; - yield return new object[] { true, (int)UiaCore.ToggleState.On }; + yield return new object[] { false, (int)ToggleState.ToggleState_Off }; + yield return new object[] { true, (int)ToggleState.ToggleState_On }; } [WinFormsTheory] @@ -37,12 +36,12 @@ public void DataGridViewCheckBoxCellAccessibleObject_ToggleState_ReturnsExpected if (isChecked) { // Make sure that toggle state is off as a default case. - Assert.Equal(UiaCore.ToggleState.Off, accessibleObject.ToggleState); + Assert.Equal(ToggleState.ToggleState_Off, accessibleObject.ToggleState); // Check it. accessibleObject.DoDefaultAction(); } - Assert.Equal((UiaCore.ToggleState)expected, accessibleObject.ToggleState); + Assert.Equal((ToggleState)expected, accessibleObject.ToggleState); Assert.True(control.IsHandleCreated); } @@ -182,10 +181,10 @@ public void DataGridViewCheckBoxCellAccessibleObject_ToggleState_ThrowsException public static IEnumerable DataGridViewCheckBoxCellAccessibleObject_DoDefaultAction_TestData() { - yield return new object[] { false, true, (int)UiaCore.ToggleState.Off }; - yield return new object[] { false, false, (int)UiaCore.ToggleState.Off }; - yield return new object[] { true, true, (int)UiaCore.ToggleState.Off }; - yield return new object[] { true, false, (int)UiaCore.ToggleState.On }; + yield return new object[] { false, true, (int)ToggleState.ToggleState_Off }; + yield return new object[] { false, false, (int)ToggleState.ToggleState_Off }; + yield return new object[] { true, true, (int)ToggleState.ToggleState_Off }; + yield return new object[] { true, false, (int)ToggleState.ToggleState_On }; } [WinFormsFact] @@ -221,25 +220,25 @@ public void DataGridViewCheckBoxCellAccessibleObject_DoDefaultAction_WorksExpect if (isChecked) { // Make sure that toogle state is off as a default case. - Assert.Equal(UiaCore.ToggleState.Off, accessibleObject.ToggleState); + Assert.Equal(ToggleState.ToggleState_Off, accessibleObject.ToggleState); // Check it. accessibleObject.DoDefaultAction(); if (createControl) { // Make sure that toogle state has been changed. - Assert.Equal(UiaCore.ToggleState.On, accessibleObject.ToggleState); + Assert.Equal(ToggleState.ToggleState_On, accessibleObject.ToggleState); } else { // Make sure that nothing changes. - Assert.Equal(UiaCore.ToggleState.Off, accessibleObject.ToggleState); + Assert.Equal(ToggleState.ToggleState_Off, accessibleObject.ToggleState); } } accessibleObject.DoDefaultAction(); - Assert.Equal((UiaCore.ToggleState)expected, accessibleObject.ToggleState); + Assert.Equal((ToggleState)expected, accessibleObject.ToggleState); Assert.Equal(createControl, control.IsHandleCreated); } @@ -259,44 +258,44 @@ public void DataGridViewCheckBoxCellAccessibleObject_ToggleStateIndeterminate_Re var checkBoxAccessibleObject = cell.AccessibilityObject; - Assert.Equal(UiaCore.ToggleState.Indeterminate, checkBoxAccessibleObject.ToggleState); + Assert.Equal(ToggleState.ToggleState_Indeterminate, checkBoxAccessibleObject.ToggleState); checkBoxAccessibleObject.DoDefaultAction(); - Assert.Equal(UiaCore.ToggleState.Off, checkBoxAccessibleObject.ToggleState); + Assert.Equal(ToggleState.ToggleState_Off, checkBoxAccessibleObject.ToggleState); checkBoxAccessibleObject.DoDefaultAction(); - Assert.Equal(UiaCore.ToggleState.On, checkBoxAccessibleObject.ToggleState); + Assert.Equal(ToggleState.ToggleState_On, checkBoxAccessibleObject.ToggleState); checkBoxAccessibleObject.DoDefaultAction(); - Assert.Equal(UiaCore.ToggleState.Indeterminate, checkBoxAccessibleObject.ToggleState); + Assert.Equal(ToggleState.ToggleState_Indeterminate, checkBoxAccessibleObject.ToggleState); checkBoxAccessibleObject.DoDefaultAction(); - Assert.Equal(UiaCore.ToggleState.Off, checkBoxAccessibleObject.ToggleState); + Assert.Equal(ToggleState.ToggleState_Off, checkBoxAccessibleObject.ToggleState); checkBoxAccessibleObject.DoDefaultAction(); - Assert.Equal(UiaCore.ToggleState.On, checkBoxAccessibleObject.ToggleState); + Assert.Equal(ToggleState.ToggleState_On, checkBoxAccessibleObject.ToggleState); dataGridView.Rows.Add(true); - Assert.Equal(UiaCore.ToggleState.On, dataGridView.Rows[1].Cells[0].AccessibilityObject.ToggleState); + Assert.Equal(ToggleState.ToggleState_On, dataGridView.Rows[1].Cells[0].AccessibilityObject.ToggleState); dataGridView.Rows.Add(false); - Assert.Equal(UiaCore.ToggleState.Off, dataGridView.Rows[2].Cells[0].AccessibilityObject.ToggleState); + Assert.Equal(ToggleState.ToggleState_Off, dataGridView.Rows[2].Cells[0].AccessibilityObject.ToggleState); dataGridView.Rows.Add(CheckState.Indeterminate); - Assert.Equal(UiaCore.ToggleState.Indeterminate, dataGridView.Rows[3].Cells[0].AccessibilityObject.ToggleState); + Assert.Equal(ToggleState.ToggleState_Indeterminate, dataGridView.Rows[3].Cells[0].AccessibilityObject.ToggleState); dataGridView.Rows.Add(CheckState.Checked); - Assert.Equal(UiaCore.ToggleState.On, dataGridView.Rows[4].Cells[0].AccessibilityObject.ToggleState); + Assert.Equal(ToggleState.ToggleState_On, dataGridView.Rows[4].Cells[0].AccessibilityObject.ToggleState); dataGridView.Rows.Add(CheckState.Unchecked); - Assert.Equal(UiaCore.ToggleState.Off, dataGridView.Rows[5].Cells[0].AccessibilityObject.ToggleState); + Assert.Equal(ToggleState.ToggleState_Off, dataGridView.Rows[5].Cells[0].AccessibilityObject.ToggleState); checkBoxColumn.TrueValue = "on"; checkBoxColumn.FalseValue = "off"; checkBoxColumn.IndeterminateValue = "not set"; dataGridView.Rows.Add("on"); - Assert.Equal(UiaCore.ToggleState.On, dataGridView.Rows[4].Cells[0].AccessibilityObject.ToggleState); + Assert.Equal(ToggleState.ToggleState_On, dataGridView.Rows[4].Cells[0].AccessibilityObject.ToggleState); dataGridView.Rows.Add("off"); - Assert.Equal(UiaCore.ToggleState.Off, dataGridView.Rows[5].Cells[0].AccessibilityObject.ToggleState); + Assert.Equal(ToggleState.ToggleState_Off, dataGridView.Rows[5].Cells[0].AccessibilityObject.ToggleState); dataGridView.Rows.Add("not set"); - Assert.Equal(UiaCore.ToggleState.Indeterminate, dataGridView.Rows[3].Cells[0].AccessibilityObject.ToggleState); + Assert.Equal(ToggleState.ToggleState_Indeterminate, dataGridView.Rows[3].Cells[0].AccessibilityObject.ToggleState); } } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DataGridViewColumnHeaderCellAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DataGridViewColumnHeaderCellAccessibleObjectTests.cs index 5574c26a774..2caa8f74728 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DataGridViewColumnHeaderCellAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DataGridViewColumnHeaderCellAccessibleObjectTests.cs @@ -3,7 +3,6 @@ using System.Drawing; using Windows.Win32.UI.Accessibility; -using static Interop; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -158,7 +157,7 @@ public void DataGridViewColumnHeaderCellAccessibleObject_FragmentNavigate_Parent var accessibleObject = control.Columns[0].HeaderCell.AccessibilityObject; AccessibleObject topRowAccessibleObject = control.AccessibilityObject.TestAccessor().Dynamic.TopRowAccessibilityObject; - Assert.Equal(topRowAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); + Assert.Equal(topRowAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); Assert.False(control.IsHandleCreated); } @@ -174,13 +173,13 @@ public void DataGridViewColumnHeaderCellAccessibleObject_FragmentNavigate_Siblin AccessibleObject accessibleObject2 = control.Columns[1].HeaderCell.AccessibilityObject; AccessibleObject accessibleObject3 = control.Columns[2].HeaderCell.AccessibilityObject; - Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(control.IsHandleCreated); } @@ -196,11 +195,11 @@ public void DataGridViewColumnHeaderCellAccessibleObject_FragmentNavigate_Siblin AccessibleObject accessibleObject2 = control.Columns[1].HeaderCell.AccessibilityObject; AccessibleObject accessibleObject3 = control.Columns[2].HeaderCell.AccessibilityObject; - Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(control.IsHandleCreated); } @@ -216,11 +215,11 @@ public void DataGridViewColumnHeaderCellAccessibleObject_FragmentNavigate_Siblin AccessibleObject accessibleObject1 = control.Columns[0].HeaderCell.AccessibilityObject; AccessibleObject accessibleObject3 = control.Columns[2].HeaderCell.AccessibilityObject; - Assert.Equal(accessibleObject3, accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(accessibleObject3, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(accessibleObject1, accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(accessibleObject1, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(control.IsHandleCreated); } @@ -236,11 +235,11 @@ public void DataGridViewColumnHeaderCellAccessibleObject_FragmentNavigate_Siblin AccessibleObject accessibleObject1 = control.Columns[0].HeaderCell.AccessibilityObject; AccessibleObject accessibleObject2 = control.Columns[1].HeaderCell.AccessibilityObject; - Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(control.IsHandleCreated); } @@ -257,15 +256,15 @@ public void DataGridViewColumnHeaderCellAccessibleObject_FragmentNavigate_Siblin AccessibleObject accessibleObject2 = control.Columns[1].HeaderCell.AccessibilityObject; AccessibleObject accessibleObject3 = control.Columns[2].HeaderCell.AccessibilityObject; - Assert.Equal(accessibleObject1, accessibleObject0.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(accessibleObject1, accessibleObject0.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(accessibleObject0, accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject0.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(accessibleObject0, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject0.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(control.IsHandleCreated); } @@ -282,13 +281,13 @@ public void DataGridViewColumnHeaderCellAccessibleObject_FragmentNavigate_Siblin AccessibleObject accessibleObject2 = control.Columns[1].HeaderCell.AccessibilityObject; AccessibleObject accessibleObject3 = control.Columns[2].HeaderCell.AccessibilityObject; - Assert.Equal(accessibleObject2, accessibleObject0.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(accessibleObject2, accessibleObject0.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(accessibleObject0, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject0.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(accessibleObject0, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject0.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(control.IsHandleCreated); } @@ -305,13 +304,13 @@ public void DataGridViewColumnHeaderCellAccessibleObject_FragmentNavigate_Siblin AccessibleObject accessibleObject1 = control.Columns[0].HeaderCell.AccessibilityObject; AccessibleObject accessibleObject3 = control.Columns[2].HeaderCell.AccessibilityObject; - Assert.Equal(accessibleObject1, accessibleObject0.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject3, accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(accessibleObject1, accessibleObject0.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject3, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(accessibleObject1, accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(accessibleObject0, accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject0.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(accessibleObject1, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(accessibleObject0, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject0.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(control.IsHandleCreated); } @@ -328,13 +327,13 @@ public void DataGridViewColumnHeaderCellAccessibleObject_FragmentNavigate_Siblin AccessibleObject accessibleObject1 = control.Columns[0].HeaderCell.AccessibilityObject; AccessibleObject accessibleObject2 = control.Columns[1].HeaderCell.AccessibilityObject; - Assert.Equal(accessibleObject1, accessibleObject0.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(accessibleObject1, accessibleObject0.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(accessibleObject0, accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject0.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(accessibleObject0, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject0.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(control.IsHandleCreated); } @@ -548,8 +547,8 @@ public void DataGridViewColumnHeaderCellAccessibleObject_FragmentNavigate_Child_ control.Columns.Add("Column 1", "Column 1"); AccessibleObject accessibleObject = control.Columns[0].HeaderCell.AccessibilityObject; - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(control.IsHandleCreated); } @@ -561,10 +560,10 @@ public void DataGridViewColumnHeaderCellAccessibleObject_FragmentNavigate_Child_ AccessibleObject accessibleObject0 = control.TopLeftHeaderCell.AccessibilityObject; AccessibleObject accessibleObject1 = control.Columns[0].HeaderCell.AccessibilityObject; - Assert.Null(accessibleObject0.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject0.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); - Assert.Null(accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Null(accessibleObject0.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject0.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(control.IsHandleCreated); } @@ -584,15 +583,15 @@ public void DataGridViewColumnHeaderCellAccessibleObject_FragmentNavigate_Siblin AccessibleObject accessibleObject2 = control.Columns[1].HeaderCell.AccessibilityObject; AccessibleObject accessibleObject3 = control.Columns[0].HeaderCell.AccessibilityObject; - Assert.Equal(accessibleObject1, accessibleObject0.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(accessibleObject1, accessibleObject0.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(accessibleObject0, accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject0.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(accessibleObject0, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject0.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(control.IsHandleCreated); } @@ -612,13 +611,13 @@ public void DataGridViewColumnHeaderCellAccessibleObject_FragmentNavigate_Siblin AccessibleObject accessibleObject1 = control.Columns[2].HeaderCell.AccessibilityObject; AccessibleObject accessibleObject2 = control.Columns[1].HeaderCell.AccessibilityObject; - Assert.Equal(accessibleObject1, accessibleObject0.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(accessibleObject1, accessibleObject0.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(accessibleObject0, accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject0.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(accessibleObject0, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject0.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(control.IsHandleCreated); } @@ -638,13 +637,13 @@ public void DataGridViewColumnHeaderCellAccessibleObject_FragmentNavigate_Siblin AccessibleObject accessibleObject1 = control.Columns[2].HeaderCell.AccessibilityObject; AccessibleObject accessibleObject3 = control.Columns[0].HeaderCell.AccessibilityObject; - Assert.Equal(accessibleObject1, accessibleObject0.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject3, accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(accessibleObject1, accessibleObject0.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject3, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(accessibleObject1, accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(accessibleObject0, accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject0.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(accessibleObject1, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(accessibleObject0, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject0.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(control.IsHandleCreated); } @@ -664,13 +663,13 @@ public void DataGridViewColumnHeaderCellAccessibleObject_FragmentNavigate_Siblin AccessibleObject accessibleObject2 = control.Columns[1].HeaderCell.AccessibilityObject; AccessibleObject accessibleObject3 = control.Columns[0].HeaderCell.AccessibilityObject; - Assert.Equal(accessibleObject2, accessibleObject0.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(accessibleObject2, accessibleObject0.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(accessibleObject0, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject0.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(accessibleObject0, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject0.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(control.IsHandleCreated); } @@ -689,13 +688,13 @@ public void DataGridViewColumnHeaderCellAccessibleObject_FragmentNavigate_Siblin AccessibleObject accessibleObject2 = control.Columns[1].HeaderCell.AccessibilityObject; AccessibleObject accessibleObject3 = control.Columns[0].HeaderCell.AccessibilityObject; - Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(control.IsHandleCreated); } @@ -714,11 +713,11 @@ public void DataGridViewColumnHeaderCellAccessibleObject_FragmentNavigate_Siblin AccessibleObject accessibleObject1 = control.Columns[2].HeaderCell.AccessibilityObject; AccessibleObject accessibleObject2 = control.Columns[1].HeaderCell.AccessibilityObject; - Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(control.IsHandleCreated); } @@ -737,11 +736,11 @@ public void DataGridViewColumnHeaderCellAccessibleObject_FragmentNavigate_Siblin AccessibleObject accessibleObject1 = control.Columns[2].HeaderCell.AccessibilityObject; AccessibleObject accessibleObject3 = control.Columns[0].HeaderCell.AccessibilityObject; - Assert.Equal(accessibleObject3, accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(accessibleObject3, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(accessibleObject1, accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(accessibleObject1, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(control.IsHandleCreated); } @@ -760,11 +759,11 @@ public void DataGridViewColumnHeaderCellAccessibleObject_FragmentNavigate_Siblin AccessibleObject accessibleObject2 = control.Columns[1].HeaderCell.AccessibilityObject; AccessibleObject accessibleObject3 = control.Columns[0].HeaderCell.AccessibilityObject; - Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(control.IsHandleCreated); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DataGridViewComboBoxEditingControlAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DataGridViewComboBoxEditingControlAccessibleObjectTests.cs index e14e01506d5..402fc30f45a 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DataGridViewComboBoxEditingControlAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DataGridViewComboBoxEditingControlAccessibleObjectTests.cs @@ -3,7 +3,6 @@ using Windows.Win32.UI.Accessibility; using static System.Windows.Forms.DataGridViewComboBoxEditingControl; -using static Interop; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -82,13 +81,13 @@ public void DataGridViewComboBoxEditingControlAccessibleObjectTest_GetPropertyVa } [WinFormsTheory] - [InlineData((int)UiaCore.NavigateDirection.NextSibling)] - [InlineData((int)UiaCore.NavigateDirection.PreviousSibling)] + [InlineData((int)NavigateDirection.NavigateDirection_NextSibling)] + [InlineData((int)NavigateDirection.NavigateDirection_PreviousSibling)] public void DataGridViewComboBoxEditingControlAccessibleObject_FragmentNavigate_SiblingsAreNull(int direction) { using DataGridViewComboBoxEditingControl control = new(); - object actual = control.AccessibilityObject.FragmentNavigate((UiaCore.NavigateDirection)direction); + object actual = control.AccessibilityObject.FragmentNavigate((NavigateDirection)direction); Assert.Null(actual); Assert.False(control.IsHandleCreated); @@ -100,8 +99,8 @@ public void DataGridViewComboBoxEditingControlAccessibleObject_FragmentNavigate_ using DataGridViewComboBoxEditingControl control = new(); control.CreateControl(); - object firstChild = control.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild); - object lastChild = control.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild); + object firstChild = control.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild); + object lastChild = control.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild); Assert.Equal(control.ChildEditAccessibleObject, firstChild); Assert.Equal(((DataGridViewComboBoxEditingControlAccessibleObject)control.AccessibilityObject).DropDownButtonUiaProvider, lastChild); @@ -122,7 +121,7 @@ public void DataGridViewComboBoxEditingControlAccessibleObject_FragmentNavigate_ control.CurrentCell = control.Rows[0].Cells[0]; control.BeginEdit(false); - object actual = control.EditingControlAccessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent); + object actual = control.EditingControlAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent); control.EndEdit(); diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DataGridViewRowAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DataGridViewRowAccessibleObjectTests.cs index 704f1cf8082..d39218b32fb 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DataGridViewRowAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DataGridViewRowAccessibleObjectTests.cs @@ -3,7 +3,6 @@ using System.Drawing; using Windows.Win32.UI.Accessibility; -using static Interop; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -414,17 +413,17 @@ public void DataGridViewRowAccessibleObject_FragmentNavigate_Sibling_ReturnExpec AccessibleObject accessibleObject3 = dataGridView.Rows[2].AccessibilityObject; AccessibleObject accessibleObject4 = dataGridView.Rows[3].AccessibilityObject; - Assert.Equal(accessibleObject1, topRowAccessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject4, accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject4.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(accessibleObject1, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject4, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject4.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(accessibleObject3, accessibleObject4.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(topRowAccessibleObject, accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(topRowAccessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(accessibleObject3, accessibleObject4.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(topRowAccessibleObject, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(dataGridView.IsHandleCreated); } @@ -443,15 +442,15 @@ public void DataGridViewRowAccessibleObject_FragmentNavigate_Sibling_ReturnExpec AccessibleObject accessibleObject3 = dataGridView.Rows[2].AccessibilityObject; AccessibleObject accessibleObject4 = dataGridView.Rows[3].AccessibilityObject; - Assert.Equal(accessibleObject2, topRowAccessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject4, accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject4.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(accessibleObject2, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject4, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject4.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(accessibleObject3, accessibleObject4.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(topRowAccessibleObject, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(topRowAccessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(accessibleObject3, accessibleObject4.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(topRowAccessibleObject, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(dataGridView.IsHandleCreated); } @@ -470,15 +469,15 @@ public void DataGridViewRowAccessibleObject_FragmentNavigate_Sibling_ReturnExpec AccessibleObject accessibleObject3 = dataGridView.Rows[2].AccessibilityObject; AccessibleObject accessibleObject4 = dataGridView.Rows[3].AccessibilityObject; - Assert.Equal(accessibleObject1, topRowAccessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject3, accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject4, accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject4.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(accessibleObject1, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject3, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject4, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject4.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(accessibleObject3, accessibleObject4.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(accessibleObject1, accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(topRowAccessibleObject, accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(topRowAccessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(accessibleObject3, accessibleObject4.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(accessibleObject1, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(topRowAccessibleObject, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(dataGridView.IsHandleCreated); } @@ -497,15 +496,15 @@ public void DataGridViewRowAccessibleObject_FragmentNavigate_Sibling_ReturnExpec AccessibleObject accessibleObject2 = dataGridView.Rows[1].AccessibilityObject; AccessibleObject accessibleObject4 = dataGridView.Rows[3].AccessibilityObject; - Assert.Equal(accessibleObject1, topRowAccessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject4, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject4.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(accessibleObject1, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject4, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject4.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(accessibleObject2, accessibleObject4.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(topRowAccessibleObject, accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(topRowAccessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(accessibleObject2, accessibleObject4.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(topRowAccessibleObject, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(dataGridView.IsHandleCreated); } @@ -522,13 +521,13 @@ public void DataGridViewRowAccessibleObject_FragmentNavigate_Sibling_ReturnExpec AccessibleObject accessibleObject2 = dataGridView.Rows[1].AccessibilityObject; AccessibleObject accessibleObject3 = dataGridView.Rows[2].AccessibilityObject; - Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(dataGridView.IsHandleCreated); } @@ -545,11 +544,11 @@ public void DataGridViewRowAccessibleObject_FragmentNavigate_Sibling_ReturnExpec AccessibleObject accessibleObject2 = dataGridView.Rows[1].AccessibilityObject; AccessibleObject accessibleObject3 = dataGridView.Rows[2].AccessibilityObject; - Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(dataGridView.IsHandleCreated); } @@ -566,11 +565,11 @@ public void DataGridViewRowAccessibleObject_FragmentNavigate_Sibling_ReturnExpec AccessibleObject accessibleObject1 = dataGridView.Rows[0].AccessibilityObject; AccessibleObject accessibleObject3 = dataGridView.Rows[2].AccessibilityObject; - Assert.Equal(accessibleObject3, accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(accessibleObject3, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(accessibleObject1, accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(accessibleObject1, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(dataGridView.IsHandleCreated); } @@ -587,11 +586,11 @@ public void DataGridViewRowAccessibleObject_FragmentNavigate_Sibling_ReturnExpec AccessibleObject accessibleObject1 = dataGridView.Rows[0].AccessibilityObject; AccessibleObject accessibleObject2 = dataGridView.Rows[1].AccessibilityObject; - Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(dataGridView.IsHandleCreated); } @@ -609,15 +608,15 @@ public void DataGridViewRowAccessibleObject_FragmentNavigate_Sibling_ReturnExpec AccessibleObject accessibleObject3 = dataGridView.Rows[2].AccessibilityObject; AccessibleObject accessibleObject4 = dataGridView.Rows[3].AccessibilityObject; - Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject4, accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject4.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject4, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject4.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(accessibleObject3, accessibleObject4.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(accessibleObject3, accessibleObject4.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(dataGridView.IsHandleCreated); } @@ -636,13 +635,13 @@ public void DataGridViewRowAccessibleObject_FragmentNavigate_Sibling_ReturnExpec AccessibleObject accessibleObject3 = dataGridView.Rows[2].AccessibilityObject; AccessibleObject accessibleObject4 = dataGridView.Rows[3].AccessibilityObject; - Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject4, accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject4.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject4, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject4.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(accessibleObject3, accessibleObject4.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(accessibleObject3, accessibleObject4.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(dataGridView.IsHandleCreated); } @@ -661,13 +660,13 @@ public void DataGridViewRowAccessibleObject_FragmentNavigate_Sibling_ReturnExpec AccessibleObject accessibleObject3 = dataGridView.Rows[2].AccessibilityObject; AccessibleObject accessibleObject4 = dataGridView.Rows[3].AccessibilityObject; - Assert.Equal(accessibleObject3, accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject4, accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject4.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(accessibleObject3, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject4, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject4.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(accessibleObject3, accessibleObject4.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(accessibleObject1, accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(accessibleObject3, accessibleObject4.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(accessibleObject1, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(dataGridView.IsHandleCreated); } @@ -686,13 +685,13 @@ public void DataGridViewRowAccessibleObject_FragmentNavigate_Sibling_ReturnExpec AccessibleObject accessibleObject2 = dataGridView.Rows[1].AccessibilityObject; AccessibleObject accessibleObject4 = dataGridView.Rows[3].AccessibilityObject; - Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject4, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject4.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject4, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject4.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(accessibleObject2, accessibleObject4.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(accessibleObject2, accessibleObject4.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(dataGridView.IsHandleCreated); } @@ -710,15 +709,15 @@ public void DataGridViewRowAccessibleObject_FragmentNavigate_Sibling_ReturnExpec AccessibleObject accessibleObject2 = dataGridView.Rows[1].AccessibilityObject; AccessibleObject accessibleObject3 = dataGridView.Rows[2].AccessibilityObject; - Assert.Equal(accessibleObject1, topRowAccessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(accessibleObject1, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(topRowAccessibleObject, accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(topRowAccessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(topRowAccessibleObject, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(dataGridView.IsHandleCreated); } @@ -736,13 +735,13 @@ public void DataGridViewRowAccessibleObject_FragmentNavigate_Sibling_ReturnExpec AccessibleObject accessibleObject2 = dataGridView.Rows[1].AccessibilityObject; AccessibleObject accessibleObject3 = dataGridView.Rows[2].AccessibilityObject; - Assert.Equal(accessibleObject2, topRowAccessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(accessibleObject2, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(topRowAccessibleObject, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(topRowAccessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(topRowAccessibleObject, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(dataGridView.IsHandleCreated); } @@ -760,13 +759,13 @@ public void DataGridViewRowAccessibleObject_FragmentNavigate_Sibling_ReturnExpec AccessibleObject accessibleObject1 = dataGridView.Rows[0].AccessibilityObject; AccessibleObject accessibleObject3 = dataGridView.Rows[2].AccessibilityObject; - Assert.Equal(accessibleObject1, topRowAccessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject3, accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(accessibleObject1, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject3, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(accessibleObject1, accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(topRowAccessibleObject, accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(topRowAccessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(accessibleObject1, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(topRowAccessibleObject, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(dataGridView.IsHandleCreated); } @@ -784,13 +783,13 @@ public void DataGridViewRowAccessibleObject_FragmentNavigate_Sibling_ReturnExpec AccessibleObject accessibleObject1 = dataGridView.Rows[0].AccessibilityObject; AccessibleObject accessibleObject2 = dataGridView.Rows[1].AccessibilityObject; - Assert.Equal(accessibleObject1, topRowAccessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(accessibleObject1, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(topRowAccessibleObject, accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(topRowAccessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(topRowAccessibleObject, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(dataGridView.IsHandleCreated); } @@ -1199,8 +1198,8 @@ public void DataGridViewRowAccessibleObject_FragmentNavigate_ReturnsExpected_IfC AccessibleObject rowAccessibleObject = dataGridView.Rows[0].AccessibilityObject; AccessibleObject topLeftAccessibilityObject = dataGridView.Rows[0].HeaderCell.AccessibilityObject; - Assert.Equal(topLeftAccessibilityObject, rowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(topLeftAccessibilityObject, rowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(topLeftAccessibilityObject, rowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(topLeftAccessibilityObject, rowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(dataGridView.IsHandleCreated); } @@ -1213,8 +1212,8 @@ public void DataGridViewRowAccessibleObject_FragmentNavigate_Child_ReturnsNull_I AccessibleObject rowAccessibleObject = dataGridView.Rows[0].AccessibilityObject; - Assert.Null(rowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Null(rowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Null(rowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(rowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(dataGridView.IsHandleCreated); } @@ -1231,8 +1230,8 @@ public void DataGridViewRowAccessibleObject_FragmentNavigate_Child_ReturnsExpect AccessibleObject accessibleObject2 = dataGridView.Rows[0].Cells[1].AccessibilityObject; AccessibleObject accessibleObject3 = dataGridView.Rows[0].Cells[2].AccessibilityObject; - Assert.Equal(accessibleObject2, rowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(accessibleObject3, rowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(accessibleObject2, rowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(accessibleObject3, rowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(dataGridView.IsHandleCreated); } @@ -1249,8 +1248,8 @@ public void DataGridViewRowAccessibleObject_FragmentNavigate_Child_ReturnsExpect AccessibleObject accessibleObject1 = dataGridView.Rows[0].Cells[0].AccessibilityObject; AccessibleObject accessibleObject3 = dataGridView.Rows[0].Cells[2].AccessibilityObject; - Assert.Equal(accessibleObject1, rowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(accessibleObject3, rowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(accessibleObject1, rowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(accessibleObject3, rowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(dataGridView.IsHandleCreated); } @@ -1267,8 +1266,8 @@ public void DataGridViewRowAccessibleObject_FragmentNavigate_Child_ReturnsExpect AccessibleObject accessibleObject1 = dataGridView.Rows[0].Cells[0].AccessibilityObject; AccessibleObject accessibleObject2 = dataGridView.Rows[0].Cells[1].AccessibilityObject; - Assert.Equal(accessibleObject1, rowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(accessibleObject2, rowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(accessibleObject1, rowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(accessibleObject2, rowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(dataGridView.IsHandleCreated); } @@ -1285,8 +1284,8 @@ public void DataGridViewRowAccessibleObject_FragmentNavigate_Child_ReturnsExpect AccessibleObject rowAccessibleObject = dataGridView.Rows[0].AccessibilityObject; - Assert.Null(rowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Null(rowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Null(rowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(rowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(dataGridView.IsHandleCreated); } @@ -1303,8 +1302,8 @@ public void DataGridViewRowAccessibleObject_FragmentNavigate_Child_ReturnsExpect AccessibleObject topLeftAccessibilityObject = dataGridView.Rows[0].HeaderCell.AccessibilityObject; AccessibleObject accessibleObject = dataGridView.Rows[0].Cells[2].AccessibilityObject; - Assert.Equal(topLeftAccessibilityObject, rowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(accessibleObject, rowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(topLeftAccessibilityObject, rowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(accessibleObject, rowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(dataGridView.IsHandleCreated); } @@ -1321,8 +1320,8 @@ public void DataGridViewRowAccessibleObject_FragmentNavigate_Child_ReturnsExpect AccessibleObject topLeftAccessibilityObject = dataGridView.Rows[0].HeaderCell.AccessibilityObject; AccessibleObject accessibleObject = dataGridView.Rows[0].Cells[2].AccessibilityObject; - Assert.Equal(topLeftAccessibilityObject, rowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(accessibleObject, rowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(topLeftAccessibilityObject, rowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(accessibleObject, rowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(dataGridView.IsHandleCreated); } @@ -1339,8 +1338,8 @@ public void DataGridViewRowAccessibleObject_FragmentNavigate_Child_ReturnsExpect AccessibleObject topLeftAccessibilityObject = dataGridView.Rows[0].HeaderCell.AccessibilityObject; AccessibleObject accessibleObject = dataGridView.Rows[0].Cells[1].AccessibilityObject; - Assert.Equal(topLeftAccessibilityObject, rowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(accessibleObject, rowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(topLeftAccessibilityObject, rowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(accessibleObject, rowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(dataGridView.IsHandleCreated); } @@ -1358,8 +1357,8 @@ public void DataGridViewRowAccessibleObject_FragmentNavigate_Child_ReturnsExpect AccessibleObject rowAccessibleObject = dataGridView.Rows[0].AccessibilityObject; AccessibleObject topLeftAccessibilityObject = dataGridView.Rows[0].HeaderCell.AccessibilityObject; - Assert.Equal(topLeftAccessibilityObject, rowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(topLeftAccessibilityObject, rowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(topLeftAccessibilityObject, rowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(topLeftAccessibilityObject, rowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(dataGridView.IsHandleCreated); } @@ -1378,8 +1377,8 @@ public void DataGridViewRowAccessibleObject_FragmentNavigate_Child_ReturnsExpect AccessibleObject accessibleObject1 = dataGridView.Rows[0].Cells[2].AccessibilityObject; AccessibleObject accessibleObject2 = dataGridView.Rows[0].Cells[0].AccessibilityObject; - Assert.Equal(accessibleObject1, rowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(accessibleObject2, rowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(accessibleObject1, rowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(accessibleObject2, rowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(dataGridView.IsHandleCreated); } @@ -1399,8 +1398,8 @@ public void DataGridViewRowAccessibleObject_FragmentNavigate_Child_ReturnsExpect AccessibleObject accessibleObject1 = dataGridView.Rows[0].Cells[2].AccessibilityObject; AccessibleObject accessibleObject2 = dataGridView.Rows[0].Cells[1].AccessibilityObject; - Assert.Equal(accessibleObject1, rowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(accessibleObject2, rowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(accessibleObject1, rowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(accessibleObject2, rowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(dataGridView.IsHandleCreated); } @@ -1420,8 +1419,8 @@ public void DataGridViewRowAccessibleObject_FragmentNavigate_Child_ReturnsExpect AccessibleObject accessibleObject1 = dataGridView.Rows[0].Cells[2].AccessibilityObject; AccessibleObject accessibleObject2 = dataGridView.Rows[0].Cells[0].AccessibilityObject; - Assert.Equal(accessibleObject1, rowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(accessibleObject2, rowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(accessibleObject1, rowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(accessibleObject2, rowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(dataGridView.IsHandleCreated); } @@ -1441,8 +1440,8 @@ public void DataGridViewRowAccessibleObject_FragmentNavigate_Child_ReturnsExpect AccessibleObject accessibleObject1 = dataGridView.Rows[0].Cells[1].AccessibilityObject; AccessibleObject accessibleObject2 = dataGridView.Rows[0].Cells[0].AccessibilityObject; - Assert.Equal(accessibleObject1, rowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(accessibleObject2, rowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(accessibleObject1, rowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(accessibleObject2, rowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(dataGridView.IsHandleCreated); } @@ -1461,8 +1460,8 @@ public void DataGridViewRowAccessibleObject_FragmentNavigate_Child_ReturnsExpect AccessibleObject topLeftAccessibilityObject = dataGridView.Rows[0].HeaderCell.AccessibilityObject; AccessibleObject accessibleObject = dataGridView.Rows[0].Cells[0].AccessibilityObject; - Assert.Equal(topLeftAccessibilityObject, rowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(accessibleObject, rowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(topLeftAccessibilityObject, rowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(accessibleObject, rowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(dataGridView.IsHandleCreated); } @@ -1482,8 +1481,8 @@ public void DataGridViewRowAccessibleObject_FragmentNavigate_Child_ReturnsExpect AccessibleObject topLeftAccessibilityObject = dataGridView.Rows[0].HeaderCell.AccessibilityObject; AccessibleObject accessibleObject = dataGridView.Rows[0].Cells[1].AccessibilityObject; - Assert.Equal(topLeftAccessibilityObject, rowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(accessibleObject, rowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(topLeftAccessibilityObject, rowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(accessibleObject, rowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(dataGridView.IsHandleCreated); } @@ -1503,8 +1502,8 @@ public void DataGridViewRowAccessibleObject_FragmentNavigate_Child_ReturnsExpect AccessibleObject topLeftAccessibilityObject = dataGridView.Rows[0].HeaderCell.AccessibilityObject; AccessibleObject accessibleObject = dataGridView.Rows[0].Cells[0].AccessibilityObject; - Assert.Equal(topLeftAccessibilityObject, rowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(accessibleObject, rowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(topLeftAccessibilityObject, rowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(accessibleObject, rowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(dataGridView.IsHandleCreated); } @@ -1524,8 +1523,8 @@ public void DataGridViewRowAccessibleObject_FragmentNavigate_Child_ReturnsExpect AccessibleObject topLeftAccessibilityObject = dataGridView.Rows[0].HeaderCell.AccessibilityObject; AccessibleObject accessibleObject = dataGridView.Rows[0].Cells[0].AccessibilityObject; - Assert.Equal(topLeftAccessibilityObject, rowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(accessibleObject, rowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(topLeftAccessibilityObject, rowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(accessibleObject, rowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(dataGridView.IsHandleCreated); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DataGridViewRowHeaderCellAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DataGridViewRowHeaderCellAccessibleObjectTests.cs index 21eb36c3174..8b1f63f3f8a 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DataGridViewRowHeaderCellAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DataGridViewRowHeaderCellAccessibleObjectTests.cs @@ -2,7 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Drawing; -using static Interop; +using Windows.Win32.UI.Accessibility; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -142,7 +142,7 @@ public void DataGridViewRowHeaderCellAccessibleObject_FragmentNavigate_Parent_Re var accessibleObject = (DataGridViewRowHeaderCellAccessibleObject)row.HeaderCell.AccessibilityObject; AccessibleObject expected = row.AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); Assert.Equal(createControl, control.IsHandleCreated); } @@ -153,7 +153,7 @@ public void DataGridViewRowHeaderCellAccessibleObject_FragmentNavigate_Parent_Re DataGridViewRowHeaderCellAccessibleObject accessibleObject = new(new()); Assert.Null(accessibleObject.Owner.OwningRow); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); } [WinFormsTheory] @@ -167,7 +167,7 @@ public void DataGridViewRowHeaderCellAccessibleObject_FragmentNavigate_NextSibli AccessibleObject accessibleObject = (DataGridViewRowHeaderCellAccessibleObject)row.HeaderCell.AccessibilityObject; AccessibleObject expected = row.Cells[0].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); Assert.Equal(createControl, control.IsHandleCreated); } @@ -184,7 +184,7 @@ public void DataGridViewRowHeaderCellAccessibleObject_FragmentNavigate_NextSibli AccessibleObject accessibleObject = (DataGridViewRowHeaderCellAccessibleObject)row.HeaderCell.AccessibilityObject; AccessibleObject expected = row.Cells[1].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); Assert.Equal(createControl, control.IsHandleCreated); } @@ -202,7 +202,7 @@ public void DataGridViewRowHeaderCellAccessibleObject_FragmentNavigate_NextSibli AccessibleObject accessibleObject = (DataGridViewRowHeaderCellAccessibleObject)row.HeaderCell.AccessibilityObject; AccessibleObject expected = row.Cells[1].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); Assert.Equal(createControl, control.IsHandleCreated); } @@ -221,7 +221,7 @@ public void DataGridViewRowHeaderCellAccessibleObject_FragmentNavigate_NextSibli AccessibleObject accessibleObject = (DataGridViewRowHeaderCellAccessibleObject)row.HeaderCell.AccessibilityObject; AccessibleObject expected = row.Cells[0].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); Assert.Equal(createControl, control.IsHandleCreated); } @@ -236,7 +236,7 @@ public void DataGridViewRowHeaderCellAccessibleObject_FragmentNavigate_PreviousS var accessibleObject = (DataGridViewRowHeaderCellAccessibleObject)row.HeaderCell.AccessibilityObject; - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.Equal(createControl, control.IsHandleCreated); } @@ -251,8 +251,8 @@ public void DataGridViewRowHeaderCellAccessibleObject_FragmentNavigate_Child_Ret var accessibleObject = (DataGridViewRowHeaderCellAccessibleObject)row.HeaderCell.AccessibilityObject; - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.Equal(createControl, control.IsHandleCreated); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DataGridViewTextBoxEditingControl.DataGridViewTextBoxEditingControlAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DataGridViewTextBoxEditingControl.DataGridViewTextBoxEditingControlAccessibleObjectTests.cs index 7a3f4f08bc5..a0c03a89ac0 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DataGridViewTextBoxEditingControl.DataGridViewTextBoxEditingControlAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DataGridViewTextBoxEditingControl.DataGridViewTextBoxEditingControlAccessibleObjectTests.cs @@ -3,7 +3,6 @@ using Windows.Win32.UI.Accessibility; using static System.Windows.Forms.DataGridViewTextBoxEditingControl; -using static Interop; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -118,15 +117,15 @@ public void DataGridViewTextBoxEditingControlAccessibleObject_GetPropertyValue_C } [WinFormsTheory] - [InlineData((int)UiaCore.NavigateDirection.NextSibling)] - [InlineData((int)UiaCore.NavigateDirection.PreviousSibling)] - [InlineData((int)UiaCore.NavigateDirection.FirstChild)] - [InlineData((int)UiaCore.NavigateDirection.LastChild)] + [InlineData((int)NavigateDirection.NavigateDirection_NextSibling)] + [InlineData((int)NavigateDirection.NavigateDirection_PreviousSibling)] + [InlineData((int)NavigateDirection.NavigateDirection_FirstChild)] + [InlineData((int)NavigateDirection.NavigateDirection_LastChild)] public void DataGridViewTextBoxEditingControlAccessibleObject_FragmentNavigate_SiblingsAndChildrenAreNull(int direction) { using DataGridViewTextBoxEditingControl control = new(); - object actual = control.AccessibilityObject.FragmentNavigate((UiaCore.NavigateDirection)direction); + object actual = control.AccessibilityObject.FragmentNavigate((NavigateDirection)direction); Assert.Null(actual); Assert.False(control.IsHandleCreated); @@ -146,7 +145,7 @@ public void DataGridViewTextBoxEditingControlAccessibleObject_FragmentNavigate_P control.CurrentCell = control.Rows[0].Cells[0]; control.BeginEdit(false); - object actual = control.EditingControlAccessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent); + object actual = control.EditingControlAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent); control.EndEdit(); diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DataGridViewTopLeftHeaderCellAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DataGridViewTopLeftHeaderCellAccessibleObjectTests.cs index e09e26abccc..5a3a78ea0a4 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DataGridViewTopLeftHeaderCellAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DataGridViewTopLeftHeaderCellAccessibleObjectTests.cs @@ -3,7 +3,6 @@ using System.Drawing; using Windows.Win32.UI.Accessibility; -using static Interop; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -154,7 +153,7 @@ public void DataGridViewTopLeftHeaderCellAccessibleObject_FragmentNavigate_Paren control.TopLeftHeaderCell = cell; AccessibleObject expected = control.AccessibilityObject.GetChild(0); - Assert.Equal(expected, cell.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); + Assert.Equal(expected, cell.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); Assert.Equal(createControl, control.IsHandleCreated); } @@ -169,7 +168,7 @@ public void DataGridViewTopLeftHeaderCellAccessibleObject_FragmentNavigate_Previ control.TopLeftHeaderCell = cell; - Assert.Null(cell.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Null(cell.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.Equal(createControl, control.IsHandleCreated); } @@ -185,7 +184,7 @@ public void DataGridViewTopLeftHeaderCellAccessibleObject_FragmentNavigate_NextS control.TopLeftHeaderCell = cell; AccessibleObject expected = control.AccessibilityObject.GetChild(0)?.GetChild(1); - Assert.Equal(expected, cell.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(expected, cell.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); Assert.Equal(createControl, control.IsHandleCreated); } @@ -200,7 +199,7 @@ public void DataGridViewTopLeftHeaderCellAccessibleObject_FragmentNavigate_NextS control.TopLeftHeaderCell = cell; - Assert.Null(cell.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Null(cell.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); Assert.Equal(createControl, control.IsHandleCreated); } @@ -218,7 +217,7 @@ public void DataGridViewTopLeftHeaderCellAccessibleObject_FragmentNavigate_NextS AccessibleObject expected = control.Columns[1].HeaderCell.AccessibilityObject; - Assert.Equal(expected, cell.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(expected, cell.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); Assert.Equal(createControl, control.IsHandleCreated); } @@ -237,7 +236,7 @@ public void DataGridViewTopLeftHeaderCellAccessibleObject_FragmentNavigate_NextS AccessibleObject expected = control.Columns[1].HeaderCell.AccessibilityObject; - Assert.Equal(expected, cell.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(expected, cell.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); Assert.Equal(createControl, control.IsHandleCreated); } @@ -257,7 +256,7 @@ public void DataGridViewTopLeftHeaderCellAccessibleObject_FragmentNavigate_NextS AccessibleObject expected = control.Columns[0].HeaderCell.AccessibilityObject; - Assert.Equal(expected, cell.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(expected, cell.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); Assert.Equal(createControl, control.IsHandleCreated); } @@ -272,8 +271,8 @@ public void DataGridViewTopLeftHeaderCellAccessibleObject_FragmentNavigate_Child using DataGridViewTopLeftHeaderCell cell = new(); control.TopLeftHeaderCell = cell; - Assert.Null(cell.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(cell.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Null(cell.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(cell.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.Equal(createControl, control.IsHandleCreated); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DataGridViewTopRowAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DataGridViewTopRowAccessibleObjectTests.cs index 89fe89fd26d..8e748c47b22 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DataGridViewTopRowAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DataGridViewTopRowAccessibleObjectTests.cs @@ -20,11 +20,11 @@ public void DataGridViewTopRowAccessibleObject_FragmentNavigate_ReturnsExpected_ AccessibleObject expectedFirstChild = dataGridView.TopLeftHeaderCell.AccessibilityObject; AccessibleObject expectedLastChild = dataGridView.Columns[0].HeaderCell.AccessibilityObject; - Assert.Equal(dataGridView.AccessibilityObject, topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.Parent)); - Assert.Null(topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(expectedNextSibling, topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(expectedFirstChild, topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(expectedLastChild, topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(dataGridView.AccessibilityObject, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(expectedNextSibling, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(expectedFirstChild, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(expectedLastChild, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(dataGridView.IsHandleCreated); } @@ -40,11 +40,11 @@ public void DataGridViewTopRowAccessibleObject_FragmentNavigate_ReturnsExpected_ AccessibleObject expectedFirstChild = dataGridView.TopLeftHeaderCell.AccessibilityObject; AccessibleObject expectedLastChild = dataGridView.Columns[0].HeaderCell.AccessibilityObject; - Assert.Equal(dataGridView.AccessibilityObject, topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.Parent)); - Assert.Null(topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(expectedFirstChild, topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(expectedLastChild, topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(dataGridView.AccessibilityObject, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(expectedFirstChild, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(expectedLastChild, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(dataGridView.IsHandleCreated); } @@ -56,11 +56,11 @@ public void DataGridViewTopRowAccessibleObject_FragmentNavigate_ReturnsExpected_ AccessibleObject topRowAccessibleObject = dataGridView.AccessibilityObject.TestAccessor().Dynamic.TopRowAccessibilityObject; AccessibleObject topLeftAccessibilityObject = dataGridView.TopLeftHeaderCell.AccessibilityObject; - Assert.Equal(dataGridView.AccessibilityObject, topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.Parent)); - Assert.Null(topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(topLeftAccessibilityObject, topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(topLeftAccessibilityObject, topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(dataGridView.AccessibilityObject, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(topLeftAccessibilityObject, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(topLeftAccessibilityObject, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(dataGridView.IsHandleCreated); } @@ -76,8 +76,8 @@ public void DataGridViewTopRowAccessibleObject_FragmentNavigate_Child_ReturnsExp AccessibleObject accessibleObject1 = dataGridView.Columns[0].HeaderCell.AccessibilityObject; AccessibleObject accessibleObject2 = dataGridView.Columns[2].HeaderCell.AccessibilityObject; - Assert.Equal(accessibleObject1, topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(accessibleObject2, topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(accessibleObject1, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(accessibleObject2, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(dataGridView.IsHandleCreated); } @@ -94,8 +94,8 @@ public void DataGridViewTopRowAccessibleObject_FragmentNavigate_Child_ReturnsExp AccessibleObject accessibleObject1 = dataGridView.Columns[1].HeaderCell.AccessibilityObject; AccessibleObject accessibleObject2 = dataGridView.Columns[2].HeaderCell.AccessibilityObject; - Assert.Equal(accessibleObject1, topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(accessibleObject2, topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(accessibleObject1, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(accessibleObject2, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(dataGridView.IsHandleCreated); } @@ -112,8 +112,8 @@ public void DataGridViewTopRowAccessibleObject_FragmentNavigate_Child_ReturnsExp AccessibleObject accessibleObject1 = dataGridView.Columns[0].HeaderCell.AccessibilityObject; AccessibleObject accessibleObject2 = dataGridView.Columns[2].HeaderCell.AccessibilityObject; - Assert.Equal(accessibleObject1, topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(accessibleObject2, topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(accessibleObject1, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(accessibleObject2, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(dataGridView.IsHandleCreated); } @@ -130,8 +130,8 @@ public void DataGridViewTopRowAccessibleObject_FragmentNavigate_Child_ReturnsExp AccessibleObject accessibleObject1 = dataGridView.Columns[0].HeaderCell.AccessibilityObject; AccessibleObject accessibleObject2 = dataGridView.Columns[1].HeaderCell.AccessibilityObject; - Assert.Equal(accessibleObject1, topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(accessibleObject2, topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(accessibleObject1, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(accessibleObject2, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(dataGridView.IsHandleCreated); } @@ -148,8 +148,8 @@ public void DataGridViewTopRowAccessibleObject_FragmentNavigate_Child_ReturnsExp AccessibleObject topRowAccessibleObject = dataGridView.AccessibilityObject.TestAccessor().Dynamic.TopRowAccessibilityObject; - Assert.Null(topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Null(topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Null(topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(dataGridView.IsHandleCreated); } @@ -166,8 +166,8 @@ public void DataGridViewTopRowAccessibleObject_FragmentNavigate_Child_ReturnsExp AccessibleObject topLeftAccessibilityObject = dataGridView.TopLeftHeaderCell.AccessibilityObject; AccessibleObject accessibleObject = dataGridView.Columns[2].HeaderCell.AccessibilityObject; - Assert.Equal(topLeftAccessibilityObject, topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(accessibleObject, topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(topLeftAccessibilityObject, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(accessibleObject, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(dataGridView.IsHandleCreated); } @@ -184,8 +184,8 @@ public void DataGridViewTopRowAccessibleObject_FragmentNavigate_Child_ReturnsExp AccessibleObject topLeftAccessibilityObject = dataGridView.TopLeftHeaderCell.AccessibilityObject; AccessibleObject accessibleObject = dataGridView.Columns[2].HeaderCell.AccessibilityObject; - Assert.Equal(topLeftAccessibilityObject, topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(accessibleObject, topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(topLeftAccessibilityObject, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(accessibleObject, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(dataGridView.IsHandleCreated); } @@ -202,8 +202,8 @@ public void DataGridViewTopRowAccessibleObject_FragmentNavigate_Child_ReturnsExp AccessibleObject topLeftAccessibilityObject = dataGridView.TopLeftHeaderCell.AccessibilityObject; AccessibleObject accessibleObject = dataGridView.Columns[1].HeaderCell.AccessibilityObject; - Assert.Equal(topLeftAccessibilityObject, topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(accessibleObject, topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(topLeftAccessibilityObject, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(accessibleObject, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(dataGridView.IsHandleCreated); } @@ -221,8 +221,8 @@ public void DataGridViewTopRowAccessibleObject_FragmentNavigate_Child_ReturnsExp AccessibleObject topRowAccessibleObject = dataGridView.AccessibilityObject.TestAccessor().Dynamic.TopRowAccessibilityObject; AccessibleObject topLeftAccessibilityObject = dataGridView.TopLeftHeaderCell.AccessibilityObject; - Assert.Equal(topLeftAccessibilityObject, topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(topLeftAccessibilityObject, topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(topLeftAccessibilityObject, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(topLeftAccessibilityObject, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(dataGridView.IsHandleCreated); } @@ -241,8 +241,8 @@ public void DataGridViewTopRowAccessibleObject_FragmentNavigate_Child_ReturnsExp AccessibleObject accessibleObject1 = dataGridView.Columns[2].HeaderCell.AccessibilityObject; AccessibleObject accessibleObject2 = dataGridView.Columns[0].HeaderCell.AccessibilityObject; - Assert.Equal(accessibleObject1, topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(accessibleObject2, topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(accessibleObject1, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(accessibleObject2, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(dataGridView.IsHandleCreated); } @@ -262,8 +262,8 @@ public void DataGridViewTopRowAccessibleObject_FragmentNavigate_Child_ReturnsExp AccessibleObject accessibleObject1 = dataGridView.Columns[2].HeaderCell.AccessibilityObject; AccessibleObject accessibleObject2 = dataGridView.Columns[1].HeaderCell.AccessibilityObject; - Assert.Equal(accessibleObject1, topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(accessibleObject2, topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(accessibleObject1, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(accessibleObject2, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(dataGridView.IsHandleCreated); } @@ -283,8 +283,8 @@ public void DataGridViewTopRowAccessibleObject_FragmentNavigate_Child_ReturnsExp AccessibleObject accessibleObject1 = dataGridView.Columns[2].HeaderCell.AccessibilityObject; AccessibleObject accessibleObject2 = dataGridView.Columns[0].HeaderCell.AccessibilityObject; - Assert.Equal(accessibleObject1, topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(accessibleObject2, topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(accessibleObject1, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(accessibleObject2, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(dataGridView.IsHandleCreated); } @@ -304,8 +304,8 @@ public void DataGridViewTopRowAccessibleObject_FragmentNavigate_Child_ReturnsExp AccessibleObject accessibleObject1 = dataGridView.Columns[1].HeaderCell.AccessibilityObject; AccessibleObject accessibleObject2 = dataGridView.Columns[0].HeaderCell.AccessibilityObject; - Assert.Equal(accessibleObject1, topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(accessibleObject2, topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(accessibleObject1, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(accessibleObject2, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(dataGridView.IsHandleCreated); } @@ -324,8 +324,8 @@ public void DataGridViewTopRowAccessibleObject_FragmentNavigate_Child_ReturnsExp AccessibleObject topLeftAccessibilityObject = dataGridView.TopLeftHeaderCell.AccessibilityObject; AccessibleObject accessibleObject = dataGridView.Columns[0].HeaderCell.AccessibilityObject; - Assert.Equal(topLeftAccessibilityObject, topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(accessibleObject, topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(topLeftAccessibilityObject, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(accessibleObject, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(dataGridView.IsHandleCreated); } @@ -345,8 +345,8 @@ public void DataGridViewTopRowAccessibleObject_FragmentNavigate_Child_ReturnsExp AccessibleObject topLeftAccessibilityObject = dataGridView.TopLeftHeaderCell.AccessibilityObject; AccessibleObject accessibleObject = dataGridView.Columns[1].HeaderCell.AccessibilityObject; - Assert.Equal(topLeftAccessibilityObject, topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(accessibleObject, topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(topLeftAccessibilityObject, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(accessibleObject, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(dataGridView.IsHandleCreated); } @@ -366,8 +366,8 @@ public void DataGridViewTopRowAccessibleObject_FragmentNavigate_Child_ReturnsExp AccessibleObject topLeftAccessibilityObject = dataGridView.TopLeftHeaderCell.AccessibilityObject; AccessibleObject accessibleObject = dataGridView.Columns[0].HeaderCell.AccessibilityObject; - Assert.Equal(topLeftAccessibilityObject, topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(accessibleObject, topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(topLeftAccessibilityObject, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(accessibleObject, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(dataGridView.IsHandleCreated); } @@ -387,8 +387,8 @@ public void DataGridViewTopRowAccessibleObject_FragmentNavigate_Child_ReturnsExp AccessibleObject topLeftAccessibilityObject = dataGridView.TopLeftHeaderCell.AccessibilityObject; AccessibleObject accessibleObject = dataGridView.Columns[0].HeaderCell.AccessibilityObject; - Assert.Equal(topLeftAccessibilityObject, topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(accessibleObject, topRowAccessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(topLeftAccessibilityObject, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(accessibleObject, topRowAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(dataGridView.IsHandleCreated); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DateTimePicker.DateTimePickerAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DateTimePicker.DateTimePickerAccessibleObjectTests.cs index 4a9dd1dbad9..9f3ad3d8795 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DateTimePicker.DateTimePickerAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DateTimePicker.DateTimePickerAccessibleObjectTests.cs @@ -3,7 +3,6 @@ using Windows.Win32.UI.Accessibility; using static System.Windows.Forms.DateTimePicker; -using static Interop; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -116,17 +115,17 @@ public void DateTimePickerAccessibleObject_GetPropertyValue_ReturnsExpected() } [WinFormsTheory] - [InlineData((int)UiaCore.ExpandCollapseState.Expanded)] - [InlineData((int)UiaCore.ExpandCollapseState.Collapsed)] + [InlineData((int)ExpandCollapseState.ExpandCollapseState_Expanded)] + [InlineData((int)ExpandCollapseState.ExpandCollapseState_Collapsed)] public void DateTimePickerAccessibleObject_ExpandCollapseState_ReturnsExpected(int expandCollapseState) { using DateTimePicker dateTimePicker = new(); - var expected = (UiaCore.ExpandCollapseState)expandCollapseState; + var expected = (ExpandCollapseState)expandCollapseState; var accessibleObject = (DateTimePickerAccessibleObject)dateTimePicker.AccessibilityObject; dateTimePicker.TestAccessor().Dynamic._expandCollapseState = expected; - UiaCore.ExpandCollapseState actual = accessibleObject.ExpandCollapseState; + ExpandCollapseState actual = accessibleObject.ExpandCollapseState; Assert.Equal(expected, actual); Assert.False(dateTimePicker.IsHandleCreated); @@ -140,11 +139,11 @@ public void DateTimePickerAccessibleObject_Expand_IfHandleIsNotCreated_NothingCh var accessibleObject = (DateTimePickerAccessibleObject)dateTimePicker.AccessibilityObject; // ExpandCollapseState is Collapsed before some actions - Assert.Equal(UiaCore.ExpandCollapseState.Collapsed, accessibleObject.ExpandCollapseState); + Assert.Equal(ExpandCollapseState.ExpandCollapseState_Collapsed, accessibleObject.ExpandCollapseState); accessibleObject.Expand(); - Assert.Equal(UiaCore.ExpandCollapseState.Collapsed, accessibleObject.ExpandCollapseState); + Assert.Equal(ExpandCollapseState.ExpandCollapseState_Collapsed, accessibleObject.ExpandCollapseState); Assert.False(dateTimePicker.IsHandleCreated); } @@ -156,15 +155,15 @@ public void DateTimePickerAccessibleObject_Collapse_IfHandleIsNotCreated_Nothing var accessibleObject = (DateTimePickerAccessibleObject)dateTimePicker.AccessibilityObject; // ExpandCollapseState is Collapsed before some actions - Assert.Equal(UiaCore.ExpandCollapseState.Collapsed, accessibleObject.ExpandCollapseState); + Assert.Equal(ExpandCollapseState.ExpandCollapseState_Collapsed, accessibleObject.ExpandCollapseState); - dateTimePicker.TestAccessor().Dynamic._expandCollapseState = UiaCore.ExpandCollapseState.Expanded; + dateTimePicker.TestAccessor().Dynamic._expandCollapseState = ExpandCollapseState.ExpandCollapseState_Expanded; - Assert.Equal(UiaCore.ExpandCollapseState.Expanded, accessibleObject.ExpandCollapseState); + Assert.Equal(ExpandCollapseState.ExpandCollapseState_Expanded, accessibleObject.ExpandCollapseState); accessibleObject.Collapse(); - Assert.Equal(UiaCore.ExpandCollapseState.Expanded, accessibleObject.ExpandCollapseState); + Assert.Equal(ExpandCollapseState.ExpandCollapseState_Expanded, accessibleObject.ExpandCollapseState); Assert.False(dateTimePicker.IsHandleCreated); } @@ -177,15 +176,15 @@ public void DateTimePickerAccessibleObject_Expand_IfControlAlreadyIsExpanded_Not var accessibleObject = (DateTimePickerAccessibleObject)dateTimePicker.AccessibilityObject; // ExpandCollapseState is Collapsed before some actions - Assert.Equal(UiaCore.ExpandCollapseState.Collapsed, accessibleObject.ExpandCollapseState); + Assert.Equal(ExpandCollapseState.ExpandCollapseState_Collapsed, accessibleObject.ExpandCollapseState); - dateTimePicker.TestAccessor().Dynamic._expandCollapseState = UiaCore.ExpandCollapseState.Expanded; + dateTimePicker.TestAccessor().Dynamic._expandCollapseState = ExpandCollapseState.ExpandCollapseState_Expanded; - Assert.Equal(UiaCore.ExpandCollapseState.Expanded, accessibleObject.ExpandCollapseState); + Assert.Equal(ExpandCollapseState.ExpandCollapseState_Expanded, accessibleObject.ExpandCollapseState); accessibleObject.Expand(); - Assert.Equal(UiaCore.ExpandCollapseState.Expanded, accessibleObject.ExpandCollapseState); + Assert.Equal(ExpandCollapseState.ExpandCollapseState_Expanded, accessibleObject.ExpandCollapseState); Assert.True(dateTimePicker.IsHandleCreated); } @@ -198,11 +197,11 @@ public void DateTimePickerAccessibleObject_Collapse_IfControlAlreadyIsCollapsed_ var accessibleObject = (DateTimePickerAccessibleObject)dateTimePicker.AccessibilityObject; // ExpandCollapseState is Collapsed before some actions - Assert.Equal(UiaCore.ExpandCollapseState.Collapsed, accessibleObject.ExpandCollapseState); + Assert.Equal(ExpandCollapseState.ExpandCollapseState_Collapsed, accessibleObject.ExpandCollapseState); accessibleObject.Collapse(); - Assert.Equal(UiaCore.ExpandCollapseState.Collapsed, accessibleObject.ExpandCollapseState); + Assert.Equal(ExpandCollapseState.ExpandCollapseState_Collapsed, accessibleObject.ExpandCollapseState); Assert.True(dateTimePicker.IsHandleCreated); } @@ -215,11 +214,11 @@ public void DateTimePickerAccessibleObject_Expand_IfHandleIsCreated_ReturnsExpec var accessibleObject = (DateTimePickerAccessibleObject)dateTimePicker.AccessibilityObject; // ExpandCollapseState is Collapsed before some actions - Assert.Equal(UiaCore.ExpandCollapseState.Collapsed, accessibleObject.ExpandCollapseState); + Assert.Equal(ExpandCollapseState.ExpandCollapseState_Collapsed, accessibleObject.ExpandCollapseState); accessibleObject.Expand(); - Assert.Equal(UiaCore.ExpandCollapseState.Expanded, accessibleObject.ExpandCollapseState); + Assert.Equal(ExpandCollapseState.ExpandCollapseState_Expanded, accessibleObject.ExpandCollapseState); Assert.True(dateTimePicker.IsHandleCreated); } @@ -231,17 +230,17 @@ public void DateTimePickerAccessibleObject_Collapse_IfHandleIsCreated_ReturnsExp dateTimePicker.CreateControl(); var accessibleObject = (DateTimePickerAccessibleObject)dateTimePicker.AccessibilityObject; - Assert.Equal(UiaCore.ExpandCollapseState.Collapsed, accessibleObject.ExpandCollapseState); + Assert.Equal(ExpandCollapseState.ExpandCollapseState_Collapsed, accessibleObject.ExpandCollapseState); // If don't call Expand() on this control and just change state value instead // then call Collapse() does't work correctly due to the control is not expanded factually accessibleObject.Expand(); - Assert.Equal(UiaCore.ExpandCollapseState.Expanded, accessibleObject.ExpandCollapseState); + Assert.Equal(ExpandCollapseState.ExpandCollapseState_Expanded, accessibleObject.ExpandCollapseState); accessibleObject.Collapse(); - Assert.Equal(UiaCore.ExpandCollapseState.Collapsed, accessibleObject.ExpandCollapseState); + Assert.Equal(ExpandCollapseState.ExpandCollapseState_Collapsed, accessibleObject.ExpandCollapseState); Assert.True(dateTimePicker.IsHandleCreated); } @@ -319,8 +318,8 @@ public void DateTimePickerAccessibleObject_DefaultAction_ReturnsExpected(bool is } [WinFormsTheory] - [InlineData(true, (int)UiaCore.ExpandCollapseState.Collapsed)] - [InlineData(false, (int)UiaCore.ExpandCollapseState.Expanded)] + [InlineData(true, (int)ExpandCollapseState.ExpandCollapseState_Collapsed)] + [InlineData(false, (int)ExpandCollapseState.ExpandCollapseState_Expanded)] public void DateTimePickerAccessibleObject_DoDefaultAction_IfHandleIsCreated_ReturnsExpected(bool isExpanded, int expected) { using DateTimePicker dateTimePicker = new(); @@ -328,18 +327,18 @@ public void DateTimePickerAccessibleObject_DoDefaultAction_IfHandleIsCreated_Ret AccessibleObject accessibleObject = dateTimePicker.AccessibilityObject; - Assert.Equal(UiaCore.ExpandCollapseState.Collapsed, accessibleObject.ExpandCollapseState); + Assert.Equal(ExpandCollapseState.ExpandCollapseState_Collapsed, accessibleObject.ExpandCollapseState); if (isExpanded) { accessibleObject.Expand(); - Assert.Equal(UiaCore.ExpandCollapseState.Expanded, accessibleObject.ExpandCollapseState); + Assert.Equal(ExpandCollapseState.ExpandCollapseState_Expanded, accessibleObject.ExpandCollapseState); } accessibleObject.DoDefaultAction(); - Assert.Equal((UiaCore.ExpandCollapseState)expected, accessibleObject.ExpandCollapseState); + Assert.Equal((ExpandCollapseState)expected, accessibleObject.ExpandCollapseState); Assert.True(dateTimePicker.IsHandleCreated); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DirectionButtonAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DirectionButtonAccessibleObjectTests.cs index 473aa6fb8c7..22630316a97 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DirectionButtonAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/DirectionButtonAccessibleObjectTests.cs @@ -1,6 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Windows.Win32.UI.Accessibility; + namespace System.Windows.Forms.Tests.AccessibleObjects; public class DirectionButtonAccessibleObjectTests @@ -89,12 +91,12 @@ public void DirectionButtonAccessibleObject_FragmentNavigate_NextSibling_Returns if (expectedChildId is null) { - Assert.Null(directionButton.FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling)); + Assert.Null(directionButton.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); } else { AccessibleObject expected = domainUpDown.UpDownButtonsInternal.AccessibilityObject.GetChild(expectedChildId.Value); - Assert.Equal(expected, directionButton.FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(expected, directionButton.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); } Assert.False(domainUpDown.IsHandleCreated); @@ -112,12 +114,12 @@ public void DirectionButtonAccessibleObject_FragmentNavigate_NextSibling_Returns if (expectedChildId is null) { - Assert.Null(directionButton.FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling)); + Assert.Null(directionButton.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); } else { AccessibleObject expected = numericUpDown.UpDownButtonsInternal.AccessibilityObject.GetChild(expectedChildId.Value); - Assert.Equal(expected, directionButton.FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(expected, directionButton.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); } Assert.False(numericUpDown.IsHandleCreated); @@ -135,12 +137,12 @@ public void DirectionButtonAccessibleObject_FragmentNavigate_PreviousSibling_Ret if (expectedChildId is null) { - Assert.Null(directionButton.FragmentNavigate(Interop.UiaCore.NavigateDirection.PreviousSibling)); + Assert.Null(directionButton.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); } else { AccessibleObject expected = domainUpDown.UpDownButtonsInternal.AccessibilityObject.GetChild(expectedChildId.Value); - Assert.Equal(expected, directionButton.FragmentNavigate(Interop.UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(expected, directionButton.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); } Assert.False(domainUpDown.IsHandleCreated); @@ -158,12 +160,12 @@ public void DirectionButtonAccessibleObject_FragmentNavigate_PreviousSibling_Ret if (expectedChildId is null) { - Assert.Null(directionButton.FragmentNavigate(Interop.UiaCore.NavigateDirection.PreviousSibling)); + Assert.Null(directionButton.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); } else { AccessibleObject expected = numericUpDown.UpDownButtonsInternal.AccessibilityObject.GetChild(expectedChildId.Value); - Assert.Equal(expected, directionButton.FragmentNavigate(Interop.UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(expected, directionButton.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); } Assert.False(numericUpDown.IsHandleCreated); diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ErrorProvider.ControlItem.ControlItemAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ErrorProvider.ControlItem.ControlItemAccessibleObjectTests.cs index d898340068f..2a901461f61 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ErrorProvider.ControlItem.ControlItemAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ErrorProvider.ControlItem.ControlItemAccessibleObjectTests.cs @@ -5,7 +5,6 @@ using System.Reflection; using Windows.Win32.UI.Accessibility; using static System.Windows.Forms.ErrorProvider; -using static Interop; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -216,7 +215,7 @@ public void ControlItemAccessibleObjectTests_FragmentNavigate_Parent_ReturnsExpe .GetNestedType("ControlItemAccessibleObject", BindingFlags.NonPublic | BindingFlags.Instance); var accessibleObject = (AccessibleObject)Activator.CreateInstance(type, new object[] { null, window, control, provider }); - Assert.Equal(window.AccessibilityObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); + Assert.Equal(window.AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); Assert.False(control.IsHandleCreated); } @@ -247,9 +246,9 @@ public void ControlItemAccessibleObjectTests_FragmentNavigate_NextSibling_Return accessibleObject2.TestAccessor().Dynamic._window = window; accessibleObject3.TestAccessor().Dynamic._window = window; - Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); Assert.False(control.IsHandleCreated); } @@ -280,9 +279,9 @@ public void ControlItemAccessibleObjectTests_FragmentNavigate_PreviousSibling_Re accessibleObject2.TestAccessor().Dynamic._window = window; accessibleObject3.TestAccessor().Dynamic._window = window; - Assert.Null(accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(control.IsHandleCreated); } } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ErrorProvider.ErrorWindow.ErrorWindowAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ErrorProvider.ErrorWindow.ErrorWindowAccessibleObjectTests.cs index abd616a04be..8e2390899c7 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ErrorProvider.ErrorWindow.ErrorWindowAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ErrorProvider.ErrorWindow.ErrorWindowAccessibleObjectTests.cs @@ -4,7 +4,6 @@ using System.Reflection; using Windows.Win32.UI.Accessibility; using static System.Windows.Forms.ErrorProvider; -using static Interop; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -169,8 +168,8 @@ public void ErrorWindowAccessibleObject_FragmentNavigate_ReturnsExpected() window.ControlItems.AddRange(new[] { item1, item2, item3 }); AccessibleObject accessibleObject = window.AccessibilityObject; - Assert.Equal(item1.AccessibilityObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(item3.AccessibilityObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(item1.AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(item3.AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(control.IsHandleCreated); } @@ -183,8 +182,8 @@ public void ErrorWindowAccessibleObject_FragmentNavigate_ReturnsExpected_NoItems AccessibleObject accessibleObject = window.AccessibilityObject; - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(control.IsHandleCreated); } } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ErrorProviderAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ErrorProviderAccessibleObjectTests.cs index 19ec6f9d221..b4367a52937 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ErrorProviderAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ErrorProviderAccessibleObjectTests.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using Windows.Win32.UI.Accessibility; -using static Interop; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -132,16 +131,16 @@ public void ErrorProvider_CorrectAccessibilityTree() actualAccessibilityObject = controlItem2_AccessibilityObject.Parent; Assert.Equal(errorWindowAccessibilityObject, actualAccessibilityObject); - actualAccessibilityObject = (AccessibleObject)controlItem1_AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling); + actualAccessibilityObject = (AccessibleObject)controlItem1_AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); Assert.Equal(controlItem2_AccessibilityObject, actualAccessibilityObject); - actualAccessibilityObject = (AccessibleObject)controlItem1_AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling); + actualAccessibilityObject = (AccessibleObject)controlItem1_AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling); Assert.Null(actualAccessibilityObject); - actualAccessibilityObject = (AccessibleObject)controlItem2_AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling); + actualAccessibilityObject = (AccessibleObject)controlItem2_AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling); Assert.Equal(controlItem1_AccessibilityObject, actualAccessibilityObject); - actualAccessibilityObject = (AccessibleObject)controlItem2_AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling); + actualAccessibilityObject = (AccessibleObject)controlItem2_AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); Assert.Null(actualAccessibilityObject); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/HScrollBar.HScrollBarAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/HScrollBar.HScrollBarAccessibleObjectTests.cs index b16af0292cd..9e4deb0f726 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/HScrollBar.HScrollBarAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/HScrollBar.HScrollBarAccessibleObjectTests.cs @@ -5,7 +5,6 @@ using System.Windows.Forms.TestUtilities; using Windows.Win32.UI.Accessibility; using static System.Windows.Forms.ScrollBar; -using static Interop; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -114,8 +113,8 @@ public void HScrollBarAccessibleObject_FragmentNavigate_Child_ReturnExpected(boo using HScrollBar scrollBar = GetHScrollBar(createControl, rightToLeft, minimum, maximum, value); var accessibleObject = (ScrollBarAccessibleObject)scrollBar.AccessibilityObject; - Assert.Equal(accessibleObject.FirstLineButtonAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(accessibleObject.LastLineButtonAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(accessibleObject.FirstLineButtonAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(accessibleObject.LastLineButtonAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.Equal(createControl, scrollBar.IsHandleCreated); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/HScrollBar.ScrollBarFirstLineButtonAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/HScrollBar.ScrollBarFirstLineButtonAccessibleObjectTests.cs index c022b617be7..89cae513b5b 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/HScrollBar.ScrollBarFirstLineButtonAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/HScrollBar.ScrollBarFirstLineButtonAccessibleObjectTests.cs @@ -4,7 +4,6 @@ using System.Drawing; using System.Windows.Forms.TestUtilities; using Windows.Win32.UI.Accessibility; -using static Interop; using static System.Windows.Forms.ScrollBar; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -143,11 +142,11 @@ public void HScrollBarFirstLineButtonAccessibleObject_FragmentNavigate_ReturnExp var scrollBarAccessibleObject = (ScrollBar.ScrollBarAccessibleObject)scrollBar.AccessibilityObject; ScrollBarFirstLineButtonAccessibleObject accessibleObject = GetFirstLineButton(scrollBar); - Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.Equal(scrollBarAccessibleObject.FirstPageButtonAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(scrollBarAccessibleObject.FirstPageButtonAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(scrollBar.IsHandleCreated); } @@ -159,11 +158,11 @@ public void HScrollBarFirstLineButtonAccessibleObject_FragmentNavigate_ReturnExp var scrollBarAccessibleObject = (ScrollBar.ScrollBarAccessibleObject)scrollBar.AccessibilityObject; ScrollBarFirstLineButtonAccessibleObject accessibleObject = GetFirstLineButton(scrollBar); - Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.Equal(scrollBarAccessibleObject.ThumbAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(scrollBarAccessibleObject.ThumbAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(scrollBar.IsHandleCreated); } @@ -175,11 +174,11 @@ public void HScrollBarFirstLineButtonAccessibleObject_FragmentNavigate_ReturnExp var scrollBarAccessibleObject = (ScrollBar.ScrollBarAccessibleObject)scrollBar.AccessibilityObject; ScrollBarFirstLineButtonAccessibleObject accessibleObject = GetFirstLineButton(scrollBar); - Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.Equal(scrollBarAccessibleObject.ThumbAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(scrollBarAccessibleObject.ThumbAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(scrollBar.IsHandleCreated); } @@ -191,11 +190,11 @@ public void HScrollBarFirstLineButtonAccessibleObject_FragmentNavigate_ReturnNul var scrollBarAccessibleObject = (ScrollBar.ScrollBarAccessibleObject)scrollBar.AccessibilityObject; ScrollBarFirstLineButtonAccessibleObject accessibleObject = GetFirstLineButton(scrollBar); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(scrollBar.IsHandleCreated); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/HScrollBar.ScrollBarFirstPageButtonAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/HScrollBar.ScrollBarFirstPageButtonAccessibleObjectTests.cs index 9758d0c54a0..c9f75a144c8 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/HScrollBar.ScrollBarFirstPageButtonAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/HScrollBar.ScrollBarFirstPageButtonAccessibleObjectTests.cs @@ -4,7 +4,6 @@ using System.Drawing; using System.Windows.Forms.TestUtilities; using Windows.Win32.UI.Accessibility; -using static Interop; using static System.Windows.Forms.ScrollBar; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -167,11 +166,11 @@ public void HScrollBarFirstPageButtonAccessibleObject_FragmentNavigate_ReturnsEx AccessibleObject thumb = scrollBarAccessibleObject.ThumbAccessibleObject; AccessibleObject lineButton = scrollBarAccessibleObject.FirstLineButtonAccessibleObject; - Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.Equal(thumb, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(lineButton, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(thumb, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(lineButton, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(scrollBar.IsHandleCreated); } @@ -183,11 +182,11 @@ public void HScrollBarFirstPageButtonAccessibleObject_FragmentNavigate_ReturnsEx var scrollBarAccessibleObject = (ScrollBar.ScrollBarAccessibleObject)scrollBar.AccessibilityObject; ScrollBarFirstPageButtonAccessibleObject accessibleObject = GetFirstPageButton(scrollBar); - Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(scrollBar.IsHandleCreated); } @@ -199,11 +198,11 @@ public void HScrollBarFirstPageButtonAccessibleObject_FragmentNavigate_ReturnsEx var scrollBarAccessibleObject = (ScrollBar.ScrollBarAccessibleObject)scrollBar.AccessibilityObject; ScrollBarFirstPageButtonAccessibleObject accessibleObject = GetFirstPageButton(scrollBar); - Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(scrollBar.IsHandleCreated); } @@ -214,11 +213,11 @@ public void HScrollBarFirstPageButtonAccessibleObject_FragmentNavigate_ReturnsNu using HScrollBar scrollBar = GetHScrollBar(createControl: false, rightToLeft, minimum, maximum, value); ScrollBarFirstPageButtonAccessibleObject accessibleObject = GetFirstPageButton(scrollBar); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(scrollBar.IsHandleCreated); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/HScrollBar.ScrollBarLastLineButtonAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/HScrollBar.ScrollBarLastLineButtonAccessibleObjectTests.cs index bdff9cb5990..3b68d70d69a 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/HScrollBar.ScrollBarLastLineButtonAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/HScrollBar.ScrollBarLastLineButtonAccessibleObjectTests.cs @@ -4,7 +4,6 @@ using System.Drawing; using System.Windows.Forms.TestUtilities; using Windows.Win32.UI.Accessibility; -using static Interop; using static System.Windows.Forms.ScrollBar; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -153,11 +152,11 @@ public void HScrollBarLastLineButtonAccessibleObject_FragmentNavigate_ReturnsExp var scrollBarAccessibleObject = (ScrollBar.ScrollBarAccessibleObject)scrollBar.AccessibilityObject; ScrollBarLastLineButtonAccessibleObject accessibleObject = GetLastLineButton(scrollBar); - Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.Equal(scrollBarAccessibleObject.LastPageButtonAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(scrollBarAccessibleObject.LastPageButtonAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(scrollBar.IsHandleCreated); } @@ -169,11 +168,11 @@ public void HScrollBarLastLineButtonAccessibleObject_FragmentNavigate_ReturnsExp var scrollBarAccessibleObject = (ScrollBar.ScrollBarAccessibleObject)scrollBar.AccessibilityObject; ScrollBarLastLineButtonAccessibleObject accessibleObject = GetLastLineButton(scrollBar); - Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.Equal(scrollBarAccessibleObject.ThumbAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(scrollBarAccessibleObject.ThumbAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(scrollBar.IsHandleCreated); } @@ -185,11 +184,11 @@ public void HScrollBarLastLineButtonAccessibleObject_FragmentNavigate_ReturnsExp var scrollBarAccessibleObject = (ScrollBar.ScrollBarAccessibleObject)scrollBar.AccessibilityObject; ScrollBarLastLineButtonAccessibleObject accessibleObject = GetLastLineButton(scrollBar); - Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.Equal(scrollBarAccessibleObject.ThumbAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(scrollBarAccessibleObject.ThumbAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(scrollBar.IsHandleCreated); } @@ -201,11 +200,11 @@ public void HScrollBarLastLineButtonAccessibleObject_FragmentNavigate_ReturnsExp var scrollBarAccessibleObject = (ScrollBar.ScrollBarAccessibleObject)scrollBar.AccessibilityObject; ScrollBarLastLineButtonAccessibleObject accessibleObject = GetLastLineButton(scrollBar); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(scrollBar.IsHandleCreated); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/HScrollBar.ScrollBarLastPageButtonAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/HScrollBar.ScrollBarLastPageButtonAccessibleObjectTests.cs index 3f21bf34e0c..f0cfedd12f6 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/HScrollBar.ScrollBarLastPageButtonAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/HScrollBar.ScrollBarLastPageButtonAccessibleObjectTests.cs @@ -4,7 +4,6 @@ using System.Drawing; using System.Windows.Forms.TestUtilities; using Windows.Win32.UI.Accessibility; -using static Interop; using static System.Windows.Forms.ScrollBar; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -154,11 +153,11 @@ public void HScrollBarLastPageButtonAccessibleObject_FragmentNavigate_ReturnExpe var scrollBarAccessibleObject = (ScrollBar.ScrollBarAccessibleObject)scrollBar.AccessibilityObject; ScrollBarLastPageButtonAccessibleObject accessibleObject = GetLastPageButton(scrollBar); - Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.Equal(scrollBarAccessibleObject.ThumbAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(scrollBarAccessibleObject.LastLineButtonAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(scrollBarAccessibleObject.ThumbAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(scrollBarAccessibleObject.LastLineButtonAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(scrollBar.IsHandleCreated); } @@ -170,11 +169,11 @@ public void HScrollBarLastPageButtonAccessibleObject_FragmentNavigate_ReturnExpe var scrollBarAccessibleObject = (ScrollBar.ScrollBarAccessibleObject)scrollBar.AccessibilityObject; ScrollBarLastPageButtonAccessibleObject accessibleObject = GetLastPageButton(scrollBar); - Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(scrollBar.IsHandleCreated); } @@ -186,11 +185,11 @@ public void HScrollBarLastPageButtonAccessibleObject_FragmentNavigate_ReturnExpe var scrollBarAccessibleObject = (ScrollBar.ScrollBarAccessibleObject)scrollBar.AccessibilityObject; ScrollBarLastPageButtonAccessibleObject accessibleObject = GetLastPageButton(scrollBar); - Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(scrollBar.IsHandleCreated); } @@ -201,11 +200,11 @@ public void HScrollBarLastPageButtonAccessibleObject_FragmentNavigate_ReturnNull using HScrollBar scrollBar = GetHScrollBar(createControl: false, rightToLeft, minimum, maximum, value); ScrollBarLastPageButtonAccessibleObject accessibleObject = GetLastPageButton(scrollBar); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(scrollBar.IsHandleCreated); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/HScrollBar.ScrollBarThumbAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/HScrollBar.ScrollBarThumbAccessibleObjectTests.cs index 315cb68fe64..bda6fd68549 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/HScrollBar.ScrollBarThumbAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/HScrollBar.ScrollBarThumbAccessibleObjectTests.cs @@ -4,7 +4,6 @@ using System.Drawing; using System.Windows.Forms.TestUtilities; using Windows.Win32.UI.Accessibility; -using static Interop; using static System.Windows.Forms.ScrollBar; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -142,11 +141,11 @@ public void HScrollBarThumbAccessibleObject_FragmentNavigate_ReturnExpected_Both var scrollBarAccessibleObject = (ScrollBar.ScrollBarAccessibleObject)scrollBar.AccessibilityObject; ScrollBarThumbAccessibleObject accessibleObject = scrollBarAccessibleObject.ThumbAccessibleObject; - Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.Equal(scrollBarAccessibleObject.FirstPageButtonAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(scrollBarAccessibleObject.LastPageButtonAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(scrollBarAccessibleObject.FirstPageButtonAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(scrollBarAccessibleObject.LastPageButtonAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(scrollBar.IsHandleCreated); } @@ -158,11 +157,11 @@ public void HScrollBarThumbAccessibleObject_FragmentNavigate_ReturnExpected_Firs var scrollBarAccessibleObject = (ScrollBar.ScrollBarAccessibleObject)scrollBar.AccessibilityObject; ScrollBarThumbAccessibleObject accessibleObject = scrollBarAccessibleObject.ThumbAccessibleObject; - Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.Equal(scrollBarAccessibleObject.FirstLineButtonAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(scrollBarAccessibleObject.LastPageButtonAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(scrollBarAccessibleObject.FirstLineButtonAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(scrollBarAccessibleObject.LastPageButtonAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(scrollBar.IsHandleCreated); } @@ -174,11 +173,11 @@ public void HScrollBarThumbAccessibleObject_FragmentNavigate_ReturnExpected_Last var scrollBarAccessibleObject = (ScrollBar.ScrollBarAccessibleObject)scrollBar.AccessibilityObject; ScrollBarThumbAccessibleObject accessibleObject = scrollBarAccessibleObject.ThumbAccessibleObject; - Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.Equal(scrollBarAccessibleObject.FirstPageButtonAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(scrollBarAccessibleObject.LastLineButtonAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(scrollBarAccessibleObject.FirstPageButtonAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(scrollBarAccessibleObject.LastLineButtonAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(scrollBar.IsHandleCreated); } @@ -190,11 +189,11 @@ public void HScrollBarThumbAccessibleObject_FragmentNavigate_ReturnExpected_Mini var scrollBarAccessibleObject = (ScrollBar.ScrollBarAccessibleObject)scrollBar.AccessibilityObject; ScrollBarThumbAccessibleObject accessibleObject = scrollBarAccessibleObject.ThumbAccessibleObject; - Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.Equal(scrollBarAccessibleObject.FirstLineButtonAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(scrollBarAccessibleObject.LastLineButtonAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(scrollBarAccessibleObject.FirstLineButtonAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(scrollBarAccessibleObject.LastLineButtonAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(scrollBar.IsHandleCreated); } @@ -205,11 +204,11 @@ public void HScrollBarThumbAccessibleObject_FragmentNavigate_ReturnNull_HandleIs using HScrollBar scrollBar = GetHScrollBar(createControl: false, rightToLeft, minimum, maximum, value); ScrollBarThumbAccessibleObject accessibleObject = GetThumb(scrollBar); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(scrollBar.IsHandleCreated); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/LinkLabel.Link.LinkAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/LinkLabel.Link.LinkAccessibleObjectTests.cs index 58e6b6b1004..fea97476d83 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/LinkLabel.Link.LinkAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/LinkLabel.Link.LinkAccessibleObjectTests.cs @@ -5,7 +5,6 @@ using static System.Windows.Forms.LinkLabel; using static System.Windows.Forms.LinkLabel.Link; using static Interop; -using static Interop.UiaCore; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -75,10 +74,10 @@ public void LinkAccessibleObject_FragmentNavigate_NextSibling_IsExpected() AccessibleObject linkLabelAccessibleObject3 = linkLabel.Links[2].AccessibleObject; AccessibleObject linkLabelAccessibleObject4 = linkLabel.Links[3].AccessibleObject; - Assert.Equal(linkLabelAccessibleObject2, linkLabelAccessibleObject1.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Equal(linkLabelAccessibleObject3, linkLabelAccessibleObject2.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Equal(linkLabelAccessibleObject4, linkLabelAccessibleObject3.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(linkLabelAccessibleObject4.FragmentNavigate(NavigateDirection.NextSibling)); + Assert.Equal(linkLabelAccessibleObject2, linkLabelAccessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(linkLabelAccessibleObject3, linkLabelAccessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(linkLabelAccessibleObject4, linkLabelAccessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(linkLabelAccessibleObject4.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); Assert.False(linkLabel.IsHandleCreated); } @@ -97,10 +96,10 @@ public void LinkAccessibleObject_FragmentNavigate_PreviousSibling_IsExpected() AccessibleObject linkLabelAccessibleObject3 = linkLabel.Links[2].AccessibleObject; AccessibleObject linkLabelAccessibleObject4 = linkLabel.Links[3].AccessibleObject; - Assert.Null(linkLabelAccessibleObject1.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Equal(linkLabelAccessibleObject1, linkLabelAccessibleObject2.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Equal(linkLabelAccessibleObject2, linkLabelAccessibleObject3.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Equal(linkLabelAccessibleObject3, linkLabelAccessibleObject4.FragmentNavigate(NavigateDirection.PreviousSibling)); + Assert.Null(linkLabelAccessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(linkLabelAccessibleObject1, linkLabelAccessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(linkLabelAccessibleObject2, linkLabelAccessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(linkLabelAccessibleObject3, linkLabelAccessibleObject4.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(linkLabel.IsHandleCreated); } @@ -121,7 +120,7 @@ public void LinkAccessibleObject_FragmentNavigate_Parent_IsExpected(int linkInde } LinkAccessibleObject linkAccessibleObject = linkLabel.Links[linkIndex].AccessibleObject; - UiaCore.IRawElementProviderFragment actual = linkAccessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent); + UiaCore.IRawElementProviderFragment actual = linkAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent); Assert.Equal(expected, actual); Assert.False(linkLabel.IsHandleCreated); diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/LinkLabel.LinkLabelAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/LinkLabel.LinkLabelAccessibleObjectTests.cs index 79fc35e861e..24ab2c81fd2 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/LinkLabel.LinkLabelAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/LinkLabel.LinkLabelAccessibleObjectTests.cs @@ -4,7 +4,6 @@ using Windows.Win32.UI.Accessibility; using static System.Windows.Forms.LinkLabel; using static System.Windows.Forms.LinkLabel.Link; -using static Interop.UiaCore; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -157,7 +156,7 @@ public void LinkLabelAccessibleObject_FragmentNavigate_IsExpected_NavigateToFirs linkLabel.Links.Add(new()); } - Assert.Equal(linkLabel.Links[0].AccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); + Assert.Equal(linkLabel.Links[0].AccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); Assert.False(linkLabel.IsHandleCreated); } @@ -172,7 +171,7 @@ public void LinkLabelAccessibleObject_FragmentNavigate_IsExpected_NavigateToLast linkLabel.Links.Add(new()); } - Assert.Equal(linkLabel.Links[^1].AccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(linkLabel.Links[^1].AccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(linkLabel.IsHandleCreated); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ListVIew.ListViewAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ListVIew.ListViewAccessibleObjectTests.cs index 1b827cbc506..7e35e164e28 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ListVIew.ListViewAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ListVIew.ListViewAccessibleObjectTests.cs @@ -96,8 +96,8 @@ public void ListViewAccessibleObject_ListWithTwoGroups_FragmentNavigateWorkCorre AccessibleObject accessibleObject = listView.AccessibilityObject; - AccessibleObject firstChild = accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild) as AccessibleObject; - AccessibleObject lastChild = accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild) as AccessibleObject; + AccessibleObject firstChild = accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild) as AccessibleObject; + AccessibleObject lastChild = accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild) as AccessibleObject; Assert.IsType(firstChild); Assert.IsType(lastChild); Assert.NotEqual(firstChild, lastChild); @@ -126,8 +126,8 @@ public void ListViewAccessibleObject_ListWithTwoGroups_FragmentNavigateWorkCorre AccessibleObject accessibleObject = listView.AccessibilityObject; - AccessibleObject firstChild = accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild) as AccessibleObject; - AccessibleObject lastChild = accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild) as AccessibleObject; + AccessibleObject firstChild = accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild) as AccessibleObject; + AccessibleObject lastChild = accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild) as AccessibleObject; Assert.IsAssignableFrom(firstChild); Assert.IsAssignableFrom(lastChild); Assert.NotEqual(firstChild, lastChild); @@ -150,8 +150,8 @@ public void ListViewAccessibleObject_ListWithTwoGroups_FragmentNavigateWorkCorre AccessibleObject accessibleObject = listView.AccessibilityObject; - AccessibleObject firstChild = accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild) as AccessibleObject; - AccessibleObject lastChild = accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild) as AccessibleObject; + AccessibleObject firstChild = accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild) as AccessibleObject; + AccessibleObject lastChild = accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild) as AccessibleObject; Assert.Null(firstChild); Assert.Null(lastChild); Assert.False(listView.IsHandleCreated); @@ -167,8 +167,8 @@ public void ListViewAccessibleObject_ListWithTwoItems_FragmentNavigateWorkCorrec AccessibleObject accessibleObject = listView.AccessibilityObject; - AccessibleObject firstChild = accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild) as AccessibleObject; - AccessibleObject lastChild = accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild) as AccessibleObject; + AccessibleObject firstChild = accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild) as AccessibleObject; + AccessibleObject lastChild = accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild) as AccessibleObject; Assert.IsAssignableFrom(firstChild); Assert.IsAssignableFrom(lastChild); Assert.NotEqual(firstChild, lastChild); @@ -184,8 +184,8 @@ public void ListViewAccessibleObject_ListWithTwoItems_FragmentNavigateWorkCorrec AccessibleObject accessibleObject = listView.AccessibilityObject; - AccessibleObject firstChild = accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild) as AccessibleObject; - AccessibleObject lastChild = accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild) as AccessibleObject; + AccessibleObject firstChild = accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild) as AccessibleObject; + AccessibleObject lastChild = accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild) as AccessibleObject; Assert.Null(firstChild); Assert.Null(lastChild); Assert.False(listView.IsHandleCreated); @@ -1336,11 +1336,11 @@ public void ListViewAccessibleObject_FragmentNavigate_ReturnsNull_IfHandleIsNotC using ListView listView = GetListViewWithData(view, createControl: false, virtualMode, showGroups); AccessibleObject accessibleObject = listView.AccessibilityObject; - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(listView.IsHandleCreated); } @@ -1351,9 +1351,9 @@ public void ListViewAccessibleObject_FragmentNavigate_ReturnsNull_IfHandleIsCrea using ListView listView = GetListViewWithData(view, createControl: false, virtualMode, showGroups); AccessibleObject accessibleObject = listView.AccessibilityObject; - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(listView.IsHandleCreated); } @@ -1371,8 +1371,8 @@ public void ListViewAccessibleObject_FragmentNavigate_Child_ReturnsExpected(View ? listView.Groups[0].AccessibilityObject : listView.Items[3].AccessibilityObject; - Assert.Equal(expectedFirstChild, listView.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(expectedLastChild, listView.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(expectedFirstChild, listView.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(expectedLastChild, listView.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(listView.IsHandleCreated); } @@ -1458,10 +1458,10 @@ public void ListViewAccessibleObject_FragmentNavigate_ReturnExpected_InvisibleGr AccessibleObject accessibleObject = listView.AccessibilityObject; Assert.Equal(listViewGroupWithItems1.AccessibilityObject, - accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); + accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); Assert.Equal(listViewGroupWithItems2.AccessibilityObject, - accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(listView.IsHandleCreated); } @@ -1482,10 +1482,10 @@ public void ListViewAccessibleObject_FragmentNavigate_ReturnExpected_InvisibleGr AccessibleObject accessibleObject = listView.AccessibilityObject; Assert.Equal(listView.Groups[1].AccessibilityObject, - accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); + accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); Assert.Equal(listView.Groups[2].AccessibilityObject, - accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); ListViewItem listViewItem1 = new(); ListViewItem listViewItem2 = new(); @@ -1495,10 +1495,10 @@ public void ListViewAccessibleObject_FragmentNavigate_ReturnExpected_InvisibleGr listView.Groups[3].Items.Add(listViewItem2); Assert.Equal(listView.Groups[0].AccessibilityObject, - accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); + accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); Assert.Equal(listView.Groups[3].AccessibilityObject, - accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(listView.IsHandleCreated); } @@ -1519,19 +1519,19 @@ public void ListViewAccessibleObject_FragmentNavigate_ReturnExpected_InvisibleGr AccessibleObject accessibleObject = listView.AccessibilityObject; Assert.Equal(listView.Groups[1].AccessibilityObject, - accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); + accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); Assert.Equal(listView.Groups[2].AccessibilityObject, - accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); listView.Groups[1].Items.RemoveAt(0); listView.Groups[2].Items.RemoveAt(0); Assert.Equal(listView.DefaultGroup.AccessibilityObject, - accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); + accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); Assert.Equal(listView.DefaultGroup.AccessibilityObject, - accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(listView.IsHandleCreated); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ListViewGroup.ListViewGroupAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ListViewGroup.ListViewGroupAccessibleObjectTests.cs index 7115fff92fc..626ddad9f54 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ListViewGroup.ListViewGroupAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ListViewGroup.ListViewGroupAccessibleObjectTests.cs @@ -7,8 +7,6 @@ using Windows.Win32.UI.Accessibility; using static System.Windows.Forms.ListView; using static System.Windows.Forms.ListViewGroup; -using static Interop; -using static Interop.UiaCore; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -158,43 +156,43 @@ public void ListViewGroupAccessibleObject_FragmentNavigate_ReturnsExpected_WithD if (listView.IsHandleCreated && listView.GroupsDisplayed) { - Assert.Equal(listView.AccessibilityObject, listView.DefaultGroup.AccessibilityObject.FragmentNavigate(NavigateDirection.Parent)); - Assert.Equal(groups[0].AccessibilityObject, listView.DefaultGroup.AccessibilityObject.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(listView.DefaultGroup.AccessibilityObject.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Equal(items[2].AccessibilityObject, listView.DefaultGroup.AccessibilityObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Equal(items[2].AccessibilityObject, listView.DefaultGroup.AccessibilityObject.FragmentNavigate(NavigateDirection.LastChild)); - - Assert.Equal(listView.AccessibilityObject, groups[0].AccessibilityObject.FragmentNavigate(NavigateDirection.Parent)); - Assert.Equal(groups[1].AccessibilityObject, groups[0].AccessibilityObject.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Equal(listView.DefaultGroup.AccessibilityObject, groups[0].AccessibilityObject.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Equal(items[0].AccessibilityObject, groups[0].AccessibilityObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Equal(items[1].AccessibilityObject, groups[0].AccessibilityObject.FragmentNavigate(NavigateDirection.LastChild)); - - Assert.Equal(listView.AccessibilityObject, groups[1].AccessibilityObject.FragmentNavigate(NavigateDirection.Parent)); - Assert.Null(groups[1].AccessibilityObject.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Equal(groups[0].AccessibilityObject, groups[1].AccessibilityObject.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Equal(items[3].AccessibilityObject, groups[1].AccessibilityObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Equal(items[5].AccessibilityObject, groups[1].AccessibilityObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(listView.AccessibilityObject, listView.DefaultGroup.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(groups[0].AccessibilityObject, listView.DefaultGroup.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(listView.DefaultGroup.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(items[2].AccessibilityObject, listView.DefaultGroup.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(items[2].AccessibilityObject, listView.DefaultGroup.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); + + Assert.Equal(listView.AccessibilityObject, groups[0].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(groups[1].AccessibilityObject, groups[0].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(listView.DefaultGroup.AccessibilityObject, groups[0].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(items[0].AccessibilityObject, groups[0].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(items[1].AccessibilityObject, groups[0].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); + + Assert.Equal(listView.AccessibilityObject, groups[1].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(groups[1].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(groups[0].AccessibilityObject, groups[1].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(items[3].AccessibilityObject, groups[1].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(items[5].AccessibilityObject, groups[1].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } else { - Assert.Null(listView.DefaultGroup.AccessibilityObject.FragmentNavigate(NavigateDirection.Parent)); - Assert.Null(listView.DefaultGroup.AccessibilityObject.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(listView.DefaultGroup.AccessibilityObject.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Null(listView.DefaultGroup.AccessibilityObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Null(listView.DefaultGroup.AccessibilityObject.FragmentNavigate(NavigateDirection.LastChild)); - - Assert.Null(listView.Groups[0].AccessibilityObject.FragmentNavigate(NavigateDirection.Parent)); - Assert.Null(listView.Groups[0].AccessibilityObject.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(listView.Groups[0].AccessibilityObject.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Null(listView.Groups[0].AccessibilityObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Null(listView.Groups[0].AccessibilityObject.FragmentNavigate(NavigateDirection.LastChild)); - - Assert.Null(listView.Groups[1].AccessibilityObject.FragmentNavigate(NavigateDirection.Parent)); - Assert.Null(listView.Groups[1].AccessibilityObject.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(listView.Groups[1].AccessibilityObject.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Null(listView.Groups[1].AccessibilityObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Null(listView.Groups[1].AccessibilityObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Null(listView.DefaultGroup.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(listView.DefaultGroup.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(listView.DefaultGroup.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(listView.DefaultGroup.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(listView.DefaultGroup.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); + + Assert.Null(listView.Groups[0].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(listView.Groups[0].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(listView.Groups[0].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(listView.Groups[0].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(listView.Groups[0].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); + + Assert.Null(listView.Groups[1].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(listView.Groups[1].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(listView.Groups[1].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(listView.Groups[1].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(listView.Groups[1].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } } @@ -227,43 +225,43 @@ public void ListViewGroupAccessibleObject_FragmentNavigate_ReturnsExpected_Witho if (listView.IsHandleCreated && listView.GroupsDisplayed) { - Assert.Null(listView.DefaultGroup.AccessibilityObject.FragmentNavigate(NavigateDirection.Parent)); - Assert.Null(listView.DefaultGroup.AccessibilityObject.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(listView.DefaultGroup.AccessibilityObject.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Null(listView.DefaultGroup.AccessibilityObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Null(listView.DefaultGroup.AccessibilityObject.FragmentNavigate(NavigateDirection.LastChild)); - - Assert.Equal(listView.AccessibilityObject, groups[0].AccessibilityObject.FragmentNavigate(NavigateDirection.Parent)); - Assert.Equal(groups[1].AccessibilityObject, groups[0].AccessibilityObject.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(groups[0].AccessibilityObject.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Equal(items[0].AccessibilityObject, groups[0].AccessibilityObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Equal(items[2].AccessibilityObject, groups[0].AccessibilityObject.FragmentNavigate(NavigateDirection.LastChild)); - - Assert.Equal(listView.AccessibilityObject, listView.Groups[1].AccessibilityObject.FragmentNavigate(NavigateDirection.Parent)); - Assert.Null(groups[1].AccessibilityObject.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Equal(groups[0].AccessibilityObject, groups[1].AccessibilityObject.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Equal(items[3].AccessibilityObject, groups[1].AccessibilityObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Equal(items[5].AccessibilityObject, groups[1].AccessibilityObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Null(listView.DefaultGroup.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(listView.DefaultGroup.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(listView.DefaultGroup.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(listView.DefaultGroup.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(listView.DefaultGroup.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); + + Assert.Equal(listView.AccessibilityObject, groups[0].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(groups[1].AccessibilityObject, groups[0].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(groups[0].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(items[0].AccessibilityObject, groups[0].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(items[2].AccessibilityObject, groups[0].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); + + Assert.Equal(listView.AccessibilityObject, listView.Groups[1].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(groups[1].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(groups[0].AccessibilityObject, groups[1].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(items[3].AccessibilityObject, groups[1].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(items[5].AccessibilityObject, groups[1].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } else { - Assert.Null(listView.DefaultGroup.AccessibilityObject.FragmentNavigate(NavigateDirection.Parent)); - Assert.Null(listView.DefaultGroup.AccessibilityObject.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(listView.DefaultGroup.AccessibilityObject.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Null(listView.DefaultGroup.AccessibilityObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Null(listView.DefaultGroup.AccessibilityObject.FragmentNavigate(NavigateDirection.LastChild)); - - Assert.Null(groups[0].AccessibilityObject.FragmentNavigate(NavigateDirection.Parent)); - Assert.Null(groups[0].AccessibilityObject.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(groups[0].AccessibilityObject.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Null(groups[0].AccessibilityObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Null(groups[0].AccessibilityObject.FragmentNavigate(NavigateDirection.LastChild)); - - Assert.Null(groups[1].AccessibilityObject.FragmentNavigate(NavigateDirection.Parent)); - Assert.Null(groups[1].AccessibilityObject.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(groups[1].AccessibilityObject.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Null(groups[1].AccessibilityObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Null(groups[1].AccessibilityObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Null(listView.DefaultGroup.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(listView.DefaultGroup.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(listView.DefaultGroup.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(listView.DefaultGroup.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(listView.DefaultGroup.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); + + Assert.Null(groups[0].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(groups[0].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(groups[0].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(groups[0].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(groups[0].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); + + Assert.Null(groups[1].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(groups[1].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(groups[1].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(groups[1].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(groups[1].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } } @@ -727,9 +725,9 @@ public void ListViewGroupAccessibleObject_ExpandCollapseState_ReturnExpected(Vie Assert.NotEqual(IntPtr.Zero, listView.Handle); } - Assert.Equal(ExpandCollapseState.Expanded, lvgroup1.AccessibilityObject.ExpandCollapseState); - Assert.Equal(ExpandCollapseState.Collapsed, lvgroup2.AccessibilityObject.ExpandCollapseState); - Assert.Equal(ExpandCollapseState.Expanded, listView.DefaultGroup.AccessibilityObject.ExpandCollapseState); + Assert.Equal(ExpandCollapseState.ExpandCollapseState_Expanded, lvgroup1.AccessibilityObject.ExpandCollapseState); + Assert.Equal(ExpandCollapseState.ExpandCollapseState_Collapsed, lvgroup2.AccessibilityObject.ExpandCollapseState); + Assert.Equal(ExpandCollapseState.ExpandCollapseState_Expanded, listView.DefaultGroup.AccessibilityObject.ExpandCollapseState); Assert.Equal(createHandle, listView.IsHandleCreated); } @@ -751,7 +749,7 @@ public void ListViewGroupAccessibleObject_ExpandCollapseStateFromKeyboard_Return listViewGroup.Items[0].Selected = true; listViewGroup.Items[0].Focused = true; AccessibleObject accessibleObject = listView.SelectedItems[0].AccessibilityObject; - ListViewGroupAccessibleObject groupAccObj = (ListViewGroupAccessibleObject)accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent); + ListViewGroupAccessibleObject groupAccObj = (ListViewGroupAccessibleObject)accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent); groupAccObj.SetFocus(); @@ -762,24 +760,24 @@ public void ListViewGroupAccessibleObject_ExpandCollapseStateFromKeyboard_Return KeyboardSimulator.KeyPress(listView, Keys.Left); Assert.Equal(ListViewGroupCollapsedState.Collapsed, listViewGroup.GetNativeCollapsedState()); - Assert.Equal(ExpandCollapseState.Collapsed, listViewGroup.AccessibilityObject.ExpandCollapseState); + Assert.Equal(ExpandCollapseState.ExpandCollapseState_Collapsed, listViewGroup.AccessibilityObject.ExpandCollapseState); KeyboardSimulator.KeyPress(listView, Keys.Left); // The second left key pressing should not change Collapsed state Assert.Equal(ListViewGroupCollapsedState.Collapsed, listViewGroup.GetNativeCollapsedState()); - Assert.Equal(ExpandCollapseState.Collapsed, listViewGroup.AccessibilityObject.ExpandCollapseState); + Assert.Equal(ExpandCollapseState.ExpandCollapseState_Collapsed, listViewGroup.AccessibilityObject.ExpandCollapseState); KeyboardSimulator.KeyPress(listView, Keys.Right); Assert.Equal(ListViewGroupCollapsedState.Expanded, listViewGroup.GetNativeCollapsedState()); - Assert.Equal(ExpandCollapseState.Expanded, listViewGroup.AccessibilityObject.ExpandCollapseState); + Assert.Equal(ExpandCollapseState.ExpandCollapseState_Expanded, listViewGroup.AccessibilityObject.ExpandCollapseState); KeyboardSimulator.KeyPress(listView, Keys.Right); // The second right key pressing should not change Expanded state Assert.Equal(ListViewGroupCollapsedState.Expanded, listViewGroup.GetNativeCollapsedState()); - Assert.Equal(ExpandCollapseState.Expanded, listViewGroup.AccessibilityObject.ExpandCollapseState); + Assert.Equal(ExpandCollapseState.ExpandCollapseState_Expanded, listViewGroup.AccessibilityObject.ExpandCollapseState); } [WinFormsTheory] @@ -860,10 +858,10 @@ public void ListViewGroupAccessibleObject_FragmentNavigate_Sibling_ReturnsExpect AccessibleObject listViewGroupWithItems1 = listView.Groups[1].AccessibilityObject; AccessibleObject listViewGroupWithItems2 = listView.Groups[2].AccessibilityObject; - Assert.Null(listViewGroupWithItems1.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Equal(listViewGroupWithItems2, listViewGroupWithItems1.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Equal(listViewGroupWithItems1, listViewGroupWithItems2.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Null(listViewGroupWithItems2.FragmentNavigate(NavigateDirection.NextSibling)); + Assert.Null(listViewGroupWithItems1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(listViewGroupWithItems2, listViewGroupWithItems1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(listViewGroupWithItems1, listViewGroupWithItems2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(listViewGroupWithItems2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); Assert.True(listView.IsHandleCreated); } @@ -882,10 +880,10 @@ public void ListViewGroupAccessibleObject_FragmentNavigate_ReturnsExpected_Sibli using ListView listView = GetListViewItemWithEmptyGroups(view); AccessibleObject accessibleObject = listView.AccessibilityObject; - Assert.Null(GetAccessibleObject(1).FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Equal(GetAccessibleObject(2), GetAccessibleObject(1).FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Equal(GetAccessibleObject(1), GetAccessibleObject(2).FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Null(GetAccessibleObject(2).FragmentNavigate(NavigateDirection.NextSibling)); + Assert.Null(GetAccessibleObject(1).FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(GetAccessibleObject(2), GetAccessibleObject(1).FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(GetAccessibleObject(1), GetAccessibleObject(2).FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(GetAccessibleObject(2).FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); ListViewItem listViewItem1 = new(); ListViewItem listViewItem2 = new(); @@ -894,14 +892,14 @@ public void ListViewGroupAccessibleObject_FragmentNavigate_ReturnsExpected_Sibli listView.Groups[0].Items.Add(listViewItem1); listView.Groups[3].Items.Add(listViewItem2); - Assert.Null(GetAccessibleObject(0).FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Equal(GetAccessibleObject(1), GetAccessibleObject(0).FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Equal(GetAccessibleObject(0), GetAccessibleObject(1).FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Equal(GetAccessibleObject(2), GetAccessibleObject(1).FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Equal(GetAccessibleObject(1), GetAccessibleObject(2).FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Equal(GetAccessibleObject(3), GetAccessibleObject(2).FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Equal(GetAccessibleObject(2), GetAccessibleObject(3).FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Null(GetAccessibleObject(3).FragmentNavigate(NavigateDirection.NextSibling)); + Assert.Null(GetAccessibleObject(0).FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(GetAccessibleObject(1), GetAccessibleObject(0).FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(GetAccessibleObject(0), GetAccessibleObject(1).FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(GetAccessibleObject(2), GetAccessibleObject(1).FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(GetAccessibleObject(1), GetAccessibleObject(2).FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(GetAccessibleObject(3), GetAccessibleObject(2).FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(GetAccessibleObject(2), GetAccessibleObject(3).FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(GetAccessibleObject(3).FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); Assert.True(listView.IsHandleCreated); AccessibleObject GetAccessibleObject(int index) => listView.Groups[index].AccessibilityObject; @@ -924,15 +922,15 @@ public void ListViewGroupAccessibleObject_FragmentNavigate_Sibling_ReturnsExpect AccessibleObject listViewGroupWithItems1 = listView.Groups[1].AccessibilityObject; AccessibleObject listViewGroupWithItems2 = listView.Groups[2].AccessibilityObject; - Assert.Null(listViewGroupWithItems1.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Equal(listViewGroupWithItems2, listViewGroupWithItems1.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Equal(listViewGroupWithItems1, listViewGroupWithItems2.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Null(listViewGroupWithItems2.FragmentNavigate(NavigateDirection.NextSibling)); + Assert.Null(listViewGroupWithItems1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(listViewGroupWithItems2, listViewGroupWithItems1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(listViewGroupWithItems1, listViewGroupWithItems2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(listViewGroupWithItems2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); listView.Groups[2].Items.RemoveAt(0); - Assert.Equal(listView.DefaultGroup.AccessibilityObject, listViewGroupWithItems1.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Null(listViewGroupWithItems1.FragmentNavigate(NavigateDirection.NextSibling)); + Assert.Equal(listView.DefaultGroup.AccessibilityObject, listViewGroupWithItems1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(listViewGroupWithItems1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); Assert.True(listView.IsHandleCreated); } @@ -951,8 +949,8 @@ public void ListViewGroupAccessibleObject_FragmentNavigate_Child_ReturnsExpected using ListView listView = GetListViewItemWithInvisibleItems(view); AccessibleObject accessibleObject = listView.Groups[0].AccessibilityObject; - Assert.Equal(listView.Groups[0].Items[1].AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Equal(listView.Groups[0].Items[2].AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(listView.Groups[0].Items[1].AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(listView.Groups[0].Items[2].AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(listView.IsHandleCreated); } @@ -971,14 +969,14 @@ public void ListViewGroupAccessibleObject_FragmentNavigate_Child_ReturnsExpected using ListView listView = GetListViewItemWithInvisibleItems(view); AccessibleObject accessibleObject = listView.Groups[0].AccessibilityObject; - Assert.Equal(listView.Groups[0].Items[1].AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Equal(listView.Groups[0].Items[2].AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(listView.Groups[0].Items[1].AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(listView.Groups[0].Items[2].AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); listView.Items.Add(listView.Groups[0].Items[0]); listView.Items.Add(listView.Groups[0].Items[3]); - Assert.Equal(listView.Groups[0].Items[0].AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Equal(listView.Groups[0].Items[3].AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(listView.Groups[0].Items[0].AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(listView.Groups[0].Items[3].AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(listView.IsHandleCreated); } @@ -997,13 +995,13 @@ public void ListViewGroupAccessibleObject_FragmentNavigate_Child_ReturnsExpected using ListView listView = GetListViewItemWithInvisibleItems(view); AccessibleObject accessibleObject = listView.Groups[0].AccessibilityObject; - Assert.Equal(listView.Groups[0].Items[1].AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Equal(listView.Groups[0].Items[2].AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(listView.Groups[0].Items[1].AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(listView.Groups[0].Items[2].AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); listView.Items.RemoveAt(1); - Assert.Equal(listView.Groups[0].Items[1].AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Equal(listView.Groups[0].Items[1].AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(listView.Groups[0].Items[1].AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(listView.Groups[0].Items[1].AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(listView.IsHandleCreated); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ListViewItem.ListViewItemAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ListViewItem.ListViewItemAccessibleObjectTests.cs index 09a341324fc..e8457d8321a 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ListViewItem.ListViewItemAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ListViewItem.ListViewItemAccessibleObjectTests.cs @@ -148,10 +148,10 @@ public void ListViewItemAccessibleObject_FragmentNavigate_Parent_ReturnExpected( AccessibleObject accessibleObject3 = listView.Items[2].AccessibilityObject; AccessibleObject accessibleObject4 = listView.Items[3].AccessibilityObject; - Assert.Equal(GetExpectedParent(0), accessibleObject1.FragmentNavigate(NavigateDirection.Parent)); - Assert.Equal(GetExpectedParent(1), accessibleObject2.FragmentNavigate(NavigateDirection.Parent)); - Assert.Equal(GetExpectedParent(2), accessibleObject3.FragmentNavigate(NavigateDirection.Parent)); - Assert.Equal(GetExpectedParent(3), accessibleObject4.FragmentNavigate(NavigateDirection.Parent)); + Assert.Equal(GetExpectedParent(0), accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(GetExpectedParent(1), accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(GetExpectedParent(2), accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(GetExpectedParent(3), accessibleObject4.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); AccessibleObject GetExpectedParent(int index) { @@ -201,17 +201,17 @@ public void ListViewItemAccessibleObject_FragmentNavigate_NextSibling_ReturnExpe if (Application.UseVisualStyles && showGroups && !virtualMode && listView.View != View.List) { - Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject4, accessibleObject3.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(accessibleObject4.FragmentNavigate(NavigateDirection.NextSibling)); + Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject4, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject4.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); } else { - Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject4, accessibleObject3.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(accessibleObject4.FragmentNavigate(NavigateDirection.NextSibling)); + Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject4, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject4.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); } Assert.True(listView.IsHandleCreated); @@ -228,10 +228,10 @@ public void ListViewItemAccessibleObject_FragmentNavigate_NextSibling_ReturnExpe AccessibleObject accessibleObject3 = listView.Items[2].AccessibilityObject; AccessibleObject accessibleObject4 = listView.Items[3].AccessibilityObject; - Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(accessibleObject4.FragmentNavigate(NavigateDirection.NextSibling)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject4.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); Assert.False(listView.IsHandleCreated); } @@ -248,17 +248,17 @@ public void ListViewItemAccessibleObject_FragmentNavigate_PreviousSibling_Return if (Application.UseVisualStyles && showGroups && !virtualMode && listView.View != View.List) { - Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Equal(accessibleObject3, accessibleObject4.FragmentNavigate(NavigateDirection.PreviousSibling)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(accessibleObject3, accessibleObject4.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); } else { - Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Equal(accessibleObject3, accessibleObject4.FragmentNavigate(NavigateDirection.PreviousSibling)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(accessibleObject3, accessibleObject4.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); } Assert.True(listView.IsHandleCreated); @@ -275,10 +275,10 @@ public void ListViewItemAccessibleObject_FragmentNavigate_PreviousSibling_Return AccessibleObject accessibleObject3 = listView.Items[2].AccessibilityObject; AccessibleObject accessibleObject4 = listView.Items[3].AccessibilityObject; - Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject4.FragmentNavigate(NavigateDirection.PreviousSibling)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject4.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(listView.IsHandleCreated); } @@ -310,10 +310,10 @@ public void ListViewItemAccessibleObject_FragmentNavigate_FirstChild_ReturnExpec AccessibleObject accessibleObject3 = listView.Items[2].AccessibilityObject; AccessibleObject accessibleObject4 = listView.Items[3].AccessibilityObject; - Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Null(accessibleObject4.FragmentNavigate(NavigateDirection.FirstChild)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject4.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); Assert.Equal(createControl, listView.IsHandleCreated); } @@ -331,10 +331,10 @@ public void ListViewItemAccessibleObject_FragmentNavigate_FirstChild_ReturnExpec AccessibleObject accessibleObject3 = listView.Items[2].AccessibilityObject; AccessibleObject accessibleObject4 = listView.Items[3].AccessibilityObject; - Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Null(accessibleObject4.FragmentNavigate(NavigateDirection.FirstChild)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject4.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); Assert.Equal(createControl, listView.IsHandleCreated); } @@ -352,10 +352,10 @@ public void ListViewItemAccessibleObject_FragmentNavigate_FirstChild_ReturnExpec AccessibleObject accessibleObject3 = listView.Items[2].AccessibilityObject; AccessibleObject accessibleObject4 = listView.Items[3].AccessibilityObject; - Assert.Equal(listView.Items[0].SubItems[0].AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Equal(listView.Items[1].SubItems[0].AccessibilityObject, accessibleObject2.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Equal(listView.Items[2].SubItems[0].AccessibilityObject, accessibleObject3.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Equal(listView.Items[3].SubItems[0].AccessibilityObject, accessibleObject4.FragmentNavigate(NavigateDirection.FirstChild)); + Assert.Equal(listView.Items[0].SubItems[0].AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(listView.Items[1].SubItems[0].AccessibilityObject, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(listView.Items[2].SubItems[0].AccessibilityObject, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(listView.Items[3].SubItems[0].AccessibilityObject, accessibleObject4.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); Assert.True(listView.IsHandleCreated); } @@ -382,8 +382,8 @@ public void ListViewItemAccessibleObject_FragmentNavigate_FirstChildReturnExpect AccessibleObject accessibleObject1 = listView.Items[0].AccessibilityObject; AccessibleObject accessibleObject2 = listView.Items[1].AccessibilityObject; - Assert.Equal(listView.Items[0].SubItems[0].AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Equal(listView.Items[1].SubItems[0].AccessibilityObject, accessibleObject2.FragmentNavigate(NavigateDirection.FirstChild)); + Assert.Equal(listView.Items[0].SubItems[0].AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(listView.Items[1].SubItems[0].AccessibilityObject, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); Assert.Equal(createControl, listView.IsHandleCreated); } @@ -398,10 +398,10 @@ public void ListViewItemAccessibleObject_FragmentNavigate_LastChild_ReturnExpect AccessibleObject accessibleObject3 = listView.Items[2].AccessibilityObject; AccessibleObject accessibleObject4 = listView.Items[3].AccessibilityObject; - Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.LastChild)); - Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.LastChild)); - Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.LastChild)); - Assert.Null(accessibleObject4.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); + Assert.Null(accessibleObject4.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.Equal(createControl, listView.IsHandleCreated); } @@ -419,10 +419,10 @@ public void ListViewItemAccessibleObject_FragmentNavigate_LastChild_ReturnExpect AccessibleObject accessibleObject3 = listView.Items[2].AccessibilityObject; AccessibleObject accessibleObject4 = listView.Items[3].AccessibilityObject; - Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.LastChild)); - Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.LastChild)); - Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.LastChild)); - Assert.Null(accessibleObject4.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); + Assert.Null(accessibleObject4.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.Equal(createControl, listView.IsHandleCreated); } @@ -435,8 +435,8 @@ public void ListViewItemAccessibleObject_FragmentNavigate_LastChild_ReturnExpect AccessibleObject accessibleObject1 = listView.Items[0].AccessibilityObject; AccessibleObject accessibleObject2 = listView.Items[1].AccessibilityObject; - Assert.Equal(listView.Items[0].SubItems[2].AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.LastChild)); - Assert.Equal(listView.Items[1].SubItems[2].AccessibilityObject, accessibleObject2.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(listView.Items[0].SubItems[2].AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); + Assert.Equal(listView.Items[1].SubItems[2].AccessibilityObject, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.Equal(createControl, listView.IsHandleCreated); } @@ -448,8 +448,8 @@ public void ListViewItemAccessibleObject_FragmentNavigate_LastChild_DoesNotRetur AccessibleObject accessibleObject1 = listView.Items[0].AccessibilityObject; AccessibleObject accessibleObject2 = listView.Items[1].AccessibilityObject; - IRawElementProviderFragment lastChild1 = accessibleObject1.FragmentNavigate(NavigateDirection.LastChild); - IRawElementProviderFragment lastChild2 = accessibleObject2.FragmentNavigate(NavigateDirection.LastChild); + IRawElementProviderFragment lastChild1 = accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild); + IRawElementProviderFragment lastChild2 = accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild); Assert.NotNull(lastChild1); Assert.NotNull(lastChild2); @@ -466,8 +466,8 @@ public void ListViewItemAccessibleObject_FragmentNavigate_LastChild_ReturnsExpec AccessibleObject accessibleObject1 = listView.Items[0].AccessibilityObject; AccessibleObject accessibleObject2 = listView.Items[1].AccessibilityObject; - IRawElementProviderFragment lastChild1 = accessibleObject1.FragmentNavigate(NavigateDirection.LastChild); - IRawElementProviderFragment lastChild2 = accessibleObject2.FragmentNavigate(NavigateDirection.LastChild); + IRawElementProviderFragment lastChild1 = accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild); + IRawElementProviderFragment lastChild2 = accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild); Assert.Equal(listView.Items[0].SubItems[0].AccessibilityObject, lastChild1); Assert.Equal(listView.Items[1].SubItems[0].AccessibilityObject, lastChild2); @@ -482,8 +482,8 @@ public void ListViewItemAccessibleObject_FragmentNavigate_LastChild_ReturnsExpec AccessibleObject accessibleObject1 = listView.Items[0].AccessibilityObject; AccessibleObject accessibleObject2 = listView.Items[1].AccessibilityObject; - IRawElementProviderFragment lastChild1 = accessibleObject1.FragmentNavigate(NavigateDirection.LastChild); - IRawElementProviderFragment lastChild2 = accessibleObject2.FragmentNavigate(NavigateDirection.LastChild); + IRawElementProviderFragment lastChild1 = accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild); + IRawElementProviderFragment lastChild2 = accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild); Assert.NotNull(lastChild1); Assert.NotNull(lastChild2); @@ -493,8 +493,8 @@ public void ListViewItemAccessibleObject_FragmentNavigate_LastChild_ReturnsExpec listView.Items[0].SubItems.Add(new ListViewSubItem() { Text = $"SubItem 0" }); listView.Items[1].SubItems.Add(new ListViewSubItem() { Text = $"SubItem 0" }); - lastChild1 = accessibleObject1.FragmentNavigate(NavigateDirection.LastChild); - lastChild2 = accessibleObject2.FragmentNavigate(NavigateDirection.LastChild); + lastChild1 = accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild); + lastChild2 = accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild); Assert.Equal(listView.Items[0].SubItems[1].AccessibilityObject, lastChild1); Assert.Equal(listView.Items[1].SubItems[1].AccessibilityObject, lastChild2); @@ -511,8 +511,8 @@ public void ListViewItemAccessibleObject_FragmentNavigate_LastChild_ReturnsExpec AccessibleObject accessibleObject1 = listView.Items[0].AccessibilityObject; AccessibleObject accessibleObject2 = listView.Items[1].AccessibilityObject; - IRawElementProviderFragment lastChild1 = accessibleObject1.FragmentNavigate(NavigateDirection.LastChild); - IRawElementProviderFragment lastChild2 = accessibleObject2.FragmentNavigate(NavigateDirection.LastChild); + IRawElementProviderFragment lastChild1 = accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild); + IRawElementProviderFragment lastChild2 = accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild); Assert.Equal(listView.Items[0].SubItems[1].AccessibilityObject, lastChild1); Assert.Equal(listView.Items[1].SubItems[1].AccessibilityObject, lastChild2); @@ -522,8 +522,8 @@ public void ListViewItemAccessibleObject_FragmentNavigate_LastChild_ReturnsExpec listView.Items[0].SubItems.RemoveAt(1); listView.Items[1].SubItems.RemoveAt(1); - lastChild1 = accessibleObject1.FragmentNavigate(NavigateDirection.LastChild); - lastChild2 = accessibleObject2.FragmentNavigate(NavigateDirection.LastChild); + lastChild1 = accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild); + lastChild2 = accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild); Assert.NotNull(lastChild1); Assert.NotNull(lastChild2); @@ -603,21 +603,21 @@ public void ListViewItemAccessibleObject_FragmentNavigate_ListWithItems_VirtualM AccessibleObject accessibleObject3 = listItem3.AccessibilityObject; // First list view item - Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NextSibling)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); // Second list view item - Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NextSibling)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); // Third list view item - Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NextSibling)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); // Parent - Assert.Equal(accessibleObject1.FragmentNavigate(NavigateDirection.Parent), listView.AccessibilityObject); - Assert.Equal(accessibleObject2.FragmentNavigate(NavigateDirection.Parent), listView.AccessibilityObject); - Assert.Equal(accessibleObject3.FragmentNavigate(NavigateDirection.Parent), listView.AccessibilityObject); + Assert.Equal(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_Parent), listView.AccessibilityObject); + Assert.Equal(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_Parent), listView.AccessibilityObject); + Assert.Equal(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_Parent), listView.AccessibilityObject); Assert.True(listView.IsHandleCreated); } @@ -899,15 +899,15 @@ public void ListViewItemAccessibleObject_ToggleState_ReturnExpected(View view, b AccessibleObject listViewItemAccessibleObject = listViewItem.AccessibilityObject; - Assert.Equal(ToggleState.Off, listViewItemAccessibleObject.ToggleState); + Assert.Equal(ToggleState.ToggleState_Off, listViewItemAccessibleObject.ToggleState); listViewItem.Checked = true; - Assert.Equal(ToggleState.On, listViewItemAccessibleObject.ToggleState); + Assert.Equal(ToggleState.ToggleState_On, listViewItemAccessibleObject.ToggleState); listViewItem.Checked = false; - Assert.Equal(ToggleState.Off, listViewItemAccessibleObject.ToggleState); + Assert.Equal(ToggleState.ToggleState_Off, listViewItemAccessibleObject.ToggleState); Assert.Equal(createHandle, listView.IsHandleCreated); } @@ -934,18 +934,18 @@ public void ListViewItemAccessibleObject_Toggle_Invoke(View view, bool showGroup AccessibleObject listViewItemAccessibleObject = listViewItem.AccessibilityObject; - Assert.Equal(ToggleState.Off, listViewItemAccessibleObject.ToggleState); + Assert.Equal(ToggleState.ToggleState_Off, listViewItemAccessibleObject.ToggleState); Assert.False(listViewItem.Checked); listViewItemAccessibleObject.Toggle(); - Assert.Equal(ToggleState.On, listViewItemAccessibleObject.ToggleState); + Assert.Equal(ToggleState.ToggleState_On, listViewItemAccessibleObject.ToggleState); Assert.True(listViewItem.Checked); // toggle again listViewItemAccessibleObject.Toggle(); - Assert.Equal(ToggleState.Off, listViewItemAccessibleObject.ToggleState); + Assert.Equal(ToggleState.ToggleState_Off, listViewItemAccessibleObject.ToggleState); Assert.False(listViewItem.Checked); Assert.Equal(createHandle, listView.IsHandleCreated); } @@ -959,10 +959,10 @@ public void ListViewItemAccessibleObject_FragmentNavigate_Sibling_ReturnsExpecte { using ListView listView = GetListViewItemWithInvisibleItems(view); - Assert.Null(GetAccessibleObject(1).FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Equal(GetAccessibleObject(2), GetAccessibleObject(1).FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Equal(GetAccessibleObject(1), GetAccessibleObject(2).FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Null(GetAccessibleObject(2).FragmentNavigate(NavigateDirection.NextSibling)); + Assert.Null(GetAccessibleObject(1).FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(GetAccessibleObject(2), GetAccessibleObject(1).FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(GetAccessibleObject(1), GetAccessibleObject(2).FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(GetAccessibleObject(2).FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); Assert.True(listView.IsHandleCreated); AccessibleObject GetAccessibleObject(int index) => listView.Groups[0].Items[index].AccessibilityObject; @@ -982,22 +982,22 @@ public void ListViewItemAccessibleObject_FragmentNavigate_Sibling_ReturnsExpecte using ListView listView = GetListViewItemWithInvisibleItems(view); - Assert.Null(GetAccessibleObject(1).FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Equal(GetAccessibleObject(2), GetAccessibleObject(1).FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Equal(GetAccessibleObject(1), GetAccessibleObject(2).FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Null(GetAccessibleObject(2).FragmentNavigate(NavigateDirection.NextSibling)); + Assert.Null(GetAccessibleObject(1).FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(GetAccessibleObject(2), GetAccessibleObject(1).FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(GetAccessibleObject(1), GetAccessibleObject(2).FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(GetAccessibleObject(2).FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); listView.Items.Add(listView.Groups[0].Items[0]); listView.Items.Add(listView.Groups[0].Items[3]); - Assert.Null(GetAccessibleObject(0).FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Equal(GetAccessibleObject(1), GetAccessibleObject(0).FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Equal(GetAccessibleObject(0), GetAccessibleObject(1).FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Equal(GetAccessibleObject(2), GetAccessibleObject(1).FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Equal(GetAccessibleObject(1), GetAccessibleObject(2).FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Equal(GetAccessibleObject(3), GetAccessibleObject(2).FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Equal(GetAccessibleObject(2), GetAccessibleObject(3).FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Null(GetAccessibleObject(3).FragmentNavigate(NavigateDirection.NextSibling)); + Assert.Null(GetAccessibleObject(0).FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(GetAccessibleObject(1), GetAccessibleObject(0).FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(GetAccessibleObject(0), GetAccessibleObject(1).FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(GetAccessibleObject(2), GetAccessibleObject(1).FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(GetAccessibleObject(1), GetAccessibleObject(2).FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(GetAccessibleObject(3), GetAccessibleObject(2).FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(GetAccessibleObject(2), GetAccessibleObject(3).FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(GetAccessibleObject(3).FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); Assert.True(listView.IsHandleCreated); AccessibleObject GetAccessibleObject(int index) => listView.Groups[0].Items[index].AccessibilityObject; @@ -1012,15 +1012,15 @@ public void ListViewItemAccessibleObject_FragmentNavigate_Sibling_ReturnsExpecte { using ListView listView = GetListViewItemWithInvisibleItems(view); - Assert.Null(GetAccessibleObject(1).FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Equal(GetAccessibleObject(2), GetAccessibleObject(1).FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Equal(GetAccessibleObject(1), GetAccessibleObject(2).FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Null(GetAccessibleObject(2).FragmentNavigate(NavigateDirection.NextSibling)); + Assert.Null(GetAccessibleObject(1).FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(GetAccessibleObject(2), GetAccessibleObject(1).FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(GetAccessibleObject(1), GetAccessibleObject(2).FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(GetAccessibleObject(2).FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); listView.Items.RemoveAt(1); - Assert.Null(GetAccessibleObject(0).FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Null(GetAccessibleObject(0).FragmentNavigate(NavigateDirection.NextSibling)); + Assert.Null(GetAccessibleObject(0).FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(GetAccessibleObject(0).FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); Assert.True(listView.IsHandleCreated); AccessibleObject GetAccessibleObject(int index) => listView.Groups[0].Items[index].AccessibilityObject; @@ -1300,32 +1300,32 @@ public void ListViewItemAccessibleObject_FragmentNavigate_Sibling_Parent_Returns AccessibleObject accessibleObject2 = listView.Items[1].AccessibilityObject; AccessibleObject accessibleObject3 = listView.Items[2].AccessibilityObject; - Assert.Equal(listView.AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.Parent)); - Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.PreviousSibling)); + Assert.Equal(listView.AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); - Assert.Equal(listView.AccessibilityObject, accessibleObject2.FragmentNavigate(NavigateDirection.Parent)); - Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(NavigateDirection.PreviousSibling)); + Assert.Equal(listView.AccessibilityObject, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); - Assert.Equal(listView.AccessibilityObject, accessibleObject3.FragmentNavigate(NavigateDirection.Parent)); - Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(NavigateDirection.PreviousSibling)); + Assert.Equal(listView.AccessibilityObject, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); listView.Groups.Add(new ListViewGroup()); listView.Items[1].Group = listView.Groups[0]; - Assert.Equal(listView.DefaultGroup.AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.Parent)); - Assert.Equal(accessibleObject3, accessibleObject1.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.PreviousSibling)); + Assert.Equal(listView.DefaultGroup.AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(accessibleObject3, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); - Assert.Equal(listView.Groups[0].AccessibilityObject, accessibleObject2.FragmentNavigate(NavigateDirection.Parent)); - Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.PreviousSibling)); + Assert.Equal(listView.Groups[0].AccessibilityObject, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); - Assert.Equal(listView.DefaultGroup.AccessibilityObject, accessibleObject3.FragmentNavigate(NavigateDirection.Parent)); - Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject1, accessibleObject3.FragmentNavigate(NavigateDirection.PreviousSibling)); + Assert.Equal(listView.DefaultGroup.AccessibilityObject, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject1, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); } [WinFormsTheory] @@ -1359,31 +1359,31 @@ public void ListViewItemAccessibleObject_FragmentNavigate_Sibling_Parent_Returns AccessibleObject accessibleObject2 = listView.Items[1].AccessibilityObject; AccessibleObject accessibleObject3 = listView.Items[2].AccessibilityObject; - Assert.Equal(listView.DefaultGroup.AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.Parent)); - Assert.Equal(accessibleObject3, accessibleObject1.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.PreviousSibling)); + Assert.Equal(listView.DefaultGroup.AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(accessibleObject3, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); - Assert.Equal(listView.Groups[0].AccessibilityObject, accessibleObject2.FragmentNavigate(NavigateDirection.Parent)); - Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.PreviousSibling)); + Assert.Equal(listView.Groups[0].AccessibilityObject, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); - Assert.Equal(listView.DefaultGroup.AccessibilityObject, accessibleObject3.FragmentNavigate(NavigateDirection.Parent)); - Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject1, accessibleObject3.FragmentNavigate(NavigateDirection.PreviousSibling)); + Assert.Equal(listView.DefaultGroup.AccessibilityObject, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject1, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); listView.Groups.RemoveAt(0); - Assert.Equal(listView.AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.Parent)); - Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.PreviousSibling)); + Assert.Equal(listView.AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); - Assert.Equal(listView.AccessibilityObject, accessibleObject2.FragmentNavigate(NavigateDirection.Parent)); - Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(NavigateDirection.PreviousSibling)); + Assert.Equal(listView.AccessibilityObject, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); - Assert.Equal(listView.AccessibilityObject, accessibleObject3.FragmentNavigate(NavigateDirection.Parent)); - Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(NavigateDirection.PreviousSibling)); + Assert.Equal(listView.AccessibilityObject, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); } [WinFormsTheory] @@ -1417,31 +1417,31 @@ public void ListViewItemAccessibleObject_FragmentNavigate_Sibling_Parent_Returns AccessibleObject accessibleObject2 = listView.Items[1].AccessibilityObject; AccessibleObject accessibleObject3 = listView.Items[2].AccessibilityObject; - Assert.Equal(listView.DefaultGroup.AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.Parent)); - Assert.Equal(accessibleObject3, accessibleObject1.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.PreviousSibling)); + Assert.Equal(listView.DefaultGroup.AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(accessibleObject3, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); - Assert.Equal(listView.Groups[0].AccessibilityObject, accessibleObject2.FragmentNavigate(NavigateDirection.Parent)); - Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.PreviousSibling)); + Assert.Equal(listView.Groups[0].AccessibilityObject, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); - Assert.Equal(listView.DefaultGroup.AccessibilityObject, accessibleObject3.FragmentNavigate(NavigateDirection.Parent)); - Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject1, accessibleObject3.FragmentNavigate(NavigateDirection.PreviousSibling)); + Assert.Equal(listView.DefaultGroup.AccessibilityObject, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject1, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); listView.Groups[0].Items.Insert(0, listView.Items[0]); - Assert.Equal(listView.Groups[0].AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.Parent)); - Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.PreviousSibling)); + Assert.Equal(listView.Groups[0].AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); - Assert.Equal(listView.Groups[0].AccessibilityObject, accessibleObject2.FragmentNavigate(NavigateDirection.Parent)); - Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(NavigateDirection.PreviousSibling)); + Assert.Equal(listView.Groups[0].AccessibilityObject, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); - Assert.Equal(listView.DefaultGroup.AccessibilityObject, accessibleObject3.FragmentNavigate(NavigateDirection.Parent)); - Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.PreviousSibling)); + Assert.Equal(listView.DefaultGroup.AccessibilityObject, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); } [WinFormsFact] @@ -1464,63 +1464,63 @@ public void ListViewItemAccessibleObject_FragmentNavigate_Sibling_Parent_Returns AccessibleObject accessibleObject2 = listView.Items[1].AccessibilityObject; AccessibleObject accessibleObject3 = listView.Items[2].AccessibilityObject; - Assert.Equal(listView.AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.Parent)); - Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.PreviousSibling)); + Assert.Equal(listView.AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); - Assert.Equal(listView.AccessibilityObject, accessibleObject2.FragmentNavigate(NavigateDirection.Parent)); - Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(NavigateDirection.PreviousSibling)); + Assert.Equal(listView.AccessibilityObject, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); - Assert.Equal(listView.AccessibilityObject, accessibleObject3.FragmentNavigate(NavigateDirection.Parent)); - Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(NavigateDirection.PreviousSibling)); + Assert.Equal(listView.AccessibilityObject, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); // Since "List" mode does not support ListViewGroups, adding a ListViewGroup should not affect the operation of availability objects listView.Groups.Add(new ListViewGroup()); listView.Items[1].Group = listView.Groups[0]; - Assert.Equal(listView.AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.Parent)); - Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.PreviousSibling)); + Assert.Equal(listView.AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); - Assert.Equal(listView.AccessibilityObject, accessibleObject2.FragmentNavigate(NavigateDirection.Parent)); - Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(NavigateDirection.PreviousSibling)); + Assert.Equal(listView.AccessibilityObject, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); - Assert.Equal(listView.AccessibilityObject, accessibleObject3.FragmentNavigate(NavigateDirection.Parent)); - Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(NavigateDirection.PreviousSibling)); + Assert.Equal(listView.AccessibilityObject, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); // Since "List" mode does not support ListViewGroups, updating a ListViewGroup should not affect the operation of availability objects listView.Groups[0].Items.Insert(0, listView.Items[0]); - Assert.Equal(listView.AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.Parent)); - Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.PreviousSibling)); + Assert.Equal(listView.AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); - Assert.Equal(listView.AccessibilityObject, accessibleObject2.FragmentNavigate(NavigateDirection.Parent)); - Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(NavigateDirection.PreviousSibling)); + Assert.Equal(listView.AccessibilityObject, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); - Assert.Equal(listView.AccessibilityObject, accessibleObject3.FragmentNavigate(NavigateDirection.Parent)); - Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(NavigateDirection.PreviousSibling)); + Assert.Equal(listView.AccessibilityObject, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); // Since "List" mode does not support ListViewGroups, removing a ListViewGroup should not affect the operation of availability objects listView.Groups.RemoveAt(0); - Assert.Equal(listView.AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.Parent)); - Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.PreviousSibling)); + Assert.Equal(listView.AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); - Assert.Equal(listView.AccessibilityObject, accessibleObject2.FragmentNavigate(NavigateDirection.Parent)); - Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(NavigateDirection.PreviousSibling)); + Assert.Equal(listView.AccessibilityObject, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); - Assert.Equal(listView.AccessibilityObject, accessibleObject3.FragmentNavigate(NavigateDirection.Parent)); - Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(NavigateDirection.PreviousSibling)); + Assert.Equal(listView.AccessibilityObject, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); } [WinFormsTheory] diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ListViewItem.ListViewItemBaseAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ListViewItem.ListViewItemBaseAccessibleObjectTests.cs index ec4e248ad77..13a0027e110 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ListViewItem.ListViewItemBaseAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ListViewItem.ListViewItemBaseAccessibleObjectTests.cs @@ -4,7 +4,6 @@ using System.Drawing; using Windows.Win32.UI.Accessibility; using static System.Windows.Forms.ListViewItem; -using static Interop; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -152,7 +151,7 @@ public void ListViewItemBaseAccessibleObject_FragmentNavigate_Parent_ReturnsExpe control.Items.Add(item); AccessibleObject accessibleObject = item.AccessibilityObject; - var actual = accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent); + var actual = accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent); Assert.Equal(control.AccessibilityObject, actual); Assert.False(control.IsHandleCreated); @@ -167,10 +166,10 @@ public void ListViewItemBaseAccessibleObject_FragmentNavigate_ToSibling_ReturnsN AccessibleObject accessibleObject1 = control.Items[0].AccessibilityObject; AccessibleObject accessibleObject2 = control.Items[1].AccessibilityObject; - Assert.Null(accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(control.IsHandleCreated); } @@ -183,8 +182,8 @@ public void ListViewItemBaseAccessibleObject_FragmentNavigate_Child_ReturnsExpec AccessibleObject accessibleObject = item.AccessibilityObject; - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(control.IsHandleCreated); } @@ -353,21 +352,21 @@ public void ListViewItemBaseAccessibleObject_ItemSelectionContainer_ReturnsExpec } [WinFormsTheory] - [InlineData(true, (int)UiaCore.ToggleState.On)] - [InlineData(false, (int)UiaCore.ToggleState.Off)] + [InlineData(true, (int)ToggleState.ToggleState_On)] + [InlineData(false, (int)ToggleState.ToggleState_Off)] public void ListViewItemBaseAccessibleObject_ToggleState_ReturnsExpected(bool isChecked, int expected) { using ListView control = new(); ListViewItem item = new() { Checked = isChecked }; control.Items.Add(item); - Assert.Equal((UiaCore.ToggleState)expected, item.AccessibilityObject.ToggleState); + Assert.Equal((ToggleState)expected, item.AccessibilityObject.ToggleState); Assert.False(control.IsHandleCreated); } [WinFormsTheory] - [InlineData(false, (int)UiaCore.ToggleState.Off, (int)UiaCore.ToggleState.On)] - [InlineData(true, (int)UiaCore.ToggleState.On, (int)UiaCore.ToggleState.Off)] + [InlineData(false, (int)ToggleState.ToggleState_Off, (int)ToggleState.ToggleState_On)] + [InlineData(true, (int)ToggleState.ToggleState_On, (int)ToggleState.ToggleState_Off)] public void ListViewItemBaseAccessibleObject_Toggle_WorksExpected(bool isChecked, int before, int expected) { using ListView control = new(); @@ -376,11 +375,11 @@ public void ListViewItemBaseAccessibleObject_Toggle_WorksExpected(bool isChecked AccessibleObject accessibleObject = item.AccessibilityObject; - Assert.Equal((UiaCore.ToggleState)before, accessibleObject.ToggleState); + Assert.Equal((ToggleState)before, accessibleObject.ToggleState); accessibleObject.Toggle(); - Assert.Equal((UiaCore.ToggleState)expected, accessibleObject.ToggleState); + Assert.Equal((ToggleState)expected, accessibleObject.ToggleState); Assert.False(control.IsHandleCreated); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ListViewItem.ListViewItemDetailsAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ListViewItem.ListViewItemDetailsAccessibleObjectTests.cs index aec4dd1e647..44bf83b73e2 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ListViewItem.ListViewItemDetailsAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ListViewItem.ListViewItemDetailsAccessibleObjectTests.cs @@ -2,8 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Drawing; +using Windows.Win32.UI.Accessibility; using static System.Windows.Forms.ListViewItem; -using static Interop; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -26,7 +26,7 @@ public void ListViewItemDetailsAccessibleObject_FragmentNavigate_FirstChild_Retu AccessibleObject accessibleObject = item.AccessibilityObject; AccessibleObject expected = item.SubItems[0].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); Assert.False(control.IsHandleCreated); } @@ -42,7 +42,7 @@ public void ListViewItemDetailsAccessibleObject_FragmentNavigate_LastChild_Retur AccessibleObject accessibleObject = item.AccessibilityObject; AccessibleObject expected = item.SubItems[control.Columns.Count - 1].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(control.IsHandleCreated); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ListViewItem.ListViewItemListAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ListViewItem.ListViewItemListAccessibleObjectTests.cs index e8b238878eb..333fff4009e 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ListViewItem.ListViewItemListAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ListViewItem.ListViewItemListAccessibleObjectTests.cs @@ -2,8 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Drawing; +using Windows.Win32.UI.Accessibility; using static System.Windows.Forms.ListViewItem; -using static Interop; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -40,7 +40,7 @@ public void ListViewItemListAccessibleObject_FragmentNavigate_Parent() control.Items.Add(new ListViewItem()); AccessibleObject accessibleObject1 = control.Items[0].AccessibilityObject; - Assert.Equal(control.AccessibilityObject, accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.Parent)); + Assert.Equal(control.AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); Assert.False(control.IsHandleCreated); } @@ -56,9 +56,9 @@ public void ListViewItemListAccessibleObject_FragmentNavigate_PreviousSibling() AccessibleObject accessibleObject2 = control.Items[1].AccessibilityObject; AccessibleObject accessibleObject3 = control.Items[2].AccessibilityObject; - Assert.Null(accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.True(control.IsHandleCreated); } @@ -75,9 +75,9 @@ public void ListViewItemListAccessibleObject_FragmentNavigate_NextSibling() AccessibleObject accessibleObject2 = control.Items[1].AccessibilityObject; AccessibleObject accessibleObject3 = control.Items[2].AccessibilityObject; - Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); Assert.True(control.IsHandleCreated); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ListViewItem.ListViewItemWithImageAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ListViewItem.ListViewItemWithImageAccessibleObjectTests.cs index 152cee74a59..5f8dc4636da 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ListViewItem.ListViewItemWithImageAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ListViewItem.ListViewItemWithImageAccessibleObjectTests.cs @@ -1,8 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Windows.Win32.UI.Accessibility; using static System.Windows.Forms.ListViewItem; -using static Interop; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -18,8 +18,8 @@ public void ListViewItemListAccessibleObject_FragmentNavigate_Children_ReturnsNu AccessibleObject listViewItemAccessibleObject = control.Items[0].AccessibilityObject; - Assert.Null(listViewItemAccessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(listViewItemAccessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Null(listViewItemAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(listViewItemAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(control.IsHandleCreated); } @@ -45,8 +45,8 @@ public void ListViewItemListAccessibleObject_FragmentNavigate_Children_IsExpecte control.Items.Add(listViewItem); AccessibleObject listViewItemAccessibleObject = control.Items[0].AccessibilityObject; - var firstChild = listViewItemAccessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild); - var lastChild = listViewItemAccessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild); + var firstChild = listViewItemAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild); + var lastChild = listViewItemAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild); Assert.IsType(firstChild); Assert.IsType(lastChild); diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ListViewItem.ListViewSubItem.ListViewSubItemAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ListViewItem.ListViewSubItem.ListViewSubItemAccessibleObjectTests.cs index e40178527aa..8fa19392ed5 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ListViewItem.ListViewSubItem.ListViewSubItemAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ListViewItem.ListViewSubItem.ListViewSubItemAccessibleObjectTests.cs @@ -151,33 +151,33 @@ public void ListViewSubItemAccessibleObject_FragmentNavigate_ReturnsNull_List_Ic AccessibleObject subItemAccObjInGroup2 = listViewItemInGroup.SubItems[1].AccessibilityObject; AccessibleObject subItemAccObjInGroup3 = listViewItemInGroup.SubItems[2].AccessibilityObject; - Assert.Null(subItemAccObj1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(subItemAccObj2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(subItemAccObj3.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(subItemAccObjInGroup1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(subItemAccObjInGroup2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(subItemAccObjInGroup3.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - - Assert.Null(subItemAccObj1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(subItemAccObj2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(subItemAccObj3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(subItemAccObjInGroup1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(subItemAccObjInGroup2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(subItemAccObjInGroup3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - - Assert.Null(subItemAccObj1.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(subItemAccObj2.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(subItemAccObj3.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(subItemAccObjInGroup1.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(subItemAccObjInGroup2.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(subItemAccObjInGroup3.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - - Assert.Null(subItemAccObj1.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); - Assert.Null(subItemAccObj2.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); - Assert.Null(subItemAccObj3.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); - Assert.Null(subItemAccObjInGroup1.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); - Assert.Null(subItemAccObjInGroup2.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); - Assert.Null(subItemAccObjInGroup3.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Null(subItemAccObj1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(subItemAccObj2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(subItemAccObj3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(subItemAccObjInGroup1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(subItemAccObjInGroup2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(subItemAccObjInGroup3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + + Assert.Null(subItemAccObj1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(subItemAccObj2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(subItemAccObj3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(subItemAccObjInGroup1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(subItemAccObjInGroup2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(subItemAccObjInGroup3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + + Assert.Null(subItemAccObj1.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(subItemAccObj2.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(subItemAccObj3.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(subItemAccObjInGroup1.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(subItemAccObjInGroup2.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(subItemAccObjInGroup3.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + + Assert.Null(subItemAccObj1.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); + Assert.Null(subItemAccObj2.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); + Assert.Null(subItemAccObj3.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); + Assert.Null(subItemAccObjInGroup1.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); + Assert.Null(subItemAccObjInGroup2.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); + Assert.Null(subItemAccObjInGroup3.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.Equal(createControl, listView.IsHandleCreated); } @@ -299,19 +299,19 @@ public void ListViewSubItemAccessibleObject_FragmentNavigate_Child_ReturnsNull_D AccessibleObject subItemAccObjInGroup2 = listViewItemInGroup.SubItems[1].AccessibilityObject; AccessibleObject subItemAccObjInGroup3 = listViewItemInGroup.SubItems[2].AccessibilityObject; - Assert.Null(subItemAccObj1.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(subItemAccObj2.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(subItemAccObj3.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(subItemAccObjInGroup1.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(subItemAccObjInGroup2.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(subItemAccObjInGroup3.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); + Assert.Null(subItemAccObj1.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(subItemAccObj2.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(subItemAccObj3.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(subItemAccObjInGroup1.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(subItemAccObjInGroup2.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(subItemAccObjInGroup3.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); - Assert.Null(subItemAccObj1.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); - Assert.Null(subItemAccObj2.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); - Assert.Null(subItemAccObj3.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); - Assert.Null(subItemAccObjInGroup1.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); - Assert.Null(subItemAccObjInGroup2.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); - Assert.Null(subItemAccObjInGroup3.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Null(subItemAccObj1.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); + Assert.Null(subItemAccObj2.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); + Assert.Null(subItemAccObj3.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); + Assert.Null(subItemAccObjInGroup1.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); + Assert.Null(subItemAccObjInGroup2.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); + Assert.Null(subItemAccObjInGroup3.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.Equal(createControl, listView.IsHandleCreated); } @@ -335,19 +335,19 @@ public void ListViewSubItemAccessibleObject_FragmentNavigate_Child_ReturnsNull_T AccessibleObject subItemAccObjInGroup2 = listViewItemInGroup.SubItems[1].AccessibilityObject; AccessibleObject subItemAccObjInGroup3 = listViewItemInGroup.SubItems[2].AccessibilityObject; - Assert.Null(subItemAccObj1.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(subItemAccObj2.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(subItemAccObj3.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(subItemAccObjInGroup1.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(subItemAccObjInGroup2.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(subItemAccObjInGroup3.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); + Assert.Null(subItemAccObj1.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(subItemAccObj2.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(subItemAccObj3.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(subItemAccObjInGroup1.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(subItemAccObjInGroup2.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(subItemAccObjInGroup3.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); - Assert.Null(subItemAccObj1.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); - Assert.Null(subItemAccObj2.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); - Assert.Null(subItemAccObj3.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); - Assert.Null(subItemAccObjInGroup1.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); - Assert.Null(subItemAccObjInGroup2.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); - Assert.Null(subItemAccObjInGroup3.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Null(subItemAccObj1.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); + Assert.Null(subItemAccObj2.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); + Assert.Null(subItemAccObj3.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); + Assert.Null(subItemAccObjInGroup1.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); + Assert.Null(subItemAccObjInGroup2.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); + Assert.Null(subItemAccObjInGroup3.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.Equal(createControl, listView.IsHandleCreated); } @@ -363,11 +363,11 @@ public void ListViewSubItemAccessibleObject_FragmentNavigate_NextSibling_Returns AccessibleObject subItemAccObj = listViewItem.SubItems[0].AccessibilityObject; AccessibleObject subItemAccInGroup = listViewItemInGroup.SubItems[0].AccessibilityObject; - AccessibleObject nextSubItemAccObj1 = (AccessibleObject)subItemAccObj.FragmentNavigate(UiaCore.NavigateDirection.NextSibling); - AccessibleObject nextSubItemAccObj2 = (AccessibleObject)nextSubItemAccObj1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling); + AccessibleObject nextSubItemAccObj1 = (AccessibleObject)subItemAccObj.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); + AccessibleObject nextSubItemAccObj2 = (AccessibleObject)nextSubItemAccObj1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); - AccessibleObject nextSubItemAccInGroup1 = (AccessibleObject)subItemAccInGroup.FragmentNavigate(UiaCore.NavigateDirection.NextSibling); - AccessibleObject nextSubItemAccInGroup2 = (AccessibleObject)nextSubItemAccInGroup1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling); + AccessibleObject nextSubItemAccInGroup1 = (AccessibleObject)subItemAccInGroup.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); + AccessibleObject nextSubItemAccInGroup2 = (AccessibleObject)nextSubItemAccInGroup1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); Assert.Same(listViewItem.SubItems[1].AccessibilityObject, nextSubItemAccObj1); Assert.Null(nextSubItemAccObj2); @@ -389,11 +389,11 @@ public void ListViewSubItemAccessibleObject_FragmentNavigate_NextSibling_Returns AccessibleObject subItemAccObj = listViewItem.SubItems[0].AccessibilityObject; AccessibleObject subItemAccInGroup = listViewItemInGroup.SubItems[0].AccessibilityObject; - AccessibleObject nextSubItemAccObj1 = (AccessibleObject)subItemAccObj.FragmentNavigate(UiaCore.NavigateDirection.NextSibling); - AccessibleObject nextSubItemAccObj2 = (AccessibleObject)nextSubItemAccObj1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling); + AccessibleObject nextSubItemAccObj1 = (AccessibleObject)subItemAccObj.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); + AccessibleObject nextSubItemAccObj2 = (AccessibleObject)nextSubItemAccObj1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); - AccessibleObject nextSubItemAccInGroup1 = (AccessibleObject)subItemAccInGroup.FragmentNavigate(UiaCore.NavigateDirection.NextSibling); - AccessibleObject nextSubItemAccInGroup2 = (AccessibleObject)nextSubItemAccInGroup1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling); + AccessibleObject nextSubItemAccInGroup1 = (AccessibleObject)subItemAccInGroup.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); + AccessibleObject nextSubItemAccInGroup2 = (AccessibleObject)nextSubItemAccInGroup1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); Assert.NotNull(nextSubItemAccObj1); Assert.NotNull(nextSubItemAccObj2); @@ -414,8 +414,8 @@ public void ListViewSubItemAccessibleObject_FragmentNavigate_PreviousSibling_Ret AccessibleObject subItemAccObj = listViewItem.SubItems[0].AccessibilityObject; AccessibleObject subItemAccInGroup = listViewItemInGroup.SubItems[0].AccessibilityObject; - AccessibleObject previousSubItemAccObj = (AccessibleObject)subItemAccObj.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling); - AccessibleObject previousSubItemAccInGroup = (AccessibleObject)subItemAccInGroup.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling); + AccessibleObject previousSubItemAccObj = (AccessibleObject)subItemAccObj.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling); + AccessibleObject previousSubItemAccInGroup = (AccessibleObject)subItemAccInGroup.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling); Assert.Null(previousSubItemAccObj); Assert.Null(previousSubItemAccInGroup); @@ -434,15 +434,15 @@ public void ListViewSubItemAccessibleObject_FragmentNavigate_PreviousSibling_Ret AccessibleObject subItemAccObj = listViewItem.SubItems[3].AccessibilityObject; AccessibleObject subItemAccInGroup = listViewItemInGroup.SubItems[3].AccessibilityObject; - AccessibleObject previousSubItemAccObj3 = (AccessibleObject)subItemAccObj.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling); - AccessibleObject previousSubItemAccObj2 = (AccessibleObject)previousSubItemAccObj3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling); - AccessibleObject previousSubItemAccObj1 = (AccessibleObject)previousSubItemAccObj2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling); - AccessibleObject previousSubItemAccObj0 = (AccessibleObject)previousSubItemAccObj1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling); + AccessibleObject previousSubItemAccObj3 = (AccessibleObject)subItemAccObj.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling); + AccessibleObject previousSubItemAccObj2 = (AccessibleObject)previousSubItemAccObj3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling); + AccessibleObject previousSubItemAccObj1 = (AccessibleObject)previousSubItemAccObj2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling); + AccessibleObject previousSubItemAccObj0 = (AccessibleObject)previousSubItemAccObj1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling); - AccessibleObject previousSubItemAccInGroup3 = (AccessibleObject)subItemAccInGroup.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling); - AccessibleObject previousSubItemAccInGroup2 = (AccessibleObject)previousSubItemAccInGroup3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling); - AccessibleObject previousSubItemAccInGroup1 = (AccessibleObject)previousSubItemAccInGroup2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling); - AccessibleObject previousSubItemAccInGroup0 = (AccessibleObject)previousSubItemAccInGroup1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling); + AccessibleObject previousSubItemAccInGroup3 = (AccessibleObject)subItemAccInGroup.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling); + AccessibleObject previousSubItemAccInGroup2 = (AccessibleObject)previousSubItemAccInGroup3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling); + AccessibleObject previousSubItemAccInGroup1 = (AccessibleObject)previousSubItemAccInGroup2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling); + AccessibleObject previousSubItemAccInGroup0 = (AccessibleObject)previousSubItemAccInGroup1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling); Assert.Same(listViewItem.SubItems[2].AccessibilityObject, previousSubItemAccObj3); Assert.Same(listViewItem.SubItems[1].AccessibilityObject, previousSubItemAccObj2); @@ -468,14 +468,14 @@ public void ListViewSubItemAccessibleObject_FragmentNavigate_NextSibling_Returns AccessibleObject subItemAccObj = listViewItem.SubItems[0].AccessibilityObject; AccessibleObject subItemAccInGroup = listViewItemInGroup.SubItems[0].AccessibilityObject; - Assert.NotNull(subItemAccObj.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.NotNull(subItemAccInGroup.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.NotNull(subItemAccObj.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.NotNull(subItemAccInGroup.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); listViewItem.SubItems.Add("SubItem"); listViewItemInGroup.SubItems.Add("SubItem"); - Assert.Same(listViewItem.SubItems[1].AccessibilityObject, subItemAccObj.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Same(listViewItemInGroup.SubItems[1].AccessibilityObject, subItemAccInGroup.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Same(listViewItem.SubItems[1].AccessibilityObject, subItemAccObj.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Same(listViewItemInGroup.SubItems[1].AccessibilityObject, subItemAccInGroup.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); Assert.Equal(createControl, listView.IsHandleCreated); } @@ -488,17 +488,17 @@ public void ListViewSubItemAccessibleObject_FragmentNavigate_PreviousSibling_Ret ListViewItem listViewItem = listView.Items[0]; ListViewItem listViewItemInGroup = listView.Items[1]; - AccessibleObject subItemAccObj = (AccessibleObject)listViewItem.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild); - AccessibleObject subItemAccInGroup = (AccessibleObject)listViewItemInGroup.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild); + AccessibleObject subItemAccObj = (AccessibleObject)listViewItem.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild); + AccessibleObject subItemAccInGroup = (AccessibleObject)listViewItemInGroup.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild); - Assert.NotNull(subItemAccObj.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.NotNull(subItemAccInGroup.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.NotNull(subItemAccObj.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.NotNull(subItemAccInGroup.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); listViewItem.SubItems.Add("SubItem"); listViewItemInGroup.SubItems.Add("SubItem"); - Assert.Same(listViewItem.SubItems[1].AccessibilityObject, subItemAccObj.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Same(listViewItemInGroup.SubItems[1].AccessibilityObject, subItemAccInGroup.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Same(listViewItem.SubItems[1].AccessibilityObject, subItemAccObj.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Same(listViewItemInGroup.SubItems[1].AccessibilityObject, subItemAccInGroup.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.Equal(createControl, listView.IsHandleCreated); } @@ -514,14 +514,14 @@ public void ListViewSubItemAccessibleObject_FragmentNavigate_NextSibling_Returns AccessibleObject subItemAccObj = listViewItem.SubItems[0].AccessibilityObject; AccessibleObject subItemAccInGroup = listViewItemInGroup.SubItems[0].AccessibilityObject; - Assert.Same(listViewItem.SubItems[1].AccessibilityObject, subItemAccObj.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Same(listViewItemInGroup.SubItems[1].AccessibilityObject, subItemAccInGroup.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Same(listViewItem.SubItems[1].AccessibilityObject, subItemAccObj.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Same(listViewItemInGroup.SubItems[1].AccessibilityObject, subItemAccInGroup.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); listViewItem.SubItems.RemoveAt(1); listViewItemInGroup.SubItems.RemoveAt(1); - Assert.NotNull(subItemAccObj.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.NotNull(subItemAccInGroup.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.NotNull(subItemAccObj.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.NotNull(subItemAccInGroup.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); Assert.Equal(createControl, listView.IsHandleCreated); } @@ -534,17 +534,17 @@ public void ListViewSubItemAccessibleObject_FragmentNavigate_PreviousSibling_Ret ListViewItem listViewItem = listView.Items[0]; ListViewItem listViewItemInGroup = listView.Items[1]; - AccessibleObject subItemAccObj = (AccessibleObject)listViewItem.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild); - AccessibleObject subItemAccInGroup = (AccessibleObject)listViewItemInGroup.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild); + AccessibleObject subItemAccObj = (AccessibleObject)listViewItem.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild); + AccessibleObject subItemAccInGroup = (AccessibleObject)listViewItemInGroup.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild); - Assert.Same(listViewItem.SubItems[1].AccessibilityObject, subItemAccObj.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Same(listViewItemInGroup.SubItems[1].AccessibilityObject, subItemAccInGroup.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Same(listViewItem.SubItems[1].AccessibilityObject, subItemAccObj.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Same(listViewItemInGroup.SubItems[1].AccessibilityObject, subItemAccInGroup.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); listViewItem.SubItems.Add("SubItem"); listViewItemInGroup.SubItems.Add("SubItem"); - Assert.NotNull(subItemAccObj.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.NotNull(subItemAccInGroup.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.NotNull(subItemAccObj.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.NotNull(subItemAccInGroup.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.Equal(createControl, listView.IsHandleCreated); } @@ -557,20 +557,20 @@ public void ListViewSubItemAccessibleObject_FragmentNavigate_PreviousSibling_Ret ListViewItem listViewItem = listView.Items[0]; ListViewItem listViewItemInGroup = listView.Items[1]; - AccessibleObject subItemAccObj = (AccessibleObject)listViewItem.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild); - AccessibleObject subItemAccInGroup = (AccessibleObject)listViewItemInGroup.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild); + AccessibleObject subItemAccObj = (AccessibleObject)listViewItem.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild); + AccessibleObject subItemAccInGroup = (AccessibleObject)listViewItemInGroup.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild); - AccessibleObject previousSubItemAccObj4 = (AccessibleObject)subItemAccObj.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling); - AccessibleObject previousSubItemAccObj3 = (AccessibleObject)previousSubItemAccObj4.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling); - AccessibleObject previousSubItemAccObj2 = (AccessibleObject)previousSubItemAccObj3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling); - AccessibleObject previousSubItemAccObj1 = (AccessibleObject)previousSubItemAccObj2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling); - AccessibleObject previousSubItemAccObj0 = (AccessibleObject)previousSubItemAccObj1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling); + AccessibleObject previousSubItemAccObj4 = (AccessibleObject)subItemAccObj.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling); + AccessibleObject previousSubItemAccObj3 = (AccessibleObject)previousSubItemAccObj4.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling); + AccessibleObject previousSubItemAccObj2 = (AccessibleObject)previousSubItemAccObj3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling); + AccessibleObject previousSubItemAccObj1 = (AccessibleObject)previousSubItemAccObj2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling); + AccessibleObject previousSubItemAccObj0 = (AccessibleObject)previousSubItemAccObj1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling); - AccessibleObject previousSubItemAccInGroup4 = (AccessibleObject)subItemAccInGroup.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling); - AccessibleObject previousSubItemAccInGroup3 = (AccessibleObject)previousSubItemAccInGroup4.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling); - AccessibleObject previousSubItemAccInGroup2 = (AccessibleObject)previousSubItemAccInGroup3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling); - AccessibleObject previousSubItemAccInGroup1 = (AccessibleObject)previousSubItemAccInGroup2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling); - AccessibleObject previousSubItemAccInGroup0 = (AccessibleObject)previousSubItemAccInGroup1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling); + AccessibleObject previousSubItemAccInGroup4 = (AccessibleObject)subItemAccInGroup.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling); + AccessibleObject previousSubItemAccInGroup3 = (AccessibleObject)previousSubItemAccInGroup4.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling); + AccessibleObject previousSubItemAccInGroup2 = (AccessibleObject)previousSubItemAccInGroup3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling); + AccessibleObject previousSubItemAccInGroup1 = (AccessibleObject)previousSubItemAccInGroup2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling); + AccessibleObject previousSubItemAccInGroup0 = (AccessibleObject)previousSubItemAccInGroup1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling); Assert.NotNull(previousSubItemAccObj4); Assert.NotNull(previousSubItemAccObj3); @@ -598,17 +598,17 @@ public void ListViewSubItemAccessibleObject_FragmentNavigate_NextSibling_Returns AccessibleObject subItemAccObj = listView.Items[0].SubItems[0].AccessibilityObject; AccessibleObject subItemAccInGroup = listViewItemInGroup.SubItems[0].AccessibilityObject; - AccessibleObject previousSubItemAccObj1 = (AccessibleObject)subItemAccObj.FragmentNavigate(UiaCore.NavigateDirection.NextSibling); - AccessibleObject previousSubItemAccObj2 = (AccessibleObject)previousSubItemAccObj1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling); - AccessibleObject previousSubItemAccObj3 = (AccessibleObject)previousSubItemAccObj2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling); - AccessibleObject previousSubItemAccObj4 = (AccessibleObject)previousSubItemAccObj3.FragmentNavigate(UiaCore.NavigateDirection.NextSibling); - AccessibleObject previousSubItemAccObj5 = (AccessibleObject)previousSubItemAccObj4.FragmentNavigate(UiaCore.NavigateDirection.NextSibling); - - AccessibleObject previousSubItemAccInGroup1 = (AccessibleObject)subItemAccInGroup.FragmentNavigate(UiaCore.NavigateDirection.NextSibling); - AccessibleObject previousSubItemAccInGroup2 = (AccessibleObject)previousSubItemAccInGroup1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling); - AccessibleObject previousSubItemAccInGroup3 = (AccessibleObject)previousSubItemAccInGroup2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling); - AccessibleObject previousSubItemAccInGroup4 = (AccessibleObject)previousSubItemAccInGroup3.FragmentNavigate(UiaCore.NavigateDirection.NextSibling); - AccessibleObject previousSubItemAccInGroup5 = (AccessibleObject)previousSubItemAccInGroup4.FragmentNavigate(UiaCore.NavigateDirection.NextSibling); + AccessibleObject previousSubItemAccObj1 = (AccessibleObject)subItemAccObj.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); + AccessibleObject previousSubItemAccObj2 = (AccessibleObject)previousSubItemAccObj1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); + AccessibleObject previousSubItemAccObj3 = (AccessibleObject)previousSubItemAccObj2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); + AccessibleObject previousSubItemAccObj4 = (AccessibleObject)previousSubItemAccObj3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); + AccessibleObject previousSubItemAccObj5 = (AccessibleObject)previousSubItemAccObj4.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); + + AccessibleObject previousSubItemAccInGroup1 = (AccessibleObject)subItemAccInGroup.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); + AccessibleObject previousSubItemAccInGroup2 = (AccessibleObject)previousSubItemAccInGroup1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); + AccessibleObject previousSubItemAccInGroup3 = (AccessibleObject)previousSubItemAccInGroup2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); + AccessibleObject previousSubItemAccInGroup4 = (AccessibleObject)previousSubItemAccInGroup3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); + AccessibleObject previousSubItemAccInGroup5 = (AccessibleObject)previousSubItemAccInGroup4.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); Assert.NotNull(previousSubItemAccObj1); Assert.NotNull(previousSubItemAccObj2); diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ListViewLabelEditAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ListViewLabelEditAccessibleObjectTests.cs index 2e73bc8ccf6..a9c2ca3557e 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ListViewLabelEditAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ListViewLabelEditAccessibleObjectTests.cs @@ -55,8 +55,8 @@ public void ListViewLabelEditAccessibleObject_FragmentNavigate_ReturnsExpected() ListViewLabelEditNativeWindow labelEdit = listView.TestAccessor().Dynamic._labelEdit; ListViewLabelEditAccessibleObject accessibilityObject = (ListViewLabelEditAccessibleObject)labelEdit.AccessibilityObject; - Assert.Equal(listView._listViewSubItem.AccessibilityObject, accessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.NotNull(accessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); + Assert.Equal(listView._listViewSubItem.AccessibilityObject, accessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.NotNull(accessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); } [WinFormsFact] diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MenuStrip.MenuStripAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MenuStrip.MenuStripAccessibleObjectTests.cs index b9ad7e4a436..0dd662f6c8c 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MenuStrip.MenuStripAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MenuStrip.MenuStripAccessibleObjectTests.cs @@ -4,7 +4,6 @@ using System.Drawing; using Windows.Win32.UI.Accessibility; using static System.Windows.Forms.Tests.AccessibleObjects.ToolStripAccessibleObjectTests; -using static Interop.UiaCore; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -165,7 +164,7 @@ public void MenuStripAccessibleObject_FragmentNavigate_Parent_ReturnsExpected() using MenuStrip menuStrip = CreateMenuStrip(); AccessibleObject accessibleObject = menuStrip.AccessibilityObject; - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.Parent)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); } [WinFormsFact] @@ -174,8 +173,8 @@ public void MenuStripAccessibleObject_FragmentNavigate_Sibling_ReturnsExpected() using MenuStrip menuStrip = CreateMenuStrip(); AccessibleObject accessibleObject = menuStrip.AccessibilityObject; - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); } public static IEnumerable MenuStripAccessibleObject_FragmentNavigate_IfNoGripAndStackLayout_TestData() @@ -233,7 +232,7 @@ public void MenuStripAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpecte AccessibleObject accessibleObject = menuStrip.AccessibilityObject; AccessibleObject expected = menuStrip.Items[0].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } [WinFormsTheory] @@ -244,7 +243,7 @@ public void MenuStripAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpecte AccessibleObject accessibleObject = menuStrip.AccessibilityObject; - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } public static IEnumerable MenuStripAccessibleObject_FragmentNavigate_IfGripVisible_TestData() @@ -272,7 +271,7 @@ public void MenuStripAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpecte AccessibleObject accessibleObject = menuStrip.AccessibilityObject; AccessibleObject expected = menuStrip.Grip.AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } [WinFormsTheory] @@ -284,7 +283,7 @@ public void MenuStripAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpecte AccessibleObject accessibleObject = menuStrip.AccessibilityObject; AccessibleObject expected = menuStrip.Grip.AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } public static IEnumerable MenuStripAccessibleObject_FragmentNavigate_IfNoGripAndOverflow_TestData() @@ -307,7 +306,7 @@ public void MenuStripAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpecte AccessibleObject accessibleObject = menuStrip.AccessibilityObject; AccessibleObject expected = menuStrip.OverflowButton.AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } public static IEnumerable MenuStripAccessibleObject_FragmentNavigate_IfNoGripAndCannotOverflowAndStackLayout_TestData() @@ -329,7 +328,7 @@ public void MenuStripAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpecte AccessibleObject accessibleObject = menuStrip.AccessibilityObject; - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } public static IEnumerable MenuStripAccessibleObject_FragmentNavigate_IfNoGripAndCannotOverflowAndNonStackLayout_TestData() @@ -351,7 +350,7 @@ public void MenuStripAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpecte AccessibleObject accessibleObject = menuStrip.AccessibilityObject; AccessibleObject expected = menuStrip.Items[0].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } [WinFormsTheory] @@ -367,7 +366,7 @@ public void MenuStripAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpecte AccessibleObject accessibleObject = menuStrip.AccessibilityObject; AccessibleObject expected = menuStrip.Items[1].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } [WinFormsTheory] @@ -383,7 +382,7 @@ public void MenuStripAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpecte AccessibleObject accessibleObject = menuStrip.AccessibilityObject; - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } [WinFormsTheory] @@ -399,7 +398,7 @@ public void MenuStripAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpecte AccessibleObject accessibleObject = menuStrip.AccessibilityObject; AccessibleObject expected = menuStrip.Items[1].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } [WinFormsTheory] @@ -415,7 +414,7 @@ public void MenuStripAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpecte AccessibleObject accessibleObject = menuStrip.AccessibilityObject; AccessibleObject expected = menuStrip.Items[0].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } [WinFormsTheory] @@ -433,7 +432,7 @@ public void MenuStripAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpecte AccessibleObject accessibleObject = menuStrip.AccessibilityObject; AccessibleObject expected = menuStrip.Items[2].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } [WinFormsTheory] @@ -451,7 +450,7 @@ public void MenuStripAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpecte AccessibleObject accessibleObject = menuStrip.AccessibilityObject; AccessibleObject expected = menuStrip.Items[1].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } [WinFormsTheory] @@ -468,7 +467,7 @@ public void MenuStripAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpecte AccessibleObject accessibleObject = menuStrip.AccessibilityObject; AccessibleObject expected = menuStrip.Items[1].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } [WinFormsTheory] @@ -485,7 +484,7 @@ public void MenuStripAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpecte AccessibleObject accessibleObject = menuStrip.AccessibilityObject; AccessibleObject expected = menuStrip.Items[0].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } public static IEnumerable MenuStripAccessibleObject_FragmentNavigate_IfStackLayout_TestData() @@ -542,7 +541,7 @@ public void MenuStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpected AccessibleObject accessibleObject = menuStrip.AccessibilityObject; AccessibleObject expected = menuStrip.Items[1].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } [WinFormsTheory] @@ -553,7 +552,7 @@ public void MenuStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpected AccessibleObject accessibleObject = menuStrip.AccessibilityObject; - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } [WinFormsTheory] @@ -565,7 +564,7 @@ public void MenuStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpected AccessibleObject accessibleObject = menuStrip.AccessibilityObject; AccessibleObject expected = menuStrip.Grip.AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } [WinFormsTheory] @@ -581,7 +580,7 @@ public void MenuStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpected AccessibleObject accessibleObject = menuStrip.AccessibilityObject; AccessibleObject expected = menuStrip.Items[0].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } [WinFormsTheory] @@ -597,7 +596,7 @@ public void MenuStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpected AccessibleObject accessibleObject = menuStrip.AccessibilityObject; - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } [WinFormsTheory] @@ -614,7 +613,7 @@ public void MenuStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpected AccessibleObject accessibleObject = menuStrip.AccessibilityObject; AccessibleObject expected = menuStrip.Grip.AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } [WinFormsTheory] @@ -630,7 +629,7 @@ public void MenuStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpected AccessibleObject accessibleObject = menuStrip.AccessibilityObject; AccessibleObject expected = menuStrip.Items[0].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } [WinFormsTheory] @@ -646,7 +645,7 @@ public void MenuStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpected AccessibleObject accessibleObject = menuStrip.AccessibilityObject; AccessibleObject expected = menuStrip.Items[1].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } [WinFormsTheory] @@ -668,7 +667,7 @@ public void MenuStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpected AccessibleObject accessibleObject = menuStrip.AccessibilityObject; AccessibleObject expected = menuStrip.Items[1].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } [WinFormsTheory] @@ -690,7 +689,7 @@ public void MenuStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpected AccessibleObject accessibleObject = menuStrip.AccessibilityObject; AccessibleObject expected = menuStrip.Items[2].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } [WinFormsTheory] @@ -707,7 +706,7 @@ public void MenuStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpected AccessibleObject accessibleObject = menuStrip.AccessibilityObject; AccessibleObject expected = menuStrip.Items[0].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } [WinFormsTheory] @@ -724,7 +723,7 @@ public void MenuStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpected AccessibleObject accessibleObject = menuStrip.AccessibilityObject; AccessibleObject expected = menuStrip.Items[1].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } public static IEnumerable MenuStripAccessibleObject_FragmentNavigate_IfOverflow_TestData() @@ -750,7 +749,7 @@ public void MenuStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpected AccessibleObject accessibleObject = menuStrip.AccessibilityObject; AccessibleObject expected = menuStrip.OverflowButton.AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } public static IEnumerable MenuStripAccessibleObject_FragmentNavigate_IfCannotOverflow_TestData() @@ -789,7 +788,7 @@ public void MenuStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpected AccessibleObject accessibleObject = menuStrip.AccessibilityObject; AccessibleObject expected = menuStrip.Items[0].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } public static IEnumerable MenuStripAccessibleObject_FragmentNavigate_IfCannotOverflowAndItemSkipped_TestData() @@ -832,7 +831,7 @@ public void MenuStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpected AccessibleObject accessibleObject = menuStrip.AccessibilityObject; AccessibleObject expected = menuStrip.Items[0].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } public static IEnumerable MenuStripAccessibleObject_FragmentNavigate_IfCannotOverflowAndItemAlignedAndStackLayout_TestData() @@ -866,7 +865,7 @@ public void MenuStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpected AccessibleObject accessibleObject = menuStrip.AccessibilityObject; AccessibleObject expected = menuStrip.Items[0].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } public static IEnumerable MenuStripAccessibleObject_FragmentNavigate_IfCannotOverflowAndItemAlignedAndNonStackLayout_TestData() @@ -891,7 +890,7 @@ public void MenuStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpected AccessibleObject accessibleObject = menuStrip.AccessibilityObject; AccessibleObject expected = menuStrip.Items[1].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } private MenuStrip CreateMenuStrip( diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.CalendarAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.CalendarAccessibleObjectTests.cs index d238c0916f0..804a2c9f7a8 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.CalendarAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.CalendarAccessibleObjectTests.cs @@ -4,7 +4,6 @@ using System.Drawing; using Windows.Win32.UI.Accessibility; using static System.Windows.Forms.MonthCalendar; -using static Interop; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -323,7 +322,7 @@ public void CalendarAccessibleObject_FragmentNavigate_Parent_ReturnsExpected() var controlAccessibleObject = (MonthCalendarAccessibleObject)control.AccessibilityObject; CalendarAccessibleObject calendar = new(controlAccessibleObject, 0, ""); - Assert.Equal(controlAccessibleObject, calendar.FragmentNavigate(UiaCore.NavigateDirection.Parent)); + Assert.Equal(controlAccessibleObject, calendar.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); Assert.False(control.IsHandleCreated); } @@ -338,7 +337,7 @@ public void CalendarAccessibleObject_FragmentNavigate_NextSibling_ReturnsExpecte CalendarAccessibleObject calendar = controlAccessibleObject.CalendarsAccessibleObjects?.First?.Value; Assert.NotNull(calendar); - Assert.Equal(controlAccessibleObject.TodayLinkAccessibleObject, calendar.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(controlAccessibleObject.TodayLinkAccessibleObject, calendar.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); } [WinFormsFact] @@ -363,10 +362,10 @@ public void CalendarAccessibleObject_FragmentNavigate_NextSibling_ReturnsExpecte Assert.NotNull(calendar3); Assert.NotNull(calendar4); - Assert.Equal(calendar2, calendar1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(calendar3, calendar2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(calendar4, calendar3.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(controlAccessibleObject.TodayLinkAccessibleObject, calendar4.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(calendar2, calendar1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(calendar3, calendar2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(calendar4, calendar3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(controlAccessibleObject.TodayLinkAccessibleObject, calendar4.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); } [WinFormsFact] @@ -380,7 +379,7 @@ public void CalendarAccessibleObject_FragmentNavigate_PreviousSibling_ReturnsExp CalendarAccessibleObject calendar = controlAccessibleObject.CalendarsAccessibleObjects?.First?.Value; Assert.NotNull(calendar); - Assert.Equal(controlAccessibleObject.NextButtonAccessibleObject, calendar.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(controlAccessibleObject.NextButtonAccessibleObject, calendar.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); } [WinFormsFact] @@ -405,10 +404,10 @@ public void CalendarAccessibleObject_FragmentNavigate_PreviousSibling_ReturnsExp Assert.NotNull(calendar3); Assert.NotNull(calendar4); - Assert.Equal(controlAccessibleObject.NextButtonAccessibleObject, calendar1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(calendar1, calendar2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(calendar2, calendar3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(calendar3, calendar4.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(controlAccessibleObject.NextButtonAccessibleObject, calendar1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(calendar1, calendar2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(calendar2, calendar3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(calendar3, calendar4.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); } [WinFormsFact] @@ -419,7 +418,7 @@ public void CalendarAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpected var controlAccessibleObject = (MonthCalendarAccessibleObject)control.AccessibilityObject; CalendarAccessibleObject calendar = new(controlAccessibleObject, 0, ""); - Assert.Equal(calendar.CalendarHeaderAccessibleObject, calendar.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); + Assert.Equal(calendar.CalendarHeaderAccessibleObject, calendar.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); Assert.False(control.IsHandleCreated); } @@ -431,7 +430,7 @@ public void CalendarAccessibleObject_FragmentNavigate_LastChild_ReturnsExpected( var controlAccessibleObject = (MonthCalendarAccessibleObject)control.AccessibilityObject; CalendarAccessibleObject calendar = new(controlAccessibleObject, 0, ""); - Assert.Equal(calendar.CalendarBodyAccessibleObject, calendar.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(calendar.CalendarBodyAccessibleObject, calendar.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(control.IsHandleCreated); } } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.CalendarBodyAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.CalendarBodyAccessibleObjectTests.cs index 220bec740cf..230f2ab024d 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.CalendarBodyAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.CalendarBodyAccessibleObjectTests.cs @@ -4,7 +4,6 @@ using System.Drawing; using Windows.Win32.UI.Accessibility; using static System.Windows.Forms.MonthCalendar; -using static Interop; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -194,7 +193,7 @@ public void CalendarBodyAccessibleObject_FragmentNavigate_Parent_ReturnsExpected CalendarAccessibleObject calendar = new(controlAccessibleObject, 0, "Test name"); CalendarBodyAccessibleObject calendarBody = new(calendar, controlAccessibleObject, 0); - Assert.Equal(calendar, calendarBody.FragmentNavigate(UiaCore.NavigateDirection.Parent)); + Assert.Equal(calendar, calendarBody.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); Assert.False(control.IsHandleCreated); } @@ -204,7 +203,7 @@ public void CalendarBodyAccessibleObject_FragmentNavigate_NextSibling_ReturnsNul using MonthCalendar control = new(); CalendarBodyAccessibleObject accessibleObject = CreateCalendarBodyAccessibleObject(control, 0); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); Assert.False(control.IsHandleCreated); } @@ -218,7 +217,7 @@ public void CalendarBodyAccessibleObject_FragmentNavigate_PreviousSibling_Return AccessibleObject expected = calendar.CalendarHeaderAccessibleObject; - Assert.Equal(expected, calendarBody.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(expected, calendarBody.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(control.IsHandleCreated); } @@ -231,8 +230,8 @@ public void CalendarBodyAccessibleObject_FragmentNavigate_Child_ReturnsExpected( AccessibleObject firstRow = accessibleObject.RowsAccessibleObjects?.First(); AccessibleObject lastRow = accessibleObject.RowsAccessibleObjects?.Last(); - Assert.Equal(firstRow, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(lastRow, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(firstRow, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(lastRow, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(control.IsHandleCreated); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.CalendarCellAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.CalendarCellAccessibleObjectTests.cs index 381b3681714..89fd74ebe66 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.CalendarCellAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.CalendarCellAccessibleObjectTests.cs @@ -2,8 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Drawing; +using Windows.Win32.UI.Accessibility; using static System.Windows.Forms.MonthCalendar; -using static Interop; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -160,7 +160,7 @@ public void CalendarCellAccessibleObject_FragmentNavigate_Parent_ReturnsExpected CalendarRowAccessibleObject row = new(body, controlAccessibleObject, 0, 2); CalendarCellAccessibleObject cell = new(row, body, controlAccessibleObject, 0, 0, 0); - Assert.Equal(row, cell.FragmentNavigate(UiaCore.NavigateDirection.Parent)); + Assert.Equal(row, cell.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); Assert.False(control.IsHandleCreated); } @@ -196,14 +196,14 @@ public void CalendarCellAccessibleObject_FragmentNavigate_Sibling_ReturnsExpecte Assert.NotNull(friday); Assert.NotNull(saturday); - Assert.Null(sunday.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(monday, sunday.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Null(sunday.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(monday, sunday.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(sunday, monday.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(tuesday, monday.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(sunday, monday.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(tuesday, monday.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(friday, saturday.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(saturday.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(friday, saturday.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(saturday.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); } [WinFormsFact] @@ -235,8 +235,8 @@ public void CalendarCellAccessibleObject_FragmentNavigate_Sibling_ReturnsExpecte Assert.NotNull(sunday); Assert.NotNull(monday); - Assert.Equal(weekNumber, sunday.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(monday, sunday.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(weekNumber, sunday.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(monday, sunday.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); } [WinFormsFact] @@ -245,8 +245,8 @@ public void CalendarCellAccessibleObject_FragmentNavigate_Child_ReturnsExpected( using MonthCalendar control = new(); CalendarCellAccessibleObject cell = CreateCalendarCellAccessibleObject(control, 0, 0, 0); - Assert.Null(cell.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(cell.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Null(cell.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(cell.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(control.IsHandleCreated); } } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.CalendarDayOfWeekCellAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.CalendarDayOfWeekCellAccessibleObjectTests.cs index b6316edb07a..45f5eadae55 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.CalendarDayOfWeekCellAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.CalendarDayOfWeekCellAccessibleObjectTests.cs @@ -3,7 +3,6 @@ using Windows.Win32.UI.Accessibility; using static System.Windows.Forms.MonthCalendar; -using static Interop; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -110,7 +109,7 @@ public void CalendarDayOfWeekCellAccessibleObject_FragmentNavigate_Parent_Return CalendarRowAccessibleObject row = new(body, controlAccessibleObject, 0, 0); CalendarDayOfWeekCellAccessibleObject cell = new(row, body, controlAccessibleObject, 0, 0, 0, ""); - Assert.Equal(row, cell.FragmentNavigate(UiaCore.NavigateDirection.Parent)); + Assert.Equal(row, cell.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); Assert.False(control.IsHandleCreated); } @@ -147,14 +146,14 @@ public void CalendarDayOfWeekCellAccessibleObject_FragmentNavigate_Sibling_Retur Assert.NotNull(friday); Assert.NotNull(saturday); - Assert.Null(sunday.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(monday, sunday.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Null(sunday.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(monday, sunday.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(sunday, monday.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(tuesday, monday.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(sunday, monday.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(tuesday, monday.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(friday, saturday.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(saturday.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(friday, saturday.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(saturday.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); } [WinFormsFact] @@ -185,8 +184,8 @@ public void CalendarDayOfWeekCellAccessibleObject_FragmentNavigate_Sibling_Retur Assert.NotNull(sunday); Assert.NotNull(monday); - Assert.Null(sunday.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(monday, sunday.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Null(sunday.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(monday, sunday.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); } [WinFormsFact] @@ -195,8 +194,8 @@ public void CalendarDayOfWeekCellAccessibleObject_FragmentNavigate_Child_Returns using MonthCalendar control = new(); CalendarDayOfWeekCellAccessibleObject cell = CreateCalendarDayOfWeekCellCellAccessibleObject(control, 0, 0, 0); - Assert.Null(cell.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(cell.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Null(cell.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(cell.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(control.IsHandleCreated); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.CalendarHeaderAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.CalendarHeaderAccessibleObjectTests.cs index 605588b9715..66941a6c9fd 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.CalendarHeaderAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.CalendarHeaderAccessibleObjectTests.cs @@ -1,6 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Windows.Win32.UI.Accessibility; using static System.Windows.Forms.MonthCalendar; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -78,7 +79,7 @@ public void CalendarHeaderAccessibleObject_FragmentNavigate_Parent_ReturnsExpect CalendarAccessibleObject calendar = new(controlAccessibleObject, 0, ""); CalendarHeaderAccessibleObject header = new(calendar, controlAccessibleObject, 0); - Assert.Equal(calendar, header.FragmentNavigate(Interop.UiaCore.NavigateDirection.Parent)); + Assert.Equal(calendar, header.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); Assert.False(control.IsHandleCreated); } @@ -90,8 +91,8 @@ public void CalendarHeaderAccessibleObject_FragmentNavigate_Sibling_ReturnsExpec CalendarAccessibleObject calendar = new(controlAccessibleObject, 0, ""); CalendarHeaderAccessibleObject header = new(calendar, controlAccessibleObject, 0); - Assert.Equal(calendar.CalendarBodyAccessibleObject, header.FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling)); - Assert.Null(header.FragmentNavigate(Interop.UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(calendar.CalendarBodyAccessibleObject, header.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(header.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(control.IsHandleCreated); } @@ -101,8 +102,8 @@ public void CalendarHeaderAccessibleObject_FragmentNavigate_Child_ReturnsExpecte using MonthCalendar control = new(); CalendarHeaderAccessibleObject header = CreateCalendarHeaderAccessibleObject(control, 0); - Assert.Null(header.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Null(header.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Null(header.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(header.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(control.IsHandleCreated); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.CalendarNextButtonAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.CalendarNextButtonAccessibleObjectTests.cs index a7c70c38387..a1d15fdabe0 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.CalendarNextButtonAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.CalendarNextButtonAccessibleObjectTests.cs @@ -1,6 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Windows.Win32.UI.Accessibility; using static System.Windows.Forms.MonthCalendar; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -64,7 +65,7 @@ public void CalendarNextButtonAccessibleObject_FragmentNavigate_Parent_ReturnsEx MonthCalendarAccessibleObject controlAccessibleObject = new(control); CalendarNextButtonAccessibleObject nextButton = new(controlAccessibleObject); - Assert.Equal(controlAccessibleObject, nextButton.FragmentNavigate(Interop.UiaCore.NavigateDirection.Parent)); + Assert.Equal(controlAccessibleObject, nextButton.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); Assert.False(control.IsHandleCreated); } @@ -78,8 +79,8 @@ public void CalendarNextButtonAccessibleObject_FragmentNavigate_Sibling_ReturnsE AccessibleObject previousButton = controlAccessibleObject.PreviousButtonAccessibleObject; AccessibleObject firstCalendar = controlAccessibleObject.CalendarsAccessibleObjects?.First?.Value; - Assert.Equal(previousButton, nextButton.FragmentNavigate(Interop.UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(firstCalendar, nextButton.FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(previousButton, nextButton.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(firstCalendar, nextButton.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); Assert.False(control.IsHandleCreated); } @@ -90,8 +91,8 @@ public void CalendarNextButtonAccessibleObject_FragmentNavigate_Child_ReturnsExp MonthCalendarAccessibleObject controlAccessibleObject = new(control); CalendarNextButtonAccessibleObject nextButton = new(controlAccessibleObject); - Assert.Null(nextButton.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Null(nextButton.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Null(nextButton.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(nextButton.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(control.IsHandleCreated); } } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.CalendarPreviousButtonAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.CalendarPreviousButtonAccessibleObjectTests.cs index 08a13c9f453..d82c9b5d985 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.CalendarPreviousButtonAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.CalendarPreviousButtonAccessibleObjectTests.cs @@ -1,6 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Windows.Win32.UI.Accessibility; using static System.Windows.Forms.MonthCalendar; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -64,7 +65,7 @@ public void CalendarPreviousButtonAccessibleObject_FragmentNavigate_Parent_Retur MonthCalendarAccessibleObject controlAccessibleObject = new(control); CalendarPreviousButtonAccessibleObject prevButton = new(controlAccessibleObject); - Assert.Equal(controlAccessibleObject, prevButton.FragmentNavigate(Interop.UiaCore.NavigateDirection.Parent)); + Assert.Equal(controlAccessibleObject, prevButton.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); Assert.False(control.IsHandleCreated); } @@ -77,8 +78,8 @@ public void CalendarPreviousButtonAccessibleObject_FragmentNavigate_Sibling_Retu AccessibleObject nextButton = controlAccessibleObject.NextButtonAccessibleObject; - Assert.Null(prevButton.FragmentNavigate(Interop.UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(nextButton, prevButton.FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling)); + Assert.Null(prevButton.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(nextButton, prevButton.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); Assert.False(control.IsHandleCreated); } @@ -89,8 +90,8 @@ public void CalendarPreviousButtonAccessibleObject_FragmentNavigate_Child_Return MonthCalendarAccessibleObject controlAccessibleObject = new(control); CalendarPreviousButtonAccessibleObject prevButton = new(controlAccessibleObject); - Assert.Null(prevButton.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Null(prevButton.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Null(prevButton.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(prevButton.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(control.IsHandleCreated); } } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.CalendarRowAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.CalendarRowAccessibleObjectTests.cs index d0321124fec..6534f4c0da1 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.CalendarRowAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.CalendarRowAccessibleObjectTests.cs @@ -3,7 +3,6 @@ using Windows.Win32.UI.Accessibility; using static System.Windows.Forms.MonthCalendar; -using static Interop; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -112,7 +111,7 @@ public void CalendarRowAccessibleObject_FragmentNavigate_Parent_ReturnsExpected( CalendarBodyAccessibleObject body = new(calendar, controlAccessibleObject, 0); CalendarRowAccessibleObject row = new(body, controlAccessibleObject, 0, 2); - Assert.Equal(body, row.FragmentNavigate(UiaCore.NavigateDirection.Parent)); + Assert.Equal(body, row.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); Assert.False(control.IsHandleCreated); } @@ -142,13 +141,13 @@ public void CalendarRowAccessibleObject_FragmentNavigate_Sibling_ReturnsExpected CalendarRowAccessibleObject thirdWeek = body.RowsAccessibleObjects?.First?.Next?.Next?.Next?.Value; Assert.NotNull(thirdWeek); - Assert.Null(daysOfWeekRow.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(daysOfWeekRow, firstWeek.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(firstWeek, secondWeek.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Null(daysOfWeekRow.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(daysOfWeekRow, firstWeek.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(firstWeek, secondWeek.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); - Assert.Equal(firstWeek, daysOfWeekRow.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(secondWeek, firstWeek.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(thirdWeek, secondWeek.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(firstWeek, daysOfWeekRow.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(secondWeek, firstWeek.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(thirdWeek, secondWeek.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); } [WinFormsFact] @@ -171,8 +170,8 @@ public void CalendarRowAccessibleObject_FragmentNavigate_Child_ReturnsExpected() CalendarCellAccessibleObject sunday = firstWeek.CellsAccessibleObjects?.First?.Value; CalendarCellAccessibleObject saturday = firstWeek.CellsAccessibleObjects?.Last?.Value; - Assert.Equal(sunday, firstWeek.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(saturday, firstWeek.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(sunday, firstWeek.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(saturday, firstWeek.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } [WinFormsFact] @@ -195,8 +194,8 @@ public void CalendarRowAccessibleObject_FragmentNavigate_Child_ReturnsExpected_I CalendarWeekNumberCellAccessibleObject weekNumber = firstWeek.WeekNumberCellAccessibleObject; CalendarCellAccessibleObject saturday = firstWeek.CellsAccessibleObjects?.Last?.Value; - Assert.Equal(weekNumber, firstWeek.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(saturday, firstWeek.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(weekNumber, firstWeek.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(saturday, firstWeek.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } private CalendarRowAccessibleObject CreateCalendarRowAccessibleObject(MonthCalendar control, int calendarIndex = 0, int rowIndex = 0) diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.CalendarTodayLinkAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.CalendarTodayLinkAccessibleObjectTests.cs index 2891e9b1851..728423ec15c 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.CalendarTodayLinkAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.CalendarTodayLinkAccessibleObjectTests.cs @@ -1,6 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Windows.Win32.UI.Accessibility; using static System.Windows.Forms.MonthCalendar; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -84,7 +85,7 @@ public void CalendarTodayLinkAccessibleObject_FragmentNavigate_Parent_ReturnsExp MonthCalendarAccessibleObject controlAccessibleObject = new(control); CalendarTodayLinkAccessibleObject todayLink = new(controlAccessibleObject); - Assert.Equal(controlAccessibleObject, todayLink.FragmentNavigate(Interop.UiaCore.NavigateDirection.Parent)); + Assert.Equal(controlAccessibleObject, todayLink.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); Assert.False(control.IsHandleCreated); } @@ -97,8 +98,8 @@ public void CalendarTodayLinkAccessibleObject_FragmentNavigate_Sibling_ReturnsEx AccessibleObject lastCalendar = controlAccessibleObject.CalendarsAccessibleObjects?.Last?.Value; - Assert.Equal(lastCalendar, todayLink.FragmentNavigate(Interop.UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(todayLink.FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(lastCalendar, todayLink.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(todayLink.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); Assert.False(control.IsHandleCreated); } @@ -109,8 +110,8 @@ public void CalendarTodayLinkAccessibleObject_FragmentNavigate_Child_ReturnsExpe MonthCalendarAccessibleObject controlAccessibleObject = new(control); CalendarTodayLinkAccessibleObject todayLink = new(controlAccessibleObject); - Assert.Null(todayLink.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Null(todayLink.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Null(todayLink.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(todayLink.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(control.IsHandleCreated); } } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.CalendarWeekNumberCellAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.CalendarWeekNumberCellAccessibleObjectTests.cs index f95af72ab86..f47caeabd04 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.CalendarWeekNumberCellAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.CalendarWeekNumberCellAccessibleObjectTests.cs @@ -3,7 +3,6 @@ using Windows.Win32.UI.Accessibility; using static System.Windows.Forms.MonthCalendar; -using static Interop; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -121,7 +120,7 @@ public void CalendarWeekNumberCellAccessibleObject_FragmentNavigate_Parent_Retur CalendarRowAccessibleObject row = new(body, controlAccessibleObject, 0, 0); CalendarWeekNumberCellAccessibleObject cell = new(row, body, controlAccessibleObject, 0, 0, 0, ""); - Assert.Equal(row, cell.FragmentNavigate(UiaCore.NavigateDirection.Parent)); + Assert.Equal(row, cell.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); Assert.False(control.IsHandleCreated); } @@ -151,8 +150,8 @@ public void CalendarWeekNumberCellAccessibleObject_FragmentNavigate_Sibling_Retu Assert.NotNull(weekNumber); Assert.NotNull(sunday); - Assert.Null(weekNumber.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(sunday, weekNumber.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Null(weekNumber.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(sunday, weekNumber.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); } [WinFormsFact] @@ -182,8 +181,8 @@ public void CalendarWeekNumberCellAccessibleObject_FragmentNavigate_Sibling_Retu Assert.NotNull(sunday); Assert.NotNull(monday); - Assert.Null(sunday.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(monday, sunday.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Null(sunday.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(monday, sunday.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); } [WinFormsFact] @@ -192,8 +191,8 @@ public void CalendarWeekNumberCellAccessibleObject_FragmentNavigate_Child_Return using MonthCalendar control = new(); CalendarWeekNumberCellAccessibleObject cell = CreateCalendarWeekNumberCellAccessibleObject(control, 0, 0, 0); - Assert.Null(cell.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(cell.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Null(cell.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(cell.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(control.IsHandleCreated); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.MonthCalendarAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.MonthCalendarAccessibleObjectTests.cs index 964f05940ca..8624dd7f21c 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.MonthCalendarAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.MonthCalendarAccessibleObjectTests.cs @@ -3,7 +3,6 @@ using Windows.Win32.UI.Accessibility; using static System.Windows.Forms.MonthCalendar; -using static Interop; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -231,7 +230,7 @@ public void MonthCalendarAccessibleObject_FragmentNavigate_Parent_Returns_Expect using MonthCalendar monthCalendar = new(); MonthCalendarAccessibleObject accessibleObject = new(monthCalendar); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); } [WinFormsFact] @@ -240,8 +239,8 @@ public void MonthCalendarAccessibleObject_FragmentNavigate_Sibling_Returns_Expec using MonthCalendar monthCalendar = new(); MonthCalendarAccessibleObject accessibleObject = new(monthCalendar); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); } [WinFormsFact] @@ -252,7 +251,7 @@ public void MonthCalendarAccessibleObject_FragmentNavigate_FirstChild_Returns_Ex AccessibleObject previousButton = accessibleObject.PreviousButtonAccessibleObject; - Assert.Equal(previousButton, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); + Assert.Equal(previousButton, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } [WinFormsFact] @@ -263,7 +262,7 @@ public void MonthCalendarAccessibleObject_FragmentNavigate_LastChild_Returns_Exp AccessibleObject todayLink = accessibleObject.TodayLinkAccessibleObject; - Assert.Equal(todayLink, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(todayLink, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } [WinFormsFact] @@ -274,6 +273,6 @@ public void MonthCalendarAccessibleObject_FragmentNavigate_LastChild_Returns_Exp AccessibleObject lastCalendar = accessibleObject.CalendarsAccessibleObjects?.Last?.Value; - Assert.Equal(lastCalendar, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(lastCalendar, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.MonthCalendarChildAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.MonthCalendarChildAccessibleObjectTests.cs index 60714180cb7..7d14a57bf1e 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.MonthCalendarChildAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/MonthCalendar.MonthCalendarChildAccessibleObjectTests.cs @@ -72,10 +72,10 @@ public void MonthCalendarChildAccessibleObject_FragmentRoot_IsControlAccessibleO } [WinFormsTheory] - [InlineData((int)UiaCore.NavigateDirection.FirstChild)] - [InlineData((int)UiaCore.NavigateDirection.LastChild)] - [InlineData((int)UiaCore.NavigateDirection.NextSibling)] - [InlineData((int)UiaCore.NavigateDirection.PreviousSibling)] + [InlineData((int)NavigateDirection.NavigateDirection_FirstChild)] + [InlineData((int)NavigateDirection.NavigateDirection_LastChild)] + [InlineData((int)NavigateDirection.NavigateDirection_NextSibling)] + [InlineData((int)NavigateDirection.NavigateDirection_PreviousSibling)] public void MonthCalendarChildAccessibleObject_FragmentNavigate_DoesntHaveChildrenAndSiblings(int direction) { using MonthCalendar control = new MonthCalendar(); @@ -83,7 +83,7 @@ public void MonthCalendarChildAccessibleObject_FragmentNavigate_DoesntHaveChildr MonthCalendarAccessibleObject controlAccessibleObject = (MonthCalendarAccessibleObject)control.AccessibilityObject; MonthCalendarChildAccessibleObject accessibleObject = new SubObject(controlAccessibleObject); - Assert.Null(accessibleObject.FragmentNavigate((UiaCore.NavigateDirection)direction)); + Assert.Null(accessibleObject.FragmentNavigate((NavigateDirection)direction)); Assert.False(control.IsHandleCreated); } @@ -95,7 +95,7 @@ public void MonthCalendarChildAccessibleObject_FragmentNavigate_Parent_IsNull() MonthCalendarAccessibleObject controlAccessibleObject = (MonthCalendarAccessibleObject)control.AccessibilityObject; MonthCalendarChildAccessibleObject accessibleObject = new SubObject(controlAccessibleObject); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); Assert.False(control.IsHandleCreated); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/PropertyGrid.PropertyGridAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/PropertyGrid.PropertyGridAccessibleObjectTests.cs index b062aed676b..c86712f32d0 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/PropertyGrid.PropertyGridAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/PropertyGrid.PropertyGridAccessibleObjectTests.cs @@ -5,7 +5,6 @@ using System.ComponentModel.Design; using System.Windows.Forms.PropertyGridInternal; using Windows.Win32.UI.Accessibility; -using static Interop; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -49,10 +48,10 @@ public void PropertyGridAccessibleObject_SupportsPattern(int pattern) new PropertyGrid.PropertyGridAccessibleObject(propertyGrid); // First child should be PropertyGrid toolbox. - AccessibleObject firstChild = (AccessibleObject)propertyGridAccessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild); + AccessibleObject firstChild = (AccessibleObject)propertyGridAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild); // Second child entry should be PropertyGridView. - AccessibleObject gridViewChild = (AccessibleObject)firstChild.FragmentNavigate(UiaCore.NavigateDirection.NextSibling); + AccessibleObject gridViewChild = (AccessibleObject)firstChild.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); Assert.True(gridViewChild.IsPatternSupported((UIA_PATTERN_ID)pattern)); } @@ -113,7 +112,7 @@ public void PropertyGridAccessibleObject_FragmentNavigate_Parent_ReturnsExpected using PropertyGrid propertyGrid = new(); PropertyGrid.PropertyGridAccessibleObject accessibleObject = new(propertyGrid); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); } [WinFormsFact] @@ -122,8 +121,8 @@ public void PropertyGridAccessibleObject_FragmentNavigate_Sibling_ReturnsExpecte using PropertyGrid propertyGrid = new(); PropertyGrid.PropertyGridAccessibleObject accessibleObject = new(propertyGrid); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); } [WinFormsFact] @@ -134,7 +133,7 @@ public void PropertyGridAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpe AccessibleObject expected = propertyGrid.ToolbarAccessibleObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } [WinFormsFact] @@ -145,7 +144,7 @@ public void PropertyGridAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpe AccessibleObject expected = propertyGrid.GridViewAccessibleObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } [WinFormsFact] @@ -156,7 +155,7 @@ public void PropertyGridAccessibleObject_FragmentNavigate_LastChild_ReturnsExpec AccessibleObject expected = propertyGrid.HelpPaneAccessibleObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } [WinFormsFact] @@ -173,7 +172,7 @@ public void PropertyGridAccessibleObject_FragmentNavigate_LastChild_ReturnsExpec AccessibleObject expected = propertyGrid.CommandsPaneAccessibleObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } [WinFormsFact] @@ -184,7 +183,7 @@ public void PropertyGridAccessibleObject_FragmentNavigate_LastChild_ReturnsExpec AccessibleObject expected = propertyGrid.GridViewAccessibleObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } private class SiteWithMenuCommands : ISite diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/PropertyGridView.PropertyGridViewAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/PropertyGridView.PropertyGridViewAccessibleObjectTests.cs index 4e4da33186f..d0201066fe7 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/PropertyGridView.PropertyGridViewAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/PropertyGridView.PropertyGridViewAccessibleObjectTests.cs @@ -7,7 +7,6 @@ using Windows.Win32.UI.Accessibility; using static System.Windows.Forms.Control; using static System.Windows.Forms.PropertyGridInternal.PropertyGridView; -using static Interop; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -32,17 +31,17 @@ public void PropertyGridViewAccessibleObject_Ctor_NullOwner_ThrowsArgumentNullEx } [WinFormsTheory] - [InlineData((int)UiaCore.NavigateDirection.Parent)] - [InlineData((int)UiaCore.NavigateDirection.NextSibling)] - [InlineData((int)UiaCore.NavigateDirection.PreviousSibling)] - [InlineData((int)UiaCore.NavigateDirection.FirstChild)] - [InlineData((int)UiaCore.NavigateDirection.LastChild)] + [InlineData((int)NavigateDirection.NavigateDirection_Parent)] + [InlineData((int)NavigateDirection.NavigateDirection_NextSibling)] + [InlineData((int)NavigateDirection.NavigateDirection_PreviousSibling)] + [InlineData((int)NavigateDirection.NavigateDirection_FirstChild)] + [InlineData((int)NavigateDirection.NavigateDirection_LastChild)] public void PropertyGridViewAccessibleObject_FragmentNavigate_DoesNotThrowExpection_WithoutOwnerGrid(int direction) { using PropertyGrid propertyGrid = new PropertyGrid(); using PropertyGridView propertyGridView = new PropertyGridView(null, null); AccessibleObject accessibleObject = new PropertyGridViewAccessibleObject(propertyGridView, propertyGrid); - Assert.Null(accessibleObject.FragmentNavigate((UiaCore.NavigateDirection)direction)); + Assert.Null(accessibleObject.FragmentNavigate((NavigateDirection)direction)); } [WinFormsFact] diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ScrollBar.ScrollBarChildAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ScrollBar.ScrollBarChildAccessibleObjectTests.cs index 120fb3bc363..051a374589e 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ScrollBar.ScrollBarChildAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ScrollBar.ScrollBarChildAccessibleObjectTests.cs @@ -4,7 +4,6 @@ using System.Drawing; using Windows.Win32.UI.Accessibility; using static System.Windows.Forms.ScrollBar; -using static Interop; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -56,7 +55,7 @@ public void ScrollBarChildAccessibleObject_FragmentNavigate_Parent_ReturnsExpect using SubScrollBar control = new(); var accessibleObject = new ScrollBarChildAccessibleObject(control); - Assert.Equal(control.AccessibilityObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); + Assert.Equal(control.AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); Assert.False(control.IsHandleCreated); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/StatusStrip.StatusStripAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/StatusStrip.StatusStripAccessibleObjectTests.cs index e176813eea1..db668617a0a 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/StatusStrip.StatusStripAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/StatusStrip.StatusStripAccessibleObjectTests.cs @@ -4,7 +4,6 @@ using System.Drawing; using Windows.Win32.UI.Accessibility; using static System.Windows.Forms.Tests.AccessibleObjects.ToolStripAccessibleObjectTests; -using static Interop.UiaCore; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -145,7 +144,7 @@ public void StatusStripAccessibleObject_FragmentNavigate_Parent_ReturnsExpected( using StatusStrip statusStrip = CreateStatusStrip(); AccessibleObject accessibleObject = statusStrip.AccessibilityObject; - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.Parent)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); } [WinFormsFact] @@ -154,8 +153,8 @@ public void StatusStripAccessibleObject_FragmentNavigate_Sibling_ReturnsExpected using StatusStrip statusStrip = CreateStatusStrip(); AccessibleObject accessibleObject = statusStrip.AccessibilityObject; - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); } public static IEnumerable StatusStripAccessibleObject_FragmentNavigate_IfNoGripAndStackLayout_TestData() @@ -213,7 +212,7 @@ public void StatusStripAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpec AccessibleObject accessibleObject = statusStrip.AccessibilityObject; AccessibleObject expected = statusStrip.Items[0].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } [WinFormsTheory] @@ -224,7 +223,7 @@ public void StatusStripAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpec AccessibleObject accessibleObject = statusStrip.AccessibilityObject; - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } public static IEnumerable StatusStripAccessibleObject_FragmentNavigate_IfGripVisible_TestData() @@ -252,7 +251,7 @@ public void StatusStripAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpec AccessibleObject accessibleObject = statusStrip.AccessibilityObject; AccessibleObject expected = statusStrip.Grip.AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } [WinFormsTheory] @@ -264,7 +263,7 @@ public void StatusStripAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpec AccessibleObject accessibleObject = statusStrip.AccessibilityObject; AccessibleObject expected = statusStrip.Grip.AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } public static IEnumerable StatusStripAccessibleObject_FragmentNavigate_IfNoGripAndOverflow_TestData() @@ -287,7 +286,7 @@ public void StatusStripAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpec AccessibleObject accessibleObject = statusStrip.AccessibilityObject; AccessibleObject expected = statusStrip.OverflowButton.AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } public static IEnumerable StatusStripAccessibleObject_FragmentNavigate_IfNoGripAndCannotOverflowAndStackLayout_TestData() @@ -309,7 +308,7 @@ public void StatusStripAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpec AccessibleObject accessibleObject = statusStrip.AccessibilityObject; - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } public static IEnumerable StatusStripAccessibleObject_FragmentNavigate_IfNoGripAndCannotOverflowAndNonStackLayout_TestData() @@ -331,7 +330,7 @@ public void StatusStripAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpec AccessibleObject accessibleObject = statusStrip.AccessibilityObject; AccessibleObject expected = statusStrip.Items[0].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } [WinFormsTheory] @@ -347,7 +346,7 @@ public void StatusStripAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpec AccessibleObject accessibleObject = statusStrip.AccessibilityObject; AccessibleObject expected = statusStrip.Items[1].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } [WinFormsTheory] @@ -363,7 +362,7 @@ public void StatusStripAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpec AccessibleObject accessibleObject = statusStrip.AccessibilityObject; - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } [WinFormsTheory] @@ -379,7 +378,7 @@ public void StatusStripAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpec AccessibleObject accessibleObject = statusStrip.AccessibilityObject; AccessibleObject expected = statusStrip.Items[1].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } [WinFormsTheory] @@ -395,7 +394,7 @@ public void StatusStripAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpec AccessibleObject accessibleObject = statusStrip.AccessibilityObject; AccessibleObject expected = statusStrip.Items[0].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } [WinFormsTheory] @@ -413,7 +412,7 @@ public void StatusStripAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpec AccessibleObject accessibleObject = statusStrip.AccessibilityObject; AccessibleObject expected = statusStrip.Items[2].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } [WinFormsTheory] @@ -431,7 +430,7 @@ public void StatusStripAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpec AccessibleObject accessibleObject = statusStrip.AccessibilityObject; AccessibleObject expected = statusStrip.Items[1].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } [WinFormsTheory] @@ -448,7 +447,7 @@ public void StatusStripAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpec AccessibleObject accessibleObject = statusStrip.AccessibilityObject; AccessibleObject expected = statusStrip.Items[1].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } [WinFormsTheory] @@ -465,7 +464,7 @@ public void StatusStripAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpec AccessibleObject accessibleObject = statusStrip.AccessibilityObject; AccessibleObject expected = statusStrip.Items[0].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } public static IEnumerable StatusStripAccessibleObject_FragmentNavigate_IfStackLayout_TestData() @@ -522,7 +521,7 @@ public void StatusStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpect AccessibleObject accessibleObject = statusStrip.AccessibilityObject; AccessibleObject expected = statusStrip.Items[1].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } [WinFormsTheory] @@ -533,7 +532,7 @@ public void StatusStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpect AccessibleObject accessibleObject = statusStrip.AccessibilityObject; - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } [WinFormsTheory] @@ -545,7 +544,7 @@ public void StatusStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpect AccessibleObject accessibleObject = statusStrip.AccessibilityObject; AccessibleObject expected = statusStrip.Grip.AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } [WinFormsTheory] @@ -561,7 +560,7 @@ public void StatusStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpect AccessibleObject accessibleObject = statusStrip.AccessibilityObject; AccessibleObject expected = statusStrip.Items[0].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } [WinFormsTheory] @@ -577,7 +576,7 @@ public void StatusStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpect AccessibleObject accessibleObject = statusStrip.AccessibilityObject; - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } [WinFormsTheory] @@ -594,7 +593,7 @@ public void StatusStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpect AccessibleObject accessibleObject = statusStrip.AccessibilityObject; AccessibleObject expected = statusStrip.Grip.AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } [WinFormsTheory] @@ -610,7 +609,7 @@ public void StatusStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpect AccessibleObject accessibleObject = statusStrip.AccessibilityObject; AccessibleObject expected = statusStrip.Items[0].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } [WinFormsTheory] @@ -626,7 +625,7 @@ public void StatusStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpect AccessibleObject accessibleObject = statusStrip.AccessibilityObject; AccessibleObject expected = statusStrip.Items[1].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } [WinFormsTheory] @@ -648,7 +647,7 @@ public void StatusStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpect AccessibleObject accessibleObject = statusStrip.AccessibilityObject; AccessibleObject expected = statusStrip.Items[1].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } [WinFormsTheory] @@ -670,7 +669,7 @@ public void StatusStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpect AccessibleObject accessibleObject = statusStrip.AccessibilityObject; AccessibleObject expected = statusStrip.Items[2].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } [WinFormsTheory] @@ -687,7 +686,7 @@ public void StatusStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpect AccessibleObject accessibleObject = statusStrip.AccessibilityObject; AccessibleObject expected = statusStrip.Items[0].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } [WinFormsTheory] @@ -704,7 +703,7 @@ public void StatusStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpect AccessibleObject accessibleObject = statusStrip.AccessibilityObject; AccessibleObject expected = statusStrip.Items[1].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } public static IEnumerable StatusStripAccessibleObject_FragmentNavigate_IfOverflow_TestData() @@ -730,7 +729,7 @@ public void StatusStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpect AccessibleObject accessibleObject = statusStrip.AccessibilityObject; AccessibleObject expected = statusStrip.OverflowButton.AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } public static IEnumerable StatusStripAccessibleObject_FragmentNavigate_IfCannotOverflow_TestData() @@ -769,7 +768,7 @@ public void StatusStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpect AccessibleObject accessibleObject = statusStrip.AccessibilityObject; AccessibleObject expected = statusStrip.Items[0].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } public static IEnumerable StatusStripAccessibleObject_FragmentNavigate_IfCannotOverflowAndItemSkipped_TestData() @@ -812,7 +811,7 @@ public void StatusStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpect AccessibleObject accessibleObject = statusStrip.AccessibilityObject; AccessibleObject expected = statusStrip.Items[0].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } public static IEnumerable StatusStripAccessibleObject_FragmentNavigate_IfCannotOverflowAndItemAlignedAndStackLayout_TestData() @@ -846,7 +845,7 @@ public void StatusStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpect AccessibleObject accessibleObject = statusStrip.AccessibilityObject; AccessibleObject expected = statusStrip.Items[0].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } public static IEnumerable StatusStripAccessibleObject_FragmentNavigate_IfCannotOverflowAndItemAlignedAndNonStackLayout_TestData() @@ -872,7 +871,7 @@ public void StatusStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpect AccessibleObject accessibleObject = statusStrip.AccessibilityObject; AccessibleObject expected = statusStrip.Items[1].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } private StatusStrip CreateStatusStrip( diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/TabControl.TabControlAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/TabControl.TabControlAccessibleObjectTests.cs index 3444761df82..301c17a2c3a 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/TabControl.TabControlAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/TabControl.TabControlAccessibleObjectTests.cs @@ -4,7 +4,6 @@ using System.Drawing; using Windows.Win32.UI.Accessibility; using static System.Windows.Forms.TabControl; -using static Interop.UiaCore; using IRawElementProviderSimple = Interop.UiaCore.IRawElementProviderSimple; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -345,8 +344,8 @@ public void TabControlAccessibleObject_FragmentNavigate_Child_ReturnsNull_IfHand TabControlAccessibleObject accessibleObject = Assert.IsType(tabControl.AccessibilityObject); - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(pages[0].IsHandleCreated); Assert.False(pages[1].IsHandleCreated); Assert.False(tabControl.IsHandleCreated); @@ -360,8 +359,8 @@ public void TabControlAccessibleObject_FragmentNavigate_Child_ReturnsNull_IfTabP TabControlAccessibleObject accessibleObject = Assert.IsType(tabControl.AccessibilityObject); - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(tabControl.IsHandleCreated); } @@ -375,8 +374,8 @@ public void TabControlAccessibleObject_FragmentNavigate_Child_ReturnsExpected_If TabControlAccessibleObject accessibleObject = Assert.IsType(tabControl.AccessibilityObject); - Assert.Equal(tabControl.SelectedTab.AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Equal(pages[0].TabAccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(tabControl.SelectedTab.AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(pages[0].TabAccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(pages[0].IsHandleCreated); Assert.True(tabControl.IsHandleCreated); } @@ -391,9 +390,9 @@ public void TabControlAccessibleObject_FragmentNavigate_Child_ReturnsExpected_If TabControlAccessibleObject accessibleObject = Assert.IsType(tabControl.AccessibilityObject); - Assert.Equal(tabControl.SelectedTab.AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Equal(pages[0].AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Equal(pages[2].TabAccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(tabControl.SelectedTab.AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(pages[0].AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(pages[2].TabAccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(pages[0].IsHandleCreated); Assert.False(pages[1].IsHandleCreated); Assert.False(pages[2].IsHandleCreated); @@ -411,9 +410,9 @@ public void TabControlAccessibleObject_FragmentNavigate_Child_ReturnsExpected_If tabControl.SelectedIndex = 1; TabControlAccessibleObject accessibleObject = Assert.IsType(tabControl.AccessibilityObject); - Assert.Equal(tabControl.SelectedTab.AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Equal(pages[1].AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Equal(pages[2].TabAccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(tabControl.SelectedTab.AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(pages[1].AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(pages[2].TabAccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(pages[0].IsHandleCreated); Assert.True(pages[1].IsHandleCreated); Assert.False(pages[2].IsHandleCreated); @@ -430,15 +429,15 @@ public void TabControlAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpect TabControlAccessibleObject accessibleObject = Assert.IsType(tabControl.AccessibilityObject); - Assert.Equal(pages[0].AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); + Assert.Equal(pages[0].AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); tabControl.SelectedIndex = 1; - Assert.Equal(pages[1].AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); + Assert.Equal(pages[1].AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); tabControl.SelectedIndex = 2; - Assert.Equal(pages[2].AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); + Assert.Equal(pages[2].AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); Assert.True(pages[0].IsHandleCreated); Assert.True(pages[1].IsHandleCreated); Assert.True(pages[2].IsHandleCreated); diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/TabPage.TabAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/TabPage.TabAccessibleObjectTests.cs index 0e7349f389c..049abdbcd08 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/TabPage.TabAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/TabPage.TabAccessibleObjectTests.cs @@ -4,7 +4,6 @@ using Windows.Win32.UI.Accessibility; using static System.Windows.Forms.TabControl; using static System.Windows.Forms.TabPage; -using static Interop; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -176,17 +175,17 @@ public void TabAccessibleObject_FragmentNavigate_ReturnsNull_IfHandleIsNotCreate TabAccessibleObject accessibleObject1 = Assert.IsType(pages[0].TabAccessibilityObject); TabAccessibleObject accessibleObject2 = Assert.IsType(pages[1].TabAccessibilityObject); - Assert.Null(accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.Null(accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); - - Assert.Null(accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.Null(accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); + + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(pages[0].IsHandleCreated); Assert.False(pages[1].IsHandleCreated); Assert.False(tabControl.IsHandleCreated); @@ -202,7 +201,7 @@ public void TabAccessibleObject_FragmentNavigate_Parent_ReturnsTabControlAccessi TabAccessibleObject accessibleObject = Assert.IsType(pages[0].TabAccessibilityObject); - Assert.Equal(tabControl.AccessibilityObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); + Assert.Equal(tabControl.AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); Assert.True(pages[0].IsHandleCreated); Assert.True(tabControl.IsHandleCreated); } @@ -218,11 +217,11 @@ public void TabAccessibleObject_FragmentNavigate_Sibling_ReturnsExpected() TabAccessibleObject accessibleObject1 = Assert.IsType(pages[0].TabAccessibilityObject); TabAccessibleObject accessibleObject2 = Assert.IsType(pages[1].TabAccessibilityObject); - Assert.Equal(pages[0].AccessibilityObject, accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(pages[0].AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); Assert.True(pages[0].IsHandleCreated); Assert.False(pages[1].IsHandleCreated); Assert.True(tabControl.IsHandleCreated); @@ -239,17 +238,17 @@ public void TabAccessibleObject_FragmentNavigate_Sibling_ReturnsExpected_AfterCh TabAccessibleObject accessibleObject1 = Assert.IsType(pages[0].TabAccessibilityObject); TabAccessibleObject accessibleObject2 = Assert.IsType(pages[1].TabAccessibilityObject); - Assert.Equal(pages[0].AccessibilityObject, accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(pages[0].AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); tabControl.SelectedIndex = 1; - Assert.Equal(pages[1].AccessibilityObject, accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(pages[1].AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); Assert.True(pages[0].IsHandleCreated); Assert.True(pages[1].IsHandleCreated); Assert.True(tabControl.IsHandleCreated); diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/TabPage.TabPageAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/TabPage.TabPageAccessibleObjectTests.cs index df830d0b7e7..5295c8f834e 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/TabPage.TabPageAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/TabPage.TabPageAccessibleObjectTests.cs @@ -4,7 +4,6 @@ using Windows.Win32.UI.Accessibility; using static System.Windows.Forms.TabControl; using static System.Windows.Forms.TabPage; -using static Interop.UiaCore; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -191,11 +190,11 @@ public void TabPageAccessibleObject_FragmentNaviage_ReturnsNull_IfTabPageHasNotT TabPageAccessibleObject accessibleObject = Assert.IsType(tabPage.AccessibilityObject); - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.Parent)); - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(tabPage.IsHandleCreated); } @@ -208,11 +207,11 @@ public void TabPageAccessibleObject_FragmentNaviage_ReturnsNull_IfHandleIsNotCre TabPageAccessibleObject accessibleObject = Assert.IsType(pages[0].AccessibilityObject); - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.Parent)); - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(pages[0].IsHandleCreated); Assert.False(tabControl.IsHandleCreated); } @@ -227,11 +226,11 @@ public void TabPageAccessibleObject_FragmentNaviage_ReturnsExpected_IfSingleItem TabPageAccessibleObject accessibleObject = Assert.IsType(pages[0].AccessibilityObject); - Assert.Equal(tabControl.AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.Parent)); - Assert.Equal(pages[0].TabAccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(tabControl.AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(pages[0].TabAccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(pages[0].IsHandleCreated); Assert.True(tabControl.IsHandleCreated); } @@ -246,11 +245,11 @@ public void TabPageAccessibleObject_FragmentNaviage_ReturnsExpected_IfThreeItem( TabPageAccessibleObject accessibleObject = Assert.IsType(pages[0].AccessibilityObject); - Assert.Equal(tabControl.AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.Parent)); - Assert.Equal(pages[0].TabAccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(tabControl.AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(pages[0].TabAccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(pages[0].IsHandleCreated); Assert.False(pages[1].IsHandleCreated); Assert.False(pages[2].IsHandleCreated); @@ -270,65 +269,65 @@ public void TabPageAccessibleObject_FragmentNaviage_ReturnsExpected_AfterChaning TabPageAccessibleObject accessibleObject3 = Assert.IsType(pages[2].AccessibilityObject); // First tab is selected - Assert.Equal(tabControl.AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.Parent)); - Assert.Equal(pages[0].TabAccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.LastChild)); - - Assert.Equal(tabControl.AccessibilityObject, accessibleObject2.FragmentNavigate(NavigateDirection.Parent)); - Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.LastChild)); - - Assert.Equal(tabControl.AccessibilityObject, accessibleObject3.FragmentNavigate(NavigateDirection.Parent)); - Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(tabControl.AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(pages[0].TabAccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); + + Assert.Equal(tabControl.AccessibilityObject, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); + + Assert.Equal(tabControl.AccessibilityObject, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); // Second tab is selected tabControl.SelectedIndex = 1; - Assert.Equal(tabControl.AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.Parent)); - Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(tabControl.AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); - Assert.Equal(tabControl.AccessibilityObject, accessibleObject2.FragmentNavigate(NavigateDirection.Parent)); - Assert.Equal(pages[0].TabAccessibilityObject, accessibleObject2.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(tabControl.AccessibilityObject, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(pages[0].TabAccessibilityObject, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); - Assert.Equal(tabControl.AccessibilityObject, accessibleObject3.FragmentNavigate(NavigateDirection.Parent)); - Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(tabControl.AccessibilityObject, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); // Third tab is selected tabControl.SelectedIndex = 2; - Assert.Equal(tabControl.AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.Parent)); - Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.LastChild)); - - Assert.Equal(tabControl.AccessibilityObject, accessibleObject2.FragmentNavigate(NavigateDirection.Parent)); - Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.LastChild)); - - Assert.Equal(tabControl.AccessibilityObject, accessibleObject3.FragmentNavigate(NavigateDirection.Parent)); - Assert.Equal(pages[0].TabAccessibilityObject, accessibleObject3.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(tabControl.AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); + + Assert.Equal(tabControl.AccessibilityObject, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); + + Assert.Equal(tabControl.AccessibilityObject, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(pages[0].TabAccessibilityObject, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(pages[0].IsHandleCreated); Assert.True(pages[1].IsHandleCreated); diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripAccessibleObjectTests.cs index e808d89754e..31d921c79cc 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripAccessibleObjectTests.cs @@ -116,9 +116,9 @@ public void ToolStripAccessibleObject_GetPropertyValue_ControlType_IsExpected_Fo public static IEnumerable ToolStripAccessibleObject_FragmentNavigate_ReturnsNull_IfHandleNotCreated_TestData() { - Array directions = Enum.GetValues(); + Array directions = Enum.GetValues(); - foreach (UiaCore.NavigateDirection direction in directions) + foreach (NavigateDirection direction in directions) { yield return new object[] { direction }; } @@ -132,7 +132,7 @@ public void ToolStripAccessibleObject_FragmentNavigate_ReturnsNull_IfHandleNotCr AccessibleObject accessibleObject = toolStrip.AccessibilityObject; - Assert.Null(accessibleObject.FragmentNavigate((UiaCore.NavigateDirection)navigateDirection)); + Assert.Null(accessibleObject.FragmentNavigate((NavigateDirection)navigateDirection)); Assert.False(toolStrip.IsHandleCreated); } @@ -142,7 +142,7 @@ public void ToolStripAccessibleObject_FragmentNavigate_Parent_ReturnsExpected() using ToolStrip toolStrip = CreateToolStrip(); AccessibleObject accessibleObject = toolStrip.AccessibilityObject; - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); } [WinFormsFact] @@ -151,8 +151,8 @@ public void ToolStripAccessibleObject_FragmentNavigate_Sibling_ReturnsExpected() using ToolStrip toolStrip = CreateToolStrip(); AccessibleObject accessibleObject = toolStrip.AccessibilityObject; - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); } [WinFormsFact] @@ -163,7 +163,7 @@ public unsafe void ToolStripAccessibleObject_FragmentNavigate_FirstChild_ThumbBu var accessibleObject = toolStrip.AccessibilityObject; - UiaCore.IRawElementProviderFragment firstChild = accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild); + UiaCore.IRawElementProviderFragment firstChild = accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild); Assert.NotNull(firstChild); Assert.Equal(UIA_CONTROLTYPE_ID.UIA_ThumbControlTypeId, firstChild.GetPropertyValue(UIA_PROPERTY_ID.UIA_ControlTypePropertyId)); } @@ -223,7 +223,7 @@ public void ToolStripAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpecte AccessibleObject accessibleObject = toolStrip.AccessibilityObject; AccessibleObject expected = toolStrip.Items[0].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } [WinFormsTheory] @@ -234,7 +234,7 @@ public void ToolStripAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpecte AccessibleObject accessibleObject = toolStrip.AccessibilityObject; - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } public static IEnumerable ToolStripAccessibleObject_FragmentNavigate_IfGripVisible_TestData() @@ -262,7 +262,7 @@ public void ToolStripAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpecte AccessibleObject accessibleObject = toolStrip.AccessibilityObject; AccessibleObject expected = toolStrip.Grip.AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } [WinFormsTheory] @@ -274,7 +274,7 @@ public void ToolStripAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpecte AccessibleObject accessibleObject = toolStrip.AccessibilityObject; AccessibleObject expected = toolStrip.Grip.AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } public static IEnumerable ToolStripAccessibleObject_FragmentNavigate_IfNoGripAndOverflow_TestData() @@ -297,7 +297,7 @@ public void ToolStripAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpecte AccessibleObject accessibleObject = toolStrip.AccessibilityObject; AccessibleObject expected = toolStrip.OverflowButton.AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } public static IEnumerable ToolStripAccessibleObject_FragmentNavigate_IfNoGripAndCannotOverflowAndStackLayout_TestData() @@ -319,7 +319,7 @@ public void ToolStripAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpecte AccessibleObject accessibleObject = toolStrip.AccessibilityObject; - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } public static IEnumerable ToolStripAccessibleObject_FragmentNavigate_IfNoGripAndCannotOverflowAndNonStackLayout_TestData() @@ -341,7 +341,7 @@ public void ToolStripAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpecte AccessibleObject accessibleObject = toolStrip.AccessibilityObject; AccessibleObject expected = toolStrip.Items[0].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } [WinFormsTheory] @@ -357,7 +357,7 @@ public void ToolStripAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpecte AccessibleObject accessibleObject = toolStrip.AccessibilityObject; AccessibleObject expected = toolStrip.Items[1].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } [WinFormsTheory] @@ -373,7 +373,7 @@ public void ToolStripAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpecte AccessibleObject accessibleObject = toolStrip.AccessibilityObject; - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } [WinFormsTheory] @@ -389,7 +389,7 @@ public void ToolStripAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpecte AccessibleObject accessibleObject = toolStrip.AccessibilityObject; AccessibleObject expected = toolStrip.Items[1].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } [WinFormsTheory] @@ -405,7 +405,7 @@ public void ToolStripAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpecte AccessibleObject accessibleObject = toolStrip.AccessibilityObject; AccessibleObject expected = toolStrip.Items[0].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } [WinFormsTheory] @@ -423,7 +423,7 @@ public void ToolStripAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpecte AccessibleObject accessibleObject = toolStrip.AccessibilityObject; AccessibleObject expected = toolStrip.Items[2].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } [WinFormsTheory] @@ -441,7 +441,7 @@ public void ToolStripAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpecte AccessibleObject accessibleObject = toolStrip.AccessibilityObject; AccessibleObject expected = toolStrip.Items[1].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } [WinFormsTheory] @@ -458,7 +458,7 @@ public void ToolStripAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpecte AccessibleObject accessibleObject = toolStrip.AccessibilityObject; AccessibleObject expected = toolStrip.Items[1].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } [WinFormsTheory] @@ -475,7 +475,7 @@ public void ToolStripAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpecte AccessibleObject accessibleObject = toolStrip.AccessibilityObject; AccessibleObject expected = toolStrip.Items[0].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } public static IEnumerable ToolStripAccessibleObject_FragmentNavigate_IfStackLayout_TestData() @@ -532,7 +532,7 @@ public void ToolStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpected AccessibleObject accessibleObject = toolStrip.AccessibilityObject; AccessibleObject expected = toolStrip.Items[1].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } [WinFormsTheory] @@ -543,7 +543,7 @@ public void ToolStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpected AccessibleObject accessibleObject = toolStrip.AccessibilityObject; - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } [WinFormsTheory] @@ -555,7 +555,7 @@ public void ToolStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpected AccessibleObject accessibleObject = toolStrip.AccessibilityObject; AccessibleObject expected = toolStrip.Grip.AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } [WinFormsTheory] @@ -571,7 +571,7 @@ public void ToolStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpected AccessibleObject accessibleObject = toolStrip.AccessibilityObject; AccessibleObject expected = toolStrip.Items[0].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } [WinFormsTheory] @@ -587,7 +587,7 @@ public void ToolStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpected AccessibleObject accessibleObject = toolStrip.AccessibilityObject; - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } [WinFormsTheory] @@ -604,7 +604,7 @@ public void ToolStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpected AccessibleObject accessibleObject = toolStrip.AccessibilityObject; AccessibleObject expected = toolStrip.Grip.AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } [WinFormsTheory] @@ -620,7 +620,7 @@ public void ToolStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpected AccessibleObject accessibleObject = toolStrip.AccessibilityObject; AccessibleObject expected = toolStrip.Items[0].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } [WinFormsTheory] @@ -636,7 +636,7 @@ public void ToolStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpected AccessibleObject accessibleObject = toolStrip.AccessibilityObject; AccessibleObject expected = toolStrip.Items[1].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } [WinFormsTheory] @@ -658,7 +658,7 @@ public void ToolStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpected AccessibleObject accessibleObject = toolStrip.AccessibilityObject; AccessibleObject expected = toolStrip.Items[1].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } [WinFormsTheory] @@ -680,7 +680,7 @@ public void ToolStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpected AccessibleObject accessibleObject = toolStrip.AccessibilityObject; AccessibleObject expected = toolStrip.Items[2].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } [WinFormsTheory] @@ -697,7 +697,7 @@ public void ToolStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpected AccessibleObject accessibleObject = toolStrip.AccessibilityObject; AccessibleObject expected = toolStrip.Items[0].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } [WinFormsTheory] @@ -714,7 +714,7 @@ public void ToolStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpected AccessibleObject accessibleObject = toolStrip.AccessibilityObject; AccessibleObject expected = toolStrip.Items[1].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } public static IEnumerable ToolStripAccessibleObject_FragmentNavigate_IfOverflow_TestData() @@ -740,7 +740,7 @@ public void ToolStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpected AccessibleObject accessibleObject = toolStrip.AccessibilityObject; AccessibleObject expected = toolStrip.OverflowButton.AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } public static IEnumerable ToolStripAccessibleObject_FragmentNavigate_IfCannotOverflow_TestData() @@ -779,7 +779,7 @@ public void ToolStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpected AccessibleObject accessibleObject = toolStrip.AccessibilityObject; AccessibleObject expected = toolStrip.Items[0].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } public static IEnumerable ToolStripAccessibleObject_FragmentNavigate_IfCannotOverflowAndItemSkipped_TestData() @@ -822,7 +822,7 @@ public void ToolStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpected AccessibleObject accessibleObject = toolStrip.AccessibilityObject; AccessibleObject expected = toolStrip.Items[0].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } public static IEnumerable ToolStripAccessibleObject_FragmentNavigate_IfCannotOverflowAndItemAlignedAndStackLayout_TestData() @@ -856,7 +856,7 @@ public void ToolStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpected AccessibleObject accessibleObject = toolStrip.AccessibilityObject; AccessibleObject expected = toolStrip.Items[0].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } public static IEnumerable ToolStripAccessibleObject_FragmentNavigate_IfCannotOverflowAndItemAlignedAndNonStackLayout_TestData() @@ -881,7 +881,7 @@ public void ToolStripAccessibleObject_FragmentNavigate_LastChild_ReturnsExpected AccessibleObject accessibleObject = toolStrip.AccessibilityObject; AccessibleObject expected = toolStrip.Items[1].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } internal static ToolStripItem CreateSkippedItem() diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripButton.ToolStripButtonAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripButton.ToolStripButtonAccessibleObjectTests.cs index c0d2961a952..07336fc5d1a 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripButton.ToolStripButtonAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripButton.ToolStripButtonAccessibleObjectTests.cs @@ -3,7 +3,6 @@ using Windows.Win32.UI.Accessibility; using static System.Windows.Forms.ToolStripButton; -using static Interop; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -156,9 +155,9 @@ public void ToolStripButtonAccessibleObject_IsTogglePatternSupported_ReturnsTrue } [WinFormsTheory] - [InlineData(CheckState.Checked, (int)UiaCore.ToggleState.On)] - [InlineData(CheckState.Unchecked, (int)UiaCore.ToggleState.Off)] - [InlineData(CheckState.Indeterminate, (int)UiaCore.ToggleState.Indeterminate)] + [InlineData(CheckState.Checked, (int)ToggleState.ToggleState_On)] + [InlineData(CheckState.Unchecked, (int)ToggleState.ToggleState_Off)] + [InlineData(CheckState.Indeterminate, (int)ToggleState.ToggleState_Indeterminate)] public void ToolStripButtonAccessibleObject_ToggleState_ReturnsExpected(CheckState checkState, int expectedToggleState) { using ToolStripButton toolStripButton = new() @@ -168,7 +167,7 @@ public void ToolStripButtonAccessibleObject_ToggleState_ReturnsExpected(CheckSta object actual = toolStripButton.AccessibilityObject.ToggleState; - Assert.Equal((UiaCore.ToggleState)expectedToggleState, actual); + Assert.Equal((ToggleState)expectedToggleState, actual); } [WinFormsFact] @@ -183,15 +182,15 @@ public void ToolStripButtonAccessibleObject_Toggle_Invoke() toolStripButton.Click += (s, e) => { clickCounter++; }; - Assert.Equal(UiaCore.ToggleState.Off, toolStripButton.AccessibilityObject.ToggleState); + Assert.Equal(ToggleState.ToggleState_Off, toolStripButton.AccessibilityObject.ToggleState); toolStripButton.AccessibilityObject.Toggle(); - Assert.Equal(UiaCore.ToggleState.On, toolStripButton.AccessibilityObject.ToggleState); + Assert.Equal(ToggleState.ToggleState_On, toolStripButton.AccessibilityObject.ToggleState); toolStripButton.AccessibilityObject.Toggle(); - Assert.Equal(UiaCore.ToggleState.Off, toolStripButton.AccessibilityObject.ToggleState); + Assert.Equal(ToggleState.ToggleState_Off, toolStripButton.AccessibilityObject.ToggleState); Assert.Equal(0, clickCounter); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripComboBox.ToolStripComboBoxControl.ToolStripComboBoxControlAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripComboBox.ToolStripComboBoxControl.ToolStripComboBoxControlAccessibleObjectTests.cs index 09f9b4b5aa2..1782d97b53b 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripComboBox.ToolStripComboBoxControl.ToolStripComboBoxControlAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripComboBox.ToolStripComboBoxControl.ToolStripComboBoxControlAccessibleObjectTests.cs @@ -4,7 +4,6 @@ using Windows.Win32.UI.Accessibility; using static System.Windows.Forms.ToolStripComboBox; using static System.Windows.Forms.ToolStripComboBox.ToolStripComboBoxControl; -using static Interop; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -76,8 +75,8 @@ public void ToolStripComboBoxControlAccessibleObject_FragmentNavigate_ChildrenAr using ToolStripComboBoxControl control = new(); control.CreateControl(); - object firstChild = control.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild); - object lastChild = control.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild); + object firstChild = control.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild); + object lastChild = control.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild); Assert.Equal(control.ChildEditAccessibleObject, firstChild); Assert.Equal(((ToolStripComboBoxControlAccessibleObject)control.AccessibilityObject).DropDownButtonUiaProvider, lastChild); @@ -94,7 +93,7 @@ public void ToolStripComboBoxControlAccessibleObject_FragmentNavigate_ParentIsTo control.Owner = item; item.Parent = toolStrip; - object actual = control.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.Parent); + object actual = control.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent); Assert.Equal(toolStrip.AccessibilityObject, actual); Assert.False(control.IsHandleCreated); diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripControlHost.ToolStripControlHostAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripControlHost.ToolStripControlHostAccessibleObjectTests.cs index e9d41cb39e8..2b2cc6d4cf6 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripControlHost.ToolStripControlHostAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripControlHost.ToolStripControlHostAccessibleObjectTests.cs @@ -1,6 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Windows.Win32.UI.Accessibility; using static System.Windows.Forms.ToolStripControlHost; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -57,8 +58,8 @@ public void ToolStripControlHostAccessibleObject_FragmentNavigate_ReturnsExpecte using ToolStripControlHost toolStrip = new(control); var accessibleObject = (ToolStripControlHostAccessibleObject)toolStrip.AccessibilityObject; - Assert.Equal(control.AccessibilityObject, accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(control.AccessibilityObject, accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(control.AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(control.AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(toolStrip.Control.IsHandleCreated); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripDropDownButton.ToolStripDropDownButtonAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripDropDownButton.ToolStripDropDownButtonAccessibleObjectTests.cs index 094ba3d894d..ce7a9e4657d 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripDropDownButton.ToolStripDropDownButtonAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripDropDownButton.ToolStripDropDownButtonAccessibleObjectTests.cs @@ -3,7 +3,6 @@ using Windows.Win32.UI.Accessibility; using static System.Windows.Forms.ToolStripDropDownButton; -using static Interop; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -83,14 +82,14 @@ public void ToolStripDropDownButtonAccessibleObject_FragmentNavigate_Child_Retur AccessibleObject accessibleObject = toolStrip.Items[0].AccessibilityObject; - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); dropDownItem.DropDown.Show(); AccessibleObject expected = dropDownItem.DropDown.AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripDropDownItemAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripDropDownItemAccessibleObjectTests.cs index 6263b874a90..bbcdaf256c7 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripDropDownItemAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripDropDownItemAccessibleObjectTests.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using static Interop.UiaCore; +using Windows.Win32.UI.Accessibility; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -54,8 +54,8 @@ public void ToolStripDropDownItemAccessibleObject_IsIAccessibleExSupported_Retur } [WinFormsTheory] - [InlineData(false, ((int)ExpandCollapseState.Collapsed))] - [InlineData(true, ((int)ExpandCollapseState.Expanded))] + [InlineData(false, ((int)ExpandCollapseState.ExpandCollapseState_Collapsed))] + [InlineData(true, ((int)ExpandCollapseState.ExpandCollapseState_Expanded))] public void ToolStripDropDownItemAccessibleObject_ExpandCollapseState_ReturnsExpected(bool visible, int expected) { using SubToolStripDropDownItem control = new(); @@ -141,9 +141,9 @@ public void ToolStripDropDownItemAccessibleObject_FragmentNavigate_NextSibling_R var accessibleObjectItem2 = (ToolStripDropDownItemAccessibleObject)item2.AccessibilityObject; var accessibleObjectNotItem = (ToolStripDropDownItemAccessibleObject)notItem.AccessibilityObject; - Assert.Equal(accessibleObjectItem2, accessibleObjectItem1.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(accessibleObjectItem2.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(accessibleObjectNotItem.FragmentNavigate(NavigateDirection.NextSibling)); + Assert.Equal(accessibleObjectItem2, accessibleObjectItem1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObjectItem2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObjectNotItem.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); } [WinFormsFact] @@ -160,9 +160,9 @@ public void ToolStripDropDownItemAccessibleObject_FragmentNavigate_PreviousSibli var accessibleObjectItem2 = (ToolStripDropDownItemAccessibleObject)item2.AccessibilityObject; var accessibleObjectNotItem = (ToolStripDropDownItemAccessibleObject)notItem.AccessibilityObject; - Assert.Null(accessibleObjectItem1.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Equal(accessibleObjectItem1, accessibleObjectItem2.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObjectNotItem.FragmentNavigate(NavigateDirection.PreviousSibling)); + Assert.Null(accessibleObjectItem1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(accessibleObjectItem1, accessibleObjectItem2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObjectNotItem.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); } [WinFormsFact] diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripDropDownMenu.ToolStripDropDownMenuAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripDropDownMenu.ToolStripDropDownMenuAccessibleObjectTests.cs index 3d61524d751..849b6d3ab79 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripDropDownMenu.ToolStripDropDownMenuAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripDropDownMenu.ToolStripDropDownMenuAccessibleObjectTests.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using Windows.Win32.UI.Accessibility; -using static Interop.UiaCore; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -36,14 +35,14 @@ public void ToolStripDropDownMenuAccessible_FragmentNavigate_ReturnExpected_With AccessibleObject accessibleObject = item.DropDown.AccessibilityObject; - Assert.Equal(item.AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.Parent)); - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(item.AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); - Assert.Null(item.AccessibilityObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Null(item.AccessibilityObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Null(item.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(item.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.Equal(createControl, toolStrip.IsHandleCreated); } @@ -64,14 +63,14 @@ public void ToolStripDropDownMenuAccessible_FragmentNavigate_ReturnExpected_With AccessibleObject accessibleObject = item.DropDown.AccessibilityObject; - Assert.Equal(item.AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.Parent)); - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(item.AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); - Assert.Null(item.AccessibilityObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Null(item.AccessibilityObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Null(item.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(item.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.Equal(createControl, toolStrip.IsHandleCreated); } @@ -123,44 +122,44 @@ public void ToolStripDropDownMenuAccessible_FragmentNavigate_ReturnExpected(Type ownerItem.DropDown.Show(); AccessibleObject accessibleObject = ownerItem.DropDown.AccessibilityObject; - Assert.Equal(ownerItem.AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.Parent)); - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Equal(parentItem1.AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Equal(parentItem2.AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(ownerItem.AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(parentItem1.AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(parentItem2.AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); - Assert.Equal(accessibleObject, ownerItem.AccessibilityObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Equal(accessibleObject, ownerItem.AccessibilityObject.FragmentNavigate(NavigateDirection.LastChild)); - Assert.Equal(accessibleObject, parentItem1.AccessibilityObject.FragmentNavigate(NavigateDirection.Parent)); - Assert.Equal(accessibleObject, parentItem2.AccessibilityObject.FragmentNavigate(NavigateDirection.Parent)); + Assert.Equal(accessibleObject, ownerItem.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(accessibleObject, ownerItem.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); + Assert.Equal(accessibleObject, parentItem1.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(accessibleObject, parentItem2.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); parentItem1.DropDown.Show(); AccessibleObject accessibleObject1 = parentItem1.DropDown.AccessibilityObject; - Assert.Equal(parentItem1.AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.Parent)); - Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Equal(childItem1.AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Equal(childItem2.AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(parentItem1.AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(childItem1.AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(childItem2.AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); - Assert.Equal(accessibleObject1, parentItem1.AccessibilityObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Equal(accessibleObject1, parentItem1.AccessibilityObject.FragmentNavigate(NavigateDirection.LastChild)); - Assert.Equal(accessibleObject1, childItem1.AccessibilityObject.FragmentNavigate(NavigateDirection.Parent)); - Assert.Equal(accessibleObject1, childItem2.AccessibilityObject.FragmentNavigate(NavigateDirection.Parent)); + Assert.Equal(accessibleObject1, parentItem1.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(accessibleObject1, parentItem1.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); + Assert.Equal(accessibleObject1, childItem1.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(accessibleObject1, childItem2.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); parentItem2.DropDown.Show(); AccessibleObject accessibleObject2 = parentItem2.DropDown.AccessibilityObject; - Assert.Equal(parentItem2.AccessibilityObject, accessibleObject2.FragmentNavigate(NavigateDirection.Parent)); - Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Equal(childItem3.AccessibilityObject, accessibleObject2.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Equal(childItem4.AccessibilityObject, accessibleObject2.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(parentItem2.AccessibilityObject, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(childItem3.AccessibilityObject, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(childItem4.AccessibilityObject, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); - Assert.Equal(accessibleObject2, parentItem2.AccessibilityObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Equal(accessibleObject2, parentItem2.AccessibilityObject.FragmentNavigate(NavigateDirection.LastChild)); - Assert.Equal(accessibleObject2, childItem3.AccessibilityObject.FragmentNavigate(NavigateDirection.Parent)); - Assert.Equal(accessibleObject2, childItem4.AccessibilityObject.FragmentNavigate(NavigateDirection.Parent)); + Assert.Equal(accessibleObject2, parentItem2.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(accessibleObject2, parentItem2.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); + Assert.Equal(accessibleObject2, childItem3.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(accessibleObject2, childItem4.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); Assert.Equal(createControl, toolStrip.IsHandleCreated); } @@ -212,44 +211,44 @@ public void ToolStripDropDownMenuAccessible_FragmentNavigate_ReturnExpected_Tool ownerItem.DropDown.Show(); AccessibleObject accessibleObject = ownerItem.DropDown.AccessibilityObject; - Assert.Equal(ownerItem.AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.Parent)); - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Equal(parentItem1.AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Equal(parentItem2.AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(ownerItem.AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(parentItem1.AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(parentItem2.AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); - Assert.Equal(accessibleObject, ownerItem.AccessibilityObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Equal(accessibleObject, ownerItem.AccessibilityObject.FragmentNavigate(NavigateDirection.LastChild)); - Assert.Equal(accessibleObject, parentItem1.AccessibilityObject.FragmentNavigate(NavigateDirection.Parent)); - Assert.Equal(accessibleObject, parentItem2.AccessibilityObject.FragmentNavigate(NavigateDirection.Parent)); + Assert.Equal(accessibleObject, ownerItem.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(accessibleObject, ownerItem.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); + Assert.Equal(accessibleObject, parentItem1.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(accessibleObject, parentItem2.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); parentItem1.DropDown.Show(); AccessibleObject accessibleObject1 = parentItem1.DropDown.AccessibilityObject; - Assert.Equal(parentItem1.AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.Parent)); - Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Equal(childItem1.AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Equal(childItem2.AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(parentItem1.AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(childItem1.AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(childItem2.AccessibilityObject, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); - Assert.Equal(accessibleObject1, parentItem1.AccessibilityObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Equal(accessibleObject1, parentItem1.AccessibilityObject.FragmentNavigate(NavigateDirection.LastChild)); - Assert.Equal(accessibleObject1, childItem1.AccessibilityObject.FragmentNavigate(NavigateDirection.Parent)); - Assert.Equal(accessibleObject1, childItem2.AccessibilityObject.FragmentNavigate(NavigateDirection.Parent)); + Assert.Equal(accessibleObject1, parentItem1.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(accessibleObject1, parentItem1.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); + Assert.Equal(accessibleObject1, childItem1.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(accessibleObject1, childItem2.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); parentItem2.DropDown.Show(); AccessibleObject accessibleObject2 = parentItem2.DropDown.AccessibilityObject; - Assert.Equal(parentItem2.AccessibilityObject, accessibleObject2.FragmentNavigate(NavigateDirection.Parent)); - Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Equal(childItem3.AccessibilityObject, accessibleObject2.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Equal(childItem4.AccessibilityObject, accessibleObject2.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(parentItem2.AccessibilityObject, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(childItem3.AccessibilityObject, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(childItem4.AccessibilityObject, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); - Assert.Equal(accessibleObject2, parentItem2.AccessibilityObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Equal(accessibleObject2, parentItem2.AccessibilityObject.FragmentNavigate(NavigateDirection.LastChild)); - Assert.Equal(accessibleObject2, childItem3.AccessibilityObject.FragmentNavigate(NavigateDirection.Parent)); - Assert.Equal(accessibleObject2, childItem4.AccessibilityObject.FragmentNavigate(NavigateDirection.Parent)); + Assert.Equal(accessibleObject2, parentItem2.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(accessibleObject2, parentItem2.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); + Assert.Equal(accessibleObject2, childItem3.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(accessibleObject2, childItem4.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); // Reset the parent to avoid errors when disposing. parentItem1.ParentInternal = null; diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripItemAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripItemAccessibleObjectTests.cs index bc28d8a550b..5c0271e67d3 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripItemAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripItemAccessibleObjectTests.cs @@ -3,7 +3,6 @@ using System.Drawing; using Windows.Win32.UI.Accessibility; -using static Interop.UiaCore; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -205,7 +204,7 @@ public void ToolStripItemAccessibleObject_FragmentNavigate_Parent_ReturnsExpecte AccessibleObject accessibleObject = toolStrip.Items[0].AccessibilityObject; AccessibleObject expected = toolStrip.AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.Parent)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); } [WinFormsFact] @@ -216,7 +215,7 @@ public void ToolStripItemAccessibleObject_FragmentNavigate_Parent_ReturnsNull_If AccessibleObject accessibleObject = toolStrip.Items[0].AccessibilityObject; - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.Parent)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); Assert.False(toolStrip.IsHandleCreated); } @@ -228,8 +227,8 @@ public void ToolStripItemAccessibleObject_FragmentNavigate_Child_ReturnExpected( AccessibleObject accessibleObject = toolStrip.Items[0].AccessibilityObject; - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(toolStrip.IsHandleCreated); } @@ -247,13 +246,13 @@ public void ToolStripItemAccessibleObject_FragmentNavigate_Sibling_ReturnExpecte AccessibleObject item1 = toolStrip.Items[0].AccessibilityObject; AccessibleObject item2 = toolStrip.Items[1].AccessibilityObject; - Assert.Equal(item1, grip.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Equal(item2, item1.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(item2.FragmentNavigate(NavigateDirection.NextSibling)); + Assert.Equal(item1, grip.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(item2, item1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(item2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(item1, item2.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Equal(grip, item1.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Null(grip.FragmentNavigate(NavigateDirection.PreviousSibling)); + Assert.Equal(item1, item2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(grip, item1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(grip.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(toolStrip.IsHandleCreated); } @@ -269,7 +268,7 @@ public void ToolStripItemAccessibleObject_FragmentNavigate_PreviousSibling_Retur AccessibleObject accessibleObject = toolStrip.Items[0].AccessibilityObject; - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(toolStrip.IsHandleCreated); } @@ -290,13 +289,13 @@ public void ToolStripItemAccessibleObject_FragmentNavigate_Sibling_ReturnExpecte AccessibleObject item1 = toolStrip.Items[0].AccessibilityObject; AccessibleObject item2 = toolStrip.Items[1].AccessibilityObject; - Assert.Equal(item2, grip.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Equal(item1, item2.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(item1.FragmentNavigate(NavigateDirection.NextSibling)); + Assert.Equal(item2, grip.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(item1, item2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(item1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(item2, item1.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Equal(grip, item2.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Null(grip.FragmentNavigate(NavigateDirection.PreviousSibling)); + Assert.Equal(item2, item1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(grip, item2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(grip.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(toolStrip.IsHandleCreated); } @@ -325,13 +324,13 @@ ToolStripItem CreateSkippedItem() AccessibleObject item2 = toolStrip.Items[1].AccessibilityObject; AccessibleObject item4 = toolStrip.Items[3].AccessibilityObject; - Assert.Equal(item2, grip.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Equal(item4, item2.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(item4.FragmentNavigate(NavigateDirection.NextSibling)); + Assert.Equal(item2, grip.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(item4, item2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(item4.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(item2, item4.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Equal(grip, item2.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Null(grip.FragmentNavigate(NavigateDirection.PreviousSibling)); + Assert.Equal(item2, item4.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(grip, item2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(grip.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(toolStrip.IsHandleCreated); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripMenuItem.ToolStripMenuItemAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripMenuItem.ToolStripMenuItemAccessibleObjectTests.cs index 138993b7df4..8eb2b56e644 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripMenuItem.ToolStripMenuItemAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripMenuItem.ToolStripMenuItemAccessibleObjectTests.cs @@ -3,7 +3,6 @@ using Windows.Win32.UI.Accessibility; using static System.Windows.Forms.ToolStripMenuItem; -using static Interop; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -169,9 +168,9 @@ public void ToolStripMenuItemAccessibleObject_IsTogglePatternSupported_ReturnsEx } [WinFormsTheory] - [InlineData(CheckState.Checked, (int)UiaCore.ToggleState.On)] - [InlineData(CheckState.Unchecked, (int)UiaCore.ToggleState.Off)] - [InlineData(CheckState.Indeterminate, (int)UiaCore.ToggleState.Indeterminate)] + [InlineData(CheckState.Checked, (int)ToggleState.ToggleState_On)] + [InlineData(CheckState.Unchecked, (int)ToggleState.ToggleState_Off)] + [InlineData(CheckState.Indeterminate, (int)ToggleState.ToggleState_Indeterminate)] public void ToolStripMenuItemAccessibleObject_ToggleState_ReturnsExpected(CheckState checkState, int expectedToggleState) { using ToolStripMenuItem toolStripMenuItem = new() @@ -181,7 +180,7 @@ public void ToolStripMenuItemAccessibleObject_ToggleState_ReturnsExpected(CheckS object actual = toolStripMenuItem.AccessibilityObject.ToggleState; - Assert.Equal((UiaCore.ToggleState)expectedToggleState, actual); + Assert.Equal((ToggleState)expectedToggleState, actual); } [WinFormsFact] @@ -196,15 +195,15 @@ public void ToolStripMenuItemAccessibleObject_Toggle_Invoke() toolStripMenuItem.Click += (s, e) => { clickCounter++; }; - Assert.Equal(UiaCore.ToggleState.Off, toolStripMenuItem.AccessibilityObject.ToggleState); + Assert.Equal(ToggleState.ToggleState_Off, toolStripMenuItem.AccessibilityObject.ToggleState); toolStripMenuItem.AccessibilityObject.Toggle(); - Assert.Equal(UiaCore.ToggleState.On, toolStripMenuItem.AccessibilityObject.ToggleState); + Assert.Equal(ToggleState.ToggleState_On, toolStripMenuItem.AccessibilityObject.ToggleState); toolStripMenuItem.AccessibilityObject.Toggle(); - Assert.Equal(UiaCore.ToggleState.Off, toolStripMenuItem.AccessibilityObject.ToggleState); + Assert.Equal(ToggleState.ToggleState_Off, toolStripMenuItem.AccessibilityObject.ToggleState); Assert.Equal(0, clickCounter); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripOverflow.ToolStripOverflowAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripOverflow.ToolStripOverflowAccessibleObjectTests.cs index d7b8f8c1ea1..6da1b86fcd4 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripOverflow.ToolStripOverflowAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripOverflow.ToolStripOverflowAccessibleObjectTests.cs @@ -3,7 +3,6 @@ using Windows.Win32.UI.Accessibility; using static System.Windows.Forms.ToolStripOverflow; -using static Interop; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -80,10 +79,10 @@ public void ToolStripOverflowAccessibleObject_GetPropertyValue_ControlType_IsExp } [WinFormsTheory] - [InlineData((int)UiaCore.NavigateDirection.NextSibling)] - [InlineData((int)UiaCore.NavigateDirection.PreviousSibling)] - [InlineData((int)UiaCore.NavigateDirection.FirstChild)] - [InlineData((int)UiaCore.NavigateDirection.LastChild)] + [InlineData((int)NavigateDirection.NavigateDirection_NextSibling)] + [InlineData((int)NavigateDirection.NavigateDirection_PreviousSibling)] + [InlineData((int)NavigateDirection.NavigateDirection_FirstChild)] + [InlineData((int)NavigateDirection.NavigateDirection_LastChild)] public void ToolStripOverflowAccessibleObject_FragmentNavigate_ReturnsNull_IfHandleNotCreated(int navigateDirection) { using ToolStripButton toolStripItem = new(); @@ -92,7 +91,7 @@ public void ToolStripOverflowAccessibleObject_FragmentNavigate_ReturnsNull_IfHan AccessibleObject accessibleObject = toolStripOverflow.AccessibilityObject; AccessibleObject expected = toolStripItem.AccessibilityObject; - Assert.Null(accessibleObject.FragmentNavigate((UiaCore.NavigateDirection)navigateDirection)); + Assert.Null(accessibleObject.FragmentNavigate((NavigateDirection)navigateDirection)); Assert.False(toolStripOverflow.IsHandleCreated); } @@ -105,7 +104,7 @@ public void ToolStripOverflowAccessibleObject_FragmentNavigate_Parent_ReturnsExp AccessibleObject accessibleObject = toolStripOverflow.AccessibilityObject; AccessibleObject expected = toolStripItem.AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); } [WinFormsFact] @@ -116,8 +115,8 @@ public void ToolStripOverflowAccessibleObject_FragmentNavigate_Sibling_ReturnsEx AccessibleObject accessibleObject = toolStripOverflow.AccessibilityObject; - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); } [WinFormsFact] @@ -130,7 +129,7 @@ public void ToolStripOverflowAccessibleObject_FragmentNavigate_FirstChild_Return AccessibleObject accessibleObject = toolStrip.OverflowButton.DropDown.AccessibilityObject; AccessibleObject expected = toolStrip.Items[0].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } [WinFormsFact] @@ -147,7 +146,7 @@ public void ToolStripOverflowAccessibleObject_FragmentNavigate_FirstChild_Return AccessibleObject accessibleObject = toolStrip.OverflowButton.DropDown.AccessibilityObject; AccessibleObject expected = toolStrip.Items[0].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); } [WinFormsFact] @@ -160,7 +159,7 @@ public void ToolStripOverflowAccessibleObject_FragmentNavigate_LastChild_Returns AccessibleObject accessibleObject = toolStrip.OverflowButton.DropDown.AccessibilityObject; AccessibleObject expected = toolStrip.Items[4].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } [WinFormsFact] @@ -177,7 +176,7 @@ public void ToolStripOverflowAccessibleObject_FragmentNavigate_LastChild_Returns AccessibleObject accessibleObject = toolStrip.OverflowButton.DropDown.AccessibilityObject; AccessibleObject expected = toolStrip.Items[4].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } [WinFormsFact] @@ -190,8 +189,8 @@ public void ToolStripOverflowAccessibleObject_FragmentNavigate_Child_ReturnsNull AccessibleObject accessibleObject = toolStripOverflow.AccessibilityObject; - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } private static ToolStrip CreateToolStripWithOverflow(int itemCount) diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripOverflowButton.ToolStripOverflowButtonAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripOverflowButton.ToolStripOverflowButtonAccessibleObjectTests.cs index bbff35b911d..dc24d98b7b7 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripOverflowButton.ToolStripOverflowButtonAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripOverflowButton.ToolStripOverflowButtonAccessibleObjectTests.cs @@ -3,7 +3,6 @@ using Windows.Win32.UI.Accessibility; using static System.Windows.Forms.ToolStripOverflowButton; -using static Interop; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -89,15 +88,15 @@ public void ToolStripOverflowButtonAccessibleObject_FragmentNavigate_Child_Retur AccessibleObject accessibleObject = toolStrip.OverflowButton.AccessibilityObject; - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); toolStrip.OverflowButton.DropDown.Show(); AccessibleObject expected = toolStrip.OverflowButton.DropDown.AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } [WinFormsFact] @@ -115,8 +114,8 @@ public void ToolStripOverflowButtonAccessibleObject_FragmentNavigate_Siblings_Re AccessibleObject overflowButton = toolStrip.OverflowButton.AccessibilityObject; AccessibleObject item1 = toolStrip.Items[0].AccessibilityObject; - Assert.Null(overflowButton.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(item1, overflowButton.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Null(overflowButton.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(item1, overflowButton.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(toolStrip.IsHandleCreated); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripProgressBar.ToolStripProgressBarControl.ToolStripProgressBarControlAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripProgressBar.ToolStripProgressBarControl.ToolStripProgressBarControlAccessibleObjectTests.cs index 885feeb269e..723913d8061 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripProgressBar.ToolStripProgressBarControl.ToolStripProgressBarControlAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripProgressBar.ToolStripProgressBarControl.ToolStripProgressBarControlAccessibleObjectTests.cs @@ -3,7 +3,6 @@ using Windows.Win32.UI.Accessibility; using static System.Windows.Forms.ToolStripProgressBar; -using static Interop; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -82,13 +81,13 @@ public void ToolStripProgressBarControlAccessibleObject_GetPropertyValue_Control } [WinFormsTheory] - [InlineData((int)UiaCore.NavigateDirection.FirstChild)] - [InlineData((int)UiaCore.NavigateDirection.LastChild)] + [InlineData((int)NavigateDirection.NavigateDirection_FirstChild)] + [InlineData((int)NavigateDirection.NavigateDirection_LastChild)] public void ToolStripProgressBarControlAccessibleObject_FragmentNavigate_ChildrenAreNull(int direction) { using ToolStripProgressBarControl control = new(); - object actual = control.AccessibilityObject.FragmentNavigate((UiaCore.NavigateDirection)direction); + object actual = control.AccessibilityObject.FragmentNavigate((NavigateDirection)direction); Assert.Null(actual); Assert.False(control.IsHandleCreated); @@ -104,7 +103,7 @@ public void ToolStripProgressBarControlAccessibleObject_FragmentNavigate_ParentI control.Owner = item; item.Parent = toolStrip; - object actual = control.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.Parent); + object actual = control.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent); Assert.Equal(toolStrip.AccessibilityObject, actual); Assert.False(control.IsHandleCreated); @@ -128,8 +127,8 @@ public void ToolStripProgressBarControlAccessibleObject_FragmentNavigate_Sibling toolStrip.Items.Add(item); toolStrip.Items.Add(button); - object nextSibling = control.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling); - object previousSibling = control.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling); + object nextSibling = control.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); + object previousSibling = control.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling); Assert.Equal(button.AccessibilityObject, nextSibling); Assert.Equal(label.AccessibilityObject, previousSibling); diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripScrollButton.ToolStripScrollButtonAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripScrollButton.ToolStripScrollButtonAccessibleObjectTests.cs index 95021cbfebf..6c8d817eed8 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripScrollButton.ToolStripScrollButtonAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripScrollButton.ToolStripScrollButtonAccessibleObjectTests.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using Windows.Win32.UI.Accessibility; -using static Interop.UiaCore; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -43,8 +42,8 @@ public void ToolStripScrollButtonAccessibleObject_FragmentNavigate_ReturnsExpect AccessibleObject accessibleObject = dropDownMenu.AccessibilityObject; - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); if (!createControl) { @@ -59,25 +58,25 @@ public void ToolStripScrollButtonAccessibleObject_FragmentNavigate_ReturnsExpect AccessibleObject itemAccessibleObject3 = dropDownMenu.Items[2].AccessibilityObject; AccessibleObject downScrollButtonAccessibleObject = dropDownMenu.DownScrollButton.AccessibilityObject; - Assert.Equal(upScrollButtonAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Equal(downScrollButtonAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(upScrollButtonAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(downScrollButtonAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); - Assert.Equal(upScrollButtonAccessibleObject, itemAccessibleObject1.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Equal(itemAccessibleObject2, itemAccessibleObject1.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Equal(itemAccessibleObject2, itemAccessibleObject3.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Equal(downScrollButtonAccessibleObject, itemAccessibleObject3.FragmentNavigate(NavigateDirection.NextSibling)); + Assert.Equal(upScrollButtonAccessibleObject, itemAccessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(itemAccessibleObject2, itemAccessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(itemAccessibleObject2, itemAccessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(downScrollButtonAccessibleObject, itemAccessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); - Assert.Equal(accessibleObject, upScrollButtonAccessibleObject.FragmentNavigate(NavigateDirection.Parent)); - Assert.Equal(itemAccessibleObject1, upScrollButtonAccessibleObject.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Null(upScrollButtonAccessibleObject.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Null(upScrollButtonAccessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Null(upScrollButtonAccessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(accessibleObject, upScrollButtonAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(itemAccessibleObject1, upScrollButtonAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(upScrollButtonAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(upScrollButtonAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(upScrollButtonAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); - Assert.Equal(accessibleObject, downScrollButtonAccessibleObject.FragmentNavigate(NavigateDirection.Parent)); - Assert.Null(downScrollButtonAccessibleObject.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Equal(itemAccessibleObject3, downScrollButtonAccessibleObject.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Null(downScrollButtonAccessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Null(downScrollButtonAccessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(accessibleObject, downScrollButtonAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(downScrollButtonAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(itemAccessibleObject3, downScrollButtonAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(downScrollButtonAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(downScrollButtonAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.Equal(createControl, toolStrip.IsHandleCreated); } @@ -105,8 +104,8 @@ public void ToolStripScrollButtonAccessibleObject_FragmentNavigate_ReturnsNull_I AccessibleObject accessibleObject = dropDownMenu.AccessibilityObject; - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); if (!createControl) { @@ -118,13 +117,13 @@ public void ToolStripScrollButtonAccessibleObject_FragmentNavigate_ReturnsNull_I AccessibleObject itemAccessibleObject1 = dropDownMenu.Items[0].AccessibilityObject; AccessibleObject itemAccessibleObject2 = dropDownMenu.Items[1].AccessibilityObject; - Assert.Equal(itemAccessibleObject1, accessibleObject.FragmentNavigate(NavigateDirection.FirstChild)); - Assert.Equal(itemAccessibleObject2, accessibleObject.FragmentNavigate(NavigateDirection.LastChild)); + Assert.Equal(itemAccessibleObject1, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(itemAccessibleObject2, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); - Assert.Null(itemAccessibleObject1.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Equal(itemAccessibleObject2, itemAccessibleObject1.FragmentNavigate(NavigateDirection.NextSibling)); - Assert.Equal(itemAccessibleObject1, itemAccessibleObject2.FragmentNavigate(NavigateDirection.PreviousSibling)); - Assert.Null(itemAccessibleObject2.FragmentNavigate(NavigateDirection.NextSibling)); + Assert.Null(itemAccessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(itemAccessibleObject2, itemAccessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(itemAccessibleObject1, itemAccessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(itemAccessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); } [WinFormsFact] diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripSplitButton.ToolStripSplitButtonExAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripSplitButton.ToolStripSplitButtonExAccessibleObjectTests.cs index 81c6f5171e8..2aaf4388fb2 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripSplitButton.ToolStripSplitButtonExAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripSplitButton.ToolStripSplitButtonExAccessibleObjectTests.cs @@ -3,7 +3,6 @@ using Windows.Win32.UI.Accessibility; using static System.Windows.Forms.ToolStripSplitButton; -using static Interop; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -42,7 +41,7 @@ public void ToolStripSplitButtonExAccessibleObject_DropDownItemsCount_ReturnsExp ToolStripSplitButtonExAccessibleObject accessibleObject = new(toolStripSplitButton); - Assert.Equal(UiaCore.ExpandCollapseState.Collapsed, accessibleObject.ExpandCollapseState); + Assert.Equal(ExpandCollapseState.ExpandCollapseState_Collapsed, accessibleObject.ExpandCollapseState); Assert.Equal(0, accessibleObject.TestAccessor().Dynamic.DropDownItemsCount); } @@ -59,7 +58,7 @@ public void ToolStripSplitButtonExAccessibleObject_FragmentNavigate_Parent_Retur ToolStripSplitButtonExAccessibleObject accessibleObject = new(toolStripSplitButton); AccessibleObject expected = toolStrip.AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); } [WinFormsFact] @@ -72,7 +71,7 @@ public void ToolStripSplitButtonExAccessibleObject_FragmentNavigate_Parent_Retur ToolStripSplitButtonExAccessibleObject accessibleObject = new(toolStripSplitButton); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); Assert.False(toolStrip.IsHandleCreated); } @@ -88,8 +87,8 @@ public void ToolStripSplitButtonExAccessibleObject_FragmentNavigate_Child_Return toolStripSplitButton.DropDown.Show(); - Assert.Equal(item1.AccessibilityObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(item2.AccessibilityObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(item1.AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(item2.AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } [WinFormsFact] @@ -101,8 +100,8 @@ public void ToolStripSplitButtonExAccessibleObject_FragmentNavigate_Child_Return ToolStripSplitButtonExAccessibleObject accessibleObject = new(toolStripSplitButton); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } [WinFormsFact] @@ -112,8 +111,8 @@ public void ToolStripSplitButtonExAccessibleObject_FragmentNavigate_Child_Return ToolStripSplitButtonExAccessibleObject accessibleObject = new(toolStripSplitButton); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } [WinFormsFact] @@ -130,7 +129,7 @@ public void ToolStripSplitButtonExAccessibleObject_FragmentNavigate_Child_Return toolStripSplitButton.DropDown.Show(); - Assert.Equal(item1.AccessibilityObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(item2.AccessibilityObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(item1.AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(item2.AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/TrackBar.TrackBarAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/TrackBar.TrackBarAccessibleObjectTests.cs index df7f4110066..b6aecb1a673 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/TrackBar.TrackBarAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/TrackBar.TrackBarAccessibleObjectTests.cs @@ -5,7 +5,6 @@ using System.Runtime.InteropServices; using System.Windows.Forms.TestUtilities; using Windows.Win32.UI.Accessibility; -using static Interop; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -337,8 +336,8 @@ public void TrackBarAccessibilityObject_FragmentNavigate_Child_ReturnsExpected_B using TrackBar trackBar = GetTrackBar(orientation, rightToLeft, rightToLeftLayout, createControl: true, value, minimum, maximum); TrackBar.TrackBarAccessibleObject accessibleObject = (TrackBar.TrackBarAccessibleObject)trackBar.AccessibilityObject; - Assert.Equal(accessibleObject.FirstButtonAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(accessibleObject.LastButtonAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(accessibleObject.FirstButtonAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(accessibleObject.LastButtonAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(trackBar.IsHandleCreated); } @@ -349,8 +348,8 @@ public void TrackBarAccessibilityObject_FragmentNavigate_Child_ReturnsExpected_I using TrackBar trackBar = GetTrackBar(orientation, rightToLeft, rightToLeftLayout, createControl: true, value, minimum, maximum); TrackBar.TrackBarAccessibleObject accessibleObject = (TrackBar.TrackBarAccessibleObject)trackBar.AccessibilityObject; - Assert.Equal(accessibleObject.ThumbAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(accessibleObject.LastButtonAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(accessibleObject.ThumbAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(accessibleObject.LastButtonAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(trackBar.IsHandleCreated); } @@ -361,8 +360,8 @@ public void TrackBarAccessibilityObject_FragmentNavigate_Child_ReturnsExpected_I using TrackBar trackBar = GetTrackBar(orientation, rightToLeft, rightToLeftLayout, createControl: true, value, minimum, maximum); TrackBar.TrackBarAccessibleObject accessibleObject = (TrackBar.TrackBarAccessibleObject)trackBar.AccessibilityObject; - Assert.Equal(accessibleObject.FirstButtonAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(accessibleObject.ThumbAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(accessibleObject.FirstButtonAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(accessibleObject.ThumbAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(trackBar.IsHandleCreated); } @@ -373,8 +372,8 @@ public void TrackBarAccessibilityObject_FragmentNavigate_Child_ReturnsNull_IfHan using TrackBar trackBar = GetTrackBar(orientation, rightToLeft, rightToLeftLayout, createControl: false, value, minimum, maximum); TrackBar.TrackBarAccessibleObject accessibleObject = (TrackBar.TrackBarAccessibleObject)trackBar.AccessibilityObject; - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(trackBar.IsHandleCreated); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/TrackBar.TrackBarChildAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/TrackBar.TrackBarChildAccessibleObjectTests.cs index f128a76b964..eaaa2769efc 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/TrackBar.TrackBarChildAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/TrackBar.TrackBarChildAccessibleObjectTests.cs @@ -4,7 +4,6 @@ using System.Drawing; using Windows.Win32.UI.Accessibility; using static System.Windows.Forms.TrackBar; -using static Interop; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -55,7 +54,7 @@ public void TrackBarChildAccessibleObject_FragmentNavigate_Parent_ReturnsExpecte using TrackBar control = new(); var accessibleObject = new SubTrackBarChildAccessibleObject(control); - Assert.Equal(control.AccessibilityObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); + Assert.Equal(control.AccessibilityObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); Assert.False(control.IsHandleCreated); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/TrackBar.TrackBarFirstButtonAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/TrackBar.TrackBarFirstButtonAccessibleObjectTests.cs index 6d0fa82239f..82c179ba782 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/TrackBar.TrackBarFirstButtonAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/TrackBar.TrackBarFirstButtonAccessibleObjectTests.cs @@ -165,11 +165,11 @@ public void TrackBarFirstButtonAccessibleObject_FragmentNavigate_ReturnsNull_IfF var trackBarAccessibleObject = (TrackBar.TrackBarAccessibleObject)trackBar.AccessibilityObject; TrackBar.TrackBarFirstButtonAccessibleObject accessibleObject = trackBarAccessibleObject.FirstButtonAccessibleObject; - Assert.Equal(trackBarAccessibleObject, accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.Parent)); - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(trackBarAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(trackBar.IsHandleCreated); } @@ -181,11 +181,11 @@ public void TrackBarFirstButtonAccessibleObject_FragmentNavigate_ReturnsNull_Min var trackBarAccessibleObject = (TrackBar.TrackBarAccessibleObject)trackBar.AccessibilityObject; TrackBar.TrackBarFirstButtonAccessibleObject accessibleObject = trackBarAccessibleObject.FirstButtonAccessibleObject; - Assert.Equal(trackBarAccessibleObject, accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.Parent)); - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(trackBarAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(trackBar.IsHandleCreated); } @@ -197,11 +197,11 @@ public void TrackBarFirstButtonAccessibleObject_FragmentNavigate_ReturnsExpected var trackBarAccessibleObject = (TrackBar.TrackBarAccessibleObject)trackBar.AccessibilityObject; TrackBar.TrackBarFirstButtonAccessibleObject accessibleObject = trackBarAccessibleObject.FirstButtonAccessibleObject; - Assert.Equal(trackBarAccessibleObject, accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.Parent)); - Assert.Equal(trackBarAccessibleObject.ThumbAccessibleObject, accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(trackBarAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(trackBarAccessibleObject.ThumbAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(trackBar.IsHandleCreated); } @@ -212,11 +212,11 @@ public void TrackBarFirstButtonAccessibleObject_FragmentNavigate_ReturnsNull_IfH using TrackBar trackBar = GetTrackBar(orientation, rightToLeft, rightToLeftLayout, createControl: false, value, minimum, maximum); TrackBar.TrackBarFirstButtonAccessibleObject accessibleObject = GetTrackBarFirstButton(trackBar); - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.Parent)); - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(trackBar.IsHandleCreated); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/TrackBar.TrackBarLastButtonAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/TrackBar.TrackBarLastButtonAccessibleObjectTests.cs index ae20453d655..9970b4acb8c 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/TrackBar.TrackBarLastButtonAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/TrackBar.TrackBarLastButtonAccessibleObjectTests.cs @@ -166,11 +166,11 @@ public void TrackBarLastButtonAccessibleObject_FragmentNavigate_ReturnsNull_IfBu var trackBarAccessibleObject = (TrackBar.TrackBarAccessibleObject)trackBar.AccessibilityObject; TrackBar.TrackBarLastButtonAccessibleObject accessibleObject = trackBarAccessibleObject.LastButtonAccessibleObject; - Assert.Equal(trackBarAccessibleObject, accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.Parent)); - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(trackBarAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(trackBar.IsHandleCreated); } @@ -182,11 +182,11 @@ public void TrackBarLastButtonAccessibleObject_FragmentNavigate_ReturnsNull_Mini var trackBarAccessibleObject = (TrackBar.TrackBarAccessibleObject)trackBar.AccessibilityObject; TrackBar.TrackBarLastButtonAccessibleObject accessibleObject = trackBarAccessibleObject.LastButtonAccessibleObject; - Assert.Equal(trackBarAccessibleObject, accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.Parent)); - Assert.Equal(trackBarAccessibleObject.ThumbAccessibleObject, accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(trackBarAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(trackBarAccessibleObject.ThumbAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(trackBar.IsHandleCreated); } @@ -197,11 +197,11 @@ public void TrackBarLastButtonAccessibleObject_FragmentNavigate_ReturnsNull_IfHa using TrackBar trackBar = GetTrackBar(orientation, rightToLeft, rightToLeftLayout, createControl: false, value, minimum, maximum); TrackBar.TrackBarLastButtonAccessibleObject accessibleObject = GetTrackBarLastButton(trackBar); - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.Parent)); - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(trackBar.IsHandleCreated); } @@ -213,11 +213,11 @@ public void TrackBarLastButtonAccessibleObject_FragmentNavigate_ReturnsExpected_ var trackBarAccessibleObject = (TrackBar.TrackBarAccessibleObject)trackBar.AccessibilityObject; TrackBar.TrackBarLastButtonAccessibleObject accessibleObject = trackBarAccessibleObject.LastButtonAccessibleObject; - Assert.Equal(trackBarAccessibleObject, accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.Parent)); - Assert.Equal(trackBarAccessibleObject.ThumbAccessibleObject, accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(trackBarAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(trackBarAccessibleObject.ThumbAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(trackBar.IsHandleCreated); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/TrackBar.TrackBarThumbAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/TrackBar.TrackBarThumbAccessibleObjectTests.cs index 95eddaf75e1..c866718c39f 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/TrackBar.TrackBarThumbAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/TrackBar.TrackBarThumbAccessibleObjectTests.cs @@ -94,11 +94,11 @@ public void TrackBarThumbAccessibleObject_FragmentNavigate_ReturnExpected_IfButt var trackBarAccessibleObject = (TrackBar.TrackBarAccessibleObject)trackBar.AccessibilityObject; TrackBar.TrackBarThumbAccessibleObject accessibleObject = trackBarAccessibleObject.ThumbAccessibleObject; - Assert.Equal(trackBarAccessibleObject, accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.Parent)); - Assert.Equal(trackBarAccessibleObject.LastButtonAccessibleObject, accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(trackBarAccessibleObject.FirstButtonAccessibleObject, accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(trackBarAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(trackBarAccessibleObject.LastButtonAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(trackBarAccessibleObject.FirstButtonAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(trackBar.IsHandleCreated); } @@ -110,11 +110,11 @@ public void TrackBarThumbAccessibleObject_FragmentNavigate_ReturnExpected_IfFirs var trackBarAccessibleObject = (TrackBar.TrackBarAccessibleObject)trackBar.AccessibilityObject; TrackBar.TrackBarThumbAccessibleObject accessibleObject = trackBarAccessibleObject.ThumbAccessibleObject; - Assert.Equal(trackBarAccessibleObject, accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.Parent)); - Assert.Equal(trackBarAccessibleObject.LastButtonAccessibleObject, accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(trackBarAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(trackBarAccessibleObject.LastButtonAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(trackBar.IsHandleCreated); } @@ -126,11 +126,11 @@ public void TrackBarThumbAccessibleObject_FragmentNavigate_ReturnExpected_IfLast var trackBarAccessibleObject = (TrackBar.TrackBarAccessibleObject)trackBar.AccessibilityObject; TrackBar.TrackBarThumbAccessibleObject accessibleObject = trackBarAccessibleObject.ThumbAccessibleObject; - Assert.Equal(trackBarAccessibleObject, accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.Parent)); - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(trackBarAccessibleObject.FirstButtonAccessibleObject, accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(trackBarAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(trackBarAccessibleObject.FirstButtonAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(trackBar.IsHandleCreated); } @@ -142,11 +142,11 @@ public void TrackBarThumbAccessibleObject_FragmentNavigate_ReturnNull_IfHandleIs var trackBarAccessibleObject = (TrackBar.TrackBarAccessibleObject)trackBar.AccessibilityObject; TrackBar.TrackBarThumbAccessibleObject accessibleObject = trackBarAccessibleObject.ThumbAccessibleObject; - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.Parent)); - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(trackBar.IsHandleCreated); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/TreeNode.TreeNodeAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/TreeNode.TreeNodeAccessibleObjectTests.cs index 131a4364fa5..0cdfe7e7c12 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/TreeNode.TreeNodeAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/TreeNode.TreeNodeAccessibleObjectTests.cs @@ -3,7 +3,6 @@ using Windows.Win32.UI.Accessibility; using static System.Windows.Forms.TreeNode; -using static Interop; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -128,7 +127,7 @@ public void TreeNodeAccessibleObject_FragmentNavigate_Parent_ReturnsTree() using TreeView control = new(); TreeNode node = new(control); - var actual = (AccessibleObject)node.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.Parent); + var actual = (AccessibleObject)node.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent); Assert.Equal(control.AccessibilityObject, actual); Assert.False(control.IsHandleCreated); @@ -141,7 +140,7 @@ public void TreeNodeAccessibleObject_FragmentNavigate_Parent_ReturnsParent() TreeNode node = new(); control.Nodes.Add(new TreeNode("Root node", new[] { node })); - var actual = (AccessibleObject)node.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.Parent); + var actual = (AccessibleObject)node.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent); Assert.Equal(node.Parent.AccessibilityObject, actual); Assert.False(control.IsHandleCreated); @@ -162,7 +161,7 @@ public void TreeNodeAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpected // If node is collapsed, child is not visible, so returns null instead of child ao. AccessibleObject expected = isExpanded ? node.FirstNode?.AccessibilityObject : null; - Assert.Equal(expected, node.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); + Assert.Equal(expected, node.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); Assert.False(control.IsHandleCreated); } @@ -181,7 +180,7 @@ public void TreeNodeAccessibleObject_FragmentNavigate_LastChild_ReturnsExpected( // If node is collapsed, child is not visible, so returns null instead of child ao. AccessibleObject expected = isExpanded ? node.LastNode?.AccessibilityObject : null; - Assert.Equal(expected, node.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(expected, node.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(control.IsHandleCreated); } @@ -195,9 +194,9 @@ public void TreeNodeAccessibleObject_FragmentNavigate_NextSibling_ReturnsExpecte AccessibleObject accessibleObject2 = control.Nodes[1].AccessibilityObject; AccessibleObject accessibleObject3 = control.Nodes[2].AccessibilityObject; - Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); + Assert.Equal(accessibleObject2, accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(accessibleObject3, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); Assert.False(control.IsHandleCreated); } @@ -211,9 +210,9 @@ public void TreeNodeAccessibleObject_FragmentNavigate_PreviousSibling_ReturnsExp AccessibleObject accessibleObject2 = control.Nodes[1].AccessibilityObject; AccessibleObject accessibleObject3 = control.Nodes[2].AccessibilityObject; - Assert.Null(accessibleObject1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Null(accessibleObject1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(accessibleObject1, accessibleObject2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(accessibleObject2, accessibleObject3.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(control.IsHandleCreated); } @@ -400,7 +399,7 @@ public void TreeNodeAccessibleObject_ExpandCollapseState_ReturnsLeafNode_IfNodeH using TreeView control = new(); TreeNode node = new(control); - Assert.Equal(UiaCore.ExpandCollapseState.LeafNode, node.AccessibilityObject.ExpandCollapseState); + Assert.Equal(ExpandCollapseState.ExpandCollapseState_LeafNode, node.AccessibilityObject.ExpandCollapseState); Assert.False(control.IsHandleCreated); } @@ -418,9 +417,9 @@ public void TreeNodeAccessibleObject_ExpandCollapseState_ReturnsExpected(bool is node.Expand(); } - UiaCore.ExpandCollapseState expected = isExpanded - ? UiaCore.ExpandCollapseState.Expanded - : UiaCore.ExpandCollapseState.Collapsed; + ExpandCollapseState expected = isExpanded + ? ExpandCollapseState.ExpandCollapseState_Expanded + : ExpandCollapseState.ExpandCollapseState_Collapsed; Assert.Equal(expected, node.AccessibilityObject.ExpandCollapseState); Assert.False(control.IsHandleCreated); @@ -458,7 +457,7 @@ public void TreeNodeAccessibleObject_ToggleState_WorksExpected(bool isChecked) using TreeView control = new() { CheckBoxes = true }; TreeNode node = new(control) { Checked = isChecked }; - UiaCore.ToggleState expected = isChecked ? UiaCore.ToggleState.On : UiaCore.ToggleState.Off; + ToggleState expected = isChecked ? ToggleState.ToggleState_On : ToggleState.ToggleState_Off; Assert.Equal(expected, node.AccessibilityObject.ToggleState); Assert.False(control.IsHandleCreated); diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/TreeView.TreeViewAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/TreeView.TreeViewAccessibleObjectTests.cs index 53a749ba59f..6926e4ce752 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/TreeView.TreeViewAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/TreeView.TreeViewAccessibleObjectTests.cs @@ -71,7 +71,7 @@ public void TreeViewAccessibleObject_FragmentNavigate_FirstChild_ReturnsExpected AccessibleObject accessibleObject = control.AccessibilityObject; AccessibleObject expected = control.Nodes[0].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); Assert.False(control.IsHandleCreated); } @@ -84,7 +84,7 @@ public void TreeViewAccessibleObject_FragmentNavigate_LastChild_ReturnsExpected( AccessibleObject accessibleObject = control.AccessibilityObject; AccessibleObject expected = control.Nodes[^1].AccessibilityObject; - Assert.Equal(expected, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(expected, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(control.IsHandleCreated); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/TreeViewLabelEditAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/TreeViewLabelEditAccessibleObjectTests.cs index e44656f5e11..173252502ce 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/TreeViewLabelEditAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/TreeViewLabelEditAccessibleObjectTests.cs @@ -54,8 +54,8 @@ public void TreeViewLabelEditAccessibleObject_FragmentNavigate_ReturnsExpected() TreeViewLabelEditNativeWindow labelEdit = treeView.TestAccessor().Dynamic._labelEdit; var accessibilityObject = (TreeViewLabelEditAccessibleObject)labelEdit.AccessibilityObject; - Assert.Equal(treeView.Nodes[0].AccessibilityObject, accessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.NotNull(accessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); + Assert.Equal(treeView.Nodes[0].AccessibilityObject, accessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.NotNull(accessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); } [WinFormsFact] diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/UpDownBase.UpDownButtons.UpDownButtonsAccessibleObject.DirectionButtonAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/UpDownBase.UpDownButtons.UpDownButtonsAccessibleObject.DirectionButtonAccessibleObjectTests.cs index 615a64b77ba..a612a45f1f5 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/UpDownBase.UpDownButtons.UpDownButtonsAccessibleObject.DirectionButtonAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/UpDownBase.UpDownButtons.UpDownButtonsAccessibleObject.DirectionButtonAccessibleObjectTests.cs @@ -4,7 +4,6 @@ using Windows.Win32.UI.Accessibility; using static System.Windows.Forms.UpDownBase; using static System.Windows.Forms.UpDownBase.UpDownButtons; -using static Interop; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -56,7 +55,7 @@ public void UpDownButtonsAccessibleObject_DirectionButtonAccessibleObject_Fragme // UpButton has 0 index, DownButton has 1 index AccessibleObject directionButton = accessibleObject.GetChild(childIndex); - Assert.Equal(accessibleObject, directionButton.FragmentNavigate(UiaCore.NavigateDirection.Parent)); + Assert.Equal(accessibleObject, directionButton.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); Assert.False(upDownButtons.IsHandleCreated); Assert.False(upDownBase.IsHandleCreated); } @@ -73,8 +72,8 @@ public void UpDownButtonsAccessibleObject_DirectionButtonAccessibleObject_Fragme // UpButton has 0 index, DownButton has 1 index AccessibleObject directionButton = accessibleObject.GetChild(childIndex); - Assert.Null(directionButton.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(directionButton.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Null(directionButton.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(directionButton.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(upDownButtons.IsHandleCreated); Assert.False(upDownBase.IsHandleCreated); diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/UpDownBase.UpDownButtons.UpDownButtonsAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/UpDownBase.UpDownButtons.UpDownButtonsAccessibleObjectTests.cs index 206faf3b4d2..9cf6ee20950 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/UpDownBase.UpDownButtons.UpDownButtonsAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/UpDownBase.UpDownButtons.UpDownButtonsAccessibleObjectTests.cs @@ -7,7 +7,6 @@ using Windows.Win32.UI.Accessibility; using static System.Windows.Forms.UpDownBase; using static System.Windows.Forms.UpDownBase.UpDownButtons; -using static Interop; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -168,7 +167,7 @@ public void UpDownButtonsAccessibleObject_FragmentNavigate_Parent_ReturnsNull() using UpDownButtons upDownButtons = new UpDownButtons(upDownBase); UpDownButtonsAccessibleObject accessibleObject = new UpDownButtonsAccessibleObject(upDownButtons); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); Assert.False(upDownBase.IsHandleCreated); Assert.False(upDownButtons.IsHandleCreated); } @@ -180,8 +179,8 @@ public void UpDownButtonsAccessibleObject_FragmentNavigate_Sibling_ReturnsNull() using UpDownButtons upDownButtons = new UpDownButtons(upDownBase); UpDownButtonsAccessibleObject accessibleObject = new UpDownButtonsAccessibleObject(upDownButtons); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); Assert.False(upDownBase.IsHandleCreated); Assert.False(upDownButtons.IsHandleCreated); } @@ -196,8 +195,8 @@ public void UpDownButtonsAccessibleObject_FragmentNavigate_Child_ReturnsExpected AccessibleObject upButton = accessibleObject.GetChild(0); AccessibleObject downButton = accessibleObject.GetChild(1); - Assert.Equal(upButton, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(downButton, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(upButton, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(downButton, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(numericUpDown.IsHandleCreated); } @@ -211,8 +210,8 @@ public void UpDownButtonsAccessibleObject_FragmentNavigate_Child_ReturnsExpected AccessibleObject upButton = accessibleObject.GetChild(0); AccessibleObject downButton = accessibleObject.GetChild(1); - Assert.Equal(upButton, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(downButton, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(upButton, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(downButton, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(domainUpDown.IsHandleCreated); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/VScrollBar.ScrollBarFirstLineButtonAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/VScrollBar.ScrollBarFirstLineButtonAccessibleObjectTests.cs index 0b0045661bb..914b5f589c1 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/VScrollBar.ScrollBarFirstLineButtonAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/VScrollBar.ScrollBarFirstLineButtonAccessibleObjectTests.cs @@ -4,7 +4,6 @@ using System.Drawing; using System.Windows.Forms.TestUtilities; using Windows.Win32.UI.Accessibility; -using static Interop; using static System.Windows.Forms.ScrollBar; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -143,11 +142,11 @@ public void VScrollBarFirstLineButtonAccessibleObject_FragmentNavigate_ReturnExp var scrollBarAccessibleObject = (ScrollBar.ScrollBarAccessibleObject)scrollBar.AccessibilityObject; ScrollBarFirstLineButtonAccessibleObject accessibleObject = GetFirstLineButton(scrollBar); - Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.Equal(scrollBarAccessibleObject.FirstPageButtonAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(scrollBarAccessibleObject.FirstPageButtonAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(scrollBar.IsHandleCreated); } @@ -159,11 +158,11 @@ public void VScrollBarFirstLineButtonAccessibleObject_FragmentNavigate_ReturnExp var scrollBarAccessibleObject = (ScrollBar.ScrollBarAccessibleObject)scrollBar.AccessibilityObject; ScrollBarFirstLineButtonAccessibleObject accessibleObject = GetFirstLineButton(scrollBar); - Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.Equal(scrollBarAccessibleObject.ThumbAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(scrollBarAccessibleObject.ThumbAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(scrollBar.IsHandleCreated); } @@ -175,11 +174,11 @@ public void VScrollBarFirstLineButtonAccessibleObject_FragmentNavigate_ReturnExp var scrollBarAccessibleObject = (ScrollBar.ScrollBarAccessibleObject)scrollBar.AccessibilityObject; ScrollBarFirstLineButtonAccessibleObject accessibleObject = GetFirstLineButton(scrollBar); - Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.Equal(scrollBarAccessibleObject.ThumbAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(scrollBarAccessibleObject.ThumbAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(scrollBar.IsHandleCreated); } @@ -191,11 +190,11 @@ public void VScrollBarFirstLineButtonAccessibleObject_FragmentNavigate_ReturnNul var scrollBarAccessibleObject = (ScrollBar.ScrollBarAccessibleObject)scrollBar.AccessibilityObject; ScrollBarFirstLineButtonAccessibleObject accessibleObject = GetFirstLineButton(scrollBar); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(scrollBar.IsHandleCreated); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/VScrollBar.ScrollBarFirstPageButtonAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/VScrollBar.ScrollBarFirstPageButtonAccessibleObjectTests.cs index 2711be14296..54d1515b507 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/VScrollBar.ScrollBarFirstPageButtonAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/VScrollBar.ScrollBarFirstPageButtonAccessibleObjectTests.cs @@ -4,7 +4,6 @@ using System.Drawing; using System.Windows.Forms.TestUtilities; using Windows.Win32.UI.Accessibility; -using static Interop; using static System.Windows.Forms.ScrollBar; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -167,11 +166,11 @@ public void VScrollBarFirstPageButtonAccessibleObject_FragmentNavigate_ReturnsEx AccessibleObject thumb = scrollBarAccessibleObject.ThumbAccessibleObject; AccessibleObject lineButton = scrollBarAccessibleObject.FirstLineButtonAccessibleObject; - Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.Equal(thumb, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(lineButton, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(thumb, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(lineButton, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(scrollBar.IsHandleCreated); } @@ -183,11 +182,11 @@ public void VScrollBarFirstPageButtonAccessibleObject_FragmentNavigate_ReturnsNu var scrollBarAccessibleObject = (ScrollBar.ScrollBarAccessibleObject)scrollBar.AccessibilityObject; ScrollBarFirstPageButtonAccessibleObject accessibleObject = GetFirstPageButton(scrollBar); - Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(scrollBar.IsHandleCreated); } @@ -199,11 +198,11 @@ public void VScrollBarFirstPageButtonAccessibleObject_FragmentNavigate_ReturnsNu var scrollBarAccessibleObject = (ScrollBar.ScrollBarAccessibleObject)scrollBar.AccessibilityObject; ScrollBarFirstPageButtonAccessibleObject accessibleObject = GetFirstPageButton(scrollBar); - Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(scrollBar.IsHandleCreated); } @@ -214,11 +213,11 @@ public void VScrollBarFirstPageButtonAccessibleObject_FragmentNavigate_ReturnsNu using VScrollBar scrollBar = GetVScrollBar(createControl: false, rightToLeft, minimum, maximum, value); ScrollBarFirstPageButtonAccessibleObject accessibleObject = GetFirstPageButton(scrollBar); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(scrollBar.IsHandleCreated); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/VScrollBar.ScrollBarLastLineButtonAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/VScrollBar.ScrollBarLastLineButtonAccessibleObjectTests.cs index d692f78ae27..c1e4422bf66 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/VScrollBar.ScrollBarLastLineButtonAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/VScrollBar.ScrollBarLastLineButtonAccessibleObjectTests.cs @@ -4,7 +4,6 @@ using System.Drawing; using System.Windows.Forms.TestUtilities; using Windows.Win32.UI.Accessibility; -using static Interop; using static System.Windows.Forms.ScrollBar; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -153,11 +152,11 @@ public void VScrollBarLastLineButtonAccessibleObject_FragmentNavigate_ReturnsExp var scrollBarAccessibleObject = (ScrollBar.ScrollBarAccessibleObject)scrollBar.AccessibilityObject; ScrollBarLastLineButtonAccessibleObject accessibleObject = GetLastLineButton(scrollBar); - Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.Equal(scrollBarAccessibleObject.LastPageButtonAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(scrollBarAccessibleObject.LastPageButtonAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(scrollBar.IsHandleCreated); } @@ -169,11 +168,11 @@ public void VScrollBarLastLineButtonAccessibleObject_FragmentNavigate_ReturnsExp var scrollBarAccessibleObject = (ScrollBar.ScrollBarAccessibleObject)scrollBar.AccessibilityObject; ScrollBarLastLineButtonAccessibleObject accessibleObject = GetLastLineButton(scrollBar); - Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.Equal(scrollBarAccessibleObject.ThumbAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(scrollBarAccessibleObject.ThumbAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(scrollBar.IsHandleCreated); } @@ -185,11 +184,11 @@ public void VScrollBarLastLineButtonAccessibleObject_FragmentNavigate_ReturnsExp var scrollBarAccessibleObject = (ScrollBar.ScrollBarAccessibleObject)scrollBar.AccessibilityObject; ScrollBarLastLineButtonAccessibleObject accessibleObject = GetLastLineButton(scrollBar); - Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.Equal(scrollBarAccessibleObject.ThumbAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(scrollBarAccessibleObject.ThumbAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(scrollBar.IsHandleCreated); } @@ -201,11 +200,11 @@ public void VScrollBarLastLineButtonAccessibleObject_FragmentNavigate_ReturnsExp var scrollBarAccessibleObject = (ScrollBar.ScrollBarAccessibleObject)scrollBar.AccessibilityObject; ScrollBarLastLineButtonAccessibleObject accessibleObject = GetLastLineButton(scrollBar); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(scrollBar.IsHandleCreated); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/VScrollBar.ScrollBarLastPageButtonAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/VScrollBar.ScrollBarLastPageButtonAccessibleObjectTests.cs index 4035f607089..4ab02112067 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/VScrollBar.ScrollBarLastPageButtonAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/VScrollBar.ScrollBarLastPageButtonAccessibleObjectTests.cs @@ -4,7 +4,6 @@ using System.Drawing; using System.Windows.Forms.TestUtilities; using Windows.Win32.UI.Accessibility; -using static Interop; using static System.Windows.Forms.ScrollBar; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -154,11 +153,11 @@ public void VScrollBarLastPageButtonAccessibleObject_FragmentNavigate_ReturnExpe var scrollBarAccessibleObject = (ScrollBar.ScrollBarAccessibleObject)scrollBar.AccessibilityObject; ScrollBarLastPageButtonAccessibleObject accessibleObject = GetLastPageButton(scrollBar); - Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.Equal(scrollBarAccessibleObject.ThumbAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(scrollBarAccessibleObject.LastLineButtonAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(scrollBarAccessibleObject.ThumbAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(scrollBarAccessibleObject.LastLineButtonAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(scrollBar.IsHandleCreated); } @@ -170,11 +169,11 @@ public void VScrollBarLastPageButtonAccessibleObject_FragmentNavigate_ReturnNull var scrollBarAccessibleObject = (ScrollBar.ScrollBarAccessibleObject)scrollBar.AccessibilityObject; ScrollBarLastPageButtonAccessibleObject accessibleObject = GetLastPageButton(scrollBar); - Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(scrollBar.IsHandleCreated); } @@ -186,11 +185,11 @@ public void VScrollBarLastPageButtonAccessibleObject_FragmentNavigate_ReturnNull var scrollBarAccessibleObject = (ScrollBar.ScrollBarAccessibleObject)scrollBar.AccessibilityObject; ScrollBarLastPageButtonAccessibleObject accessibleObject = GetLastPageButton(scrollBar); - Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(scrollBar.IsHandleCreated); } @@ -201,11 +200,11 @@ public void VScrollBarLastPageButtonAccessibleObject_FragmentNavigate_ReturnNull using VScrollBar scrollBar = GetVScrollBar(createControl: false, rightToLeft, minimum, maximum, value); ScrollBarLastPageButtonAccessibleObject accessibleObject = GetLastPageButton(scrollBar); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(scrollBar.IsHandleCreated); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/VScrollBar.ScrollBarThumbAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/VScrollBar.ScrollBarThumbAccessibleObjectTests.cs index 0770b6715cc..b293cc72194 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/VScrollBar.ScrollBarThumbAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/VScrollBar.ScrollBarThumbAccessibleObjectTests.cs @@ -4,7 +4,6 @@ using System.Drawing; using System.Windows.Forms.TestUtilities; using Windows.Win32.UI.Accessibility; -using static Interop; using static System.Windows.Forms.ScrollBar; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -142,11 +141,11 @@ public void VScrollBarThumbAccessibleObject_FragmentNavigate_ReturnExpected_Both var scrollBarAccessibleObject = (ScrollBar.ScrollBarAccessibleObject)scrollBar.AccessibilityObject; ScrollBarThumbAccessibleObject accessibleObject = scrollBarAccessibleObject.ThumbAccessibleObject; - Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.Equal(scrollBarAccessibleObject.FirstPageButtonAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(scrollBarAccessibleObject.LastPageButtonAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(scrollBarAccessibleObject.FirstPageButtonAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(scrollBarAccessibleObject.LastPageButtonAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(scrollBar.IsHandleCreated); } @@ -158,11 +157,11 @@ public void VScrollBarThumbAccessibleObject_FragmentNavigate_ReturnExpected_Firs var scrollBarAccessibleObject = (ScrollBar.ScrollBarAccessibleObject)scrollBar.AccessibilityObject; ScrollBarThumbAccessibleObject accessibleObject = scrollBarAccessibleObject.ThumbAccessibleObject; - Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.Equal(scrollBarAccessibleObject.FirstLineButtonAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(scrollBarAccessibleObject.LastPageButtonAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(scrollBarAccessibleObject.FirstLineButtonAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(scrollBarAccessibleObject.LastPageButtonAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(scrollBar.IsHandleCreated); } @@ -174,11 +173,11 @@ public void VScrollBarThumbAccessibleObject_FragmentNavigate_ReturnExpected_Last var scrollBarAccessibleObject = (ScrollBar.ScrollBarAccessibleObject)scrollBar.AccessibilityObject; ScrollBarThumbAccessibleObject accessibleObject = scrollBarAccessibleObject.ThumbAccessibleObject; - Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.Equal(scrollBarAccessibleObject.FirstPageButtonAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(scrollBarAccessibleObject.LastLineButtonAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(scrollBarAccessibleObject.FirstPageButtonAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(scrollBarAccessibleObject.LastLineButtonAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(scrollBar.IsHandleCreated); } @@ -190,11 +189,11 @@ public void VScrollBarThumbAccessibleObject_FragmentNavigate_ReturnExpected_Mini var scrollBarAccessibleObject = (ScrollBar.ScrollBarAccessibleObject)scrollBar.AccessibilityObject; ScrollBarThumbAccessibleObject accessibleObject = scrollBarAccessibleObject.ThumbAccessibleObject; - Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.Equal(scrollBarAccessibleObject.FirstLineButtonAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Equal(scrollBarAccessibleObject.LastLineButtonAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(scrollBarAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(scrollBarAccessibleObject.FirstLineButtonAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Equal(scrollBarAccessibleObject.LastLineButtonAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.True(scrollBar.IsHandleCreated); } @@ -205,11 +204,11 @@ public void VScrollBarThumbAccessibleObject_FragmentNavigate_ReturnNull_HandleIs using VScrollBar scrollBar = GetVScrollBar(createControl: false, rightToLeft, minimum, maximum, value); ScrollBarThumbAccessibleObject accessibleObject = GetThumb(scrollBar); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(scrollBar.IsHandleCreated); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/VScrollBar.VScrollBarAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/VScrollBar.VScrollBarAccessibleObjectTests.cs index 3be8348c47d..9b87970c5c1 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/VScrollBar.VScrollBarAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/VScrollBar.VScrollBarAccessibleObjectTests.cs @@ -5,7 +5,6 @@ using System.Windows.Forms.TestUtilities; using Windows.Win32.UI.Accessibility; using static System.Windows.Forms.ScrollBar; -using static Interop; namespace System.Windows.Forms.Tests.AccessibleObjects; @@ -114,8 +113,8 @@ public void VScrollBarAccessibleObject_FragmentNavigate_Child_ReturnExpected(boo using VScrollBar scrollBar = GetVScrollBar(createControl, rightToLeft, minimum, maximum, value); var accessibleObject = (ScrollBarAccessibleObject)scrollBar.AccessibilityObject; - Assert.Equal(accessibleObject.FirstLineButtonAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(accessibleObject.LastLineButtonAccessibleObject, accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild)); + Assert.Equal(accessibleObject.FirstLineButtonAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(accessibleObject.LastLineButtonAccessibleObject, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.Equal(createControl, scrollBar.IsHandleCreated); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBox.ComboBoxChildDropDownButtonUiaProviderTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBox.ComboBoxChildDropDownButtonUiaProviderTests.cs index bea68581d2a..643fcb4ed97 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBox.ComboBoxChildDropDownButtonUiaProviderTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBox.ComboBoxChildDropDownButtonUiaProviderTests.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using static Interop; +using Windows.Win32.UI.Accessibility; namespace System.Windows.Forms.Tests; @@ -46,7 +46,7 @@ public void DropDownButtonUiaProvider_FragmentNavigate_NextSibling_ReturnsExpect comboBox.DroppedDown = droppedDown; AccessibleObject nextItem = GetComboBoxAccessibleObject(comboBox).DropDownButtonUiaProvider - .FragmentNavigate(UiaCore.NavigateDirection.NextSibling) as AccessibleObject; + .FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling) as AccessibleObject; Assert.Null(nextItem); Assert.True(comboBox.IsHandleCreated); @@ -71,7 +71,7 @@ public void DropDownButtonUiaProvider_FragmentNavigate_PreviousSibling_ReturnsEx comboBox.DroppedDown = droppedDown; AccessibleObject previousItem = GetComboBoxAccessibleObject(comboBox).DropDownButtonUiaProvider - .FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling) as AccessibleObject; + .FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling) as AccessibleObject; AccessibleObject expectedItem = comboBoxStyle == ComboBoxStyle.DropDownList ? comboBox.ChildTextAccessibleObject @@ -94,7 +94,7 @@ public void DropDownButtonUiaProvider_FragmentNavigate_PreviousSibling_ReturnsEx }; AccessibleObject previousItem = GetComboBoxAccessibleObject(comboBox).DropDownButtonUiaProvider - .FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling) as AccessibleObject; + .FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling) as AccessibleObject; Assert.Null(previousItem); Assert.False(comboBox.IsHandleCreated); diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBox.ComboBoxChildEditUiaProviderTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBox.ComboBoxChildEditUiaProviderTests.cs index ac721be39ec..c2108866f39 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBox.ComboBoxChildEditUiaProviderTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBox.ComboBoxChildEditUiaProviderTests.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using Windows.Win32.UI.Accessibility; -using static Interop; namespace System.Windows.Forms.Tests; @@ -49,7 +48,7 @@ public void ComboBoxChildEditUiaProvider_FragmentNavigate_PreviousSibling_Return comboBox.DroppedDown = droppedDown; AccessibleObject previousItem = comboBox.ChildEditAccessibleObject - .FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling) as AccessibleObject; + .FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling) as AccessibleObject; Assert.Equal(!childListDisplayed, previousItem is null); Assert.Equal(childListDisplayed, previousItem == comboBox.ChildListAccessibleObject); @@ -95,7 +94,7 @@ public void ComboBoxChildEditUiaProvider_FragmentNavigate_NextSibling_ReturnsExp comboBox.DroppedDown = droppedDown; AccessibleObject nextItem = comboBox.ChildEditAccessibleObject - .FragmentNavigate(UiaCore.NavigateDirection.NextSibling) as AccessibleObject; + .FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling) as AccessibleObject; AccessibleObject expectedItem = comboBoxStyle != ComboBoxStyle.Simple ? ((ComboBox.ComboBoxAccessibleObject)comboBox.AccessibilityObject).DropDownButtonUiaProvider diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBox.ComboBoxChildListUiaProviderTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBox.ComboBoxChildListUiaProviderTests.cs index b76af273946..17cc2f22617 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBox.ComboBoxChildListUiaProviderTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBox.ComboBoxChildListUiaProviderTests.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Drawing; +using Windows.Win32.UI.Accessibility; using static Interop; namespace System.Windows.Forms.Tests; @@ -41,7 +42,7 @@ public void ChildListAccessibleObject_FragmentNavigate_PreviousSibling_ReturnsEx comboBox.DroppedDown = droppedDown; AccessibleObject previousItem = comboBox.ChildListAccessibleObject - .FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling) as AccessibleObject; + .FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling) as AccessibleObject; AccessibleObject expectedItem = comboBoxStyle == ComboBoxStyle.Simple ? comboBox.ChildListAccessibleObject @@ -70,7 +71,7 @@ public void ChildListAccessibleObject_FragmentNavigate_NextSibling_ReturnsExpect comboBox.DroppedDown = droppedDown; AccessibleObject nextItem = comboBox.ChildListAccessibleObject - .FragmentNavigate(UiaCore.NavigateDirection.NextSibling) as AccessibleObject; + .FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling) as AccessibleObject; AccessibleObject expectedItem = comboBoxStyle == ComboBoxStyle.DropDownList ? comboBox.ChildTextAccessibleObject diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBox.ComboBoxChildTextUiaProviderTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBox.ComboBoxChildTextUiaProviderTests.cs index f47a2afe852..5a295072552 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBox.ComboBoxChildTextUiaProviderTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBox.ComboBoxChildTextUiaProviderTests.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using static Interop; +using Windows.Win32.UI.Accessibility; namespace System.Windows.Forms.Tests; @@ -36,7 +36,7 @@ public void ComboBoxChildTextUiaProvider_FragmentNavigate_PreviousSibling_Return comboBox.DroppedDown = droppedDown; AccessibleObject previousItem = comboBox.ChildTextAccessibleObject - .FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling) as AccessibleObject; + .FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling) as AccessibleObject; Assert.Equal(!droppedDown, previousItem is null); Assert.Equal(droppedDown, previousItem == comboBox.ChildListAccessibleObject); @@ -61,7 +61,7 @@ public void ComboBoxChildTextUiaProvider_FragmentNavigate_NextSibling_ReturnsExp comboBox.DroppedDown = droppedDown; AccessibleObject nextItem = comboBox.ChildTextAccessibleObject - .FragmentNavigate(UiaCore.NavigateDirection.NextSibling) as AccessibleObject; + .FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling) as AccessibleObject; AccessibleObject expectedItem = ((ComboBox.ComboBoxAccessibleObject)comboBox.AccessibilityObject).DropDownButtonUiaProvider; diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/MdiControlStripTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/MdiControlStripTests.cs index 22766723aa0..3bd1a13b7d4 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/MdiControlStripTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/MdiControlStripTests.cs @@ -3,7 +3,7 @@ using System.ComponentModel; using System.Drawing; -using static Interop; +using Windows.Win32.UI.Accessibility; using Point = System.Drawing.Point; using Size = System.Drawing.Size; @@ -215,13 +215,13 @@ public void MdiControlStrip_MaximizedChildWindow_NextSibling_ReturnsControlBoxBu mdiParent.Show(); mdiChild.Show(); AccessibleObject accessibleObject = mdiParent.MainMenuStrip.AccessibilityObject; - ToolStripItem.ToolStripItemAccessibleObject systemItem = (ToolStripItem.ToolStripItemAccessibleObject)accessibleObject.TestAccessor().Dynamic.FragmentNavigate(UiaCore.NavigateDirection.FirstChild); - ToolStripItem.ToolStripItemAccessibleObject test1Item = (ToolStripItem.ToolStripItemAccessibleObject)systemItem.FragmentNavigate(UiaCore.NavigateDirection.NextSibling); - ToolStripItem.ToolStripItemAccessibleObject test2Item = (ToolStripItem.ToolStripItemAccessibleObject)test1Item.FragmentNavigate(UiaCore.NavigateDirection.NextSibling); - ToolStripItem.ToolStripItemAccessibleObject minimizeItem = (ToolStripItem.ToolStripItemAccessibleObject)test2Item.FragmentNavigate(UiaCore.NavigateDirection.NextSibling); - ToolStripItem.ToolStripItemAccessibleObject restoreItem = (ToolStripItem.ToolStripItemAccessibleObject)minimizeItem.FragmentNavigate(UiaCore.NavigateDirection.NextSibling); - ToolStripItem.ToolStripItemAccessibleObject closeItem = (ToolStripItem.ToolStripItemAccessibleObject)restoreItem.FragmentNavigate(UiaCore.NavigateDirection.NextSibling); - ToolStripItem.ToolStripItemAccessibleObject nullItem = (ToolStripItem.ToolStripItemAccessibleObject)closeItem.FragmentNavigate(UiaCore.NavigateDirection.NextSibling); + ToolStripItem.ToolStripItemAccessibleObject systemItem = (ToolStripItem.ToolStripItemAccessibleObject)accessibleObject.TestAccessor().Dynamic.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild); + ToolStripItem.ToolStripItemAccessibleObject test1Item = (ToolStripItem.ToolStripItemAccessibleObject)systemItem.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); + ToolStripItem.ToolStripItemAccessibleObject test2Item = (ToolStripItem.ToolStripItemAccessibleObject)test1Item.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); + ToolStripItem.ToolStripItemAccessibleObject minimizeItem = (ToolStripItem.ToolStripItemAccessibleObject)test2Item.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); + ToolStripItem.ToolStripItemAccessibleObject restoreItem = (ToolStripItem.ToolStripItemAccessibleObject)minimizeItem.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); + ToolStripItem.ToolStripItemAccessibleObject closeItem = (ToolStripItem.ToolStripItemAccessibleObject)restoreItem.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); + ToolStripItem.ToolStripItemAccessibleObject nullItem = (ToolStripItem.ToolStripItemAccessibleObject)closeItem.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling); Assert.Equal("System", systemItem.Name); Assert.Equal("Test1", test1Item.Name); @@ -261,13 +261,13 @@ public void MdiControlStrip_MaximizedChildWindow_PreviousSibling_ReturnsControlB mdiParent.Show(); mdiChild.Show(); AccessibleObject accessibleObject = mdiParent.MainMenuStrip.AccessibilityObject; - ToolStripItem.ToolStripItemAccessibleObject closeItem = (ToolStripItem.ToolStripItemAccessibleObject)accessibleObject.TestAccessor().Dynamic.FragmentNavigate(UiaCore.NavigateDirection.LastChild); - ToolStripItem.ToolStripItemAccessibleObject restoreItem = (ToolStripItem.ToolStripItemAccessibleObject)closeItem.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling); - ToolStripItem.ToolStripItemAccessibleObject minimizeItem = (ToolStripItem.ToolStripItemAccessibleObject)restoreItem.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling); - ToolStripItem.ToolStripItemAccessibleObject test2Item = (ToolStripItem.ToolStripItemAccessibleObject)minimizeItem.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling); - ToolStripItem.ToolStripItemAccessibleObject test1Item = (ToolStripItem.ToolStripItemAccessibleObject)test2Item.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling); - ToolStripItem.ToolStripItemAccessibleObject systemItem = (ToolStripItem.ToolStripItemAccessibleObject)test1Item.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling); - ToolStripItem.ToolStripItemAccessibleObject nullItem = (ToolStripItem.ToolStripItemAccessibleObject)systemItem.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling); + ToolStripItem.ToolStripItemAccessibleObject closeItem = (ToolStripItem.ToolStripItemAccessibleObject)accessibleObject.TestAccessor().Dynamic.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild); + ToolStripItem.ToolStripItemAccessibleObject restoreItem = (ToolStripItem.ToolStripItemAccessibleObject)closeItem.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling); + ToolStripItem.ToolStripItemAccessibleObject minimizeItem = (ToolStripItem.ToolStripItemAccessibleObject)restoreItem.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling); + ToolStripItem.ToolStripItemAccessibleObject test2Item = (ToolStripItem.ToolStripItemAccessibleObject)minimizeItem.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling); + ToolStripItem.ToolStripItemAccessibleObject test1Item = (ToolStripItem.ToolStripItemAccessibleObject)test2Item.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling); + ToolStripItem.ToolStripItemAccessibleObject systemItem = (ToolStripItem.ToolStripItemAccessibleObject)test1Item.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling); + ToolStripItem.ToolStripItemAccessibleObject nullItem = (ToolStripItem.ToolStripItemAccessibleObject)systemItem.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling); Assert.Equal("Close", closeItem.Name); Assert.Equal("Restore", restoreItem.Name); diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Printing/PrintPreviewControl.PrintPreviewControlAccessibilityObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Printing/PrintPreviewControl.PrintPreviewControlAccessibilityObjectTests.cs index 39d45ef60d5..c8883e4760a 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Printing/PrintPreviewControl.PrintPreviewControlAccessibilityObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Printing/PrintPreviewControl.PrintPreviewControlAccessibilityObjectTests.cs @@ -84,25 +84,25 @@ public void PrintPreviewControlAccessibilityObject_FragmentNavigate_Children_Ret AccessibleObject verticalScrollBarAO = control.VerticalScrollBar.AccessibilityObject; AccessibleObject horizontalScrollBarAO = control.HorizontalScrollBar.AccessibilityObject; - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); Assert.False(control.IsHandleCreated); control.MakeOnlyVerticalScrollBarVisible(); - Assert.Equal(verticalScrollBarAO, accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(verticalScrollBarAO, accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(verticalScrollBarAO, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(verticalScrollBarAO, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); control.MakeOnlyHorizontalScrollBarVisible(); - Assert.Equal(horizontalScrollBarAO, accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(horizontalScrollBarAO, accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(horizontalScrollBarAO, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(horizontalScrollBarAO, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); control.MakeBothScrollBarsVisible(); - Assert.Equal(verticalScrollBarAO, accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Equal(horizontalScrollBarAO, accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Equal(verticalScrollBarAO, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Equal(horizontalScrollBarAO, accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); control.MakeNoScrollBarsVisible(); - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.FirstChild)); - Assert.Null(accessibleObject.FragmentNavigate(Interop.UiaCore.NavigateDirection.LastChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)); + Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild)); } [WinFormsFact] @@ -114,31 +114,31 @@ public void PrintPreviewControlAccessibilityObject_FragmentNavigate_ReturnsConsi AccessibleObject verticalScrollBarAO = control.VerticalScrollBar.AccessibilityObject; AccessibleObject horizontalScrollBarAO = control.HorizontalScrollBar.AccessibilityObject; - Assert.Null(verticalScrollBarAO.FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling)); - Assert.Null(verticalScrollBarAO.FragmentNavigate(Interop.UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(horizontalScrollBarAO.FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling)); - Assert.Null(horizontalScrollBarAO.FragmentNavigate(Interop.UiaCore.NavigateDirection.PreviousSibling)); + Assert.Null(verticalScrollBarAO.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(verticalScrollBarAO.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(horizontalScrollBarAO.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(horizontalScrollBarAO.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); control.MakeOnlyVerticalScrollBarVisible(); - Assert.Null(verticalScrollBarAO.FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling)); - Assert.Null(verticalScrollBarAO.FragmentNavigate(Interop.UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(horizontalScrollBarAO.FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling)); - Assert.Null(horizontalScrollBarAO.FragmentNavigate(Interop.UiaCore.NavigateDirection.PreviousSibling)); + Assert.Null(verticalScrollBarAO.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(verticalScrollBarAO.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(horizontalScrollBarAO.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(horizontalScrollBarAO.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); control.MakeOnlyHorizontalScrollBarVisible(); - Assert.Null(verticalScrollBarAO.FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling)); - Assert.Null(verticalScrollBarAO.FragmentNavigate(Interop.UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(horizontalScrollBarAO.FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling)); - Assert.Null(horizontalScrollBarAO.FragmentNavigate(Interop.UiaCore.NavigateDirection.PreviousSibling)); + Assert.Null(verticalScrollBarAO.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(verticalScrollBarAO.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(horizontalScrollBarAO.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(horizontalScrollBarAO.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); control.MakeBothScrollBarsVisible(); - Assert.Equal(horizontalScrollBarAO, verticalScrollBarAO.FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling)); - Assert.Null(verticalScrollBarAO.FragmentNavigate(Interop.UiaCore.NavigateDirection.PreviousSibling)); - Assert.Null(horizontalScrollBarAO.FragmentNavigate(Interop.UiaCore.NavigateDirection.NextSibling)); - Assert.Equal(verticalScrollBarAO, horizontalScrollBarAO.FragmentNavigate(Interop.UiaCore.NavigateDirection.PreviousSibling)); + Assert.Equal(horizontalScrollBarAO, verticalScrollBarAO.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Null(verticalScrollBarAO.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); + Assert.Null(horizontalScrollBarAO.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)); + Assert.Equal(verticalScrollBarAO, horizontalScrollBarAO.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)); - Assert.Equal(accessibleObject, verticalScrollBarAO.FragmentNavigate(Interop.UiaCore.NavigateDirection.Parent)); - Assert.Equal(accessibleObject, horizontalScrollBarAO.FragmentNavigate(Interop.UiaCore.NavigateDirection.Parent)); + Assert.Equal(accessibleObject, verticalScrollBarAO.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); + Assert.Equal(accessibleObject, horizontalScrollBarAO.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); } [WinFormsFact] diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PropertyGridInternal/AccessibleObjects/DropDownButton.DropDownButtonAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PropertyGridInternal/AccessibleObjects/DropDownButton.DropDownButtonAccessibleObjectTests.cs index f4112cf6469..bb961dc7cb0 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PropertyGridInternal/AccessibleObjects/DropDownButton.DropDownButtonAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PropertyGridInternal/AccessibleObjects/DropDownButton.DropDownButtonAccessibleObjectTests.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using Windows.Win32.UI.Accessibility; -using static Interop; namespace System.Windows.Forms.PropertyGridInternal.Tests.AccessibleObjects; @@ -58,13 +57,13 @@ public void DropDownButtonAccessibleObject_Role_IsPushButton_ByDefault() } [WinFormsTheory] - [InlineData((int)UiaCore.NavigateDirection.FirstChild)] - [InlineData((int)UiaCore.NavigateDirection.LastChild)] + [InlineData((int)NavigateDirection.NavigateDirection_FirstChild)] + [InlineData((int)NavigateDirection.NavigateDirection_LastChild)] public void DropDownButtonAccessibleObject_FragmentNavigate_ChildrenAreNull(int direction) { using DropDownButton dropDownButton = new(); - object actual = dropDownButton.AccessibilityObject.FragmentNavigate((UiaCore.NavigateDirection)direction); + object actual = dropDownButton.AccessibilityObject.FragmentNavigate((NavigateDirection)direction); Assert.Null(actual); Assert.False(dropDownButton.IsHandleCreated); @@ -82,7 +81,7 @@ public void DropDownButtonAccessibleObject_FragmentNavigate_ParentIsGridEntry() DropDownButton dropDownButton = gridView.DropDownButton; dropDownButton.Visible = true; - object actual = dropDownButton.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.Parent); + object actual = dropDownButton.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent); Assert.Equal(gridView.SelectedGridEntry.AccessibilityObject, actual); Assert.False(control.IsHandleCreated); diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PropertyGridInternal/AccessibleObjects/PropertyDescriptorGridEntry.PropertyDescriptorGridEntryAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PropertyGridInternal/AccessibleObjects/PropertyDescriptorGridEntry.PropertyDescriptorGridEntryAccessibleObjectTests.cs index d75e7e43a14..eb2af6ffc14 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PropertyGridInternal/AccessibleObjects/PropertyDescriptorGridEntry.PropertyDescriptorGridEntryAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PropertyGridInternal/AccessibleObjects/PropertyDescriptorGridEntry.PropertyDescriptorGridEntryAccessibleObjectTests.cs @@ -27,7 +27,7 @@ public void PropertyDescriptorGridEntryAccessibleObject_Navigates_to_DropDownCon propertyGridView.TestAccessor().Dynamic._dropDownHolder = dropDownHolder; gridEntry.TestAccessor().Dynamic._parent = new TestGridEntry(propertyGrid, null, propertyGridView); - UiaCore.IRawElementProviderFragment firstChild = gridEntry.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild); + UiaCore.IRawElementProviderFragment firstChild = gridEntry.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild); Assert.NotNull(firstChild); Assert.Equal(typeof(PropertyGridView.DropDownHolder.DropDownHolderAccessibleObject), firstChild.GetType()); } @@ -53,8 +53,8 @@ public void PropertyDescriptorGridEntryAccessibleObject_ExpandCollapseState_coll TestPropertyDescriptorGridEntry propertyDescriptorGridEntryTestEntity = new(propertyGrid, null, false); AccessibleObject propertyDescriptorGridEntryAccessibleObject = propertyDescriptorGridEntryTestEntity.AccessibilityObject; - UiaCore.ExpandCollapseState expandCollapseState = propertyDescriptorGridEntryAccessibleObject.ExpandCollapseState; - Assert.Equal(UiaCore.ExpandCollapseState.Collapsed, expandCollapseState); + ExpandCollapseState expandCollapseState = propertyDescriptorGridEntryAccessibleObject.ExpandCollapseState; + Assert.Equal(ExpandCollapseState.ExpandCollapseState_Collapsed, expandCollapseState); } [WinFormsFact] @@ -76,10 +76,10 @@ public void PropertyDescriptorGridEntryAccessibleObject_ExpandCollapseState_refl AccessibleObject selectedGridEntryAccessibleObject = gridEntry.AccessibilityObject; gridEntry.InternalExpanded = false; - Assert.Equal(UiaCore.ExpandCollapseState.Collapsed, selectedGridEntryAccessibleObject.ExpandCollapseState); + Assert.Equal(ExpandCollapseState.ExpandCollapseState_Collapsed, selectedGridEntryAccessibleObject.ExpandCollapseState); gridEntry.InternalExpanded = true; - Assert.Equal(UiaCore.ExpandCollapseState.Expanded, selectedGridEntryAccessibleObject.ExpandCollapseState); + Assert.Equal(ExpandCollapseState.ExpandCollapseState_Expanded, selectedGridEntryAccessibleObject.ExpandCollapseState); } [WinFormsFact] diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PropertyGridInternal/AccessibleObjects/PropertyGridView.DropDownHolder.DropDownHolderAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PropertyGridInternal/AccessibleObjects/PropertyGridView.DropDownHolder.DropDownHolderAccessibleObjectTests.cs index acb89883cd6..7653e4d02ba 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PropertyGridInternal/AccessibleObjects/PropertyGridView.DropDownHolder.DropDownHolderAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PropertyGridInternal/AccessibleObjects/PropertyGridView.DropDownHolder.DropDownHolderAccessibleObjectTests.cs @@ -3,7 +3,6 @@ using System.ComponentModel; using Windows.Win32.UI.Accessibility; -using static Interop; namespace System.Windows.Forms.PropertyGridInternal.Tests.AccessibleObjects; @@ -48,7 +47,7 @@ public void DropDownHolder_AccessibilityObject_ReturnsExpected() accessibilityObject.GetPropertyValue(UIA_PROPERTY_ID.UIA_NamePropertyId)); AccessibleObject selectedGridEntryAccessibleObject = null; - Assert.Equal(selectedGridEntryAccessibleObject, accessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); + Assert.Equal(selectedGridEntryAccessibleObject, accessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); PropertyDescriptor property = TypeDescriptor.GetProperties(typeof(PropertyGrid))[0]; PropertyDescriptorGridEntry gridEntry = new PropertyDescriptorGridEntry(propertyGrid, null, property, false); @@ -57,7 +56,7 @@ public void DropDownHolder_AccessibilityObject_ReturnsExpected() ownerControl.Visible = true; selectedGridEntryAccessibleObject = gridEntry.AccessibilityObject; - Assert.Equal(selectedGridEntryAccessibleObject, accessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.Parent)); + Assert.Equal(selectedGridEntryAccessibleObject, accessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)); Assert.Equal(propertyGridView.AccessibilityObject, accessibilityObject.FragmentRoot); } diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PropertyGridInternal/AccessibleObjects/PropertyGridView.GridViewTextBox.GridViewTextBoxAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PropertyGridInternal/AccessibleObjects/PropertyGridView.GridViewTextBox.GridViewTextBoxAccessibleObjectTests.cs index 58a8ec59956..16db433c737 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PropertyGridInternal/AccessibleObjects/PropertyGridView.GridViewTextBox.GridViewTextBoxAccessibleObjectTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PropertyGridInternal/AccessibleObjects/PropertyGridView.GridViewTextBox.GridViewTextBoxAccessibleObjectTests.cs @@ -36,7 +36,7 @@ public void GridViewTextBoxAccessibleObject_created_for_string_property() Assert.NotEqual(IntPtr.Zero, propertyGridView.TestAccessor().Dynamic.EditTextBox.Handle); AccessibleObject selectedGridEntryAccessibleObject = gridEntry.AccessibilityObject; - UiaCore.IRawElementProviderFragment editFieldAccessibleObject = selectedGridEntryAccessibleObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild); + UiaCore.IRawElementProviderFragment editFieldAccessibleObject = selectedGridEntryAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild); Assert.NotNull(editFieldAccessibleObject); Assert.Equal("GridViewTextBoxAccessibleObject", editFieldAccessibleObject.GetType().Name); @@ -63,7 +63,7 @@ public void GridViewTextBoxAccessibleObject_FragmentNavigate_navigates_correctly // In UI case an entry edit control is created when an PropertyGridView gets focus. Assert.NotEqual(IntPtr.Zero, propertyGridView.TestAccessor().Dynamic.EditTextBox.Handle); - UiaCore.IRawElementProviderFragment editFieldAccessibleObject = gridEntry.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild); + UiaCore.IRawElementProviderFragment editFieldAccessibleObject = gridEntry.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild); Assert.Equal("GridViewTextBoxAccessibleObject", editFieldAccessibleObject.GetType().Name); // The case with drop down holder: @@ -72,11 +72,11 @@ public void GridViewTextBoxAccessibleObject_FragmentNavigate_navigates_correctly propertyGridView.TestAccessor().Dynamic._dropDownHolder = dropDownHolder; dropDownHolder.TestAccessor().Dynamic.SetState(0x00000002, true); // Control class States.Visible flag - UiaCore.IRawElementProviderFragment dropDownHolderAccessibleObject = gridEntry.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild); + UiaCore.IRawElementProviderFragment dropDownHolderAccessibleObject = gridEntry.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild); Assert.Equal("DropDownHolderAccessibleObject", dropDownHolderAccessibleObject.GetType().Name); Assert.True(propertyGridView.DropDownVisible); - object previousAccessibleObject = editFieldAccessibleObject.Navigate(UiaCore.NavigateDirection.PreviousSibling); + object previousAccessibleObject = editFieldAccessibleObject.Navigate(NavigateDirection.NavigateDirection_PreviousSibling); Assert.NotNull(previousAccessibleObject); Assert.Same(dropDownHolder.AccessibilityObject, previousAccessibleObject); } @@ -198,7 +198,7 @@ public void GridViewTextBoxAccessibleObject_RuntimeId_ReturnsNull() // In UI case an entry edit control is created when an PropertyGridView gets focus. Assert.NotEqual(IntPtr.Zero, propertyGridView.TestAccessor().Dynamic.EditTextBox.Handle); - AccessibleObject editFieldAccessibleObject = (AccessibleObject)gridEntry.AccessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild); + AccessibleObject editFieldAccessibleObject = (AccessibleObject)gridEntry.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild); propertyGridView.TestAccessor().Dynamic._selectedGridEntry = null; Assert.NotNull(editFieldAccessibleObject.RuntimeId);