Skip to content
This repository was archived by the owner on Apr 14, 2022. It is now read-only.

Commit 75b10c1

Browse files
committed
Bug fix
1 parent 96c5063 commit 75b10c1

3 files changed

Lines changed: 9 additions & 10 deletions

File tree

src/Analysis/Engine/Test/FluentAssertions/AnalysisValueAssertions.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public AndConstraint<TAssertions> HaveMemberOfTypes(string memberName, IEnumerab
129129
NotBeNull(because, reasonArgs);
130130

131131
Execute.Assertion.BecauseOf(because, reasonArgs)
132-
.AssertHasMember(Subject, OwnerScope, GetName(), $"member '{memberName}'", out var member);
132+
.AssertHasMember(Subject, OwnerScope, memberName, GetName(), $"member '{memberName}'", out var member);
133133

134134
AssertTypeIds(member, typeIds, memberName, Is3X(OwnerScope), because, reasonArgs);
135135
return new AndConstraint<TAssertions>((TAssertions)this);
@@ -212,8 +212,7 @@ public AndWhichConstraint<TAssertions, AnalysisValueTestInfo<TMember>> HaveMembe
212212
NotBeNull(because, reasonArgs);
213213

214214
Execute.Assertion.BecauseOf(because, reasonArgs)
215-
.AssertHasMemberOfType(Subject, OwnerScope, GetName(), $"member '{name}'", out TMember typedMember);
216-
215+
.AssertHasMemberOfType(Subject, OwnerScope, name, GetName(), $"member '{name}'", out TMember typedMember);
217216
return new AndWhichConstraint<TAssertions, AnalysisValueTestInfo<TMember>>((TAssertions)this, new AnalysisValueTestInfo<TMember>(typedMember, null, OwnerScope));
218217
}
219218

src/Analysis/Engine/Test/FluentAssertions/AssertionsUtilities.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -224,25 +224,25 @@ public static Continuation AssertAtIndex<T, TItem>(this AssertionScope assertion
224224
.FailWith($"Expected {subjectName} to have {itemName} of type `{typeof(T).Name}` at index {index}{{reason}}, but its type is `{collection[index].GetType().Name}`.");
225225

226226
[CustomAssertion]
227-
public static Continuation AssertHasMember(this AssertionScope assertionScope, IAnalysisValue analysisValue, IScope scope, string analysisValueName, string memberName, out IAnalysisSet member) {
227+
public static Continuation AssertHasMember(this AssertionScope assertionScope, IAnalysisValue analysisValue, IScope scope, string memberName, string analysisValueName, string memberPrintName, out IAnalysisSet member) {
228228
try {
229229
member = analysisValue.GetMember(null, new AnalysisUnit(null, null, scope, true), memberName);
230230
} catch (Exception e) {
231231
member = null;
232-
return assertionScope.FailWith($"Expected {analysisValueName} to have a {memberName}{{reason}}, but {nameof(analysisValue.GetMember)} has failed with exception: {e}.");
232+
return assertionScope.FailWith($"Expected {analysisValueName} to have a {memberPrintName}{{reason}}, but {nameof(analysisValue.GetMember)} has failed with exception: {e}.");
233233
}
234234

235235
return assertionScope.ForCondition(!(member is null))
236-
.FailWith($"Expected {analysisValueName} to have a {memberName}{{reason}}.");
236+
.FailWith($"Expected {analysisValueName} to have a {memberPrintName}{{reason}}.");
237237
}
238238

239239
[CustomAssertion]
240-
public static Continuation AssertHasMemberOfType<TMember>(this AssertionScope assertionScope, IAnalysisValue analysisValue, IScope scope, string analysisValueName, string memberName, out TMember typedMember)
240+
public static Continuation AssertHasMemberOfType<TMember>(this AssertionScope assertionScope, IAnalysisValue analysisValue, IScope scope, string memberName, string analysisValueName, string memberPrintName, out TMember typedMember)
241241
where TMember : class, IAnalysisValue {
242-
var continuation = assertionScope.AssertHasMember(analysisValue, scope, analysisValueName, memberName, out var member)
242+
var continuation = assertionScope.AssertHasMember(analysisValue, scope, memberName, analysisValueName, memberPrintName, out var member)
243243
.Then
244244
.ForCondition(member is TMember)
245-
.FailWith($"Expected {analysisValueName} to have a {memberName} of type {typeof(TMember)}{{reason}}, but its type is {member.GetType()}.");
245+
.FailWith($"Expected {analysisValueName} to have a {memberPrintName} of type {typeof(TMember)}{{reason}}, but its type is {member.GetType()}.");
246246
typedMember = member as TMember;
247247
return continuation;
248248
}

src/Analysis/Engine/Test/FluentAssertions/ModuleAnalysisAssertions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public AndWhichConstraint<ModuleAnalysisAssertions, AnalysisValueTestInfo<TMembe
4545
.Then
4646
.AssertIsNotNull(Subject.ProjectState.BuiltinModule, $"module '{Subject.ModuleName}'", "builtin module", "\'IModuleAnalysis.ProjectState.BuiltinModule\'")
4747
.Then
48-
.AssertHasMemberOfType<TMember>(Subject.ProjectState.BuiltinModule, Subject.Scope, $"module '{Subject.ModuleName}'", $"builtin member '{name}'", out var typedMember);
48+
.AssertHasMemberOfType<TMember>(Subject.ProjectState.BuiltinModule, Subject.Scope, name, $"module '{Subject.ModuleName}'", $"builtin member '{name}'", out var typedMember);
4949

5050
return new AndWhichConstraint<ModuleAnalysisAssertions, AnalysisValueTestInfo<TMember>>(this, new AnalysisValueTestInfo<TMember>(typedMember, null, Subject.Scope));
5151
}

0 commit comments

Comments
 (0)