Skip to content

Simplify generators #302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
robkeim merged 22 commits into from
Jun 22, 2017
Merged

Simplify generators #302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
4bc9936
Simplify generators
ErikSchierboom Jun 12, 2017
dd4f80c
Small refactoring
ErikSchierboom Jun 19, 2017
1de916a
Use enumerable for body input
ErikSchierboom Jun 19, 2017
06c4df1
Simplify options
ErikSchierboom Jun 19, 2017
2a27dac
Namespace refactoring
ErikSchierboom Jun 19, 2017
ee45af0
Use dotliquid template engine
ErikSchierboom Jun 19, 2017
952face
Remove unused body
ErikSchierboom Jun 19, 2017
6f4d4a0
Simplify options
ErikSchierboom Jun 19, 2017
3be3c84
Simplified objects
ErikSchierboom Jun 19, 2017
64b5006
Remove exercise inheritance
ErikSchierboom Jun 19, 2017
13f85ec
Extracted test class generator
ErikSchierboom Jun 19, 2017
189d35d
Make generators simpler
ErikSchierboom Jun 19, 2017
d4e3613
Infer expected test method type
ErikSchierboom Jun 20, 2017
8b70d77
Remove unused using statement
ErikSchierboom Jun 20, 2017
153a703
Simplify value formatting
ErikSchierboom Jun 20, 2017
1358b8e
Fix unknown exception type namespaces
ErikSchierboom Jun 20, 2017
3946fbc
Prefix Luhn property with "Is"
ErikSchierboom Jun 20, 2017
8001026
Fix leap exercise
ErikSchierboom Jun 21, 2017
2e5ec9c
Remove unused code
ErikSchierboom Jun 21, 2017
d4b14d9
Fix multi-line variables
ErikSchierboom Jun 22, 2017
211eba4
Allow easy exercise extension points
ErikSchierboom Jun 22, 2017
217e60e
Update .NET CLI and Cake version in build script
ErikSchierboom Jun 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
$CakeVersion = "0.18.0"
$DotNetVersion = "1.0.1";
$CakeVersion = "0.20.0"
$DotNetVersion = "1.0.4";
$DotNetInstallerUri = "https://dot.net/v1/dotnet-install.ps1";

# Make sure tools folder exists
Expand Down
4 changes: 2 additions & 2 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
# Define directories.
SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
TOOLS_DIR=$SCRIPT_DIR/tools
CAKE_VERSION=0.18.0
CAKE_VERSION=0.20.0
CAKE_DLL=$TOOLS_DIR/Cake.CoreCLR.$CAKE_VERSION/Cake.dll
DOTNET_VERSION=1.0.1
DOTNET_VERSION=1.0.4

# Make sure the tools folder exist.
if [ ! -d "$TOOLS_DIR" ]; then
Expand Down
644 changes: 322 additions & 322 deletions exercises/beer-song/BeerSongTest.cs
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions exercises/bob/BobTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// This file was auto-generated based on version 1.0.0 of the canonical data.

using Xunit;

public class BobTest
Expand Down
192 changes: 96 additions & 96 deletions exercises/food-chain/FoodChainTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ public class FoodChainTest
public void Fly()
{
var expected =
"I know an old lady who swallowed a fly.\n"+
"I know an old lady who swallowed a fly.\n" +
"I don't know why she swallowed the fly. Perhaps she'll die.";
Assert.Equal(expected, FoodChain.Verse(1));
}
Expand All @@ -17,9 +17,9 @@ public void Fly()
public void Spider()
{
var expected =
"I know an old lady who swallowed a spider.\n"+
"It wriggled and jiggled and tickled inside her.\n"+
"She swallowed the spider to catch the fly.\n"+
"I know an old lady who swallowed a spider.\n" +
"It wriggled and jiggled and tickled inside her.\n" +
"She swallowed the spider to catch the fly.\n" +
"I don't know why she swallowed the fly. Perhaps she'll die.";
Assert.Equal(expected, FoodChain.Verse(2));
}
Expand All @@ -28,10 +28,10 @@ public void Spider()
public void Bird()
{
var expected =
"I know an old lady who swallowed a bird.\n"+
"How absurd to swallow a bird!\n"+
"She swallowed the bird to catch the spider that wriggled and jiggled and tickled inside her.\n"+
"She swallowed the spider to catch the fly.\n"+
"I know an old lady who swallowed a bird.\n" +
"How absurd to swallow a bird!\n" +
"She swallowed the bird to catch the spider that wriggled and jiggled and tickled inside her.\n" +
"She swallowed the spider to catch the fly.\n" +
"I don't know why she swallowed the fly. Perhaps she'll die.";
Assert.Equal(expected, FoodChain.Verse(3));
}
Expand All @@ -40,11 +40,11 @@ public void Bird()
public void Cat()
{
var expected =
"I know an old lady who swallowed a cat.\n"+
"Imagine that, to swallow a cat!\n"+
"She swallowed the cat to catch the bird.\n"+
"She swallowed the bird to catch the spider that wriggled and jiggled and tickled inside her.\n"+
"She swallowed the spider to catch the fly.\n"+
"I know an old lady who swallowed a cat.\n" +
"Imagine that, to swallow a cat!\n" +
"She swallowed the cat to catch the bird.\n" +
"She swallowed the bird to catch the spider that wriggled and jiggled and tickled inside her.\n" +
"She swallowed the spider to catch the fly.\n" +
"I don't know why she swallowed the fly. Perhaps she'll die.";
Assert.Equal(expected, FoodChain.Verse(4));
}
Expand All @@ -53,12 +53,12 @@ public void Cat()
public void Dog()
{
var expected =
"I know an old lady who swallowed a dog.\n"+
"What a hog, to swallow a dog!\n"+
"She swallowed the dog to catch the cat.\n"+
"She swallowed the cat to catch the bird.\n"+
"She swallowed the bird to catch the spider that wriggled and jiggled and tickled inside her.\n"+
"She swallowed the spider to catch the fly.\n"+
"I know an old lady who swallowed a dog.\n" +
"What a hog, to swallow a dog!\n" +
"She swallowed the dog to catch the cat.\n" +
"She swallowed the cat to catch the bird.\n" +
"She swallowed the bird to catch the spider that wriggled and jiggled and tickled inside her.\n" +
"She swallowed the spider to catch the fly.\n" +
"I don't know why she swallowed the fly. Perhaps she'll die.";
Assert.Equal(expected, FoodChain.Verse(5));
}
Expand All @@ -67,13 +67,13 @@ public void Dog()
public void Goat()
{
var expected =
"I know an old lady who swallowed a goat.\n"+
"Just opened her throat and swallowed a goat!\n"+
"She swallowed the goat to catch the dog.\n"+
"She swallowed the dog to catch the cat.\n"+
"She swallowed the cat to catch the bird.\n"+
"She swallowed the bird to catch the spider that wriggled and jiggled and tickled inside her.\n"+
"She swallowed the spider to catch the fly.\n"+
"I know an old lady who swallowed a goat.\n" +
"Just opened her throat and swallowed a goat!\n" +
"She swallowed the goat to catch the dog.\n" +
"She swallowed the dog to catch the cat.\n" +
"She swallowed the cat to catch the bird.\n" +
"She swallowed the bird to catch the spider that wriggled and jiggled and tickled inside her.\n" +
"She swallowed the spider to catch the fly.\n" +
"I don't know why she swallowed the fly. Perhaps she'll die.";
Assert.Equal(expected, FoodChain.Verse(6));
}
Expand All @@ -82,14 +82,14 @@ public void Goat()
public void Cow()
{
var expected =
"I know an old lady who swallowed a cow.\n"+
"I don't know how she swallowed a cow!\n"+
"She swallowed the cow to catch the goat.\n"+
"She swallowed the goat to catch the dog.\n"+
"She swallowed the dog to catch the cat.\n"+
"She swallowed the cat to catch the bird.\n"+
"She swallowed the bird to catch the spider that wriggled and jiggled and tickled inside her.\n"+
"She swallowed the spider to catch the fly.\n"+
"I know an old lady who swallowed a cow.\n" +
"I don't know how she swallowed a cow!\n" +
"She swallowed the cow to catch the goat.\n" +
"She swallowed the goat to catch the dog.\n" +
"She swallowed the dog to catch the cat.\n" +
"She swallowed the cat to catch the bird.\n" +
"She swallowed the bird to catch the spider that wriggled and jiggled and tickled inside her.\n" +
"She swallowed the spider to catch the fly.\n" +
"I don't know why she swallowed the fly. Perhaps she'll die.";
Assert.Equal(expected, FoodChain.Verse(7));
}
Expand All @@ -98,7 +98,7 @@ public void Cow()
public void Horse()
{
var expected =
"I know an old lady who swallowed a horse.\n"+
"I know an old lady who swallowed a horse.\n" +
"She's dead, of course!";
Assert.Equal(expected, FoodChain.Verse(8));
}
Expand All @@ -107,18 +107,18 @@ public void Horse()
public void Multiple_verses()
{
var expected =
"I know an old lady who swallowed a fly.\n"+
"I don't know why she swallowed the fly. Perhaps she'll die.\n"+
"\n"+
"I know an old lady who swallowed a spider.\n"+
"It wriggled and jiggled and tickled inside her.\n"+
"She swallowed the spider to catch the fly.\n"+
"I don't know why she swallowed the fly. Perhaps she'll die.\n"+
"\n"+
"I know an old lady who swallowed a bird.\n"+
"How absurd to swallow a bird!\n"+
"She swallowed the bird to catch the spider that wriggled and jiggled and tickled inside her.\n"+
"She swallowed the spider to catch the fly.\n"+
"I know an old lady who swallowed a fly.\n" +
"I don't know why she swallowed the fly. Perhaps she'll die.\n" +
"\n" +
"I know an old lady who swallowed a spider.\n" +
"It wriggled and jiggled and tickled inside her.\n" +
"She swallowed the spider to catch the fly.\n" +
"I don't know why she swallowed the fly. Perhaps she'll die.\n" +
"\n" +
"I know an old lady who swallowed a bird.\n" +
"How absurd to swallow a bird!\n" +
"She swallowed the bird to catch the spider that wriggled and jiggled and tickled inside her.\n" +
"She swallowed the spider to catch the fly.\n" +
"I don't know why she swallowed the fly. Perhaps she'll die.";
Assert.Equal(expected, FoodChain.Verse(1, 3));
}
Expand All @@ -127,55 +127,55 @@ public void Multiple_verses()
public void Full_song()
{
var expected =
"I know an old lady who swallowed a fly.\n"+
"I don't know why she swallowed the fly. Perhaps she'll die.\n"+
"\n"+
"I know an old lady who swallowed a spider.\n"+
"It wriggled and jiggled and tickled inside her.\n"+
"She swallowed the spider to catch the fly.\n"+
"I don't know why she swallowed the fly. Perhaps she'll die.\n"+
"\n"+
"I know an old lady who swallowed a bird.\n"+
"How absurd to swallow a bird!\n"+
"She swallowed the bird to catch the spider that wriggled and jiggled and tickled inside her.\n"+
"She swallowed the spider to catch the fly.\n"+
"I don't know why she swallowed the fly. Perhaps she'll die.\n"+
"\n"+
"I know an old lady who swallowed a cat.\n"+
"Imagine that, to swallow a cat!\n"+
"She swallowed the cat to catch the bird.\n"+
"She swallowed the bird to catch the spider that wriggled and jiggled and tickled inside her.\n"+
"She swallowed the spider to catch the fly.\n"+
"I don't know why she swallowed the fly. Perhaps she'll die.\n"+
"\n"+
"I know an old lady who swallowed a dog.\n"+
"What a hog, to swallow a dog!\n"+
"She swallowed the dog to catch the cat.\n"+
"She swallowed the cat to catch the bird.\n"+
"She swallowed the bird to catch the spider that wriggled and jiggled and tickled inside her.\n"+
"She swallowed the spider to catch the fly.\n"+
"I don't know why she swallowed the fly. Perhaps she'll die.\n"+
"\n"+
"I know an old lady who swallowed a goat.\n"+
"Just opened her throat and swallowed a goat!\n"+
"She swallowed the goat to catch the dog.\n"+
"She swallowed the dog to catch the cat.\n"+
"She swallowed the cat to catch the bird.\n"+
"She swallowed the bird to catch the spider that wriggled and jiggled and tickled inside her.\n"+
"She swallowed the spider to catch the fly.\n"+
"I don't know why she swallowed the fly. Perhaps she'll die.\n"+
"\n"+
"I know an old lady who swallowed a cow.\n"+
"I don't know how she swallowed a cow!\n"+
"She swallowed the cow to catch the goat.\n"+
"She swallowed the goat to catch the dog.\n"+
"She swallowed the dog to catch the cat.\n"+
"She swallowed the cat to catch the bird.\n"+
"She swallowed the bird to catch the spider that wriggled and jiggled and tickled inside her.\n"+
"She swallowed the spider to catch the fly.\n"+
"I don't know why she swallowed the fly. Perhaps she'll die.\n"+
"\n"+
"I know an old lady who swallowed a horse.\n"+
"I know an old lady who swallowed a fly.\n" +
"I don't know why she swallowed the fly. Perhaps she'll die.\n" +
"\n" +
"I know an old lady who swallowed a spider.\n" +
"It wriggled and jiggled and tickled inside her.\n" +
"She swallowed the spider to catch the fly.\n" +
"I don't know why she swallowed the fly. Perhaps she'll die.\n" +
"\n" +
"I know an old lady who swallowed a bird.\n" +
"How absurd to swallow a bird!\n" +
"She swallowed the bird to catch the spider that wriggled and jiggled and tickled inside her.\n" +
"She swallowed the spider to catch the fly.\n" +
"I don't know why she swallowed the fly. Perhaps she'll die.\n" +
"\n" +
"I know an old lady who swallowed a cat.\n" +
"Imagine that, to swallow a cat!\n" +
"She swallowed the cat to catch the bird.\n" +
"She swallowed the bird to catch the spider that wriggled and jiggled and tickled inside her.\n" +
"She swallowed the spider to catch the fly.\n" +
"I don't know why she swallowed the fly. Perhaps she'll die.\n" +
"\n" +
"I know an old lady who swallowed a dog.\n" +
"What a hog, to swallow a dog!\n" +
"She swallowed the dog to catch the cat.\n" +
"She swallowed the cat to catch the bird.\n" +
"She swallowed the bird to catch the spider that wriggled and jiggled and tickled inside her.\n" +
"She swallowed the spider to catch the fly.\n" +
"I don't know why she swallowed the fly. Perhaps she'll die.\n" +
"\n" +
"I know an old lady who swallowed a goat.\n" +
"Just opened her throat and swallowed a goat!\n" +
"She swallowed the goat to catch the dog.\n" +
"She swallowed the dog to catch the cat.\n" +
"She swallowed the cat to catch the bird.\n" +
"She swallowed the bird to catch the spider that wriggled and jiggled and tickled inside her.\n" +
"She swallowed the spider to catch the fly.\n" +
"I don't know why she swallowed the fly. Perhaps she'll die.\n" +
"\n" +
"I know an old lady who swallowed a cow.\n" +
"I don't know how she swallowed a cow!\n" +
"She swallowed the cow to catch the goat.\n" +
"She swallowed the goat to catch the dog.\n" +
"She swallowed the dog to catch the cat.\n" +
"She swallowed the cat to catch the bird.\n" +
"She swallowed the bird to catch the spider that wriggled and jiggled and tickled inside her.\n" +
"She swallowed the spider to catch the fly.\n" +
"I don't know why she swallowed the fly. Perhaps she'll die.\n" +
"\n" +
"I know an old lady who swallowed a horse.\n" +
"She's dead, of course!";
Assert.Equal(expected, FoodChain.Verse(1, 8));
}
Expand Down
3 changes: 1 addition & 2 deletions exercises/nth-prime/NthPrimeTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// This file was auto-generated based on version 1.0.0 of the canonical data.

using Xunit;
using System;

public class NthPrimeTest
{
Expand Down Expand Up @@ -32,6 +31,6 @@ public void Big_prime()
[Fact(Skip = "Remove to run test")]
public void There_is_no_zeroth_prime()
{
Assert.Throws<ArgumentOutOfRangeException>(() => NthPrime.Prime(0));
Assert.Throws<System.ArgumentOutOfRangeException>(() => NthPrime.Prime(0));
}
}
5 changes: 2 additions & 3 deletions exercises/perfect-numbers/PerfectNumbersTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// This file was auto-generated based on version 1.0.1 of the canonical data.

using Xunit;
using System;

public class PerfectNumbersTest
{
Expand Down Expand Up @@ -74,12 +73,12 @@ public void Edge_case_no_factors_other_than_itself_is_classified_correctly()
[Fact(Skip = "Remove to run test")]
public void Zero_is_rejected_not_a_natural_number_()
{
Assert.Throws<ArgumentOutOfRangeException>(() => PerfectNumbers.Classify(0));
Assert.Throws<System.ArgumentOutOfRangeException>(() => PerfectNumbers.Classify(0));
}

[Fact(Skip = "Remove to run test")]
public void Negative_integer_is_rejected_not_a_natural_number_()
{
Assert.Throws<ArgumentOutOfRangeException>(() => PerfectNumbers.Classify(-1));
Assert.Throws<System.ArgumentOutOfRangeException>(() => PerfectNumbers.Classify(-1));
}
}
5 changes: 2 additions & 3 deletions exercises/wordy/WordyTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// This file was auto-generated based on version 1.0.0 of the canonical data.

using Xunit;
using System;

public class WordyTest
{
Expand Down Expand Up @@ -92,12 +91,12 @@ public void Multiple_division()
[Fact(Skip = "Remove to run test")]
public void Unknown_operation()
{
Assert.Throws<ArgumentException>(() => Wordy.Answer("What is 52 cubed?"));
Assert.Throws<System.ArgumentException>(() => Wordy.Answer("What is 52 cubed?"));
}

[Fact(Skip = "Remove to run test")]
public void Non_math_question()
{
Assert.Throws<ArgumentException>(() => Wordy.Answer("Who is the President of the United States?"));
Assert.Throws<System.ArgumentException>(() => Wordy.Answer("Who is the President of the United States?"));
}
}
15 changes: 0 additions & 15 deletions generators/Classes/TestClass.cs
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions generators/Classes/TestClassNameTransformer.cs
View file
Open in desktop

This file was deleted.

Loading