Skip to content

Commit 2d4f326

Browse files
BrennanConroyBrennanConroy
committed
nullref
1 parent 2defc64 commit 2d4f326

10 files changed

+125
-23
lines changed

‎src/ProjectTemplates/test/BaselineTest.cs

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ public class BaselineTest : LoggedTest
3535
public BaselineTest(ProjectFactoryFixture projectFactory)
3636
{
3737
ProjectFactory = projectFactory;
38-
Output = new TestOutputLogger(Logger);
3938
}
4039

4140
public Project Project { get; set; }
@@ -67,7 +66,18 @@ public static TheoryData<string, string[]> TemplateBaselines
6766
}
6867

6968
public ProjectFactoryFixture ProjectFactory { get; }
70-
public ITestOutputHelper Output { get; }
69+
private ITestOutputHelper _output;
70+
public ITestOutputHelper Output
71+
{
72+
get
73+
{
74+
if (_output == null)
75+
{
76+
_output = new TestOutputLogger(Logger);
77+
}
78+
return _output;
79+
}
80+
}
7181

7282
[Theory]
7383
[MemberData(nameof(TemplateBaselines))]

‎src/ProjectTemplates/test/ByteOrderMarkTest.cs

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,21 @@ namespace Templates.Test
1414
{
1515
public class ByteOrderMarkTest : LoggedTest
1616
{
17-
private readonly ITestOutputHelper _output;
17+
private ITestOutputHelper _output;
18+
public ITestOutputHelper Output
19+
{
20+
get
21+
{
22+
if (_output == null)
23+
{
24+
_output = new TestOutputLogger(Logger);
25+
}
26+
return _output;
27+
}
28+
}
1829

1930
public ByteOrderMarkTest()
2031
{
21-
_output = new TestOutputLogger(Logger);
2232
}
2333

2434
[Theory]
@@ -45,13 +55,13 @@ public void JSAndJSONInAllTemplates_ShouldNotContainBOM(string projectName)
4555
// Check for UTF8 BOM 0xEF,0xBB,0xBF
4656
if (bytes[0] == 0xEF && bytes[1] == 0xBB && bytes[2] == 0xBF)
4757
{
48-
_output.WriteLine($"File {filePath} has UTF-8 BOM characters.");
58+
Output.WriteLine($"File {filePath} has UTF-8 BOM characters.");
4959
filesWithBOMCharactersPresent = true;
5060
}
5161
// Check for UTF16 BOM 0xFF, 0xFE
5262
if (bytes[0] == 0xFF && bytes[1] == 0xFE)
5363
{
54-
_output.WriteLine($"File {filePath} has UTF-16 BOM characters.");
64+
Output.WriteLine($"File {filePath} has UTF-16 BOM characters.");
5565
filesWithBOMCharactersPresent = true;
5666
}
5767
}
@@ -85,7 +95,7 @@ public void RazorFilesInWebProjects_ShouldContainBOM(string projectName)
8595
var expectedBytes = Encoding.UTF8.GetPreamble();
8696
if (bytes[0] != expectedBytes[0] || bytes[1] != expectedBytes[1] || bytes[2] != expectedBytes[2])
8797
{
88-
_output.WriteLine($"File {filePath} does not have UTF-8 BOM characters.");
98+
Output.WriteLine($"File {filePath} does not have UTF-8 BOM characters.");
8999
nonBOMFilesPresent = true;
90100
}
91101
}

‎src/ProjectTemplates/test/EmptyWebTemplateTest.cs

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,22 @@ public class EmptyWebTemplateTest : LoggedTest
1414
public EmptyWebTemplateTest(ProjectFactoryFixture projectFactory)
1515
{
1616
ProjectFactory = projectFactory;
17-
Output = new TestOutputLogger(Logger);
1817
}
1918

2019
public ProjectFactoryFixture ProjectFactory { get; }
2120

22-
public ITestOutputHelper Output { get; }
21+
private ITestOutputHelper _output;
22+
public ITestOutputHelper Output
23+
{
24+
get
25+
{
26+
if (_output == null)
27+
{
28+
_output = new TestOutputLogger(Logger);
29+
}
30+
return _output;
31+
}
32+
}
2333

2434
[ConditionalFact]
2535
[SkipOnHelix("Cert failures", Queues = "All.OSX")]

‎src/ProjectTemplates/test/GrpcTemplateTest.cs

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,21 @@ public class GrpcTemplateTest : LoggedTest
1616
public GrpcTemplateTest(ProjectFactoryFixture projectFactory)
1717
{
1818
ProjectFactory = projectFactory;
19-
Output = new TestOutputLogger(Logger);
2019
}
2120

2221
public ProjectFactoryFixture ProjectFactory { get; }
23-
public ITestOutputHelper Output { get; }
22+
private ITestOutputHelper _output;
23+
public ITestOutputHelper Output
24+
{
25+
get
26+
{
27+
if (_output == null)
28+
{
29+
_output = new TestOutputLogger(Logger);
30+
}
31+
return _output;
32+
}
33+
}
2434

2535
[ConditionalFact]
2636
[SkipOnHelix("Not supported queues", Queues = "Windows.7.Amd64;Windows.7.Amd64.Open;Windows.81.Amd64.Open;All.OSX")]

‎src/ProjectTemplates/test/IdentityUIPackageTest.cs

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,22 @@ public class IdentityUIPackageTest : LoggedTest
1717
public IdentityUIPackageTest(ProjectFactoryFixture projectFactory)
1818
{
1919
ProjectFactory = projectFactory;
20-
Output = new TestOutputLogger(Logger);
2120
}
2221

2322
public ProjectFactoryFixture ProjectFactory { get; set; }
2423

25-
public ITestOutputHelper Output { get; }
24+
private ITestOutputHelper _output;
25+
public ITestOutputHelper Output
26+
{
27+
get
28+
{
29+
if (_output == null)
30+
{
31+
_output = new TestOutputLogger(Logger);
32+
}
33+
return _output;
34+
}
35+
}
2636

2737
public static string[] Bootstrap4ContentFiles { get; } = new string[]
2838
{

‎src/ProjectTemplates/test/MvcTemplateTest.cs

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
using Templates.Test.Helpers;
1111
using Xunit;
1212
using Xunit.Abstractions;
13+
using Xunit.Sdk;
1314

1415
namespace Templates.Test
1516
{
@@ -18,11 +19,22 @@ public class MvcTemplateTest : LoggedTest
1819
public MvcTemplateTest(ProjectFactoryFixture projectFactory)
1920
{
2021
ProjectFactory = projectFactory;
21-
Output = new TestOutputLogger(Logger);
2222
}
2323

2424
public ProjectFactoryFixture ProjectFactory { get; }
25-
public ITestOutputHelper Output { get; }
25+
26+
private ITestOutputHelper _output;
27+
public ITestOutputHelper Output
28+
{
29+
get
30+
{
31+
if (_output == null)
32+
{
33+
_output = new TestOutputLogger(Logger);
34+
}
35+
return _output;
36+
}
37+
}
2638

2739
[Fact]
2840
public async Task MvcTemplate_NoAuthFSharp() => await MvcTemplateCore(languageOverride: "F#");

‎src/ProjectTemplates/test/RazorClassLibraryTemplateTest.cs

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,21 @@ public class RazorClassLibraryTemplateTest : LoggedTest
1414
public RazorClassLibraryTemplateTest(ProjectFactoryFixture projectFactory)
1515
{
1616
ProjectFactory = projectFactory;
17-
Output = new TestOutputLogger(Logger);
1817
}
1918

2019
public ProjectFactoryFixture ProjectFactory { get; }
21-
public ITestOutputHelper Output { get; }
20+
private ITestOutputHelper _output;
21+
public ITestOutputHelper Output
22+
{
23+
get
24+
{
25+
if (_output == null)
26+
{
27+
_output = new TestOutputLogger(Logger);
28+
}
29+
return _output;
30+
}
31+
}
2232

2333
[Fact]
2434
public async Task RazorClassLibraryTemplate_WithViews_Async()

‎src/ProjectTemplates/test/RazorPagesTemplateTest.cs

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,22 @@ public class RazorPagesTemplateTest : LoggedTest
1717
public RazorPagesTemplateTest(ProjectFactoryFixture projectFactory)
1818
{
1919
ProjectFactory = projectFactory;
20-
Output = new TestOutputLogger(Logger);
2120
}
2221

2322
public ProjectFactoryFixture ProjectFactory { get; set; }
2423

25-
public ITestOutputHelper Output { get; }
24+
private ITestOutputHelper _output;
25+
public ITestOutputHelper Output
26+
{
27+
get
28+
{
29+
if (_output == null)
30+
{
31+
_output = new TestOutputLogger(Logger);
32+
}
33+
return _output;
34+
}
35+
}
2636

2737
[ConditionalFact]
2838
[SkipOnHelix("Cert failures", Queues = "All.OSX")]

‎src/ProjectTemplates/test/WebApiTemplateTest.cs

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,22 @@ public class WebApiTemplateTest : LoggedTest
1515
public WebApiTemplateTest(ProjectFactoryFixture factoryFixture)
1616
{
1717
FactoryFixture = factoryFixture;
18-
Output = new TestOutputLogger(Logger);
1918
}
2019

2120
public ProjectFactoryFixture FactoryFixture { get; }
2221

23-
public ITestOutputHelper Output { get; }
22+
private ITestOutputHelper _output;
23+
public ITestOutputHelper Output
24+
{
25+
get
26+
{
27+
if (_output == null)
28+
{
29+
_output = new TestOutputLogger(Logger);
30+
}
31+
return _output;
32+
}
33+
}
2434

2535
[Theory]
2636
[InlineData("IndividualB2C", null)]

‎src/ProjectTemplates/test/WorkerTemplateTest.cs

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,21 @@ public class WorkerTemplateTest : LoggedTest
1414
public WorkerTemplateTest(ProjectFactoryFixture projectFactory)
1515
{
1616
ProjectFactory = projectFactory;
17-
Output = new TestOutputLogger(Logger);
1817
}
1918

2019
public ProjectFactoryFixture ProjectFactory { get; }
21-
public ITestOutputHelper Output { get; }
20+
private ITestOutputHelper _output;
21+
public ITestOutputHelper Output
22+
{
23+
get
24+
{
25+
if (_output == null)
26+
{
27+
_output = new TestOutputLogger(Logger);
28+
}
29+
return _output;
30+
}
31+
}
2232

2333
[ConditionalTheory]
2434
[OSSkipCondition(OperatingSystems.Linux, SkipReason = "https://github.com/dotnet/sdk/issues/12831")]

0 commit comments

Comments
 (0)