Rewrite tests of creating Enum from invalid values - use data provider

Author: mirfilip

src/Enum.php

@@ -12,7 +12,8 @@
  * Create an enum by implementing this class and adding class constants.
  *
  * @author Matthieu Napoli <matthieu@mnapoli.fr>
- * @author Daniel Costa <danielcosta@gmail.com
+ * @author Daniel Costa <danielcosta@gmail.com>
+ * @author Mirosław Filip <mirfilip@gmail.com>
  */
 abstract class Enum
 {
@@ -22,7 +23,7 @@ abstract class Enum
      * @var mixed
      */
     protected $value;
-    
+
     /**
      * Store existing constants in a static cache per object.
      *

tests/EnumTest.php

@@ -8,7 +8,8 @@
 
 /**
  * @author Matthieu Napoli <matthieu@mnapoli.fr>
- * @author Daniel Costa <danielcosta@gmail.com
+ * @author Daniel Costa <danielcosta@gmail.com>
+ * @author Mirosław Filip <mirfilip@gmail.com>
  */
 class EnumTest extends \PHPUnit_Framework_TestCase
 {
@@ -38,27 +39,28 @@ public function testGetKey()
     }
 
     /**
-     * @expectedException \UnexpectedValueException
+     * @dataProvider invalidValueProvider
      */
-    public function testInvalidValueString()
+    public function testCreatingEnumWithInvalidValue($value)
     {
-        new EnumFixture("test");
-    }
+        $this->setExpectedException(
+            '\UnexpectedValueException',
+            'Value \'' . $value . '\' is not part of the enum MyCLabs\Tests\Enum\EnumFixture'
+        );
 
-    /**
-     * @expectedException \UnexpectedValueException
-     */
-    public function testInvalidValueInt()
-    {
-        new EnumFixture(1234);
+        new EnumFixture($value);
     }
 
     /**
-     * @expectedException \UnexpectedValueException
+     * Contains values not existing in EnumFixture
+     * @return array
      */
-    public function testInvalidValueEmpty()
-    {
-        new EnumFixture(null);
+    public function invalidValueProvider() {
+        return [
+            "string" => ['test'],
+            "int" => [1234],
+            "null" => [null],
+        ];
     }
 
     /**