Skip to content

Rewrite Member Syntax Elements Tests and Refactor Member Syntax Elements #464

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
mak638 merged 3 commits into from
Jun 12, 2026
Merged

Rewrite Member Syntax Elements Tests and Refactor Member Syntax Elements #464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da74e40
test: rewrite member syntax elements tests
alexanderlinne Mar 20, 2026
2c473e3
refactor: deduplicate implementation of member syntax elements
alexanderlinne Mar 20, 2026
012b9c7
fix: correctly set MethodMember.IsVirtual in DomainResolver
alexanderlinne Mar 20, 2026
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
18 changes: 10 additions & 8 deletions ArchUnitNET/Fluent/Syntax/Elements/Members/AddMemberCondition.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@ internal AddMemberCondition(IArchRuleCreator<TRuleType> ruleCreator)
: base(ruleCreator) { }

// csharpier-ignore-start
public TNextElement BeDeclaredIn(IType firstType, params IType[] moreTypes) => CreateNextElement(MemberConditionsDefinition<TRuleType>.BeDeclaredIn(firstType, moreTypes));
public TNextElement BeDeclaredIn(Type firstType, params Type[] moreTypes) => CreateNextElement(MemberConditionsDefinition<TRuleType>.BeDeclaredIn(firstType, moreTypes));
public TNextElement BeDeclaredIn() => BeDeclaredIn(new ObjectProvider<IType>());
public TNextElement BeDeclaredIn(params IType[] types) => BeDeclaredIn(new ObjectProvider<IType>(types));
public TNextElement BeDeclaredIn(params Type[] types) => BeDeclaredIn(new SystemTypeObjectProvider<IType>(types));
public TNextElement BeDeclaredIn(IObjectProvider<IType> types) => CreateNextElement(MemberConditionsDefinition<TRuleType>.BeDeclaredIn(types));
public TNextElement BeDeclaredIn(IEnumerable<IType> types) => CreateNextElement(MemberConditionsDefinition<TRuleType>.BeDeclaredIn(types));
public TNextElement BeDeclaredIn(IEnumerable<Type> types) => CreateNextElement(MemberConditionsDefinition<TRuleType>.BeDeclaredIn(types));
public TNextElement BeDeclaredIn(IEnumerable<IType> types) => BeDeclaredIn(new ObjectProvider<IType>(types));
public TNextElement BeDeclaredIn(IEnumerable<Type> types) => BeDeclaredIn(new SystemTypeObjectProvider<IType>(types));

public TNextElement BeStatic() => CreateNextElement(MemberConditionsDefinition<TRuleType>.BeStatic());
public TNextElement BeReadOnly() => CreateNextElement(MemberConditionsDefinition<TRuleType>.BeReadOnly());
Expand All @@ -30,11 +31,12 @@ internal AddMemberCondition(IArchRuleCreator<TRuleType> ruleCreator)

//Negations

public TNextElement NotBeDeclaredIn(IType firstType, params IType[] moreTypes) => CreateNextElement(MemberConditionsDefinition<TRuleType>.NotBeDeclaredIn(firstType, moreTypes));
public TNextElement NotBeDeclaredIn(Type firstType, params Type[] moreTypes) => CreateNextElement(MemberConditionsDefinition<TRuleType>.NotBeDeclaredIn(firstType, moreTypes));
public TNextElement NotBeDeclaredIn() => NotBeDeclaredIn(new ObjectProvider<IType>());
public TNextElement NotBeDeclaredIn(params IType[] types) => NotBeDeclaredIn(new ObjectProvider<IType>(types));
public TNextElement NotBeDeclaredIn(params Type[] types) => NotBeDeclaredIn(new SystemTypeObjectProvider<IType>(types));
public TNextElement NotBeDeclaredIn(IObjectProvider<IType> types) => CreateNextElement(MemberConditionsDefinition<TRuleType>.NotBeDeclaredIn(types));
public TNextElement NotBeDeclaredIn(IEnumerable<IType> types) => CreateNextElement(MemberConditionsDefinition<TRuleType>.NotBeDeclaredIn(types));
public TNextElement NotBeDeclaredIn(IEnumerable<Type> types) => CreateNextElement(MemberConditionsDefinition<TRuleType>.NotBeDeclaredIn(types));
public TNextElement NotBeDeclaredIn(IEnumerable<IType> types) => NotBeDeclaredIn(new ObjectProvider<IType>(types));
public TNextElement NotBeDeclaredIn(IEnumerable<Type> types) => NotBeDeclaredIn(new SystemTypeObjectProvider<IType>(types));

public TNextElement NotBeStatic() => CreateNextElement(MemberConditionsDefinition<TRuleType>.NotBeStatic());
public TNextElement NotBeReadOnly() => CreateNextElement(MemberConditionsDefinition<TRuleType>.NotBeReadOnly());
Expand Down
18 changes: 10 additions & 8 deletions ArchUnitNET/Fluent/Syntax/Elements/Members/AddMemberPredicate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,25 @@ internal AddMemberPredicate(IArchRuleCreator<TRelatedType> ruleCreator)
: base(ruleCreator) { }

// csharpier-ignore-start
public TNextElement AreDeclaredIn(IType firstType, params IType[] moreTypes) => CreateNextElement(MemberPredicatesDefinition<TRuleType>.AreDeclaredIn(firstType, moreTypes));
public TNextElement AreDeclaredIn(Type firstType, params Type[] moreTypes) => CreateNextElement(MemberPredicatesDefinition<TRuleType>.AreDeclaredIn(firstType, moreTypes));
public TNextElement AreDeclaredIn() => AreDeclaredIn(new ObjectProvider<IType>());
public TNextElement AreDeclaredIn(params IType[] types) => AreDeclaredIn(new ObjectProvider<IType>(types));
public TNextElement AreDeclaredIn(params Type[] types) => AreDeclaredIn(new SystemTypeObjectProvider<IType>(types));
public TNextElement AreDeclaredIn(IObjectProvider<IType> types) => CreateNextElement(MemberPredicatesDefinition<TRuleType>.AreDeclaredIn(types));
public TNextElement AreDeclaredIn(IEnumerable<IType> types) => CreateNextElement(MemberPredicatesDefinition<TRuleType>.AreDeclaredIn(types));
public TNextElement AreDeclaredIn(IEnumerable<Type> types) => CreateNextElement(MemberPredicatesDefinition<TRuleType>.AreDeclaredIn(types));
public TNextElement AreDeclaredIn(IEnumerable<IType> types) => AreDeclaredIn(new ObjectProvider<IType>(types));
public TNextElement AreDeclaredIn(IEnumerable<Type> types) => AreDeclaredIn(new SystemTypeObjectProvider<IType>(types));

public TNextElement AreStatic() => CreateNextElement(MemberPredicatesDefinition<TRuleType>.AreStatic());
public TNextElement AreReadOnly() => CreateNextElement(MemberPredicatesDefinition<TRuleType>.AreReadOnly());
public TNextElement AreImmutable() => CreateNextElement(MemberPredicatesDefinition<TRuleType>.AreImmutable());

//Negations

public TNextElement AreNotDeclaredIn(IType firstType, params IType[] moreTypes) => CreateNextElement(MemberPredicatesDefinition<TRuleType>.AreNotDeclaredIn(firstType, moreTypes));
public TNextElement AreNotDeclaredIn(Type firstType, params Type[] moreTypes) => CreateNextElement(MemberPredicatesDefinition<TRuleType>.AreNotDeclaredIn(firstType, moreTypes));
public TNextElement AreNotDeclaredIn() => AreNotDeclaredIn(new ObjectProvider<IType>());
public TNextElement AreNotDeclaredIn(params IType[] types) => AreNotDeclaredIn(new ObjectProvider<IType>(types));
public TNextElement AreNotDeclaredIn(params Type[] types) => AreNotDeclaredIn(new SystemTypeObjectProvider<IType>(types));
public TNextElement AreNotDeclaredIn(IObjectProvider<IType> types) => CreateNextElement(MemberPredicatesDefinition<TRuleType>.AreNotDeclaredIn(types));
public TNextElement AreNotDeclaredIn(IEnumerable<IType> types) => CreateNextElement(MemberPredicatesDefinition<TRuleType>.AreNotDeclaredIn(types));
public TNextElement AreNotDeclaredIn(IEnumerable<Type> types) => CreateNextElement(MemberPredicatesDefinition<TRuleType>.AreNotDeclaredIn(types));
public TNextElement AreNotDeclaredIn(IEnumerable<IType> types) => AreNotDeclaredIn(new ObjectProvider<IType>(types));
public TNextElement AreNotDeclaredIn(IEnumerable<Type> types) => AreNotDeclaredIn(new SystemTypeObjectProvider<IType>(types));

public TNextElement AreNotStatic() => CreateNextElement(MemberPredicatesDefinition<TRuleType>.AreNotStatic());
public TNextElement AreNotReadOnly() => CreateNextElement(MemberPredicatesDefinition<TRuleType>.AreNotReadOnly());
Expand Down
10 changes: 6 additions & 4 deletions ArchUnitNET/Fluent/Syntax/Elements/Members/IAddMemberCondition.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ public interface IAddMemberCondition<TNextElement, TRuleType>
: IAddObjectCondition<TNextElement, TRuleType>
where TRuleType : ICanBeAnalyzed
{
TNextElement BeDeclaredIn(IType firstType, params IType[] moreTypes);
TNextElement BeDeclaredIn(Type firstType, params Type[] moreTypes);
TNextElement BeDeclaredIn();
TNextElement BeDeclaredIn(params IType[] types);
TNextElement BeDeclaredIn(params Type[] types);
TNextElement BeDeclaredIn(IObjectProvider<IType> types);
TNextElement BeDeclaredIn(IEnumerable<IType> types);
TNextElement BeDeclaredIn(IEnumerable<Type> types);
Expand All @@ -20,8 +21,9 @@ public interface IAddMemberCondition<TNextElement, TRuleType>
TNextElement BeImmutable();

//Negations
TNextElement NotBeDeclaredIn(IType firstType, params IType[] moreTypes);
TNextElement NotBeDeclaredIn(Type firstType, params Type[] moreTypes);
TNextElement NotBeDeclaredIn();
TNextElement NotBeDeclaredIn(params IType[] types);
TNextElement NotBeDeclaredIn(params Type[] types);
TNextElement NotBeDeclaredIn(IObjectProvider<IType> types);
TNextElement NotBeDeclaredIn(IEnumerable<IType> types);
TNextElement NotBeDeclaredIn(IEnumerable<Type> types);
Expand Down
12 changes: 8 additions & 4 deletions ArchUnitNET/Fluent/Syntax/Elements/Members/IAddMemberPredicate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@ public interface IAddMemberPredicate<out TNextElement, TRuleType>
: IAddObjectPredicate<TNextElement, TRuleType>
where TRuleType : ICanBeAnalyzed
{
TNextElement AreDeclaredIn(IType firstType, params IType[] moreTypes);
TNextElement AreDeclaredIn(Type firstType, params Type[] moreTypes);
// csharpier-ignore-start
TNextElement AreDeclaredIn();
TNextElement AreDeclaredIn(params IType[] types);
TNextElement AreDeclaredIn(params Type[] types);
TNextElement AreDeclaredIn(IObjectProvider<IType> types);
TNextElement AreDeclaredIn(IEnumerable<IType> types);
TNextElement AreDeclaredIn(IEnumerable<Type> types);
Expand All @@ -18,12 +20,14 @@ public interface IAddMemberPredicate<out TNextElement, TRuleType>

//Negations

TNextElement AreNotDeclaredIn(IType firstType, params IType[] moreTypes);
TNextElement AreNotDeclaredIn(Type firstType, params Type[] moreTypes);
TNextElement AreNotDeclaredIn();
TNextElement AreNotDeclaredIn(params IType[] types);
TNextElement AreNotDeclaredIn(params Type[] types);
TNextElement AreNotDeclaredIn(IObjectProvider<IType> types);
TNextElement AreNotDeclaredIn(IEnumerable<IType> types);
TNextElement AreNotDeclaredIn(IEnumerable<Type> types);
TNextElement AreNotStatic();
TNextElement AreNotImmutable();
// csharpier-ignore-end
}
}
Loading
Loading