From f157e2cab178dcf813cb77f7c68201e0ba7dc382 Mon Sep 17 00:00:00 2001
From: Jens-Christian Skibakk <jens.christian.skibakk@lexit.no>
Date: Thu, 19 Dec 2024 10:44:15 +0100
Subject: [PATCH 1/2] Update IsListNotNullOrEmptyConverter tests and method

Modified IsListNotNullOrEmptyConverterTests:
- Empty List<string> now returns true.
- Added empty array (Array.Empty<string>()) returning true.
- List<string> with "TestValue" now returns false.
- Null value now returns true.
- Enumerable.Range(1, 3) now returns false.

Added new test cases:
- Empty array (Array.Empty<string>()) returning true.
- Array with "TestValue" returning false.

Updated IsListNullOrEmpty method:
- Check if enumerator is IDisposable before disposing.
---
 .../IsListNotNullOrEmptyConverterTests.cs      | 18 ++++++++++++++----
 .../IsListNullOrEmptyConverterTests.cs         | 12 +++++++++++-
 .../IsListNullOrEmptyConverter.shared.cs       |  6 +++++-
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/CommunityToolkit.Maui.UnitTests/Converters/IsListNotNullOrEmptyConverterTests.cs b/src/CommunityToolkit.Maui.UnitTests/Converters/IsListNotNullOrEmptyConverterTests.cs
index 546bd8c519..8cb101d0a5 100644
--- a/src/CommunityToolkit.Maui.UnitTests/Converters/IsListNotNullOrEmptyConverterTests.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/Converters/IsListNotNullOrEmptyConverterTests.cs
@@ -10,21 +10,31 @@ public class IsListNotNullOrEmptyConverterTests : BaseOneWayConverterTest<IsList
 	public static TheoryData<IEnumerable?, bool> Data { get; } = new()
 	{
 		{
-			new List<string>(), false
+			new List<string>(), true
+		},
+		{
+			Array.Empty<string>(), true
 		},
 		{
 			new List<string>
 			{
 				"TestValue"
 			},
-			true
+			false
 		},
 		{
-			null, false
+			new []
+			{
+				"TestValue"
+			},
+			false
 		},
 		{
-			Enumerable.Range(1, 3), true
+			null, true
 		},
+		{
+			Enumerable.Range(1, 3), false
+		}
 	};
 
 	[Theory]
diff --git a/src/CommunityToolkit.Maui.UnitTests/Converters/IsListNullOrEmptyConverterTests.cs b/src/CommunityToolkit.Maui.UnitTests/Converters/IsListNullOrEmptyConverterTests.cs
index 441a721eaf..4df13eb44a 100644
--- a/src/CommunityToolkit.Maui.UnitTests/Converters/IsListNullOrEmptyConverterTests.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/Converters/IsListNullOrEmptyConverterTests.cs
@@ -12,6 +12,9 @@ public class IsListNullOrEmptyConverterTests : BaseOneWayConverterTest<IsListNul
 		{
 			new List<string>(), true
 		},
+		{
+			Array.Empty<string>(), true
+		},
 		{
 			new List<string>
 			{
@@ -19,12 +22,19 @@ public class IsListNullOrEmptyConverterTests : BaseOneWayConverterTest<IsListNul
 			},
 			false
 		},
+		{
+			new []
+			{
+				"TestValue"
+			},
+			false
+		},
 		{
 			null, true
 		},
 		{
 			Enumerable.Range(1, 3), false
-		},
+		}
 	};
 
 	[Theory]
diff --git a/src/CommunityToolkit.Maui/Converters/IsListNullOrEmptyConverter.shared.cs b/src/CommunityToolkit.Maui/Converters/IsListNullOrEmptyConverter.shared.cs
index e39b247785..80e9d2e431 100644
--- a/src/CommunityToolkit.Maui/Converters/IsListNullOrEmptyConverter.shared.cs
+++ b/src/CommunityToolkit.Maui/Converters/IsListNullOrEmptyConverter.shared.cs
@@ -30,7 +30,11 @@ internal static bool IsListNullOrEmpty(IEnumerable? value)
 		var enumerator = value.GetEnumerator();
 		bool result = !enumerator.MoveNext();
 
-		((IDisposable)enumerator).Dispose();
+		if (enumerator is IDisposable disposable)
+		{
+			disposable.Dispose();
+		}
+
 		return result;
 	}
 }
\ No newline at end of file

From ccf8d75c0d67da809af04116b588c9bd8678cc8e Mon Sep 17 00:00:00 2001
From: Jens-Christian Skibakk <jens.christian.skibakk@lexit.no>
Date: Thu, 19 Dec 2024 11:57:01 +0100
Subject: [PATCH 2/2] Fix tests

---
 .../Converters/IsListNotNullOrEmptyConverterTests.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/CommunityToolkit.Maui.UnitTests/Converters/IsListNotNullOrEmptyConverterTests.cs b/src/CommunityToolkit.Maui.UnitTests/Converters/IsListNotNullOrEmptyConverterTests.cs
index 8cb101d0a5..5099196573 100644
--- a/src/CommunityToolkit.Maui.UnitTests/Converters/IsListNotNullOrEmptyConverterTests.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/Converters/IsListNotNullOrEmptyConverterTests.cs
@@ -10,30 +10,30 @@ public class IsListNotNullOrEmptyConverterTests : BaseOneWayConverterTest<IsList
 	public static TheoryData<IEnumerable?, bool> Data { get; } = new()
 	{
 		{
-			new List<string>(), true
+			new List<string>(), false
 		},
 		{
-			Array.Empty<string>(), true
+			Array.Empty<string>(), false
 		},
 		{
 			new List<string>
 			{
 				"TestValue"
 			},
-			false
+			true
 		},
 		{
 			new []
 			{
 				"TestValue"
 			},
-			false
+			true
 		},
 		{
-			null, true
+			null, false
 		},
 		{
-			Enumerable.Range(1, 3), false
+			Enumerable.Range(1, 3), true
 		}
 	};