Skip to content
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

Jump to bottom

Fix on Issue #7 #16

Closed
wants to merge 1 commit into from
Closed

Fix on Issue #7 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
49 changes: 36 additions & 13 deletions Tests/Management/TileChangeManagerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,13 @@ public void TileChangeEvents()
// Mock IChangeTile on entity
var mockMovable = mockEntity.As<IChangeTile>();

// Tile from
var mockTileOne = new Mock<ITile>();
// Entity that will trigger NULL check
var mockNullEntity = new Mock<IEntity>();
// Mock IChangeTile on entity that triggers NULL
var mockNullMovable = mockNullEntity.As<IChangeTile>();

// Tile from
var mockTileOne = new Mock<ITile>();
// Tile to
var mockTileTwo = new Mock<ITile>();

Expand All @@ -109,32 +114,50 @@ public void TileChangeEvents()
var tileChangeArgs = new TileChangedArgs(mockTileOne.Object, mockTileTwo.Object, TileChangeType.Change);
var tileFinishArgs = new TileChangedArgs(mockTileOne.Object, mockTileTwo.Object, TileChangeType.Finish);


// Setup events for Start, Change, and Finish functions so they emit the events
mockMovable.Setup(movable => movable.StartChangeTile(mockTileOne.Object, mockTileTwo.Object))
.Raises(m => m.ChangeStarted += null, mockMovable.Object, tileStartArgs);

mockMovable.Setup(movable => movable.ChangeTile(mockTileOne.Object, mockTileTwo.Object))
mockMovable.Setup(movable => movable.ChangeTile(mockTileOne.Object, mockTileTwo.Object))
.Raises(m => m.Changing += null, mockMovable.Object, tileChangeArgs);

mockMovable.Setup(movable => movable.FinishChangeTile(mockTileOne.Object, mockTileTwo.Object))
.Raises(m => m.ChangeFinished += null, mockMovable.Object, tileFinishArgs);

// Register Creator
manager.RegisterEntityCreator(mockCreator.Object);

// Setup events for Start, Change, and Finish functions so they emit NULL trigger on the events
mockNullMovable.Setup(movable => movable.StartChangeTile(mockTileOne.Object, mockTileTwo.Object))
.Raises(m => m.ChangeStarted += null, null, tileStartArgs);

mockNullMovable.Setup(movable => movable.ChangeTile(mockTileOne.Object, mockTileTwo.Object))
.Raises(m => m.Changing += null, null, tileChangeArgs);

mockNullMovable.Setup(movable => movable.FinishChangeTile(mockTileOne.Object, mockTileTwo.Object))
.Raises(m => m.ChangeFinished += null, null, tileFinishArgs);

// Register Creator
manager.RegisterEntityCreator(mockCreator.Object);

// Add solver that will handlt the entities Tile Change
manager.Add(mockSolver.Object);

// Raise entity created event
mockCreator.Raise(creator => creator.EntityCreated += null, mockCreator.Object, new EntityCreatedArgs(mockTileOne.Object, mockEntity.Object));
mockCreator.Raise(creator => creator.EntityCreated += null, mockCreator.Object, new EntityCreatedArgs(mockTileOne.Object, mockNullEntity.Object));

// Move the entity
mockMovable.Object.StartChangeTile(mockTileOne.Object, mockTileTwo.Object);
mockMovable.Object.ChangeTile(mockTileOne.Object, mockTileTwo.Object);
mockMovable.Object.FinishChangeTile(mockTileOne.Object, mockTileTwo.Object);
// Move the entity
mockMovable.Object.StartChangeTile(mockTileOne.Object, mockTileTwo.Object);
mockMovable.Object.ChangeTile(mockTileOne.Object, mockTileTwo.Object);
mockMovable.Object.FinishChangeTile(mockTileOne.Object, mockTileTwo.Object);

// Asset if event was called with NULL object
Assert.That(() => mockNullMovable.Object.StartChangeTile(mockTileOne.Object, mockTileTwo.Object), Throws.ArgumentNullException);
Assert.That(() => mockNullMovable.Object.ChangeTile(mockTileOne.Object, mockTileTwo.Object), Throws.ArgumentNullException);
Assert.That(() => mockNullMovable.Object.FinishChangeTile(mockTileOne.Object, mockTileTwo.Object), Throws.ArgumentNullException);

// Verify the solver was executed with correct args
mockSolver.Verify(solver => solver.Solve(mockEntity.Object, tileStartArgs), Times.Exactly(1));
// Verify the solver was executed with correct args
mockSolver.Verify(solver => solver.Solve(mockEntity.Object, tileStartArgs), Times.Exactly(1));
mockSolver.Verify(solver => solver.Solve(mockEntity.Object, tileChangeArgs), Times.Exactly(1));
mockSolver.Verify(solver => solver.Solve(mockEntity.Object, tileFinishArgs), Times.Exactly(1));

Expand Down
16 changes: 7 additions & 9 deletions TileSystem/Implementation/Management/TileChangeManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ private void RegisterTileChangeEvents(object sender, EntityCreatedArgs e)

if (movable == null)
{

return;
}

Expand All @@ -159,7 +160,7 @@ private void DeregisterTileChangeEvents(object sender, EntityDestroyedArgs e)

if (movableEntity == null)
{
return;
throw new ArgumentNullException("ChangeTile", "TileChange event was invoked with null object");
}

movableEntity.ChangeStarted -= EntityTileChangeStarted;
Expand All @@ -177,8 +178,7 @@ private void EntityTileChangeStarted(object sender, TileChangedArgs e)
IEntity entity = sender as IEntity;
if (entity == null)
{
// TODO: Issue 7 (https://github.com/Wizcorp/TileSystem/issues/7)
return;
throw new ArgumentNullException("ChangeTile", "TileChange event was invoked with null object");
}

ExecuteSolvers(entity, e);
Expand All @@ -194,9 +194,8 @@ private void EntityTileChanged(object sender, TileChangedArgs e)
IEntity entity = sender as IEntity;
if (entity == null)
{
// TODO: Issue 7 (https://github.com/Wizcorp/TileSystem/issues/7)
return;
}
throw new ArgumentNullException("ChangeTile", "TileChange event was invoked with null object");
}

ExecuteSolvers(entity, e);
}
Expand All @@ -211,9 +210,8 @@ private void EntityTileChangeFinished(object sender, TileChangedArgs e)
IEntity entity = sender as IEntity;
if (entity == null)
{
// TODO: Issue 7 (https://github.com/Wizcorp/TileSystem/issues/7)
return;
}
throw new ArgumentNullException("ChangeTile", "TileChange event was invoked with null object");
}

ExecuteSolvers(entity, e);
}
Expand Down