Skip to content

Commit 374a31a

Browse files
CharliePooleCharliePoole
committed
Add tests of teamcity extension under .NET Core
1 parent 1670c74 commit 374a31a

File tree

1 file changed

+49
-30
lines changed

1 file changed

+49
-30
lines changed

‎package-tests.cake

+49-30
Original file line numberDiff line numberDiff line change
@@ -26,35 +26,35 @@ public static class PackageTests
2626

2727
StandardAndZipLists.Add(new PackageTest(1, "Net462Test")
2828
{
29-
Description="Run mock-assembly.dll under .NET 4.6.2",
29+
Description= "Run mock-assembly.dll targeting .NET 4.6.2",
3030
Arguments="testdata/net462/mock-assembly.dll",
3131
ExpectedResult=new MockAssemblyExpectedResult("net-4.6.2")
3232
});
3333

3434
AllLists.Add(new PackageTest(1, "Net80Test")
3535
{
36-
Description = "Run mock-assembly.dll under .NET 8.0",
36+
Description = "Run mock-assembly.dll targeting .NET 8.0",
3737
Arguments = "testdata/net8.0/mock-assembly.dll",
3838
ExpectedResult = new MockAssemblyExpectedResult("netcore-8.0")
3939
});
4040

4141
AllLists.Add(new PackageTest(1, "Net70Test")
4242
{
43-
Description = "Run mock-assembly.dll under .NET 7.0",
43+
Description = "Run mock-assembly.dll targeting .NET 7.0",
4444
Arguments = "testdata/net7.0/mock-assembly.dll",
4545
ExpectedResult = new MockAssemblyExpectedResult("netcore-7.0")
4646
});
4747

4848
AllLists.Add(new PackageTest(1, "Net60Test")
4949
{
50-
Description = "Run mock-assembly.dll under .NET 6.0",
50+
Description = "Run mock-assembly.dll targeting .NET 6.0",
5151
Arguments = "testdata/net6.0/mock-assembly.dll",
5252
ExpectedResult = new MockAssemblyExpectedResult("netcore-6.0")
5353
});
5454

5555
AllLists.Add(new PackageTest(1, "NetCore31Test")
5656
{
57-
Description = "Run mock-assembly.dll under .NET Core 3.1",
57+
Description = "Run mock-assembly.dll targeting .NET Core 3.1",
5858
Arguments = "testdata/netcoreapp3.1/mock-assembly.dll",
5959
ExpectedResult = new MockAssemblyExpectedResult("netcore-3.1")
6060
});
@@ -70,7 +70,7 @@ public static class PackageTests
7070
// X86 is always available for .NET Framework
7171
StandardAndZipLists.Add(new PackageTest(1, "Net462X86Test")
7272
{
73-
Description = "Run mock-assembly-x86.dll under .NET 4.6.2",
73+
Description = "Run mock-assembly-x86.dll targeting .NET 4.6.2",
7474
Arguments = "testdata/net462/mock-assembly-x86.dll",
7575
ExpectedResult = new MockAssemblyX86ExpectedResult("net-4.6.2")
7676
});
@@ -82,30 +82,30 @@ public static class PackageTests
8282

8383
StandardAndZipLists.Add(new PackageTest(1, "Net80X86Test")
8484
{
85-
Description = "Run mock-assembly-x86.dll under .NET 8.0",
85+
Description = "Run mock-assembly-x86.dll targeting .NET 8.0",
8686
Arguments = "testdata/net8.0/mock-assembly-x86.dll",
8787
ExpectedResult = new MockAssemblyX86ExpectedResult("netcore-8.0")
8888
});
8989

9090
if (!onGitHubActions)
9191
StandardAndZipLists.Add(new PackageTest(1, "Net70X86Test")
9292
{
93-
Description = "Run mock-assembly-x86.dll under .NET 7.0",
93+
Description = "Run mock-assembly-x86.dll targeting .NET 7.0",
9494
Arguments = "testdata/net7.0/mock-assembly-x86.dll",
9595
ExpectedResult = new MockAssemblyX86ExpectedResult("netcore-7.0")
9696
});
9797

9898
StandardAndZipLists.Add(new PackageTest(1, "Net60X86Test")
9999
{
100-
Description = "Run mock-assembly-x86.dll under .NET 6.0",
100+
Description = "Run mock-assembly-x86.dll targeting .NET 6.0",
101101
Arguments = "testdata/net6.0/mock-assembly-x86.dll",
102102
ExpectedResult = new MockAssemblyX86ExpectedResult("netcore-6.0")
103103
});
104104

105105
if (!onGitHubActions)
106106
StandardAndZipLists.Add(new PackageTest(1, "NetCore31X86Test")
107107
{
108-
Description = "Run mock-assembly-x86.dll under .NET Core 3.1",
108+
Description = "Run mock-assembly-x86.dll targeting .NET Core 3.1",
109109
Arguments = "testdata/netcoreapp3.1/mock-assembly-x86.dll",
110110
ExpectedResult = new MockAssemblyX86ExpectedResult("netcore-3.1")
111111
});
@@ -124,14 +124,14 @@ public static class PackageTests
124124

125125
StandardAndZipLists.Add(new PackageTest(1, "Net60PlusNet80Test")
126126
{
127-
Description = "Run mock-assembly under .NET6.0 and 8.0 together",
127+
Description = "Run mock-assembly targeting .NET6.0 and 8.0 together",
128128
Arguments = "testdata/net6.0/mock-assembly.dll testdata/net8.0/mock-assembly.dll",
129129
ExpectedResult = new MockAssemblyExpectedResult("netcore-6.0", "netcore-8.0")
130130
});
131131

132132
StandardAndZipLists.Add(new PackageTest(1, "Net462PlusNet60Test")
133133
{
134-
Description = "Run mock-assembly under .Net Framework 4.6.2 and .Net 6.0 together",
134+
Description = "Run mock-assembly targeting .Net Framework 4.6.2 and .Net 6.0 together",
135135
Arguments = "testdata/net462/mock-assembly.dll testdata/net6.0/mock-assembly.dll",
136136
ExpectedResult = new MockAssemblyExpectedResult("net-4.6.2", "netcore-6.0")
137137
});
@@ -178,7 +178,7 @@ public static class PackageTests
178178

179179
AllLists.Add(new PackageTest(1, "Net60WindowsFormsTest")
180180
{
181-
Description = "Run test using windows forms under .NET 6.0",
181+
Description = "Run test using windows forms targeting .NET 6.0",
182182
Arguments = "testdata/net6.0-windows/windows-forms-test.dll",
183183
ExpectedResult = new ExpectedResult("Passed")
184184
{
@@ -194,7 +194,7 @@ public static class PackageTests
194194

195195
StandardAndZipLists.Add(new PackageTest(1, "Net80WindowsFormsTest")
196196
{
197-
Description = "Run test using windows forms under .NET 8.0",
197+
Description = "Run test using windows forms targeting .NET 8.0",
198198
Arguments = "testdata/net8.0-windows/windows-forms-test.dll",
199199
ExpectedResult = new ExpectedResult("Passed")
200200
{
@@ -214,14 +214,14 @@ public static class PackageTests
214214

215215
AllLists.Add(new PackageTest(1, "Net60WPFTest")
216216
{
217-
Description = "Run test using WPF under .NET 6.0",
217+
Description = "Run test using WPF targeting .NET 6.0",
218218
Arguments = "testdata/net6.0-windows/WpfTest.dll --trace=Debug",
219219
ExpectedResult = new ExpectedResult("Passed") { Assemblies = new[] { new ExpectedAssemblyResult("WpfTest.dll", "netcore-6.0") } }
220220
});
221221

222222
AllLists.Add(new PackageTest(1, "Net80WPFTest")
223223
{
224-
Description = "Run test using WPF under .NET 8.0",
224+
Description = "Run test using WPF targeting .NET 8.0",
225225
Arguments = "testdata/net8.0-windows/WpfTest.dll --trace=Debug",
226226
ExpectedResult = new ExpectedResult("Passed") { Assemblies = new[] { new ExpectedAssemblyResult("WpfTest.dll", "netcore-8.0") } }
227227
});
@@ -258,15 +258,15 @@ public static class PackageTests
258258
// NUnit Project Loader Tests
259259
StandardAndZipLists.Add(new PackageTest(1, "NUnitProjectTest")
260260
{
261-
Description = "Run NUnit project with mock-assembly.dll built for .NET 4.6.2 and 6.0",
261+
Description = "Run NUnit project with mock-assembly.dll targeting .NET 4.6.2 and 6.0",
262262
Arguments = "../../MixedTests.nunit --config=Release",
263263
ExpectedResult = new MockAssemblyExpectedResult("net-4.6.2", "net-6.0"),
264264
ExtensionsNeeded = new [] { KnownExtensions.NUnitProjectLoader }
265265
});
266266

267267
NetCoreRunnerTests.Add(new PackageTest(1, "NUnitProjectTest")
268268
{
269-
Description="Run NUnit project with mock-assembly.dll built for .NET 6.0 and 8.0",
269+
Description= "Run NUnit project with mock-assembly.dll targeting .NET 6.0 and 8.0",
270270
Arguments="../../NetCoreTests.nunit --config=Release",
271271
ExpectedResult = new MockAssemblyExpectedResult("netcore-6.0", "netcore-8.0"),
272272
ExtensionsNeeded = new [] { KnownExtensions.NUnitProjectLoader }
@@ -275,7 +275,7 @@ public static class PackageTests
275275
// V2 Result Writer Test
276276
AllLists.Add(new PackageTest(1, "V2ResultWriterTest")
277277
{
278-
Description = "Run mock-assembly under .NET 6.0 and produce V2 output",
278+
Description = "Run mock-assembly targeting .NET 6.0 and produce V2 output",
279279
Arguments = "testdata/net6.0/mock-assembly.dll --result=TestResult.xml --result=NUnit2TestResult.xml;format=nunit2",
280280
ExpectedResult = new MockAssemblyExpectedResult("netcore-6.0"),
281281
ExtensionsNeeded = new[] { KnownExtensions.NUnitV2ResultWriter }
@@ -318,26 +318,45 @@ public static class PackageTests
318318
ExtensionsNeeded = new[] { KnownExtensions.VSProjectLoader }
319319
});
320320

321-
// TeamCity Event Listener Test
322-
StandardAndZipLists.Add(new PackageTest(1, "TeamCityListenerTest1")
321+
// TeamCity Event Listener Tests
322+
StandardAndZipLists.Add(new PackageTest(1, "Net462TeamCityListenerTest1")
323323
{
324-
Description = "Run mock-assembly with --teamcity option",
325-
Arguments = "testdata/net462/mock-assembly.dll --teamcity",
324+
Description = "Run mock-assembly targeting .NET 4.6.2 with --teamcity option",
325+
Arguments = "testdata/net462/mock-assembly.dll --teamcity --trace:Debug",
326326
ExpectedResult = new MockAssemblyExpectedResult("net-4.6.2"),
327327
ExtensionsNeeded = new[] { KnownExtensions.TeamCityEventListener },
328328
OutputCheck = new OutputContains("##teamcity")
329329
});
330330

331331
// TeamCity Event Listener Test
332-
StandardAndZipLists.Add(new PackageTest(1, "TeamCityListenerTest2")
332+
StandardAndZipLists.Add(new PackageTest(1, "Net462TeamCityListenerTest2")
333333
{
334-
Description = "Run mock-assembly with --enable teamcity option",
335-
Arguments = "testdata/net462/mock-assembly.dll --enable:NUnit.Engine.Listeners.TeamCityEventListener",
334+
Description = "Run mock-assembly targeting .NET 4.6.2 with --enable teamcity option",
335+
Arguments = "testdata/net462/mock-assembly.dll --enable:NUnit.Engine.Listeners.TeamCityEventListener --trace:Debug",
336336
ExpectedResult = new MockAssemblyExpectedResult("net-4.6.2"),
337337
ExtensionsNeeded = new[] { KnownExtensions.TeamCityEventListener },
338338
OutputCheck = new OutputContains("##teamcity")
339339
});
340340

341+
AllLists.Add(new PackageTest(1, "Net60TeamCityListenerTest1")
342+
{
343+
Description = "Run mock-assembly targeting .NET 6.0 with --teamcity option",
344+
Arguments = "testdata/net6.0/mock-assembly.dll --teamcity --trace:Debug",
345+
ExpectedResult = new MockAssemblyExpectedResult("net-6.0"),
346+
ExtensionsNeeded = new[] { KnownExtensions.TeamCityEventListener },
347+
OutputCheck = new OutputContains("##teamcity")
348+
});
349+
350+
// TeamCity Event Listener Test
351+
AllLists.Add(new PackageTest(1, "Net60TeamCityListenerTest2")
352+
{
353+
Description = "Run mock-assembly targeting .NET 6.0 with --enable teamcity option",
354+
Arguments = "testdata/net6.0/mock-assembly.dll --enable:NUnit.Engine.Listeners.TeamCityEventListener --trace:Debug",
355+
ExpectedResult = new MockAssemblyExpectedResult("net-6.0"),
356+
ExtensionsNeeded = new[] { KnownExtensions.TeamCityEventListener },
357+
OutputCheck = new OutputContains("##teamcity")
358+
});
359+
341360
// V2 Framework Driver Tests
342361
StandardAndZipLists.Add(new PackageTest(1, "V2FrameworkDriverTest")
343362
{
@@ -379,7 +398,7 @@ public static class PackageTests
379398

380399
StandardAndZipLists.Add(new PackageTest(1, "InvalidTestNameTest_Net462")
381400
{
382-
Description = "Ensure we handle invalid test names correctly under .NET 4.6.2",
401+
Description = "Ensure we handle invalid test names correctly targeting .NET 4.6.2",
383402
Arguments = "testdata/net462/InvalidTestNames.dll --trace:Debug",
384403
ExpectedResult = new ExpectedResult("Passed")
385404
{
@@ -389,7 +408,7 @@ public static class PackageTests
389408

390409
AllLists.Add(new PackageTest(1, "InvalidTestNameTest_Net60")
391410
{
392-
Description = "Ensure we handle invalid test names correctly under .NET 6.0",
411+
Description = "Ensure we handle invalid test names correctly targeting .NET 6.0",
393412
Arguments = "testdata/net6.0/InvalidTestNames.dll --trace:Debug",
394413
ExpectedResult = new ExpectedResult("Passed")
395414
{
@@ -399,7 +418,7 @@ public static class PackageTests
399418

400419
AllLists.Add(new PackageTest(1, "InvalidTestNameTest_Net80")
401420
{
402-
Description = "Ensure we handle invalid test names correctly under .NET 8.0",
421+
Description = "Ensure we handle invalid test names correctly targeting .NET 8.0",
403422
Arguments = "testdata/net8.0/InvalidTestNames.dll --trace:Debug",
404423
ExpectedResult = new ExpectedResult("Passed")
405424
{
@@ -409,7 +428,7 @@ public static class PackageTests
409428

410429
StandardAndZipLists.Add(new PackageTest(1, "AppContextBaseDirectory_NET80")
411430
{
412-
Description = "Test Setting the BaseDirectory to match test assembly location under .NET 8.0",
431+
Description = "Test Setting the BaseDirectory to match test assembly location targeting .NET 8.0",
413432
Arguments = "testdata/net8.0/AppContextTest.dll",
414433
ExpectedResult = new ExpectedResult("Passed")
415434
{

0 commit comments

Comments
 (0)