Skip to content

DynamicLinqTypeAttribute can now also be defined on an interface #750

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

Merged
merged 1 commit into from
Oct 14, 2023
Merged

DynamicLinqTypeAttribute can now also be defined on an interface #750

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
17 changes: 8 additions & 9 deletions src/System.Linq.Dynamic.Core/CustomTypeProviders/DynamicLinqTypeAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
namespace System.Linq.Dynamic.Core.CustomTypeProviders
namespace System.Linq.Dynamic.Core.CustomTypeProviders;

/// <summary>
/// Indicates to Dynamic Linq to consider the Type as a valid dynamic linq type.
/// </summary>
[AttributeUsage(AttributeTargets.Class | AttributeTargets.Interface | AttributeTargets.Struct | AttributeTargets.Enum, AllowMultiple = false, Inherited = false)]
public sealed class DynamicLinqTypeAttribute : Attribute
{
/// <summary>
/// Indicates to Dynamic Linq to consider the Type as a valid dynamic linq type.
/// </summary>
[AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Enum, AllowMultiple = false, Inherited = false)]
public sealed class DynamicLinqTypeAttribute : Attribute
{
}
}
}
31 changes: 29 additions & 2 deletions test/System.Linq.Dynamic.Core.Tests/DynamicExpressionParserTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,17 @@ public class CustomClassWithMethodWithDynamicLinqTypeAttribute
public int GetAge(int x) => x;
}

[DynamicLinqType]
public interface ICustomInterfaceWithMethodWithDynamicLinqTypeAttribute
{
int GetAge(int x);
}

public class CustomClassImplementingInterface : ICustomInterfaceWithMethodWithDynamicLinqTypeAttribute
{
public int GetAge(int x) => x;
}

[DynamicLinqType]
public class CustomClassWithStaticMethodWithDynamicLinqTypeAttribute
{
Expand Down Expand Up @@ -1057,7 +1068,7 @@ public void DynamicExpressionParser_ParseLambda_CustomStaticMethod_WhenClassHasD
// Act
var lambdaExpression = DynamicExpressionParser.ParseLambda(typeof(CustomClassWithStaticMethodWithDynamicLinqTypeAttribute), null, expression);
var del = lambdaExpression.Compile();
var result = (int)del.DynamicInvoke(context);
var result = (int?)del.DynamicInvoke(context);

// Assert
Check.That(result).IsEqualTo(10);
Expand All @@ -1073,12 +1084,28 @@ public void DynamicExpressionParser_ParseLambda_CustomMethod_WhenClassHasDynamic
// Act
var lambdaExpression = DynamicExpressionParser.ParseLambda(typeof(CustomClassWithMethodWithDynamicLinqTypeAttribute), null, expression);
var del = lambdaExpression.Compile();
var result = (int)del.DynamicInvoke(context);
var result = (int?)del.DynamicInvoke(context);

// Assert
Check.That(result).IsEqualTo(10);
}

[Fact]
public void DynamicExpressionParser_ParseLambda_CustomInterface_WhenInterfaceHasDynamicLinqTypeAttribute_ShouldWorkCorrect()
{
// Arrange
var context = new CustomClassImplementingInterface();
var expression = $"{nameof(ICustomInterfaceWithMethodWithDynamicLinqTypeAttribute.GetAge)}(10)";

// Act
var lambdaExpression = DynamicExpressionParser.ParseLambda(typeof(ICustomInterfaceWithMethodWithDynamicLinqTypeAttribute), null, expression);
var del = lambdaExpression.Compile();
var result = (int?)del.DynamicInvoke(context);

// Assert
result.Should().Be(10);
}

[Fact]
public void DynamicExpressionParser_ParseLambda_CustomMethod_WhenClassDoesNotHaveDynamicLinqTypeAttribute_ShouldThrowException()
{
Expand Down