Reorganized unit-test data providers

Author: raymondschouten

tests/EntityToIdentifierTransformerTest.php

@@ -108,7 +108,7 @@ public function testTransformNull()
     /**
      * @param mixed $value
      *
-     * @dataProvider providerTransformNoObject
+     * @dataProvider providerNoObject
      *
      * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
      * @expectedExceptionMessage Expected an object.
@@ -120,22 +120,6 @@ public function testTransformNoObject($value)
         $transformer->transform($value);
     }
 
-    /**
-     * @return array[]
-     */
-    public function providerTransformNoObject()
-    {
-        return array(
-            'bool'     => array(true),
-            'int'      => array(1),
-            'float'    => array(1.2),
-            'string'   => array('foo'),
-            'array'    => array(array('foo', 'bar')),
-            'resource' => array(tmpfile()),
-            'callable' => array(function () {})
-        );
-    }
-
     /**
      * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
      * @expectedExceptionMessage Expected entity DarkWebDesign\SymfonyAddon\Transformer\Tests\Models\City.
@@ -181,7 +165,7 @@ public function testReverseTransformEmptyString()
     /**
      * @param mixed $value
      *
-     * @dataProvider providerReverseTransformNoScalar
+     * @dataProvider providerNoScalar
      *
      * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
      * @expectedExceptionMessage Expected a scalar.
@@ -193,29 +177,45 @@ public function testReverseTransformNoScalar($value)
         $transformer->reverseTransform($value);
     }
 
+    /**
+     * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
+     * @expectedExceptionMessage Entity DarkWebDesign\SymfonyAddon\Transformer\Tests\Models\City with identifier "123" not found.
+     */
+    public function testReverseTransformEntityNotFound()
+    {
+        $transformer = new EntityToIdentifierTransformer($this->entityManager, $this->className);
+
+        $this->repository->method('find')->willReturn(null);
+
+        $transformer->reverseTransform($this->identifier);
+    }
+
     /**
      * @return array[]
      */
-    public function providerReverseTransformNoScalar()
+    public function providerNoObject()
     {
         return array(
+            'bool'     => array(true),
+            'int'      => array(1),
+            'float'    => array(1.2),
+            'string'   => array('foo'),
             'array'    => array(array('foo', 'bar')),
-            'object'   => array(new stdClass()),
             'resource' => array(tmpfile()),
-            'callable' => array(function () {}),
+            'callable' => array(function () {})
         );
     }
 
     /**
-     * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
-     * @expectedExceptionMessage Entity DarkWebDesign\SymfonyAddon\Transformer\Tests\Models\City with identifier "123" not found.
+     * @return array[]
      */
-    public function testReverseTransformEntityNotFound()
+    public function providerNoScalar()
     {
-        $transformer = new EntityToIdentifierTransformer($this->entityManager, $this->className);
-
-        $this->repository->method('find')->willReturn(null);
-
-        $transformer->reverseTransform($this->identifier);
+        return array(
+            'array'    => array(array('foo', 'bar')),
+            'object'   => array(new stdClass()),
+            'resource' => array(tmpfile()),
+            'callable' => array(function () {}),
+        );
     }
 }