tidy up tests (#12)

Author: shieldo

Tests/Validator/FixedLengthDigitPostalCodeValidatorTest.php

@@ -23,7 +23,7 @@ public function testIsConstraintValidator()
 
     public function testValidationWithoutLengthThrowsLogicException()
     {
-        $this->setExpectedException('LogicException');
+        $this->expectException(\LogicException::class);
         $value = '12345';
         $constraint = new FixedLengthDigitPostalCodeConstraint();
         $this->validator->validate($value, $constraint);

Tests/Validator/PostalCodeConstraintTest.php

@@ -3,25 +3,31 @@
 namespace Markup\AddressingBundle\Tests\Validator;
 
 use Markup\AddressingBundle\Validator\PostalCodeConstraint;
+use Symfony\Component\Validator\Constraint;
 
 /**
 * A test for a class-based validator for postal codes that applies validation on a per-country basis.
 */
 class PostalCodeConstraintTest extends \PHPUnit_Framework_TestCase
 {
+    /**
+     * @var PostalCodeConstraint
+     */
+    private $constraint;
+
     public function setUp()
     {
         $this->constraint = new PostalCodeConstraint();
     }
 
     public function testIsConstraint()
     {
-        $this->assertInstanceOf('Symfony\Component\Validator\Constraint', $this->constraint);
+        $this->assertInstanceOf(Constraint::class, $this->constraint);
     }
 
     public function testIsDeclaredClassLevelConstraint()
     {
-        $this->assertEquals(\Symfony\Component\Validator\Constraint::CLASS_CONSTRAINT, $this->constraint->getTargets());
+        $this->assertEquals(Constraint::CLASS_CONSTRAINT, $this->constraint->getTargets());
     }
 
     public function testValidatedByPostalCodeValidator()

Tests/Validator/PostalCodeValidatorTest.php

@@ -2,7 +2,10 @@
 
 namespace Markup\AddressingBundle\Tests\Validator;
 
+use Markup\AddressingBundle\Validator\LocalizedPostalCodeValidatorClosureProvider;
 use Markup\AddressingBundle\Validator\PostalCodeValidator;
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\ConstraintValidatorInterface;
 
 /**
 * A test for a postal code validator that can perform localized postal code validation where available.
@@ -11,24 +14,20 @@ class PostalCodeValidatorTest extends \PHPUnit_Framework_TestCase
 {
     public function setUp()
     {
-        $this->validatorProvider = $this->getMockBuilder('Markup\AddressingBundle\Validator\LocalizedPostalCodeValidatorClosureProvider')
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->validatorProvider = $this->createMock(LocalizedPostalCodeValidatorClosureProvider::class);
         $this->validator = new PostalCodeValidator($this->validatorProvider);
     }
 
     public function testIsValidator()
     {
-        $this->assertInstanceOf('Symfony\Component\Validator\ConstraintValidatorInterface', $this->validator);
+        $this->assertInstanceOf(ConstraintValidatorInterface::class, $this->validator);
     }
 
     public function testPassingNonObjectThrowsInvalidArgumentException()
     {
-        $constraint = $this->getMockBuilder('Symfony\Component\Validator\Constraint')
-            ->disableOriginalConstructor()
-            ->getMock();
+        $constraint = $this->createMock(Constraint::class);
         $value = 'POSTCODE';
-        $this->setExpectedException('InvalidArgumentException');
+        $this->expectException(\InvalidArgumentException::class);
         $this->validator->validate($value, $constraint);
     }
 }

Tests/Validator/RegionValidatorTest.php

@@ -5,10 +5,11 @@
 use Markup\AddressingBundle\Validator\RegionConstraint;
 use Markup\AddressingBundle\Validator\RegionValidator;
 use Mockery as m;
+use Mockery\Adapter\Phpunit\MockeryTestCase;
 use Symfony\Component\Validator\ConstraintValidatorInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
-class RegionValidatorTest extends \PHPUnit_Framework_TestCase
+class RegionValidatorTest extends MockeryTestCase
 {
     protected function setUp()
     {
@@ -18,11 +19,6 @@ protected function setUp()
         $this->validator->initialize($this->context);
     }
 
-    protected function tearDown()
-    {
-        m::close();
-    }
-
     public function testIsValidator()
     {
         $this->assertInstanceOf(ConstraintValidatorInterface::class, $this->validator);
@@ -31,7 +27,7 @@ public function testIsValidator()
     public function testThrowInvalidArgumentExceptionWhenInvalid()
     {
         $invalid = 'not an address';
-        $this->setExpectedException('InvalidArgumentException');
+        $this->expectException(\InvalidArgumentException::class);
         $this->validator->validate($invalid, new RegionConstraint());
     }
 

composer.json

@@ -25,7 +25,7 @@
         "mockery/mockery": "~0.9.0",
         "symfony/console": "~2.7|~3.0"
     },
-    "suggests": {
+    "suggest": {
         "symfony/validator": "~2.7|~3.0"
     },
     "autoload": {