Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update DateTimePicker and Accessibility class #9253

Merged
merged 7 commits into from
Jun 20, 2023
Merged

Update DateTimePicker and Accessibility class #9253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6034263
Update DateTimePicker and Accessibility class
Epica3055 Jun 8, 2023
1df9424
fix string"", convert if else to conditional expression, unittest,mo…
Epica3055 Jun 13, 2023
4c63439
Merge branch 'dotnet:main' into Issue_9232_GetBaseText_DateTimePicker
Epica3055 Jun 13, 2023
bfbb0b6
Merge branch 'Issue_9232_GetBaseText_DateTimePicker' of https://githu…
Epica3055 Jun 13, 2023
da7c1cb
fix DateTimePicker.Text fix unitTest, add more format to DateTimePick…
Epica3055 Jun 15, 2023
5e64e67
fix DateTimePicker UnitTest
Epica3055 Jun 16, 2023
070b24e
fix UnitTests and WinformsControlsTest DateTimePicker
Epica3055 Jun 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/System.Windows.Forms/src/System/Windows/Forms/DateTimePicker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -830,7 +830,7 @@ public bool ShowUpDown
[AllowNull]
public override string Text
{
get => Value.ToString(CustomFormat);
get => base.Text;
set
{
// Clause to check length
Expand Down
87 changes: 72 additions & 15 deletions ...stem.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/DateTimePicker.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/DateTimePicker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@ public partial class DateTimePicker : Form
public DateTimePicker()
{
InitializeComponent();
this.dateTimePicker5.CustomFormat = "yyyy-MM-dd HH:mm:ss";
}
}
5 changes: 4 additions & 1 deletion ...ests/UnitTests/System/Windows/Forms/DateTimePicker.DateTimePickerAccessibleObjectTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,12 @@ public void DateTimePickerAccessibleObject_GetPropertyValue_ReturnsExpected()
dateTimePicker.Value = dt;
AccessibleObject accessibleObject = dateTimePicker.AccessibilityObject;

Assert.Equal(dt.ToString(), accessibleObject.GetPropertyValue(UiaCore.UIA.ValueValuePropertyId));
Assert.True((bool)accessibleObject.GetPropertyValue(UiaCore.UIA.IsExpandCollapsePatternAvailablePropertyId));
Assert.False(dateTimePicker.IsHandleCreated);

dateTimePicker.CreateControl();

Assert.Equal(dt.ToLongDateString(), accessibleObject.GetPropertyValue(UiaCore.UIA.ValueValuePropertyId));
}

[WinFormsTheory]
Expand Down
39 changes: 37 additions & 2 deletions src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DateTimePickerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public void DateTimePicker_Ctor_Default()
Assert.Equal(new Size(200, control.PreferredHeight), control.Size);
Assert.Equal(0, control.TabIndex);
Assert.True(control.TabStop);
Assert.Equal(control.TestAccessor().Dynamic._creationTime.ToString(), control.Text);
dmitrii-drobotov marked this conversation as resolved.
Show resolved Hide resolved
Assert.Equal(string.Empty, control.Text);
Assert.Equal(0, control.Top);
Assert.Null(control.TopLevelControl);
Assert.False(control.UseWaitCursor);
Expand Down Expand Up @@ -220,9 +220,36 @@ public void DateTimePicker_CustomFormat_Null_Text_ReturnsExpected()
using DateTimePicker dateTimePicker = new();
DateTime dt = new(2000, 1, 2, 3, 4, 5);
dateTimePicker.Value = dt;
dateTimePicker.CreateControl();

Assert.Null(dateTimePicker.CustomFormat);
Assert.Equal(dt.ToString(), dateTimePicker.Text);
Assert.Equal(dt.ToLongDateString(), dateTimePicker.Text);
}
dmitrii-drobotov marked this conversation as resolved.
Show resolved Hide resolved

[WinFormsFact]
public void DateTimePicker_CustomFormat_Null_Format_Short_Text_ReturnsExpected()
{
using DateTimePicker dateTimePicker = new();
DateTime dt = new(2000, 1, 2, 3, 4, 5);
dateTimePicker.Value = dt;
dateTimePicker.Format = DateTimePickerFormat.Short;
dateTimePicker.CreateControl();

Assert.Null(dateTimePicker.CustomFormat);
Assert.Equal(dt.ToShortDateString(), dateTimePicker.Text);
}

[WinFormsFact]
public void DateTimePicker_CustomFormat_Null_Format_Time_Text_ReturnsExpected()
{
using DateTimePicker dateTimePicker = new();
DateTime dt = new(2000, 1, 2, 3, 4, 5);
dateTimePicker.Value = dt;
dateTimePicker.Format = DateTimePickerFormat.Time;
dateTimePicker.CreateControl();

Assert.Null(dateTimePicker.CustomFormat);
Assert.Equal(dt.ToLongTimeString(), dateTimePicker.Text);
}

[WinFormsFact]
Expand All @@ -232,7 +259,9 @@ public void DateTimePicker_CustomFormat_LongDatePattern_Text_ReturnsExpected()
DateTime dt = new(2000, 1, 2, 3, 4, 5);
dateTimePicker.Value = dt;
Globalization.DateTimeFormatInfo dateTimeFormat = Globalization.CultureInfo.CurrentCulture.DateTimeFormat;
dateTimePicker.Format = DateTimePickerFormat.Custom;
dateTimePicker.CustomFormat = dateTimeFormat.LongDatePattern;
dateTimePicker.CreateControl();

Assert.Equal(dt.ToLongDateString(), dateTimePicker.Text);
}
Expand All @@ -244,7 +273,9 @@ public void DateTimePicker_CustomFormat_ShortDatePattern_Text_ReturnsExpected()
DateTime dt = new(2000, 1, 2, 3, 4, 5);
dateTimePicker.Value = dt;
Globalization.DateTimeFormatInfo dateTimeFormat = Globalization.CultureInfo.CurrentCulture.DateTimeFormat;
dateTimePicker.Format = DateTimePickerFormat.Custom;
dateTimePicker.CustomFormat = dateTimeFormat.ShortDatePattern;
dateTimePicker.CreateControl();

Assert.Equal(dt.ToShortDateString(), dateTimePicker.Text);
}
Expand All @@ -256,7 +287,9 @@ public void DateTimePicker_CustomFormat_LongTimePattern_Text_ReturnsExpected()
DateTime dt = new(2000, 1, 2, 3, 4, 5);
dateTimePicker.Value = dt;
Globalization.DateTimeFormatInfo dateTimeFormat = Globalization.CultureInfo.CurrentCulture.DateTimeFormat;
dateTimePicker.Format = DateTimePickerFormat.Custom;
dateTimePicker.CustomFormat = dateTimeFormat.LongTimePattern;
dateTimePicker.CreateControl();

Assert.Equal(dt.ToLongTimeString(), dateTimePicker.Text);
}
Expand All @@ -268,7 +301,9 @@ public void DateTimePicker_CustomFormat_ShortTimePattern_Text_ReturnsExpected()
DateTime dt = new(2000, 1, 2, 3, 4, 5);
dateTimePicker.Value = dt;
Globalization.DateTimeFormatInfo dateTimeFormat = Globalization.CultureInfo.CurrentCulture.DateTimeFormat;
dateTimePicker.Format = DateTimePickerFormat.Custom;
dateTimePicker.CustomFormat = dateTimeFormat.ShortTimePattern;
dateTimePicker.CreateControl();

Assert.Equal(dt.ToShortTimeString(), dateTimePicker.Text);
}
Expand Down