Skip to content

Drop the null forgiving operator from generated TestContext getter #1901

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
SimonCropp merged 1 commit into from
Aug 29, 2026
Merged

Drop the null forgiving operator from generated TestContext getter #1901

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
2 changes: 1 addition & 1 deletion ...erify.MSTest.SourceGenerator.Tests/GlobalNamespaceTests.HasAssemblyAttribute.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ partial class Foo
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Verify.MSTest.SourceGenerator", "1.0.0.0")]
public global::Microsoft.VisualStudio.TestTools.UnitTesting.TestContext TestContext
{
get => global::VerifyMSTest.Verifier.CurrentTestContext.Value!.TestContext;
get => global::VerifyMSTest.Verifier.CurrentTestContext.Value.TestContext;
set => global::VerifyMSTest.Verifier.CurrentTestContext.Value = new global::VerifyMSTest.TestExecutionContext(value, GetType());
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...r.Tests/GlobalNamespaceTests.HasAssemblyAttributeAndCustomTestClassAttribute.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ partial class Foo
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Verify.MSTest.SourceGenerator", "1.0.0.0")]
public global::Microsoft.VisualStudio.TestTools.UnitTesting.TestContext TestContext
{
get => global::VerifyMSTest.Verifier.CurrentTestContext.Value!.TestContext;
get => global::VerifyMSTest.Verifier.CurrentTestContext.Value.TestContext;
set => global::VerifyMSTest.Verifier.CurrentTestContext.Value = new global::VerifyMSTest.TestExecutionContext(value, GetType());
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...Verify.MSTest.SourceGenerator.Tests/GlobalNamespaceTests.HasAttributeOnClass.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ partial class Foo
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Verify.MSTest.SourceGenerator", "1.0.0.0")]
public global::Microsoft.VisualStudio.TestTools.UnitTesting.TestContext TestContext
{
get => global::VerifyMSTest.Verifier.CurrentTestContext.Value!.TestContext;
get => global::VerifyMSTest.Verifier.CurrentTestContext.Value.TestContext;
set => global::VerifyMSTest.Verifier.CurrentTestContext.Value = new global::VerifyMSTest.TestExecutionContext(value, GetType());
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...SourceGenerator.Tests/GlobalNamespaceTests.HasBothAssemblyAndClassAttributes.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ partial class Foo
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Verify.MSTest.SourceGenerator", "1.0.0.0")]
public global::Microsoft.VisualStudio.TestTools.UnitTesting.TestContext TestContext
{
get => global::VerifyMSTest.Verifier.CurrentTestContext.Value!.TestContext;
get => global::VerifyMSTest.Verifier.CurrentTestContext.Value.TestContext;
set => global::VerifyMSTest.Verifier.CurrentTestContext.Value = new global::VerifyMSTest.TestExecutionContext(value, GetType());
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...Generator.Tests/InheritanceTests.HasAssemblyAttributeAndTestClassInheritance.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ partial class Base
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Verify.MSTest.SourceGenerator", "1.0.0.0")]
public global::Microsoft.VisualStudio.TestTools.UnitTesting.TestContext TestContext
{
get => global::VerifyMSTest.Verifier.CurrentTestContext.Value!.TestContext;
get => global::VerifyMSTest.Verifier.CurrentTestContext.Value.TestContext;
set => global::VerifyMSTest.Verifier.CurrentTestContext.Value = new global::VerifyMSTest.TestExecutionContext(value, GetType());
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...anceTests.HasAssemblyAttributeWithTestClassOnDerivedAndMarkerAttributeOnBase.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ partial class Base
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Verify.MSTest.SourceGenerator", "1.0.0.0")]
public global::Microsoft.VisualStudio.TestTools.UnitTesting.TestContext TestContext
{
get => global::VerifyMSTest.Verifier.CurrentTestContext.Value!.TestContext;
get => global::VerifyMSTest.Verifier.CurrentTestContext.Value.TestContext;
set => global::VerifyMSTest.Verifier.CurrentTestContext.Value = new global::VerifyMSTest.TestExecutionContext(value, GetType());
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...t.SourceGenerator.Tests/InheritanceTests.HasAttributeOnBaseAndDerivedClasses.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ partial class Base
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Verify.MSTest.SourceGenerator", "1.0.0.0")]
public global::Microsoft.VisualStudio.TestTools.UnitTesting.TestContext TestContext
{
get => global::VerifyMSTest.Verifier.CurrentTestContext.Value!.TestContext;
get => global::VerifyMSTest.Verifier.CurrentTestContext.Value.TestContext;
set => global::VerifyMSTest.Verifier.CurrentTestContext.Value = new global::VerifyMSTest.TestExecutionContext(value, GetType());
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...Verify.MSTest.SourceGenerator.Tests/InheritanceTests.HasAttributeOnBaseClass.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ partial class Base
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Verify.MSTest.SourceGenerator", "1.0.0.0")]
public global::Microsoft.VisualStudio.TestTools.UnitTesting.TestContext TestContext
{
get => global::VerifyMSTest.Verifier.CurrentTestContext.Value!.TestContext;
get => global::VerifyMSTest.Verifier.CurrentTestContext.Value.TestContext;
set => global::VerifyMSTest.Verifier.CurrentTestContext.Value = new global::VerifyMSTest.TestExecutionContext(value, GetType());
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...ify.MSTest.SourceGenerator.Tests/InheritanceTests.HasAttributeOnDerivedClass.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ partial class Derived
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Verify.MSTest.SourceGenerator", "1.0.0.0")]
public global::Microsoft.VisualStudio.TestTools.UnitTesting.TestContext TestContext
{
get => global::VerifyMSTest.Verifier.CurrentTestContext.Value!.TestContext;
get => global::VerifyMSTest.Verifier.CurrentTestContext.Value.TestContext;
set => global::VerifyMSTest.Verifier.CurrentTestContext.Value = new global::VerifyMSTest.TestExecutionContext(value, GetType());
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...anceTests.HasAttributeOnDerivedClassAndAbstractPropertyManuallyDefinedInBase.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ partial class Derived
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Verify.MSTest.SourceGenerator", "1.0.0.0")]
public sealed override global::Microsoft.VisualStudio.TestTools.UnitTesting.TestContext TestContext
{
get => global::VerifyMSTest.Verifier.CurrentTestContext.Value!.TestContext;
get => global::VerifyMSTest.Verifier.CurrentTestContext.Value.TestContext;
set => global::VerifyMSTest.Verifier.CurrentTestContext.Value = new global::VerifyMSTest.TestExecutionContext(value, GetType());
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/Verify.MSTest.SourceGenerator.Tests/NamespaceTests.HasAttributeOnClass.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ partial class Bar
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Verify.MSTest.SourceGenerator", "1.0.0.0")]
public global::Microsoft.VisualStudio.TestTools.UnitTesting.TestContext TestContext
{
get => global::VerifyMSTest.Verifier.CurrentTestContext.Value!.TestContext;
get => global::VerifyMSTest.Verifier.CurrentTestContext.Value.TestContext;
set => global::VerifyMSTest.Verifier.CurrentTestContext.Value = new global::VerifyMSTest.TestExecutionContext(value, GetType());
}
}
Expand Down
6 changes: 3 additions & 3 deletions ...erator.Tests/NamespaceTests.HasAttributeOnClassWithGenericsInNestedNamespace.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ partial class TestClass1<U>
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Verify.MSTest.SourceGenerator", "1.0.0.0")]
public global::Microsoft.VisualStudio.TestTools.UnitTesting.TestContext TestContext
{
get => global::VerifyMSTest.Verifier.CurrentTestContext.Value!.TestContext;
get => global::VerifyMSTest.Verifier.CurrentTestContext.Value.TestContext;
set => global::VerifyMSTest.Verifier.CurrentTestContext.Value = new global::VerifyMSTest.TestExecutionContext(value, GetType());
}
}
Expand All @@ -39,7 +39,7 @@ partial class TestClass2
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Verify.MSTest.SourceGenerator", "1.0.0.0")]
public global::Microsoft.VisualStudio.TestTools.UnitTesting.TestContext TestContext
{
get => global::VerifyMSTest.Verifier.CurrentTestContext.Value!.TestContext;
get => global::VerifyMSTest.Verifier.CurrentTestContext.Value.TestContext;
set => global::VerifyMSTest.Verifier.CurrentTestContext.Value = new global::VerifyMSTest.TestExecutionContext(value, GetType());
}
}
Expand All @@ -58,7 +58,7 @@ partial class TestClass3<T1, T2>
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Verify.MSTest.SourceGenerator", "1.0.0.0")]
public global::Microsoft.VisualStudio.TestTools.UnitTesting.TestContext TestContext
{
get => global::VerifyMSTest.Verifier.CurrentTestContext.Value!.TestContext;
get => global::VerifyMSTest.Verifier.CurrentTestContext.Value.TestContext;
set => global::VerifyMSTest.Verifier.CurrentTestContext.Value = new global::VerifyMSTest.TestExecutionContext(value, GetType());
}
}
Expand Down
2 changes: 1 addition & 1 deletion ....MSTest.SourceGenerator.Tests/RecordTests.HasAttributeOnClassNestedInRecords.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ partial class Bar
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Verify.MSTest.SourceGenerator", "1.0.0.0")]
public global::Microsoft.VisualStudio.TestTools.UnitTesting.TestContext TestContext
{
get => global::VerifyMSTest.Verifier.CurrentTestContext.Value!.TestContext;
get => global::VerifyMSTest.Verifier.CurrentTestContext.Value.TestContext;
set => global::VerifyMSTest.Verifier.CurrentTestContext.Value = new global::VerifyMSTest.TestExecutionContext(value, GetType());
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/Verify.MSTest.SourceGenerator.Tests/RecordTests.HasAttributeOnRecord.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ partial record Bar
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Verify.MSTest.SourceGenerator", "1.0.0.0")]
public global::Microsoft.VisualStudio.TestTools.UnitTesting.TestContext TestContext
{
get => global::VerifyMSTest.Verifier.CurrentTestContext.Value!.TestContext;
get => global::VerifyMSTest.Verifier.CurrentTestContext.Value.TestContext;
set => global::VerifyMSTest.Verifier.CurrentTestContext.Value = new global::VerifyMSTest.TestExecutionContext(value, GetType());
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/Verify.MSTest.SourceGenerator.Tests/RecordTests.HasAttributeOnRecordClass.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ partial record Bar
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Verify.MSTest.SourceGenerator", "1.0.0.0")]
public global::Microsoft.VisualStudio.TestTools.UnitTesting.TestContext TestContext
{
get => global::VerifyMSTest.Verifier.CurrentTestContext.Value!.TestContext;
get => global::VerifyMSTest.Verifier.CurrentTestContext.Value.TestContext;
set => global::VerifyMSTest.Verifier.CurrentTestContext.Value = new global::VerifyMSTest.TestExecutionContext(value, GetType());
}
}
Expand Down
5 changes: 4 additions & 1 deletion src/Verify.MSTest.SourceGenerator/Emitter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,13 @@ void AppendCallBaseSetter() =>
}
""");

// No null forgiving operator: a consuming project targeting net4x defaults to
// LangVersion 7.3, where `!` is CS8370. The generated file is <auto-generated />,
// so nullable warnings are suppressed there anyway.
static string GetterBody(PropertyFlags flags) =>
flags.HasFlag(PropertyFlags.CallBase)
? "base.TestContext;"
: "global::VerifyMSTest.Verifier.CurrentTestContext.Value!.TestContext;";
: "global::VerifyMSTest.Verifier.CurrentTestContext.Value.TestContext;";

static string GetModifiers(PropertyFlags flags) =>
flags.HasFlag(PropertyFlags.Override)
Expand Down
Loading