Skip to content

Fix assignment of MemberGenericArguments #400

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 2 commits into from
Sep 26, 2025
Merged

Fix assignment of MemberGenericArguments #400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db01106
Fix assignment of MemberGenericArguments to revert assignment changes…
ManuelWalz Sep 1, 2025
2242b88
Merge branch 'main' into fix/use-intended-member-generic-arguments
alexanderlinne Sep 26, 2025
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
3 changes: 1 addition & 2 deletions ArchUnitNET/Domain/Dependencies/MethodCallDependency.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System.Collections.Generic;
using ArchUnitNET.Loader;

namespace ArchUnitNET.Domain.Dependencies
{
Expand All @@ -9,7 +8,7 @@ public MethodCallDependency(IMember originMember, MethodMemberInstance calledMet
: base(originMember, calledMethodInstance)
{
TargetMember = calledMethodInstance.Member;
TargetMemberGenericArguments = calledMethodInstance.GenericArguments;
TargetMemberGenericArguments = calledMethodInstance.MemberGenericArguments;
}

public IMember TargetMember { get; }
Expand Down
102 changes: 102 additions & 0 deletions ArchUnitNETTests/Domain/Dependencies/Members/MethodCallDependencyTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,44 @@ public MethodCallDependencyTests()
.FirstOrDefault();
}

[Fact]
public void UsesMemberGenericArguments()
{
var architecture = StaticTestArchitectures.ArchUnitNETTestArchitecture;
var originClass = architecture.GetClassOfType(
typeof(ClassWithMethodWithGenericMethodArguments)
);
var originMember = originClass
.GetMembersWithName(
nameof(ClassWithMethodWithGenericMethodArguments.Method).BuildMethodMemberName()
)
.Single();
var targetClass = architecture.GetClassOfType(typeof(ClassWithGenericMethodArguments));
var targetMember = targetClass
.GetMethodMembersWithName(
nameof(ClassWithGenericMethodArguments.Method).BuildMethodMemberName()
)
.Single();
var memberGenericArgument = new GenericArgument(
new TypeInstance<IType>(
architecture.GetClassOfType(typeof(ClassForGenericArgument))
)
);
var methodCallDependency = new MethodCallDependency(
targetMember,
new MethodMemberInstance(
targetMember,
Enumerable.Empty<GenericArgument>(),
[memberGenericArgument]
)
);

Assert.Contains(
memberGenericArgument,
methodCallDependency.TargetMemberGenericArguments
);
}

[Theory]
[ClassData(typeof(MethodDependencyTestBuild.ConstructorTestData))]
public void ConstructorsAddedToClass(Class classWithConstructors)
Expand Down Expand Up @@ -68,6 +106,42 @@ MethodCallDependency expectedDependency
Assert.True(originMember.HasMemberDependency(expectedDependency));
Assert.Contains(expectedDependency, originMember.GetMethodCallDependencies());
}

[Theory]
[ClassData(
typeof(MethodDependencyTestBuild.MethodCallGenericConstructorArgumentsDependencyTestData)
)]
public void MethodCallGenericConstructorArgumentDependenciesAreFound(
IMember originMember,
MethodCallDependency expectedDependency
)
{
Assert.Contains(
originMember.GetMethodCallDependencies(),
methodCallDependency =>
methodCallDependency.TargetGenericArguments.SequenceEqual(
expectedDependency.TargetGenericArguments
)
);
}

[Theory]
[ClassData(
typeof(MethodDependencyTestBuild.MethodCallGenericMethodArgumentsDependencyTestData)
)]
public void MethodCallGenericMethodArgumentDependenciesAreFound(
IMember originMember,
MethodCallDependency expectedDependency
)
{
Assert.Contains(
originMember.GetMethodCallDependencies(),
methodCallDependency =>
methodCallDependency.TargetMemberGenericArguments.SequenceEqual(
expectedDependency.TargetMemberGenericArguments
)
);
}
}

public class ClassWithMethodA
Expand Down Expand Up @@ -99,6 +173,34 @@ public static async void MethodAAsync()
}
}

public class ClassWithMethodWithGenericConstructorArguments
{
public static void Method()
{
var classForGenericArguments =
new ClassWithGenericConstructorArguments<ClassForGenericArgument>();
}
}

// ReSharper disable once UnusedTypeParameter
public class ClassWithGenericConstructorArguments<T>;

public class ClassWithMethodWithGenericMethodArguments
{
public static void Method()
{
ClassWithGenericMethodArguments.Method<ClassForGenericArgument>();
}
}

public class ClassWithGenericMethodArguments
{
// ReSharper disable once UnusedTypeParameter
public static void Method<T>() { }
}

public class ClassForGenericArgument;

public class ClassWithConstructors
{
private FieldType _fieldTest;
Expand Down
71 changes: 67 additions & 4 deletions ArchUnitNETTests/Domain/Dependencies/Members/MethodDependencyTestBuild.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
using ArchUnitNET.Domain;
using ArchUnitNET.Domain.Dependencies;
using ArchUnitNET.Domain.Extensions;
using ArchUnitNET.Loader;
using ArchUnitNETTests.Fluent.Extensions;
using JetBrains.Annotations;
using Type = System.Type;

namespace ArchUnitNETTests.Domain.Dependencies.Members
Expand All @@ -19,7 +19,9 @@ private static object[] BuildMethodCallDependencyTestData(
Type originType,
string nameOfOriginMember,
Type targetType,
string nameOfTargetMember
string nameOfTargetMember,
[CanBeNull] IEnumerable<Type> declaringGenericArgumentsTypes = null,
[CanBeNull] IEnumerable<Type> memberGenericArgumentsTypes = null
)
{
var originClass = Architecture.GetClassOfType(originType);
Expand All @@ -30,13 +32,22 @@ string nameOfTargetMember
originMember,
new MethodMemberInstance(
targetMember,
Enumerable.Empty<GenericArgument>(),
Enumerable.Empty<GenericArgument>()
CreateGenericArguments(declaringGenericArgumentsTypes ?? []),
CreateGenericArguments(memberGenericArgumentsTypes ?? [])
)
);
return new object[] { originMember, expectedDependency };
}

private static IEnumerable<GenericArgument> CreateGenericArguments(
IEnumerable<Type> classTypes
)
{
return classTypes
.Select(x => Architecture.GetClassOfType(x))
.Select(x => new GenericArgument(new TypeInstance<Class>(x)));
}

private static object[] BuildMethodSignatureDependencyTestData(
Type originType,
string nameOfOriginMember,
Expand Down Expand Up @@ -171,6 +182,58 @@ IEnumerator IEnumerable.GetEnumerator()
}
}

public class MethodCallGenericConstructorArgumentsDependencyTestData : IEnumerable<object[]>
{
private readonly List<object[]> _methodCallDependencyData = new List<object[]>
{
BuildMethodCallDependencyTestData(
typeof(ClassWithMethodWithGenericConstructorArguments),
nameof(ClassWithMethodWithGenericConstructorArguments.Method)
.BuildMethodMemberName(),
typeof(ClassWithGenericConstructorArguments<>),
StaticConstants.ConstructorNameBase.BuildMethodMemberName(),
[typeof(ClassForGenericArgument)],
[]
),
};

public IEnumerator<object[]> GetEnumerator()
{
return _methodCallDependencyData.GetEnumerator();
}

IEnumerator IEnumerable.GetEnumerator()
{
return GetEnumerator();
}
}

public class MethodCallGenericMethodArgumentsDependencyTestData : IEnumerable<object[]>
{
private readonly List<object[]> _methodCallDependencyData = new List<object[]>
{
BuildMethodCallDependencyTestData(
typeof(ClassWithMethodWithGenericMethodArguments),
nameof(ClassWithMethodWithGenericMethodArguments.Method)
.BuildMethodMemberName(),
typeof(ClassWithGenericMethodArguments),
nameof(ClassWithGenericMethodArguments.Method).BuildMethodMemberName(),
[],
[typeof(ClassForGenericArgument)]
),
};

public IEnumerator<object[]> GetEnumerator()
{
return _methodCallDependencyData.GetEnumerator();
}

IEnumerator IEnumerable.GetEnumerator()
{
return GetEnumerator();
}
}

public class ConstructorTestData : IEnumerable<object[]>
{
private readonly List<object[]> _methodCallDependencyData = new List<object[]>
Expand Down
Loading