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

CompositeControl: ambiguous GetContents error message, test inheritance #1715

Merged
merged 1 commit into from
Oct 22, 2023
Merged

CompositeControl: ambiguous GetContents error message, test inheritance #1715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 12 additions & 1 deletion src/Framework/Framework/Controls/CompositeControl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)))
Expand Down
44 changes: 44 additions & 0 deletions src/Tests/ControlTests/CompositeControlTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down Expand Up @@ -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")]
Expand Down Expand Up @@ -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)
}
};
}
}
}
7 changes: 7 additions & 0 deletions src/Tests/ControlTests/testoutputs/CompositeControlTests.CompositeControlInheritance.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<html>
<head></head>
<body>
<div>Text1</div>
<p>SecondText1.1</p>
</body>
</html>
Loading