Fix #33829: Don't log warning for View content when ControlTemplate is set

kubaflo · kubaflo · commit fe0d1d970199 · 2026-02-02T15:57:17.000+01:00
When RadioButton has a ControlTemplate applied, View content IS supported per
documentation. The warning should only appear when no ControlTemplate is set.

- Modified ContentAsString() to check ResolveControlTemplate() == null before logging
- Added unit tests to verify correct warning behavior
- Updated XML documentation to reflect correct behavior
diff --git a/src/Controls/src/Core/RadioButton/RadioButton.cs b/src/Controls/src/Core/RadioButton/RadioButton.cs
@@ -26,7 +26,7 @@ public partial class RadioButton : TemplatedView, IElementConfiguration<RadioBut
 		/// </summary>
 		/// <value>The string "Checked".</value>
 		public const string CheckedVisualState = "Checked";
-		
+
 		/// <summary>
 		/// The visual state name for when the radio button is unchecked.
 		/// </summary>
@@ -38,13 +38,13 @@ public partial class RadioButton : TemplatedView, IElementConfiguration<RadioBut
 		/// </summary>
 		/// <value>The string "Root".</value>
 		public const string TemplateRootName = "Root";
-		
+
 		/// <summary>
 		/// The name of the checked indicator element in the control template.
 		/// </summary>
 		/// <value>The string "CheckedIndicator".</value>
 		public const string CheckedIndicator = "CheckedIndicator";
-		
+
 		/// <summary>
 		/// The name of the unchecked button element in the control template.
 		/// </summary>
@@ -686,12 +686,15 @@ static View BuildDefaultTemplate()
 		/// </summary>
 		/// <returns>The string representation of the content, or the result of <c>ToString()</c> if content is not a string.</returns>
 		/// <remarks>
-		/// If <see cref="Content"/> is a <see cref="View"/>, a warning is logged and the <c>ToString()</c> representation is used instead.
+		/// If <see cref="Content"/> is a <see cref="View"/> and no <see cref="ControlTemplate"/> is set, a warning is logged 
+		/// and the <c>ToString()</c> representation is used instead. When a ControlTemplate is applied, View content is supported.
 		/// </remarks>
 		public string ContentAsString()
 		{
 			var content = Content;
-			if (content is View)
+			// Only log warning if Content is a View AND no ControlTemplate is set
+			// When ControlTemplate is set, View content IS supported (per documentation)
+			if (content is View && ResolveControlTemplate() == null)
 			{
 				Application.Current?.FindMauiContext()?.CreateLogger<RadioButton>()?.LogWarning("Warning - {RuntimePlatform} does not support View as the {PropertyName} property of RadioButton; the return value of the ToString() method will be displayed instead.", DeviceInfo.Platform, ContentProperty.PropertyName);
 			}
diff --git a/src/Controls/tests/Core.UnitTests/RadioButtonContentAsStringTests.cs b/src/Controls/tests/Core.UnitTests/RadioButtonContentAsStringTests.cs
@@ -0,0 +1,68 @@
+using System;
+using System.Linq;
+using Xunit;
+
+namespace Microsoft.Maui.Controls.Core.UnitTests
+{
+	/// <summary>
+	/// Tests for RadioButton ContentAsString() warning behavior.
+	/// Issue #33829: Warning should not be logged when ControlTemplate is set because
+	/// View content IS supported in that scenario.
+	/// </summary>
+	[Category("RadioButton")]
+	public class RadioButtonContentAsStringTests : BaseTestFixture
+	{
+		public RadioButtonContentAsStringTests()
+		{
+			ApplicationExtensions.CreateAndSetMockApplication();
+		}
+
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing)
+			{
+				Application.ClearCurrent();
+			}
+			base.Dispose(disposing);
+		}
+
+		[Fact]
+		public void ContentAsStringDoesNotLogWarningWhenControlTemplateIsSet()
+		{
+			// Arrange: RadioButton with ControlTemplate AND View Content
+			// This scenario IS supported per documentation, so no warning should be logged
+			var radioButton = new RadioButton
+			{
+				ControlTemplate = RadioButton.DefaultTemplate,
+				Content = new Label { Text = "Test Label" }
+			};
+
+			// Act
+			var result = radioButton.ContentAsString();
+
+			// Assert: No warning should be logged when ControlTemplate is set
+			Assert.True(MockApplication.MockLogger.Messages.Count == 0,
+				"No warning should be logged when ControlTemplate is set. " +
+				$"Found: {MockApplication.MockLogger.Messages.FirstOrDefault()}");
+			Assert.NotNull(result);
+		}
+
+		[Fact]
+		public void ContentAsStringLogsWarningWhenNoControlTemplate()
+		{
+			// Arrange: RadioButton without ControlTemplate but with View Content
+			// This scenario is NOT supported, so warning should be logged
+			var radioButton = new RadioButton
+			{
+				Content = new Label { Text = "Test Label" }
+			};
+
+			// Act
+			var result = radioButton.ContentAsString();
+
+			// Assert: Warning SHOULD be logged when ControlTemplate is null
+			Assert.Single(MockApplication.MockLogger.Messages);
+			Assert.Contains("does not support View as the Content property", MockApplication.MockLogger.Messages.First(), StringComparison.Ordinal);
+		}
+	}
+}
