100% of code coverage

Maykonn · May 23, 2018 · 377cc60 · 377cc60
1 parent 2ce7c09
commit 377cc60
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 23 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: install update test
+.PHONY: install update test clean-coverage
 
 install:
 	composer install
@@ -9,5 +9,8 @@ update:
 	composer dumpautoload
 	make test
 
-test:
-	./vendor/bin/phpunit --testdox
+test: clean-coverage
+	./vendor/bin/phpunit --testdox
+
+clean-coverage:
+	rm -rf ./test/_reports
diff --git a/src/Model/Command/TurnLeft.php b/src/Model/Command/TurnLeft.php
@@ -21,6 +21,9 @@ public function execute(Rover $Rover): void
         return;
     }
 
+    /**
+     * @codeCoverageIgnore
+     */
     protected function rotateFrom($currentDirection): string
     {
         switch ($currentDirection) {

diff --git a/src/Model/Command/TurnRight.php b/src/Model/Command/TurnRight.php
@@ -21,6 +21,9 @@ public function execute(Rover $Rover): void
         return;
     }
 
+    /**
+     * @codeCoverageIgnore
+     */
     protected function rotateFrom($currentDirection): string
     {
         switch ($currentDirection) {

diff --git a/test/Model/Command/TurnLeftTest.php b/test/Model/Command/TurnLeftTest.php
@@ -4,26 +4,21 @@
 
 namespace MarsRover\Test\Model\Command;
 
-use MarsRover\Model\Command\CommandsCollection;
 use MarsRover\Model\Rover\Rover;
 use MarsRover\Model\Rover\RoverSetup;
 use MarsRover\Service\CommandFactory;
 use PHPUnit\Framework\TestCase;
 
 class TurnLeftTest extends TestCase
 {
-    public function testCanTurnCorrectly()
+    public function testCanTurnLefCorrectly()
     {
-        $Move = (new CommandFactory())->createCommand("L");
-        $CommandCollection = new CommandsCollection();
-        $CommandCollection->append($Move);
-
         $Rover = new Rover();
         $Rover->setSetup(new RoverSetup("1 1 S"));
-        $Rover->setCommands($CommandCollection);
-        $Rover->execute();
 
-        $this->expectOutputString("1 1 E");
-        echo $Rover->getSetupAsString();
+        $TurnLeft = (new CommandFactory())->createCommand("L");
+        $TurnLeft->execute($Rover);
+
+        $this->assertEquals("E", $Rover->getSetup()->getDirection()->getOrientation());
     }
 }
diff --git a/test/Model/Command/TurnRightTest.php b/test/Model/Command/TurnRightTest.php
@@ -4,26 +4,21 @@
 
 namespace MarsRover\Test\Model\Command;
 
-use MarsRover\Model\Command\CommandsCollection;
 use MarsRover\Model\Rover\Rover;
 use MarsRover\Model\Rover\RoverSetup;
 use MarsRover\Service\CommandFactory;
 use PHPUnit\Framework\TestCase;
 
 class TurnRightTest extends TestCase
 {
-    public function testCanTurnCorrectly()
+    public function testCanTurnRightCorrectly()
     {
-        $Move = (new CommandFactory())->createCommand("R");
-        $CommandCollection = new CommandsCollection();
-        $CommandCollection->append($Move);
-
         $Rover = new Rover();
         $Rover->setSetup(new RoverSetup("1 1 S"));
-        $Rover->setCommands($CommandCollection);
-        $Rover->execute();
 
-        $this->expectOutputString("1 1 W");
-        echo $Rover->getSetupAsString();
+        $TurnLeft = (new CommandFactory())->createCommand("R");
+        $TurnLeft->execute($Rover);
+
+        $this->assertEquals("W", $Rover->getSetup()->getDirection()->getOrientation());
     }
 }