Skip to content

Commit 8253037

Browse files
CharliePooleCharliePoole
authored
Merge pull request #71 from nunit/updt-recipe
Update recipe to latest version
2 parents a774323 + 3253118 commit 8253037

File tree

1 file changed

+54
-39
lines changed

1 file changed

+54
-39
lines changed

‎build.cake

Lines changed: 54 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
#tool nuget:?package=NUnit.ConsoleRunner.NetCore&version=3.18.0-dev00037
55

66
// Load the recipe
7-
#load nuget:?package=NUnit.Cake.Recipe&version=1.0.0-dev00001
7+
#load nuget:?package=NUnit.Cake.Recipe&version=1.4.0-alpha.4
8+
89
// Comment out above line and uncomment below for local tests of recipe changes
910
//#load ../NUnit.Cake.Recipe/recipe/*.cake
1011

@@ -23,60 +24,66 @@ BuildSettings.Initialize(
2324

2425
PackageTest[] PackageTests = new PackageTest[]
2526
{
26-
new PackageTest (
27-
1, "SingleAssembly_AllTestsPass",
28-
"Project with one assembly, all tests pass",
29-
"../../PassingAssembly.nunit",
30-
new ExpectedResult("Passed") {
27+
new PackageTest (1, "SingleAssembly_AllTestsPass")
28+
{
29+
Description = "Project with one assembly, all tests pass",
30+
Arguments = "../../PassingAssembly.nunit",
31+
ExpectedResult = new ExpectedResult("Passed") {
3132
Total = 4, Passed = 4, Failed = 0, Warnings = 0, Inconclusive = 0, Skipped = 0,
32-
Assemblies = new[] { new ExpectedAssemblyResult("test-lib-1.dll", "net-4.6.2") } } ),
33+
Assemblies = new[] { new ExpectedAssemblyResult("test-lib-1.dll", "net-4.6.2") } }
34+
},
3335

34-
new PackageTest (
35-
1, "SingleAssembly_SomeTestsFail",
36-
"Project with one assembly, some failures",
37-
"../../FailingAssembly.nunit",
38-
new ExpectedResult("Failed") {
36+
new PackageTest (1, "SingleAssembly_SomeTestsFail")
37+
{
38+
Description = "Project with one assembly, some failures",
39+
Arguments = "../../FailingAssembly.nunit",
40+
ExpectedResult = new ExpectedResult("Failed") {
3941
Total = 9, Passed = 4, Failed = 2, Warnings = 0, Inconclusive = 1, Skipped = 2,
40-
Assemblies = new[] { new ExpectedAssemblyResult("test-lib-2.dll", "net-4.6.2") } } ),
42+
Assemblies = new[] { new ExpectedAssemblyResult("test-lib-2.dll", "net-4.6.2") } }
43+
},
4144

42-
new PackageTest (
43-
1, "BothAssembliesTogether",
44-
"Project with both assemblies",
45-
"../../BothAssemblies.nunit",
46-
new ExpectedResult("Failed") {
45+
new PackageTest (1, "BothAssembliesTogether")
46+
{
47+
Description = "Project with both assemblies",
48+
Arguments = "../../BothAssemblies.nunit",
49+
ExpectedResult = new ExpectedResult("Failed") {
4750
Total = 13, Passed = 8, Failed = 2, Warnings = 0, Inconclusive = 1, Skipped = 2,
4851
Assemblies = new[] {
4952
new ExpectedAssemblyResult("test-lib-1.dll", "net-4.6.2"),
50-
new ExpectedAssemblyResult("test-lib-2.dll", "net-4.6.2") } } ),
53+
new ExpectedAssemblyResult("test-lib-2.dll", "net-4.6.2") } }
54+
},
5155

52-
new PackageTest (
53-
1, "SingleNetCoreAssembly_AllTestsPass",
54-
"Project with one .NET Core assembly, all tests pass",
55-
"../../PassingAssemblyNetCore.nunit",
56-
new ExpectedResult("Passed") {
56+
new PackageTest (1, "SingleNetCoreAssembly_AllTestsPass")
57+
{
58+
Description = "Project with one .NET Core assembly, all tests pass",
59+
Arguments = "../../PassingAssemblyNetCore.nunit",
60+
ExpectedResult = new ExpectedResult("Passed") {
5761
Total = 4, Passed = 4, Failed = 0, Warnings = 0, Inconclusive = 0, Skipped = 0,
5862
Assemblies = new[] { new ExpectedAssemblyResult("test-lib-1.dll", "netcore-6.0") } },
59-
new IPackageTestRunner[] { (IPackageTestRunner)new NUnitNetCoreConsoleRunner("3.18.0-dev00037") } ),
63+
TestRunners = new IPackageTestRunner[] { (IPackageTestRunner)new NUnit3NetCoreConsoleRunner("3.18.0-dev00037") }
64+
},
6065

61-
new PackageTest (
62-
1, "SingleNetCoreAssembly_SomeTestsFail",
63-
"Project with one .NET Core assembly, some failures",
64-
"../../FailingAssemblyNetCore.nunit",
65-
new ExpectedResult("Failed") {
66+
new PackageTest (1, "SingleNetCoreAssembly_SomeTestsFail")
67+
{
68+
Description = "Project with one .NET Core assembly, some failures",
69+
Arguments = "../../FailingAssemblyNetCore.nunit",
70+
ExpectedResult = new ExpectedResult("Failed") {
6671
Total = 9, Passed = 4, Failed = 2, Warnings = 0, Inconclusive = 1, Skipped = 2,
6772
Assemblies = new[] { new ExpectedAssemblyResult("test-lib-2.dll", "netcore-6.0") } },
68-
new IPackageTestRunner[] { (IPackageTestRunner)new NUnitNetCoreConsoleRunner("3.18.0-dev00037") } ),
73+
TestRunners = new IPackageTestRunner[] { (IPackageTestRunner)new NUnit3NetCoreConsoleRunner("3.18.0-dev00037") }
74+
},
6975

70-
new PackageTest (
71-
1, "BothNetCoreAssembliesTogether",
72-
"Project with both .NET Core assemblies",
73-
"../../BothAssembliesNetCore.nunit",
74-
new ExpectedResult("Failed") {
76+
new PackageTest (1, "BothNetCoreAssembliesTogether")
77+
{
78+
Description = "Project with both .NET Core assemblies",
79+
Arguments = "../../BothAssembliesNetCore.nunit",
80+
ExpectedResult = new ExpectedResult("Failed") {
7581
Total = 13, Passed = 8, Failed = 2, Warnings = 0, Inconclusive = 1, Skipped = 2,
7682
Assemblies = new[] {
7783
new ExpectedAssemblyResult("test-lib-1.dll", "netcore-6.0"),
7884
new ExpectedAssemblyResult("test-lib-2.dll", "netcore-6.0") } },
79-
new IPackageTestRunner[] { (IPackageTestRunner)new NUnitNetCoreConsoleRunner("3.18.0-dev00037") } )
85+
TestRunners = new IPackageTestRunner[] { (IPackageTestRunner)new NUnit3NetCoreConsoleRunner("3.18.0-dev00037") }
86+
}
8087
};
8188

8289
//////////////////////////////////////////////////////////////////////
@@ -93,7 +100,11 @@ BuildSettings.Packages.Add(
93100
HasDirectory("tools/net462").WithFiles("nunit-project-loader.dll", "nunit.engine.api.dll"),
94101
HasDirectory("tools/net6.0").WithFiles("nunit-project-loader.dll", "nunit.engine.api.dll") },
95102
tests: PackageTests,
96-
testRunnerSource: new TestRunnerSource(new NUnitConsoleRunner("3.17.0"), new NUnitConsoleRunner("3.15.5"), new NUnitConsoleRunner("3.18.0-dev00037"))
103+
testRunners: new IPackageTestRunner[] {
104+
new NUnitConsoleRunner("3.17.0"),
105+
new NUnitConsoleRunner("3.15.5"),
106+
new NUnitConsoleRunner("3.18.0-dev00037")
107+
}
97108
));
98109

99110
//////////////////////////////////////////////////////////////////////
@@ -109,7 +120,11 @@ BuildSettings.Packages.Add(
109120
HasDirectory("tools/net462").WithFiles("nunit-project-loader.dll", "nunit.engine.api.dll"),
110121
HasDirectory("tools/net6.0").WithFiles("nunit-project-loader.dll", "nunit.engine.api.dll") },
111122
tests: PackageTests,
112-
testRunnerSource: new TestRunnerSource(new NUnitConsoleRunner("3.17.0"), new NUnitConsoleRunner("3.15.5"), new NUnitConsoleRunner("3.18.0-dev00037"))
123+
testRunners: new IPackageTestRunner[] {
124+
new NUnitConsoleRunner("3.17.0"),
125+
new NUnitConsoleRunner("3.15.5"),
126+
new NUnitConsoleRunner("3.18.0-dev00037")
127+
}
113128
));
114129

115130
//////////////////////////////////////////////////////////////////////

0 commit comments

Comments
 (0)