Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@ public void MissingRemoteDataSource_ByNameAndType_Triggers() { }

[{|#3:MemberData(nameof(MissingRemoteDataSource_ByNameofAndType_Triggers), MemberType = typeof(OtherClass))|}]
public void MissingRemoteDataSource_ByNameofAndType_Triggers() { }

public TheoryData<int> NonStatic => null;

[{|#4:MemberData("BogusName")|}]
[{|#5:MemberData(nameof(NonStatic))|}]
public void MissingDataSource_DoesNotStopAnalysisOfSubsequentAttributes(int _) { }
}

public abstract class BaseClassWithTestWithoutData
Expand All @@ -43,19 +49,19 @@ public class SubClassWithTestData : BaseClassWithTestWithoutData

public record TestRecord {
[Theory]
[{|#4:MemberData("BogusName")|}]
[{|#6:MemberData("BogusName")|}]
public void MissingLocalDataSource_InRecord_Triggers(int _) { }
}

public record class TestRecordClass {
[Theory]
[{|#5:MemberData("BogusName")|}]
[{|#7:MemberData("BogusName")|}]
public void MissingLocalDataSource_InRecordClass_Triggers(int _) { }
}

public record struct TestRecordStruct {
[Theory]
[{|#6:MemberData("BogusName")|}]
[{|#8:MemberData("BogusName")|}]
public void MissingLocalDataSource_InRecordStruct_Triggers(int _) { }
}
""";
Expand All @@ -65,9 +71,11 @@ public void MissingLocalDataSource_InRecordStruct_Triggers(int _) { }
Verify.Diagnostic("xUnit1015").WithLocation(1).WithArguments("BogusName", "TestClass"),
Verify.Diagnostic("xUnit1015").WithLocation(2).WithArguments("BogusName", "OtherClass"),
Verify.Diagnostic("xUnit1015").WithLocation(3).WithArguments("MissingRemoteDataSource_ByNameofAndType_Triggers", "OtherClass"),
Verify.Diagnostic("xUnit1015").WithLocation(4).WithArguments("BogusName", "TestRecord"),
Verify.Diagnostic("xUnit1015").WithLocation(5).WithArguments("BogusName", "TestRecordClass"),
Verify.Diagnostic("xUnit1015").WithLocation(6).WithArguments("BogusName", "TestRecordStruct"),
Verify.Diagnostic("xUnit1015").WithLocation(4).WithArguments("BogusName", "TestClass"),
Verify.Diagnostic("xUnit1017").WithLocation(5),
Verify.Diagnostic("xUnit1015").WithLocation(6).WithArguments("BogusName", "TestRecord"),
Verify.Diagnostic("xUnit1015").WithLocation(7).WithArguments("BogusName", "TestRecordClass"),
Verify.Diagnostic("xUnit1015").WithLocation(8).WithArguments("BogusName", "TestRecordStruct"),
};

await Verify.VerifyAnalyzer(LanguageVersion.CSharp10, [source1, source2], expected);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,14 +103,14 @@ public override void AnalyzeCompilation(
if (declaredMemberTypeSymbol.DeclaredAccessibility is not Accessibility.Public and not Accessibility.Internal)
{
ReportTypeMustBePublicOrInternal(context, attributeSyntax, declaredMemberTypeSymbol);
return;
continue;
}

// We can't close an open generic in Native AOT
if (declaredMemberTypeSymbol is INamedTypeSymbol namedMemberType && namedMemberType.IsGenericType && namedMemberType.TypeArguments.Any(t => t.Kind == SymbolKind.TypeParameter))
{
ReportOpenGenericMemberType(context, attributeSyntax);
return;
continue;
}
}

Expand All @@ -120,11 +120,11 @@ public override void AnalyzeCompilation(
{
case 0:
ReportMissingMember(context, attributeSyntax, memberName, declaredMemberTypeSymbol);
return;
continue;

case > 1:
ReporterOverloadedMember(context, attributeSyntax, memberName, declaredMemberTypeSymbol, xunitContext.HasV3AotReferences);
return;
continue;
}
var memberSymbol = memberSymbols[0];

Expand All @@ -139,7 +139,7 @@ public override void AnalyzeCompilation(
if (memberReturnType is null)
{
ReportIncorrectMemberType(context, attributeSyntax);
return;
continue;
}

// Make sure they use nameof() instead of a string constant for the member name
Expand Down