Rename XunitContext.ForV2Core to .ForV2, since this is the standard r…

…eferences for v2 test authors
xunit · Nov 3, 2024 · c707020 · c707020
1 parent 99947a9
commit c707020
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 deletions.
diff --git a/src/xunit.analyzers.tests/Analyzers/X1000/InlineDataMustMatchTheoryParametersTests.cs b/src/xunit.analyzers.tests/Analyzers/X1000/InlineDataMustMatchTheoryParametersTests.cs
@@ -1482,6 +1482,6 @@ public void TestMethod(int a, params {1}[] b) {{ }}
 	internal class Analyzer_v2_Pre240 : InlineDataMustMatchTheoryParameters
 	{
 		protected override XunitContext CreateXunitContext(Compilation compilation) =>
-			XunitContext.ForV2Core(compilation, new Version(2, 3, 999));
+			XunitContext.ForV2(compilation, new Version(2, 3, 999));
 	}
 }
diff --git a/src/xunit.analyzers.tests/Analyzers/X1000/TheoryMethodCannotHaveDefaultParameterTests.cs b/src/xunit.analyzers.tests/Analyzers/X1000/TheoryMethodCannotHaveDefaultParameterTests.cs
@@ -38,6 +38,6 @@ public void TestMethod(int a, string b, string c = "") { }
 	internal class Analyzer_v2_Pre220 : TheoryMethodCannotHaveDefaultParameter
 	{
 		protected override XunitContext CreateXunitContext(Compilation compilation) =>
-			XunitContext.ForV2Core(compilation, new Version(2, 1, 999));
+			XunitContext.ForV2(compilation, new Version(2, 1, 999));
 	}
 }
diff --git a/src/xunit.analyzers.tests/Analyzers/X1000/TheoryMethodCannotHaveParamsArrayTests.cs b/src/xunit.analyzers.tests/Analyzers/X1000/TheoryMethodCannotHaveParamsArrayTests.cs
@@ -64,6 +64,6 @@ public void TestMethod(int a, string b, string[] c) { }
 	internal class Analyzer_v2_Pre220 : TheoryMethodCannotHaveParamsArray
 	{
 		protected override XunitContext CreateXunitContext(Compilation compilation) =>
-			XunitContext.ForV2Core(compilation, new Version(2, 1, 999));
+			XunitContext.ForV2(compilation, new Version(2, 1, 999));
 	}
 }
diff --git a/src/xunit.analyzers.tests/Fixes/X1000/RemoveMethodParameterFixTests.cs b/src/xunit.analyzers.tests/Fixes/X1000/RemoveMethodParameterFixTests.cs
@@ -93,6 +93,6 @@ public void Test1(int x, {|CS1001:{|CS1031:{|xUnit1026:|})|}|}
 	internal class Analyzer_X1022 : TheoryMethodCannotHaveParamsArray
 	{
 		protected override XunitContext CreateXunitContext(Compilation compilation) =>
-			XunitContext.ForV2Core(compilation, new Version(2, 1, 999));
+			XunitContext.ForV2(compilation, new Version(2, 1, 999));
 	}
 }
diff --git a/src/xunit.analyzers.tests/Fixes/X1000/TheoryMethodCannotHaveDefaultParameterFixerTests.cs b/src/xunit.analyzers.tests/Fixes/X1000/TheoryMethodCannotHaveDefaultParameterFixerTests.cs
@@ -36,6 +36,6 @@ public void TestMethod(int _) { }
 	internal class Analyzer : TheoryMethodCannotHaveDefaultParameter
 	{
 		protected override XunitContext CreateXunitContext(Compilation compilation) =>
-			XunitContext.ForV2Core(compilation, new Version(2, 1, 999));
+			XunitContext.ForV2(compilation, new Version(2, 1, 999));
 	}
 }
diff --git a/src/xunit.analyzers/Utility/XunitContext.cs b/src/xunit.analyzers/Utility/XunitContext.cs
@@ -168,6 +168,21 @@ public IRunnerUtilityContext RunnerUtility
 	/// </summary>
 	public V3RunnerUtilityContext? V3RunnerUtility { get; private set; }
 
+	/// <summary>
+	/// Used to create a context object for testing v2 analyzers and fixers. This includes references
+	/// to <c>xunit.abstractions</c> (at version 2.0.3) and <c>xunit.core</c>.
+	/// </summary>
+	/// <param name="compilation">The Roslyn compilation object used to look up types</param>
+	/// <param name="versionOverride">The overridden version for <c>xunit.core</c></param>
+	public static XunitContext ForV2(
+		Compilation compilation,
+		Version? versionOverride = null) =>
+			new()
+			{
+				V2Abstractions = V2AbstractionsContext.Get(compilation, v2AbstractionsVersion),
+				V2Core = V2CoreContext.Get(compilation, versionOverride),
+			};
+
 	/// <summary>
 	/// Used to create a context object for testing v2 analyzers and fixers. This includes references
 	/// to <c>xunit.abstactions</c> (at version 2.0.3).
@@ -192,21 +207,6 @@ public static XunitContext ForV2Assert(
 				V2Assert = V2AssertContext.Get(compilation, versionOverride),
 			};
 
-	/// <summary>
-	/// Used to create a context object for testing v2 analyzers and fixers. This includes references
-	/// to <c>xunit.abstractions</c> (at version 2.0.3) and <c>xunit.core</c>.
-	/// </summary>
-	/// <param name="compilation">The Roslyn compilation object used to look up types</param>
-	/// <param name="versionOverride">The overridden version for <c>xunit.core</c></param>
-	public static XunitContext ForV2Core(
-		Compilation compilation,
-		Version? versionOverride = null) =>
-			new()
-			{
-				V2Abstractions = V2AbstractionsContext.Get(compilation, v2AbstractionsVersion),
-				V2Core = V2CoreContext.Get(compilation, versionOverride),
-			};
-
 	/// <summary>
 	/// Used to create a context object for testing v2 analyzers and fixers. This includes references
 	/// to <c>xunit.abstractions</c> (at version 2.0.3) and <c>xunit.execution</c>.