Skip to content

Commit b8fc651

Browse files
Update add exercise
[no important files changed]
1 parent 6fb2946 commit b8fc651

File tree

5 files changed

+26
-18
lines changed

5 files changed

+26
-18
lines changed

bin/add-practice-exercise.ps1

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,25 +38,28 @@ $project = "${exerciseDir}/${ExerciseName}.csproj"
3838
# Update project packages
3939
& dotnet remove $project package coverlet.collector
4040
& dotnet add $project package Exercism.Tests --version 0.1.0-beta1
41-
& dotnet add $project package xunit.runner.visualstudio --version 2.4.3
42-
& dotnet add $project package xunit --version 2.4.1
43-
& dotnet add $project package Microsoft.NET.Test.Sdk --version 16.8.3
41+
& dotnet add $project package xunit.runner.visualstudio --version 3.0.1
42+
& dotnet add $project package xunit --version 2.8.1
43+
& dotnet add $project package Microsoft.NET.Test.Sdk --version 17.12.0
4444

4545
# Remove and update files
4646
Remove-Item -Path "${exerciseDir}/UnitTest1.cs"
4747
(Get-Content -Path ".editorconfig") -Replace "\[\*\.cs\]", "[${exerciseName}.cs]" | Set-Content -Path "${exerciseDir}/.editorconfig"
4848

4949
# Add and run generator (this will update the tests file)
50-
$generator = "generators/Exercises/Generators/${ExerciseName}.cs"
50+
$generator = "${exerciseDir}/.meta/Generator.tpl"
5151
Add-Content -Path $generator -Value @"
52-
using System;
52+
using Xunit;
5353
54-
using Exercism.CSharp.Output;
55-
56-
namespace Exercism.CSharp.Exercises.Generators;
57-
58-
internal class ${exerciseName} : ExerciseGenerator
54+
public class ${exerciseName}Tests
5955
{
56+
{{#test_cases}}
57+
[Fact{{#unless @first}}(Skip = "Remove this Skip property to run this test"){{/unless}}]
58+
public void {{test_method_name}}()
59+
{
60+
// TODO: implement the test
61+
}
62+
{{/test_cases}}
6063
}
6164
"@
6265
& dotnet run --project generators --exercise $Exercise

bin/generate-tests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ $ErrorActionPreference = "Stop"
2424
$PSNativeCommandUseErrorActionPreference = $true
2525

2626
if ($Exercise) {
27-
dotnet run --project generators -- --exercise $Exercise
27+
dotnet run --project generators --exercise $Exercise
2828
} else {
2929
dotnet run --project generators
3030
}

exercises/concept/roll-the-die/RollTheDie.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<ItemGroup>
88
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
99
<PackageReference Include="xunit" Version="2.8.1" />
10-
<PackageReference Include="xunit.runner.visualstudio" Version="2.9.3" />
1110
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.1" />
1211
<PackageReference Include="Exercism.Tests" Version="0.1.0-beta1" />
1312
</ItemGroup>

exercises/practice/sieve/.meta/Generator.tpl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ public class SieveTests
66
[Fact{{#unless @first}}(Skip = "Remove this Skip property to run this test"){{/unless}}]
77
public void {{test_method_name}}()
88
{
9-
Assert.Equal([{{expected}}], Sieve.Primes({{input.limit}}));
9+
int[] expected = [{{expected}}];
10+
Assert.Equal(expected, Sieve.Primes({{input.limit}}));
1011
}
1112
{{/test_cases}}
1213
}

exercises/practice/sieve/SieveTests.cs

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,35 @@ public class SieveTests
55
[Fact]
66
public void No_primes_under_two()
77
{
8-
Assert.Equal([], Sieve.Primes(1));
8+
int[] expected = [];
9+
Assert.Equal(expected, Sieve.Primes(1));
910
}
1011

1112
[Fact(Skip = "Remove this Skip property to run this test")]
1213
public void Find_first_prime()
1314
{
14-
Assert.Equal([2], Sieve.Primes(2));
15+
int[] expected = [2];
16+
Assert.Equal(expected, Sieve.Primes(2));
1517
}
1618

1719
[Fact(Skip = "Remove this Skip property to run this test")]
1820
public void Find_primes_up_to_10()
1921
{
20-
Assert.Equal([2, 3, 5, 7], Sieve.Primes(10));
22+
int[] expected = [2, 3, 5, 7];
23+
Assert.Equal(expected, Sieve.Primes(10));
2124
}
2225

2326
[Fact(Skip = "Remove this Skip property to run this test")]
2427
public void Limit_is_prime()
2528
{
26-
Assert.Equal([2, 3, 5, 7, 11, 13], Sieve.Primes(13));
29+
int[] expected = [2, 3, 5, 7, 11, 13];
30+
Assert.Equal(expected, Sieve.Primes(13));
2731
}
2832

2933
[Fact(Skip = "Remove this Skip property to run this test")]
3034
public void Find_primes_up_to_1000()
3135
{
32-
Assert.Equal([2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97, 101, 103, 107, 109, 113, 127, 131, 137, 139, 149, 151, 157, 163, 167, 173, 179, 181, 191, 193, 197, 199, 211, 223, 227, 229, 233, 239, 241, 251, 257, 263, 269, 271, 277, 281, 283, 293, 307, 311, 313, 317, 331, 337, 347, 349, 353, 359, 367, 373, 379, 383, 389, 397, 401, 409, 419, 421, 431, 433, 439, 443, 449, 457, 461, 463, 467, 479, 487, 491, 499, 503, 509, 521, 523, 541, 547, 557, 563, 569, 571, 577, 587, 593, 599, 601, 607, 613, 617, 619, 631, 641, 643, 647, 653, 659, 661, 673, 677, 683, 691, 701, 709, 719, 727, 733, 739, 743, 751, 757, 761, 769, 773, 787, 797, 809, 811, 821, 823, 827, 829, 839, 853, 857, 859, 863, 877, 881, 883, 887, 907, 911, 919, 929, 937, 941, 947, 953, 967, 971, 977, 983, 991, 997], Sieve.Primes(1000));
36+
int[] expected = [2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97, 101, 103, 107, 109, 113, 127, 131, 137, 139, 149, 151, 157, 163, 167, 173, 179, 181, 191, 193, 197, 199, 211, 223, 227, 229, 233, 239, 241, 251, 257, 263, 269, 271, 277, 281, 283, 293, 307, 311, 313, 317, 331, 337, 347, 349, 353, 359, 367, 373, 379, 383, 389, 397, 401, 409, 419, 421, 431, 433, 439, 443, 449, 457, 461, 463, 467, 479, 487, 491, 499, 503, 509, 521, 523, 541, 547, 557, 563, 569, 571, 577, 587, 593, 599, 601, 607, 613, 617, 619, 631, 641, 643, 647, 653, 659, 661, 673, 677, 683, 691, 701, 709, 719, 727, 733, 739, 743, 751, 757, 761, 769, 773, 787, 797, 809, 811, 821, 823, 827, 829, 839, 853, 857, 859, 863, 877, 881, 883, 887, 907, 911, 919, 929, 937, 941, 947, 953, 967, 971, 977, 983, 991, 997];
37+
Assert.Equal(expected, Sieve.Primes(1000));
3338
}
3439
}

0 commit comments

Comments
 (0)