Skip to content

Commit

Permalink
fixed warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
@daerup
daerup committed May 12, 2024
1 parent 285d2df commit e85eb3f
Show file tree
Hide file tree
Showing 23 changed files with 54 additions and 72 deletions.
16 changes: 8 additions & 8 deletions Schnacc.Domain.IntegrationTests/PlayareaTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public class PlayareaTest
private Playarea.Playarea _testee;

[Scenario]
private void WhenTheSnakeCollidesInFruitItGrows()
public void WhenTheSnakeCollidesInFruitItGrows()
{
IFoodFactory foodFactory = null;

Expand Down Expand Up @@ -46,7 +46,7 @@ private void WhenTheSnakeCollidesInFruitItGrows()
}

[Scenario]
private void SnakeCannotBeResetUnlessTheGameIsOver()
public void SnakeCannotBeResetUnlessTheGameIsOver()
{
IFoodFactory foodFactory = null;
"Given a food factory"
Expand Down Expand Up @@ -91,7 +91,7 @@ private void SnakeCannotBeResetUnlessTheGameIsOver()
}

[Scenario]
private void SnakeCannotMoveWhenTheGameIsOver()
public void SnakeCannotMoveWhenTheGameIsOver()
{
IFoodFactory foodFactory = null;
"Given a food factory"
Expand Down Expand Up @@ -138,7 +138,7 @@ private void SnakeCannotMoveWhenTheGameIsOver()
}

[Scenario]
private void GameIsOverWhenSnakeCollidesWithRightWall()
public void GameIsOverWhenSnakeCollidesWithRightWall()
{
IFoodFactory foodFactory = null;

Expand Down Expand Up @@ -174,7 +174,7 @@ private void GameIsOverWhenSnakeCollidesWithRightWall()
}

[Scenario]
private void GameIsOverWhenSnakeCollidesWithLeftWall()
public void GameIsOverWhenSnakeCollidesWithLeftWall()
{
IFoodFactory foodFactory = null;

Expand Down Expand Up @@ -210,7 +210,7 @@ private void GameIsOverWhenSnakeCollidesWithLeftWall()
}

[Scenario]
private void GameIsOverWhenSnakeCollidesWithTopWall()
public void GameIsOverWhenSnakeCollidesWithTopWall()
{
IFoodFactory foodFactory = null;

Expand Down Expand Up @@ -246,7 +246,7 @@ private void GameIsOverWhenSnakeCollidesWithTopWall()
}

[Scenario]
private void GameIsOverWhenSnakeCollidesWithBottomWall()
public void GameIsOverWhenSnakeCollidesWithBottomWall()
{
IFoodFactory foodFactory = null;
"Given a food factory"
Expand Down Expand Up @@ -281,7 +281,7 @@ private void GameIsOverWhenSnakeCollidesWithBottomWall()
}

[Scenario]
private void GameIsOverWhenSnakeCollidesWithItself()
public void GameIsOverWhenSnakeCollidesWithItself()
{
IFoodFactory foodFactory = null;
"Given a food factory"
Expand Down
11 changes: 5 additions & 6 deletions Schnacc.Domain.IntegrationTests/SnakeMovementTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

namespace Schnacc.Domain.IntegrationTests
{
[SuppressMessage("ReSharper", "TooManyDeclarations")]
public class SnakeMovementTest
{
private Snake.Snake _testee;
Expand Down Expand Up @@ -36,7 +35,7 @@ private void WhenASnakeGrowsASnakeBodyPartShouldBeAdded()

[Scenario]
[Example(0, 0)]
private void BodyOfSnakeIsFollowingTheSnakeHeadRightwards(int startRow, int startColumn)
public void BodyOfSnakeIsFollowingTheSnakeHeadRightwards(int startRow, int startColumn)
{
this.GivingASnakeWithABodyFacingInACertainDirection(startRow, startColumn, Direction.Right);

Expand Down Expand Up @@ -74,7 +73,7 @@ private void BodyOfSnakeIsFollowingTheSnakeHeadRightwards(int startRow, int star

[Scenario]
[Example(0, 0)]
private void BodyOfSnakeIsFollowingTheSnakeHeadLeftwards(int startRow, int startColumn)
public void BodyOfSnakeIsFollowingTheSnakeHeadLeftwards(int startRow, int startColumn)
{
this.GivingASnakeWithABodyFacingInACertainDirection(startRow, startColumn, Direction.Left);

Expand Down Expand Up @@ -112,7 +111,7 @@ private void BodyOfSnakeIsFollowingTheSnakeHeadLeftwards(int startRow, int start

[Scenario]
[Example(0, 0)]
private void BodyOfSnakeIsFollowingTheSnakeHeadUpwards(int startRow, int startColumn)
public void BodyOfSnakeIsFollowingTheSnakeHeadUpwards(int startRow, int startColumn)
{
this.GivingASnakeWithABodyFacingInACertainDirection(startRow, startColumn, Direction.Up);

Expand Down Expand Up @@ -150,7 +149,7 @@ private void BodyOfSnakeIsFollowingTheSnakeHeadUpwards(int startRow, int startCo

[Scenario]
[Example(0, 0)]
private void BodyOfSnakeIsFollowingTheSnakeHeadDownwards(int startRow, int startColumn)
public void BodyOfSnakeIsFollowingTheSnakeHeadDownwards(int startRow, int startColumn)
{
this.GivingASnakeWithABodyFacingInACertainDirection(startRow, startColumn, Direction.Down);

Expand Down Expand Up @@ -188,7 +187,7 @@ private void BodyOfSnakeIsFollowingTheSnakeHeadDownwards(int startRow, int start

[Scenario]
[Example(0, 0)]
private void BodyOfSnakeIsCapableOfMovingInCircularMotions(int startRow, int startColumn)
public void BodyOfSnakeIsCapableOfMovingInCircularMotions(int startRow, int startColumn)
{
this.GivingASnakeWithABodyFacingInACertainDirection(startRow, startColumn, Direction.Right);

Expand Down
2 changes: 1 addition & 1 deletion Schnacc.Domain.UnitTests/Food/AppleTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class AppleTest
private readonly IFood _testee = new Apple(A.Dummy<Position>());

[Fact]
private void AppleInstanceShouldBeNamedApple()
public void AppleInstanceShouldBeNamedApple()
{
// Assert
this._testee.Name.Should().Be("Apple");
Expand Down
2 changes: 1 addition & 1 deletion Schnacc.Domain.UnitTests/Food/BananaTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class BananaTest
private readonly IFood _testee = new Banana(A.Dummy<Position>());

[Fact]
private void BananaInstanceShouldBeNamedBanana()
public void BananaInstanceShouldBeNamedBanana()
{
// Assert
this._testee.Name.Should().Be("Banana");
Expand Down
4 changes: 2 additions & 2 deletions Schnacc.Domain.UnitTests/Food/FoodFactoryTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public class FoodFactoryTest
private FoodFactory _testee;

[Fact]
private void CreateRandomFoodShouldCreateFoodType()
public void CreateRandomFoodShouldCreateFoodType()
{
for (int i = 0; i < 30; i++)
{
Expand All @@ -28,7 +28,7 @@ private void CreateRandomFoodShouldCreateFoodType()
}

[Fact]
private void CreateRandomFoodShouldCreateFoodAtRandomPosition()
public void CreateRandomFoodShouldCreateFoodAtRandomPosition()
{
for (int i = 0; i < 30; i++)
{
Expand Down
2 changes: 1 addition & 1 deletion Schnacc.Domain.UnitTests/Food/WatermelonTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class WatermelonTest
private readonly IFood _testee = new Watermelon(A.Dummy<Position>());

[Fact]
private void WatermelonInstanceShouldBeNamedWatermelon()
public void WatermelonInstanceShouldBeNamedWatermelon()
{
// Assert
this._testee.Name.Should().Be("Watermelon");
Expand Down
10 changes: 5 additions & 5 deletions Schnacc.Domain.UnitTests/Playarea/PlayareaTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class PlayareaTest
[InlineData(3, 2)]
[InlineData(4, 4)]
[InlineData(4, 0)]
private void PlayareaSizeIsAtLeast4RowsAnd4Columns(int numberOfRows, int numberOfColumns)
public void PlayareaSizeIsAtLeast4RowsAnd4Columns(int numberOfRows, int numberOfColumns)
{
// Arrange
var size = new PlayareaSize(numberOfRows, numberOfColumns);
Expand All @@ -30,7 +30,7 @@ private void PlayareaSizeIsAtLeast4RowsAnd4Columns(int numberOfRows, int numberO
}

[Fact]
private void NewlyCreatedPlaygroundShouldHaveStartGamestate()
public void NewlyCreatedPlaygroundShouldHaveStartGamestate()
{
// Act
this._testee = new Domain.Playarea.Playarea(new PlayareaSize(10, 10), A.Dummy<IFoodFactory>());
Expand All @@ -44,7 +44,7 @@ private void NewlyCreatedPlaygroundShouldHaveStartGamestate()
[InlineData(Direction.Left)]
[InlineData(Direction.Up)]
[InlineData(Direction.Down)]
private void WhenDirectionOfSnakeSetPlaygroundShouldHaveRunningGamestate(Direction newFacingDirection)
public void WhenDirectionOfSnakeSetPlaygroundShouldHaveRunningGamestate(Direction newFacingDirection)
{
// Arrange
this._testee = new Domain.Playarea.Playarea(new PlayareaSize(10, 10), A.Dummy<IFoodFactory>());
Expand All @@ -57,13 +57,13 @@ private void WhenDirectionOfSnakeSetPlaygroundShouldHaveRunningGamestate(Directi
}

[Fact]
private void SnakeShouldNotMoveWhenDirectionIsNeverUpdated()
public void SnakeShouldNotMoveWhenDirectionIsNeverUpdated()
{
// Arrange
var size = new PlayareaSize(10, 10);
var foodFactory = A.Dummy<IFoodFactory>();
this._testee = new Domain.Playarea.Playarea(size, foodFactory);
Position previousHeadPosition = this._testee.Snake.Head.Position;
var previousHeadPosition = this._testee.Snake.Head.Position;

// Act
this._testee.MoveSnakeWhenAllowed();
Expand Down
30 changes: 15 additions & 15 deletions Schnacc.Domain.UnitTests/Snake/SnakeTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public class SnakeTest
private readonly Domain.Snake.Snake _testee = new Domain.Snake.Snake(new Position(0, 0));

[Fact]
private void ForwardsFacingSnakeShouldMoveFarwards()
public void ForwardsFacingSnakeShouldMoveFarwards()
{
// Arrange
this._testee.ResetSnakeToStartPosition();
Expand All @@ -25,7 +25,7 @@ private void ForwardsFacingSnakeShouldMoveFarwards()
}

[Fact]
private void BackwardsFacingSnakeShouldMoveBackwards()
public void BackwardsFacingSnakeShouldMoveBackwards()
{
// Arrange
this._testee.ResetSnakeToStartPosition();
Expand All @@ -40,7 +40,7 @@ private void BackwardsFacingSnakeShouldMoveBackwards()
}

[Fact]
private void UpwardsFacingSnakeShouldMoveUpwards()
public void UpwardsFacingSnakeShouldMoveUpwards()
{
// Arrange
this._testee.ResetSnakeToStartPosition();
Expand All @@ -55,7 +55,7 @@ private void UpwardsFacingSnakeShouldMoveUpwards()
}

[Fact]
private void DownwardsFacingSnakeShouldMoveDownwards()
public void DownwardsFacingSnakeShouldMoveDownwards()
{
// Arrange
this._testee.ResetSnakeToStartPosition();
Expand All @@ -70,7 +70,7 @@ private void DownwardsFacingSnakeShouldMoveDownwards()
}

[Fact]
private void StillStandingSnakeShouldNotMove()
public void StillStandingSnakeShouldNotMove()
{
// Arrange
this._testee.ResetSnakeToStartPosition();
Expand All @@ -93,7 +93,7 @@ private void StillStandingSnakeShouldNotMove()
[InlineData(Direction.Up, Direction.Left)]
[InlineData(Direction.Down, Direction.Right)]
[InlineData(Direction.Down, Direction.Left)]
private void SnakeShouldBeAbleToChangeDirectionBy90Degrees(Direction startDirection, Direction newDirection)
public void SnakeShouldBeAbleToChangeDirectionBy90Degrees(Direction startDirection, Direction newDirection)
{
// Arrange
this._testee.ResetSnakeToStartPosition();
Expand All @@ -111,7 +111,7 @@ private void SnakeShouldBeAbleToChangeDirectionBy90Degrees(Direction startDirect
[InlineData(Direction.Left, Direction.Right)]
[InlineData(Direction.Up, Direction.Down)]
[InlineData(Direction.Down, Direction.Up)]
private void SnakeShouldNotBeAbleToChangeDirectionBy180Degrees(Direction startDirection, Direction newDirection)
public void SnakeShouldNotBeAbleToChangeDirectionBy180Degrees(Direction startDirection, Direction newDirection)
{
// Arrange
this._testee.ResetSnakeToStartPosition();
Expand All @@ -130,7 +130,7 @@ private void SnakeShouldNotBeAbleToChangeDirectionBy180Degrees(Direction startDi
[InlineData(Direction.Up)]
[InlineData(Direction.Down)]
[InlineData(Direction.None)]
private void SnakeShouldBeAbleToChangeIntoEveryDirectionWhenNotMoving(Direction newDirection)
public void SnakeShouldBeAbleToChangeIntoEveryDirectionWhenNotMoving(Direction newDirection)
{
// Arrange
this._testee.ResetSnakeToStartPosition();
Expand All @@ -148,7 +148,7 @@ private void SnakeShouldBeAbleToChangeIntoEveryDirectionWhenNotMoving(Direction
[InlineData(Direction.Left)]
[InlineData(Direction.Up)]
[InlineData(Direction.Down)]
private void SnakeShouldNotBeAbleToChangeIntoNoDirectionWhenAlreadyMoving(Direction newDirection)
public void SnakeShouldNotBeAbleToChangeIntoNoDirectionWhenAlreadyMoving(Direction newDirection)
{
// Arrange
this._testee.ResetSnakeToStartPosition();
Expand All @@ -167,7 +167,7 @@ private void SnakeShouldNotBeAbleToChangeIntoNoDirectionWhenAlreadyMoving(Direct
[InlineData(Direction.Up)]
[InlineData(Direction.Down)]
[InlineData(Direction.None)]
private void WhenNewDirectionIsSameAsOldOneNothingChanges(Direction sameDirection)
public void WhenNewDirectionIsSameAsOldOneNothingChanges(Direction sameDirection)
{
// Arrange
this._testee.ResetSnakeToStartPosition();
Expand All @@ -180,11 +180,11 @@ private void WhenNewDirectionIsSameAsOldOneNothingChanges(Direction sameDirectio
}

[Fact]
private void WhenSnakeGrowsForTheFirstTimeABodyPartShouldBeAddedAfterTheHeadOfTheSnake()
public void WhenSnakeGrowsForTheFirstTimeABodyPartShouldBeAddedAfterTheHeadOfTheSnake()
{
// Arrange
this._testee.ResetSnakeToStartPosition();
Position positionOfHead = this._testee.Head.Position;
var positionOfHead = this._testee.Head.Position;

// Act
this._testee.Grow();
Expand All @@ -196,12 +196,12 @@ private void WhenSnakeGrowsForTheFirstTimeABodyPartShouldBeAddedAfterTheHeadOfTh
}

[Fact]
private void WhenTheSnakeGrowsABodyPartShouldBeAddedAtTheEndOfTheSnake()
public void WhenTheSnakeGrowsABodyPartShouldBeAddedAtTheEndOfTheSnake()
{
// Arrange
this._testee.ResetSnakeToStartPosition();
this._testee.Grow();
Position positionOfLastBodyPart = this._testee.Body.Last().Position;
var positionOfLastBodyPart = this._testee.Body.Last().Position;

// Act
this._testee.Grow();
Expand All @@ -213,7 +213,7 @@ private void WhenTheSnakeGrowsABodyPartShouldBeAddedAtTheEndOfTheSnake()
}

[Fact]
private void WhenSnakeHasABodyItMovesWithTheHead()
public void WhenSnakeHasABodyItMovesWithTheHead()
{
// Arrange
this._testee.ResetSnakeToStartPosition();
Expand Down
4 changes: 2 additions & 2 deletions Schnacc.Domain/Food/FoodFactory.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ public class FoodFactory : IFoodFactory
{
public Food CreateRandomFoodBetweenBoundaries(Position boundaries)
{
List<Type> allFoodTypes = this.GetAllFoodTypes();
var allFoodTypes = this.GetAllFoodTypes();
int randomRow = this.GetRandomInt(0, boundaries.Row);
int randomColumn = this.GetRandomInt(0, boundaries.Column);
return (Food)Activator.CreateInstance(allFoodTypes.ElementAt(this.GetRandomInt(0, allFoodTypes.Count)), new Position(randomRow, randomColumn));
}

private List<Type> GetAllFoodTypes()
{
Type derivedType = typeof(Food);
var derivedType = typeof(Food);
return Assembly.GetAssembly(typeof(Food))?.GetTypes().Where(t => t != derivedType && derivedType.IsAssignableFrom(t)).ToList();
}

Expand Down
6 changes: 3 additions & 3 deletions Schnacc.Domain/Playarea/Playarea.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,13 @@ private void SetGameState()

private bool NextPositionCollidesWithSnakeBody()
{
Position nextHeadPosition = this.Snake.GetNextHeadPosition();
var nextHeadPosition = this.Snake.GetNextHeadPosition();
return this.Snake.Body.Select(sb => sb.Position).Any(p => p.Equals(nextHeadPosition));
}

private bool NextPositionCollidesWithWalls()
{
Position nextPosition = this.Snake.GetNextHeadPosition();
var nextPosition = this.Snake.GetNextHeadPosition();
return
nextPosition.Column <= -1 ||
nextPosition.Row <= -1 ||
Expand Down Expand Up @@ -123,7 +123,7 @@ private PlayareaSize GetValidFieldSize(PlayareaSize size)

private IFood GetRandomFoodInUniquePosition()
{
List<Position> allUsedPositions = this.Snake.Body.Select(bp => bp.Position).ToList();
var allUsedPositions = this.Snake.Body.Select(bp => bp.Position).ToList();
allUsedPositions.Add(this.Snake.Head.Position);
IFood randomFood;

Expand Down
2 changes: 1 addition & 1 deletion Schnacc.Domain/Snake/Orientation/DownwardDirection.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public override void MoveHead()

public override Position GetNexPosition()
{
Position previousPosition = this.Snake.Head.Position;
var previousPosition = this.Snake.Head.Position;
return new Position(previousPosition.Row + 1, previousPosition.Column);
}
}
Expand Down

0 comments on commit e85eb3f

Please sign in to comment.