Merge pull request #1715 from riganti/compositecontrol-inheritance-ha…

…ndling CompositeControl: ambiguous GetContents error message, test inheritance
riganti · Oct 22, 2023 · 585f522 · 585f522
2 parents 5bd1ee7 + f21c2cf
commit 585f522
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 1 deletion.
diff --git a/src/Framework/Framework/Controls/CompositeControl.cs b/src/Framework/Framework/Controls/CompositeControl.cs
@@ -85,7 +85,18 @@ Func<IDotvvmRequestContext, CompositeControl, object> compileGetter(IControlAttr
 
                 DefaultControlResolver.InitType(controlType.BaseType.NotNull());
 
-                var method = controlType.GetMethod("GetContents", BindingFlags.Static | BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
+                MethodInfo? method;
+                try
+                {
+                    method = controlType.GetMethod("GetContents", BindingFlags.Static | BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
+                }
+                catch (AmbiguousMatchException ex)
+                {
+                    var allMethods = controlType.GetMethods(BindingFlags.Static | BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.FlattenHierarchy).Where(m => m.Name == "GetContents").ToArray();
+
+                    var message = $"Could not initialize control {controlType.FullName}, multiple GetContents methods are present: {allMethods.Take(3).Select(m => ReflectionUtils.FormatMethodInfo(m, stripNamespace: true)).StringJoin(", ")}{(allMethods.Length > 3 ? ", ..." : "")}";
+                    throw new Exception(message, ex);
+                }
                 if (method == null)
                     throw new Exception($"Could not initialize control {controlType.FullName}, could not find (single) GetContents method");
                 if (!(typeof(DotvvmControl).IsAssignableFrom(method.ReturnType) || typeof(IEnumerable<DotvvmControl>).IsAssignableFrom(method.ReturnType)))

diff --git a/src/Tests/ControlTests/CompositeControlTests.cs b/src/Tests/ControlTests/CompositeControlTests.cs
@@ -17,6 +17,7 @@
 using DotVVM.Framework.ViewModel;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using DotVVM.Framework.Hosting;
+using System.ComponentModel;
 
 namespace DotVVM.Framework.Tests.ControlTests
 {
@@ -322,6 +323,18 @@ public async Task MenuRepeater()
             check.CheckString(r.FormattedHtml, fileExtension: "html");
         }
 
+        [TestMethod]
+        public async Task CompositeControlInheritance()
+        {
+            var r = await cth.RunPage(typeof(BasicTestViewModel), """
+                <cc:TestBaseCompositeControl Text="Text" Number=1 />
+                <cc:TestDerivedCompositeControl Text="SecondText" AnotherNumber=1.1 />
+                """
+            );
+
+            check.CheckString(r.FormattedHtml, fileExtension: "html");
+        }
+
         public class BasicTestViewModel: DotvvmViewModelBase
         {
             [Bind(Name = "int")]
@@ -689,4 +702,35 @@ public static DotvvmControl GetContents(ValueOrBinding<TestStatusEnum> testStatu
             return icon;
         }
     }
+
+    public class TestBaseCompositeControl: CompositeControl
+    {
+        public static DotvvmControl GetContents(
+            ValueOrBinding<string> text,
+            [DefaultValue(1)]
+            ValueOrBinding<int> number
+        )
+        {
+            return new HtmlGenericControl("div") {
+                Children = {
+                    new Literal(text), new Literal(number)
+                }
+            };
+        }
+    }
+
+    public class TestDerivedCompositeControl: TestBaseCompositeControl
+    {
+        public static DotvvmControl GetContents(
+            ValueOrBinding<string> text,
+            ValueOrBinding<double> anotherNumber // declare another property, type of existing property cannot be changed
+        )
+        {
+            return new HtmlGenericControl("p") {
+                Children = {
+                    new Literal(text), new Literal(anotherNumber)
+                }
+            };
+        }
+    }
 }
diff --git a/src/Tests/ControlTests/testoutputs/CompositeControlTests.CompositeControlInheritance.html b/src/Tests/ControlTests/testoutputs/CompositeControlTests.CompositeControlInheritance.html
@@ -0,0 +1,7 @@
+<html>
+	<head></head>
+	<body>
+		<div>Text1</div>
+		<p>SecondText1.1</p>
+	</body>
+</html>