#869 - DBAL-1293 - converting all tests to use a data provider

tests/Doctrine/Tests/DBAL/Types/DateTest.php

@@ -7,21 +7,20 @@ use Doctrine\Tests\DBAL\Mocks\MockPlatform;
 
 class DateTest extends \Doctrine\Tests\DbalTestCase
 {
-    protected
-        $_platform,
-        $_type,
-        $_tz;
+    /**
+     * @var MockPlatform
+     */
+    private $_platform;
+
+    /**
+     * @var \Doctrine\DBAL\Types\DateType
+     */
+    private $_type;
 
     protected function setUp()
     {
         $this->_platform = new MockPlatform();
         $this->_type = Type::getType('date');
-        $this->_tz = date_default_timezone_get();
-    }
-
-    public function tearDown()
-    {
-        date_default_timezone_set($this->_tz);
     }
 
     public function testDateConvertsToDatabaseValue()
@@ -31,18 +30,16 @@ class DateTest extends \Doctrine\Tests\DbalTestCase
         );
     }
 
-    public function testInvalidDateTimeValueInteger()
-    {
-        $this->setExpectedException('Doctrine\DBAL\Types\ConversionException');
-
-        $this->_type->convertToDatabaseValue(27, $this->_platform);
-    }
-
-    public function testInvalidDateTimeValueStdClass()
+    /**
+     * @dataProvider invalidPHPValuesProvider
+     *
+     * @param mixed $value
+     */
+    public function testInvalidTypeConversionToDatabaseValue($value)
     {
         $this->setExpectedException('Doctrine\DBAL\Types\ConversionException');
 
-        $this->_type->convertToDatabaseValue(new \stdClass(), $this->_platform);
+        $this->_type->convertToDatabaseValue($value, $this->_platform);
     }
 
     public function testDateConvertsToPHPValue()
@@ -90,4 +87,26 @@ class DateTest extends \Doctrine\Tests\DbalTestCase
         $date = new \DateTime("now");
         $this->assertSame($date, $this->_type->convertToPHPValue($date, $this->_platform));
     }
+
+    /**
+     * @return mixed[][]
+     */
+    public function invalidPHPValuesProvider()
+    {
+        return [
+            [0],
+            [''],
+            ['foo'],
+            ['10:11:12'],
+            ['2015-01-31'],
+            ['2015-01-31 10:11:12'],
+            [new \stdClass()],
+            [$this],
+            [27],
+            [-1],
+            [1.2],
+            [[]],
+            [['an array']],
+        ];
+    }
 }

tests/Doctrine/Tests/DBAL/Types/DateTimeTest.php

@@ -33,18 +33,16 @@ class DateTimeTest extends \Doctrine\Tests\DbalTestCase
         $this->assertEquals($expected, $actual);
     }
 
-    public function testInvalidDateTimeValueInteger()
-    {
-        $this->setExpectedException('Doctrine\DBAL\Types\ConversionException');
-
-        $this->_type->convertToDatabaseValue(27, $this->_platform);
-    }
-
-    public function testInvalidDateTimeValueStdClass()
+    /**
+     * @dataProvider invalidPHPValuesProvider
+     *
+     * @param mixed $value
+     */
+    public function testInvalidTypeConversionToDatabaseValue($value)
     {
         $this->setExpectedException('Doctrine\DBAL\Types\ConversionException');
 
-        $this->_type->convertToDatabaseValue(new \stdClass(), $this->_platform);
+        $this->_type->convertToDatabaseValue($value, $this->_platform);
     }
 
     public function testDateTimeConvertsToPHPValue()
@@ -80,4 +78,26 @@ class DateTimeTest extends \Doctrine\Tests\DbalTestCase
 
         $this->assertEquals('1985-09-01 10:10:10', $actual->format('Y-m-d H:i:s'));
     }
+
+    /**
+     * @return mixed[][]
+     */
+    public function invalidPHPValuesProvider()
+    {
+        return [
+            [0],
+            [''],
+            ['foo'],
+            ['10:11:12'],
+            ['2015-01-31'],
+            ['2015-01-31 10:11:12'],
+            [new \stdClass()],
+            [$this],
+            [27],
+            [-1],
+            [1.2],
+            [[]],
+            [['an array']],
+        ];
+    }
 }

tests/Doctrine/Tests/DBAL/Types/DateTimeTzTest.php

@@ -33,18 +33,16 @@ class DateTimeTzTest extends \Doctrine\Tests\DbalTestCase
         $this->assertEquals($expected, $actual);
     }
 
-    public function testInvalidDateTimeValueInteger()
-    {
-        $this->setExpectedException('Doctrine\DBAL\Types\ConversionException');
-
-        $this->_type->convertToDatabaseValue(27, $this->_platform);
-    }
-
-    public function testInvalidDateTimeValueStdClass()
+    /**
+     * @dataProvider invalidPHPValuesProvider
+     *
+     * @param mixed $value
+     */
+    public function testInvalidTypeConversionToDatabaseValue($value)
     {
         $this->setExpectedException('Doctrine\DBAL\Types\ConversionException');
 
-        $this->_type->convertToDatabaseValue(new \stdClass(), $this->_platform);
+        $this->_type->convertToDatabaseValue($value, $this->_platform);
     }
 
     public function testDateTimeConvertsToPHPValue()
@@ -71,4 +69,26 @@ class DateTimeTzTest extends \Doctrine\Tests\DbalTestCase
         $date = new \DateTime("now");
         $this->assertSame($date, $this->_type->convertToPHPValue($date, $this->_platform));
     }
+
+    /**
+     * @return mixed[][]
+     */
+    public function invalidPHPValuesProvider()
+    {
+        return [
+            [0],
+            [''],
+            ['foo'],
+            ['10:11:12'],
+            ['2015-01-31'],
+            ['2015-01-31 10:11:12'],
+            [new \stdClass()],
+            [$this],
+            [27],
+            [-1],
+            [1.2],
+            [[]],
+            [['an array']],
+        ];
+    }
 }

tests/Doctrine/Tests/DBAL/Types/TimeTest.php

@@ -32,6 +32,7 @@ class TimeTest extends \Doctrine\Tests\DbalTestCase
 
     /**
      * @dataProvider invalidPHPValuesProvider
+     *
      * @param mixed $value
      */
     public function testInvalidTypeConversionToDatabaseValue($value)
@@ -83,6 +84,8 @@ class TimeTest extends \Doctrine\Tests\DbalTestCase
             [''],
             ['foo'],
             ['10:11:12'],
+            ['2015-01-31'],
+            ['2015-01-31 10:11:12'],
             [new \stdClass()],
             [$this],
             [27],