Fixing member data sources

Keboo · Keboo · commit 2a85a2756b4e · 2025-06-13T00:53:31.000-07:00
Updates TimePicker unit tests to use MethodDataSource with Func to prevent test data from being eagerly evaluated, resolving issues with the test framework.
diff --git a/tests/MaterialDesignThemes.Wpf.Tests/TimePickerUnitTests.cs b/tests/MaterialDesignThemes.Wpf.Tests/TimePickerUnitTests.cs
@@ -3,7 +3,6 @@
 
 namespace MaterialDesignThemes.Wpf.Tests;
 
-
 public class TimePickerUnitTests
 {
     private readonly TimePicker _timePicker;
@@ -28,21 +27,21 @@ public async Task DontOverwriteDate()
     [Test, STAThreadExecutor]
     [MethodDataSource(nameof(GetDisplaysExpectedTextData))]
     public async Task DisplaysExpectedText(CultureInfo culture, DatePickerFormat format, bool is24Hour, bool withSeconds,
-        DateTime? selectedTime, string expectedText)
+        DateTime selectedTime, string expectedText)
     {
         _timePicker.Language = XmlLanguage.GetLanguage(culture.IetfLanguageTag);
         _timePicker.SelectedTimeFormat = format;
         _timePicker.Is24Hours = is24Hour;
         _timePicker.WithSeconds = withSeconds;
         _timePicker.SelectedTime = selectedTime;
 
-        await Assert.That(_timePicker.Text).IsEqualTo(expectedText);
+        await Assert.That(_timePicker.Text).IsEqualTo( expectedText);
     }
 
     [Test, STAThreadExecutor]
     [MethodDataSource(nameof(GetParseLocalizedTimeStringData))]
     public async Task CanParseLocalizedTimeString(CultureInfo culture, DatePickerFormat format, bool is24Hour, bool withSeconds,
-        string timeString, DateTime? expectedTime)
+        string timeString, DateTime expectedTime)
     {
         _timePicker.Language = XmlLanguage.GetLanguage(culture.IetfLanguageTag);
         _timePicker.SelectedTimeFormat = format;
@@ -57,15 +56,15 @@ public async Task CanParseLocalizedTimeString(CultureInfo culture, DatePickerFor
         await Assert.That(_timePicker.SelectedTime).IsEqualTo(expectedTime);
     }
 
-    public static IEnumerable<(CultureInfo culture,
+    public static IEnumerable<Func<(CultureInfo culture,
          DatePickerFormat format,
          bool is24Hour,
          bool withSeconds,
          string timeString,
-         DateTime expectedTime)> GetParseLocalizedTimeStringData()
+         DateTime expectedTime)>> GetParseLocalizedTimeStringData()
     {
         //for now just using the same set of data to make sure we can go both directions.
-        foreach ((CultureInfo culture, DatePickerFormat format, bool is24Hour, bool withSeconds, DateTime date, string timeString) in GetDisplaysExpectedTextData())
+        foreach ((CultureInfo culture, DatePickerFormat format, bool is24Hour, bool withSeconds, DateTime date, string timeString) in GetDisplaysExpectedTextData().Select(x => x()))
         {
             //Convert the date to Today
             var newDate = DateTime.MinValue.AddHours(date.Hour).AddMinutes(date.Minute).AddSeconds(withSeconds ? date.Second : 0);
@@ -79,18 +78,18 @@ public async Task CanParseLocalizedTimeString(CultureInfo culture, DatePickerFor
             }
 
             //Invert the order of the parameters.
-            yield return (culture, format, is24Hour, withSeconds, timeString, date);
+            yield return () => (culture, format, is24Hour, withSeconds, timeString, date);
         }
     }
 
-    public static IEnumerable<
+    public static IEnumerable<Func<
         (CultureInfo culture,
          DatePickerFormat format,
          bool is24Hour,
          bool withSeconds,
          DateTime dateTime,
          string expectedText)
-        > GetDisplaysExpectedTextData()
+        >> GetDisplaysExpectedTextData()
     {
         //AM intentionally picks values with only a single digit to verify the DatePickerFormat is applied
         var am = new DateTime(2000, 1, 1, 3, 5, 9);
@@ -104,15 +103,15 @@ public static IEnumerable<
             "3:05", "3:05:09", //24 hour short
             "03:05", "03:05:09")) //24 hour long
         {
-            yield return data;
+            yield return () => data;
         }
         foreach (var data in GetDisplaysExpectedTextDataForCulture(CultureInfo.InvariantCulture, pm,
             "4:30 PM", "4:30:25 PM", //12 hour short
             "04:30 PM", "04:30:25 PM", //12 hour long
             "16:30", "16:30:25", //24 hour short
             "16:30", "16:30:25")) //24 hour long
         {
-            yield return data;
+            yield return () => data;
         }
 
         //US English
@@ -123,15 +122,15 @@ public static IEnumerable<
             "3:05", "3:05:09", //24 hour short
             "03:05", "03:05:09")) //24 hour long
         {
-            yield return data;
+            yield return () => data;
         }
         foreach (var data in GetDisplaysExpectedTextDataForCulture(usEnglish, pm,
             "4:30 PM", "4:30:25 PM", //12 hour short
             "04:30 PM", "04:30:25 PM", //12 hour long
             "16:30", "16:30:25", //24 hour short
             "16:30", "16:30:25")) //24 hour long
         {
-            yield return data;
+            yield return () => data;
         }
 
         //Spain Spanish
@@ -143,15 +142,15 @@ public static IEnumerable<
             "3:05", "3:05:09", //24 hour short
             "03:05", "03:05:09")) //24 hour long
         {
-            yield return data;
+            yield return () => data;
         }
         foreach (var data in GetDisplaysExpectedTextDataForCulture(spainSpanish, pm,
             "4:30 p. m.", "4:30:25 p. m.", //12 hour short
             "04:30 p. m.", "04:30:25 p. m.", //12 hour long
             "16:30", "16:30:25", //24 hour short
             "16:30", "16:30:25")) //24 hour long
         {
-            yield return data;
+            yield return () => data;
         }
 #else
         foreach (var data in GetDisplaysExpectedTextDataForCulture(spainSpanish, am,
@@ -160,15 +159,15 @@ public static IEnumerable<
             "3:05", "3:05:09", //24 hour short
             "03:05", "03:05:09")) //24 hour long
         {
-            yield return data;
+            yield return () => data;
         }
         foreach (var data in GetDisplaysExpectedTextDataForCulture(spainSpanish, pm,
             "4:30", "4:30:25", //12 hour short
             "04:30", "04:30:25", //12 hour long
             "16:30", "16:30:25", //24 hour short
             "16:30", "16:30:25")) //24 hour long
         {
-            yield return data;
+            yield return () => data;
         }
 #endif
 
@@ -181,15 +180,15 @@ public static IEnumerable<
             "3:05", "3:05:09", //24 hour short
             "03:05", "03:05:09")) //24 hour long
         {
-            yield return data;
+            yield return () => data;
         }
         foreach (var data in GetDisplaysExpectedTextDataForCulture(iranFarsi, pm,
             "4:30 بعدازظهر", "4:30:25 بعدازظهر", //12 hour short
             "04:30 بعدازظهر", "04:30:25 بعدازظهر", //12 hour long
             "16:30", "16:30:25", //24 hour short
             "16:30", "16:30:25")) //24 hour long
         {
-            yield return data;
+            yield return () => data;
         }
 #else
         foreach (var data in GetDisplaysExpectedTextDataForCulture(iranFarsi, am,
@@ -198,15 +197,15 @@ public static IEnumerable<
             "3:05", "3:05:09", //24 hour short
             "03:05", "03:05:09")) //24 hour long
         {
-            yield return data;
+            yield return () => data;
         }
         foreach (var data in GetDisplaysExpectedTextDataForCulture(iranFarsi, pm,
             "4:30 ب.ظ", "4:30:25 ب.ظ", //12 hour short
             "04:30 ب.ظ", "04:30:25 ب.ظ", //12 hour long
             "16:30", "16:30:25", //24 hour short
             "16:30", "16:30:25")) //24 hour long
         {
-            yield return data;
+            yield return () => data;
         }
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`
`4`	`4`	`namespace MaterialDesignThemes.Wpf.Tests;`
`5`	`5`
`6`		`-`
`7`	`6`	`public class TimePickerUnitTests`
`8`	`7`	`{`
`9`	`8`	`private readonly TimePicker _timePicker;`
`@@ -28,21 +27,21 @@ public async Task DontOverwriteDate()`
`28`	`27`	`[Test, STAThreadExecutor]`
`29`	`28`	`[MethodDataSource(nameof(GetDisplaysExpectedTextData))]`
`30`	`29`	`public async Task DisplaysExpectedText(CultureInfo culture, DatePickerFormat format, bool is24Hour, bool withSeconds,`
`31`		`- DateTime? selectedTime, string expectedText)`
	`30`	`+ DateTime selectedTime, string expectedText)`
`32`	`31`	`{`
`33`	`32`	`_timePicker.Language = XmlLanguage.GetLanguage(culture.IetfLanguageTag);`
`34`	`33`	`_timePicker.SelectedTimeFormat = format;`
`35`	`34`	`_timePicker.Is24Hours = is24Hour;`
`36`	`35`	`_timePicker.WithSeconds = withSeconds;`
`37`	`36`	`_timePicker.SelectedTime = selectedTime;`
`38`	`37`
`39`		`- await Assert.That(_timePicker.Text).IsEqualTo(expectedText);`
	`38`	`+ await Assert.That(_timePicker.Text).IsEqualTo( expectedText);`
`40`	`39`	`}`
`41`	`40`
`42`	`41`	`[Test, STAThreadExecutor]`
`43`	`42`	`[MethodDataSource(nameof(GetParseLocalizedTimeStringData))]`
`44`	`43`	`public async Task CanParseLocalizedTimeString(CultureInfo culture, DatePickerFormat format, bool is24Hour, bool withSeconds,`
`45`		`- string timeString, DateTime? expectedTime)`
	`44`	`+ string timeString, DateTime expectedTime)`
`46`	`45`	`{`
`47`	`46`	`_timePicker.Language = XmlLanguage.GetLanguage(culture.IetfLanguageTag);`
`48`	`47`	`_timePicker.SelectedTimeFormat = format;`
`@@ -57,15 +56,15 @@ public async Task CanParseLocalizedTimeString(CultureInfo culture, DatePickerFor`
`57`	`56`	`await Assert.That(_timePicker.SelectedTime).IsEqualTo(expectedTime);`
`58`	`57`	`}`
`59`	`58`
`60`		`- public static IEnumerable<(CultureInfo culture,`
	`59`	`+ public static IEnumerable<Func<(CultureInfo culture,`
`61`	`60`	`DatePickerFormat format,`
`62`	`61`	`bool is24Hour,`
`63`	`62`	`bool withSeconds,`
`64`	`63`	`string timeString,`
`65`		`- DateTime expectedTime)> GetParseLocalizedTimeStringData()`
	`64`	`+ DateTime expectedTime)>> GetParseLocalizedTimeStringData()`
`66`	`65`	`{`
`67`	`66`	`//for now just using the same set of data to make sure we can go both directions.`
`68`		`- foreach ((CultureInfo culture, DatePickerFormat format, bool is24Hour, bool withSeconds, DateTime date, string timeString) in GetDisplaysExpectedTextData())`
	`67`	`+ foreach ((CultureInfo culture, DatePickerFormat format, bool is24Hour, bool withSeconds, DateTime date, string timeString) in GetDisplaysExpectedTextData().Select(x => x()))`
`69`	`68`	`{`
`70`	`69`	`//Convert the date to Today`
`71`	`70`	`var newDate = DateTime.MinValue.AddHours(date.Hour).AddMinutes(date.Minute).AddSeconds(withSeconds ? date.Second : 0);`
`@@ -79,18 +78,18 @@ public async Task CanParseLocalizedTimeString(CultureInfo culture, DatePickerFor`
`79`	`78`	`}`
`80`	`79`
`81`	`80`	`//Invert the order of the parameters.`
`82`		`- yield return (culture, format, is24Hour, withSeconds, timeString, date);`
	`81`	`+ yield return () => (culture, format, is24Hour, withSeconds, timeString, date);`
`83`	`82`	`}`
`84`	`83`	`}`
`85`	`84`
`86`		`- public static IEnumerable<`
	`85`	`+ public static IEnumerable<Func<`
`87`	`86`	`(CultureInfo culture,`
`88`	`87`	`DatePickerFormat format,`
`89`	`88`	`bool is24Hour,`
`90`	`89`	`bool withSeconds,`
`91`	`90`	`DateTime dateTime,`
`92`	`91`	`string expectedText)`
`93`		`- > GetDisplaysExpectedTextData()`
	`92`	`+ >> GetDisplaysExpectedTextData()`
`94`	`93`	`{`
`95`	`94`	`//AM intentionally picks values with only a single digit to verify the DatePickerFormat is applied`
`96`	`95`	`var am = new DateTime(2000, 1, 1, 3, 5, 9);`
`@@ -104,15 +103,15 @@ public static IEnumerable<`
`104`	`103`	`"3:05", "3:05:09", //24 hour short`
`105`	`104`	`"03:05", "03:05:09")) //24 hour long`
`106`	`105`	`{`
`107`		`- yield return data;`
	`106`	`+ yield return () => data;`
`108`	`107`	`}`
`109`	`108`	`foreach (var data in GetDisplaysExpectedTextDataForCulture(CultureInfo.InvariantCulture, pm,`
`110`	`109`	`"4:30 PM", "4:30:25 PM", //12 hour short`
`111`	`110`	`"04:30 PM", "04:30:25 PM", //12 hour long`
`112`	`111`	`"16:30", "16:30:25", //24 hour short`
`113`	`112`	`"16:30", "16:30:25")) //24 hour long`
`114`	`113`	`{`
`115`		`- yield return data;`
	`114`	`+ yield return () => data;`
`116`	`115`	`}`
`117`	`116`
`118`	`117`	`//US English`
`@@ -123,15 +122,15 @@ public static IEnumerable<`
`123`	`122`	`"3:05", "3:05:09", //24 hour short`
`124`	`123`	`"03:05", "03:05:09")) //24 hour long`
`125`	`124`	`{`
`126`		`- yield return data;`
	`125`	`+ yield return () => data;`
`127`	`126`	`}`
`128`	`127`	`foreach (var data in GetDisplaysExpectedTextDataForCulture(usEnglish, pm,`
`129`	`128`	`"4:30 PM", "4:30:25 PM", //12 hour short`
`130`	`129`	`"04:30 PM", "04:30:25 PM", //12 hour long`
`131`	`130`	`"16:30", "16:30:25", //24 hour short`
`132`	`131`	`"16:30", "16:30:25")) //24 hour long`
`133`	`132`	`{`
`134`		`- yield return data;`
	`133`	`+ yield return () => data;`
`135`	`134`	`}`
`136`	`135`
`137`	`136`	`//Spain Spanish`
`@@ -143,15 +142,15 @@ public static IEnumerable<`
`143`	`142`	`"3:05", "3:05:09", //24 hour short`
`144`	`143`	`"03:05", "03:05:09")) //24 hour long`
`145`	`144`	`{`
`146`		`- yield return data;`
	`145`	`+ yield return () => data;`
`147`	`146`	`}`
`148`	`147`	`foreach (var data in GetDisplaysExpectedTextDataForCulture(spainSpanish, pm,`
`149`	`148`	`"4:30 p. m.", "4:30:25 p. m.", //12 hour short`
`150`	`149`	`"04:30 p. m.", "04:30:25 p. m.", //12 hour long`
`151`	`150`	`"16:30", "16:30:25", //24 hour short`
`152`	`151`	`"16:30", "16:30:25")) //24 hour long`
`153`	`152`	`{`
`154`		`- yield return data;`
	`153`	`+ yield return () => data;`
`155`	`154`	`}`
`156`	`155`	`#else`
`157`	`156`	`foreach (var data in GetDisplaysExpectedTextDataForCulture(spainSpanish, am,`
`@@ -160,15 +159,15 @@ public static IEnumerable<`
`160`	`159`	`"3:05", "3:05:09", //24 hour short`
`161`	`160`	`"03:05", "03:05:09")) //24 hour long`
`162`	`161`	`{`
`163`		`- yield return data;`
	`162`	`+ yield return () => data;`
`164`	`163`	`}`
`165`	`164`	`foreach (var data in GetDisplaysExpectedTextDataForCulture(spainSpanish, pm,`
`166`	`165`	`"4:30", "4:30:25", //12 hour short`
`167`	`166`	`"04:30", "04:30:25", //12 hour long`
`168`	`167`	`"16:30", "16:30:25", //24 hour short`
`169`	`168`	`"16:30", "16:30:25")) //24 hour long`
`170`	`169`	`{`
`171`		`- yield return data;`
	`170`	`+ yield return () => data;`
`172`	`171`	`}`
`173`	`172`	`#endif`
`174`	`173`
`@@ -181,15 +180,15 @@ public static IEnumerable<`
`181`	`180`	`"3:05", "3:05:09", //24 hour short`
`182`	`181`	`"03:05", "03:05:09")) //24 hour long`
`183`	`182`	`{`
`184`		`- yield return data;`
	`183`	`+ yield return () => data;`
`185`	`184`	`}`
`186`	`185`	`foreach (var data in GetDisplaysExpectedTextDataForCulture(iranFarsi, pm,`
`187`	`186`	`"4:30 بعدازظهر", "4:30:25 بعدازظهر", //12 hour short`
`188`	`187`	`"04:30 بعدازظهر", "04:30:25 بعدازظهر", //12 hour long`
`189`	`188`	`"16:30", "16:30:25", //24 hour short`
`190`	`189`	`"16:30", "16:30:25")) //24 hour long`
`191`	`190`	`{`
`192`		`- yield return data;`
	`191`	`+ yield return () => data;`
`193`	`192`	`}`
`194`	`193`	`#else`
`195`	`194`	`foreach (var data in GetDisplaysExpectedTextDataForCulture(iranFarsi, am,`
`@@ -198,15 +197,15 @@ public static IEnumerable<`
`198`	`197`	`"3:05", "3:05:09", //24 hour short`
`199`	`198`	`"03:05", "03:05:09")) //24 hour long`
`200`	`199`	`{`
`201`		`- yield return data;`
	`200`	`+ yield return () => data;`
`202`	`201`	`}`
`203`	`202`	`foreach (var data in GetDisplaysExpectedTextDataForCulture(iranFarsi, pm,`
`204`	`203`	`"4:30 ب.ظ", "4:30:25 ب.ظ", //12 hour short`
`205`	`204`	`"04:30 ب.ظ", "04:30:25 ب.ظ", //12 hour long`
`206`	`205`	`"16:30", "16:30:25", //24 hour short`
`207`	`206`	`"16:30", "16:30:25")) //24 hour long`
`208`	`207`	`{`
`209`		`- yield return data;`
	`208`	`+ yield return () => data;`
`210`	`209`	`}`
`211`	`210`	`#endif`
`212`	`211`