Removed CS8602 error from tests, which started to show up with 3.1.300

egil · egil · commit 007b8b3cb8ca · 2020-05-20T16:31:39.000Z
diff --git a/src/bunit.core.tests/RazorTesting/FixtureBaseTest.cs b/src/bunit.core.tests/RazorTesting/FixtureBaseTest.cs
@@ -32,13 +32,13 @@ public async Task Test001()
 			callLog[1].ShouldBe(nameof(SetupAsync));
 			callLog[2].ShouldBe(nameof(Test));
 
-			void Setup(FixtureComponent fixture) => callLog.Add(nameof(Setup));
+			void Setup(FixtureComponent fixture) => callLog?.Add(nameof(Setup));
 			Task SetupAsync(FixtureComponent fixture)
 			{
-				callLog.Add(nameof(SetupAsync));
+				callLog?.Add(nameof(SetupAsync));
 				return Task.CompletedTask;
 			}
-			void Test(FixtureComponent fixture) => callLog.Add(nameof(Test));
+			void Test(FixtureComponent fixture) => callLog?.Add(nameof(Test));
 		}
 
 		[Fact(DisplayName = "Setup, SetupAsync and TestAsync methods are called in the correct order")]
@@ -58,15 +58,15 @@ public async Task Test002()
 			callLog[1].ShouldBe(nameof(SetupAsync));
 			callLog[2].ShouldBe(nameof(TestAsync));
 
-			void Setup(FixtureComponent fixture) => callLog.Add(nameof(Setup));
+			void Setup(FixtureComponent fixture) => callLog?.Add(nameof(Setup));
 			Task SetupAsync(FixtureComponent fixture)
 			{
-				callLog.Add(nameof(SetupAsync));
+				callLog?.Add(nameof(SetupAsync));
 				return Task.CompletedTask;
 			}
 			Task TestAsync(FixtureComponent fixture)
 			{
-				callLog.Add(nameof(TestAsync));
+				callLog?.Add(nameof(TestAsync));
 				return Task.CompletedTask;
 			}
 		}
diff --git a/src/bunit.sln b/src/bunit.sln
@@ -45,7 +45,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{785D
 		..\.github\workflows\nuget-pack-push.yml = ..\.github\workflows\nuget-pack-push.yml
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "bunit.template", "..\templates\bunit-project\bunit.template.csproj", "{67937C33-0609-4B37-AA36-5441B701C74B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "bunit.template", "bunit.template\bunit.template.csproj", "{56F7777C-38B1-4183-98A1-3D8D207A19BB}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -87,8 +87,8 @@ Global
 		{797E5586-8F42-4EC6-A70A-F99BAC747AE7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2C0FEE71-208C-4CAD-B37B-C762D9D30A3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2C0FEE71-208C-4CAD-B37B-C762D9D30A3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{67937C33-0609-4B37-AA36-5441B701C74B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{67937C33-0609-4B37-AA36-5441B701C74B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{56F7777C-38B1-4183-98A1-3D8D207A19BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{56F7777C-38B1-4183-98A1-3D8D207A19BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Original file line number	Diff line number	Diff line change
`@@ -32,13 +32,13 @@ public async Task Test001()`
`32`	`32`	`callLog[1].ShouldBe(nameof(SetupAsync));`
`33`	`33`	`callLog[2].ShouldBe(nameof(Test));`
`34`	`34`
`35`		`- void Setup(FixtureComponent fixture) => callLog.Add(nameof(Setup));`
	`35`	`+ void Setup(FixtureComponent fixture) => callLog?.Add(nameof(Setup));`
`36`	`36`	`Task SetupAsync(FixtureComponent fixture)`
`37`	`37`	`{`
`38`		`- callLog.Add(nameof(SetupAsync));`
	`38`	`+ callLog?.Add(nameof(SetupAsync));`
`39`	`39`	`return Task.CompletedTask;`
`40`	`40`	`}`
`41`		`- void Test(FixtureComponent fixture) => callLog.Add(nameof(Test));`
	`41`	`+ void Test(FixtureComponent fixture) => callLog?.Add(nameof(Test));`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`[Fact(DisplayName = "Setup, SetupAsync and TestAsync methods are called in the correct order")]`
`@@ -58,15 +58,15 @@ public async Task Test002()`
`58`	`58`	`callLog[1].ShouldBe(nameof(SetupAsync));`
`59`	`59`	`callLog[2].ShouldBe(nameof(TestAsync));`
`60`	`60`
`61`		`- void Setup(FixtureComponent fixture) => callLog.Add(nameof(Setup));`
	`61`	`+ void Setup(FixtureComponent fixture) => callLog?.Add(nameof(Setup));`
`62`	`62`	`Task SetupAsync(FixtureComponent fixture)`
`63`	`63`	`{`
`64`		`- callLog.Add(nameof(SetupAsync));`
	`64`	`+ callLog?.Add(nameof(SetupAsync));`
`65`	`65`	`return Task.CompletedTask;`
`66`	`66`	`}`
`67`	`67`	`Task TestAsync(FixtureComponent fixture)`
`68`	`68`	`{`
`69`		`- callLog.Add(nameof(TestAsync));`
	`69`	`+ callLog?.Add(nameof(TestAsync));`
`70`	`70`	`return Task.CompletedTask;`
`71`	`71`	`}`
`72`	`72`	`}`