Updated PHPUnit

sardella-dav · Oct 25, 2017 · 69041df · 69041df
1 parent fddb333
commit 69041df
Show file tree

Hide file tree

Showing 20 changed files with 138 additions and 117 deletions.
diff --git a/test/FactoryTest.php b/test/FactoryTest.php
diff --git a/test/Object/Code25Test.php b/test/Object/Code25Test.php
@@ -83,7 +83,7 @@ public function testBadTextAlwaysAllowed()
 
     public function testBadTextDetectedIfChecksumWished()
     {
-        $this->setExpectedException('\Zend\Barcode\Object\Exception\ExceptionInterface');
+        $this->expectException('\Zend\Barcode\Object\Exception\ExceptionInterface');
         $this->object->setText('a');
         $this->object->setWithChecksum(true);
         $this->object->getText();
@@ -97,7 +97,7 @@ public function testCheckGoodParams()
 
     public function testCheckParamsWithLowRatio()
     {
-        $this->setExpectedException('\Zend\Barcode\Object\Exception\ExceptionInterface');
+        $this->expectException('\Zend\Barcode\Object\Exception\ExceptionInterface');
         $this->object->setText('0123456789');
         $this->object->setBarThinWidth(21);
         $this->object->setBarThickWidth(40);
@@ -106,7 +106,7 @@ public function testCheckParamsWithLowRatio()
 
     public function testCheckParamsWithHighRatio()
     {
-        $this->setExpectedException('\Zend\Barcode\Object\Exception\ExceptionInterface');
+        $this->expectException('\Zend\Barcode\Object\Exception\ExceptionInterface');
         $this->object->setText('0123456789');
         $this->object->setBarThinWidth(20);
         $this->object->setBarThickWidth(61);

diff --git a/test/Object/Code25interleavedTest.php b/test/Object/Code25interleavedTest.php
@@ -109,7 +109,7 @@ public function testBadTextAlwaysAllowed()
 
     public function testBadTextDetectedIfChecksumWished()
     {
-        $this->setExpectedException('\Zend\Barcode\Object\Exception\ExceptionInterface');
+        $this->expectException('\Zend\Barcode\Object\Exception\ExceptionInterface');
         $this->object->setText('a');
         $this->object->setWithChecksum(true);
         $this->object->getText();
@@ -123,7 +123,7 @@ public function testCheckGoodParams()
 
     public function testCheckParamsWithLowRatio()
     {
-        $this->setExpectedException('\Zend\Barcode\Object\Exception\ExceptionInterface');
+        $this->expectException('\Zend\Barcode\Object\Exception\ExceptionInterface');
         $this->object->setText('0123456789');
         $this->object->setBarThinWidth(21);
         $this->object->setBarThickWidth(40);
@@ -132,7 +132,7 @@ public function testCheckParamsWithLowRatio()
 
     public function testCheckParamsWithHighRatio()
     {
-        $this->setExpectedException('\Zend\Barcode\Object\Exception\ExceptionInterface');
+        $this->expectException('\Zend\Barcode\Object\Exception\ExceptionInterface');
         $this->object->setText('0123456789');
         $this->object->setBarThinWidth(20);
         $this->object->setBarThickWidth(61);

diff --git a/test/Object/Code39Test.php b/test/Object/Code39Test.php
@@ -76,7 +76,7 @@ public function testBadTextAlwaysAllowed()
 
     public function testBadTextDetectedIfChecksumWished()
     {
-        $this->setExpectedException('\Zend\Barcode\Object\Exception\ExceptionInterface');
+        $this->expectException('\Zend\Barcode\Object\Exception\ExceptionInterface');
         $this->object->setText('&');
         $this->object->setWithChecksum(true);
         $this->object->getText();
@@ -90,7 +90,7 @@ public function testCheckGoodParams()
 
     public function testCheckParamsWithLowRatio()
     {
-        $this->setExpectedException('\Zend\Barcode\Object\Exception\ExceptionInterface');
+        $this->expectException('\Zend\Barcode\Object\Exception\ExceptionInterface');
         $this->object->setText('TEST');
         $this->object->setBarThinWidth(21);
         $this->object->setBarThickWidth(40);
@@ -99,7 +99,7 @@ public function testCheckParamsWithLowRatio()
 
     public function testCheckParamsWithHighRatio()
     {
-        $this->setExpectedException('\Zend\Barcode\Object\Exception\ExceptionInterface');
+        $this->expectException('\Zend\Barcode\Object\Exception\ExceptionInterface');
         $this->object->setText('TEST');
         $this->object->setBarThinWidth(20);
         $this->object->setBarThickWidth(61);

diff --git a/test/Object/Ean13Test.php b/test/Object/Ean13Test.php
@@ -75,7 +75,7 @@ public function testSetTextWithChecksumNotDisplayed()
 
     public function testBadTextDetectedIfChecksumWished()
     {
-        $this->setExpectedException('\Zend\Barcode\Object\Exception\ExceptionInterface');
+        $this->expectException('\Zend\Barcode\Object\Exception\ExceptionInterface');
         $this->object->setText('a');
         $this->object->setWithChecksum(true);
         $this->object->getText();

diff --git a/test/Object/Ean8Test.php b/test/Object/Ean8Test.php
@@ -75,7 +75,7 @@ public function testSetTextWithChecksumNotDisplayed()
 
     public function testBadTextDetectedIfChecksumWished()
     {
-        $this->setExpectedException('\Zend\Barcode\Object\Exception\ExceptionInterface');
+        $this->expectException('\Zend\Barcode\Object\Exception\ExceptionInterface');
         $this->object->setText('a');
         $this->object->setWithChecksum(true);
         $this->object->getText();

diff --git a/test/Object/IdentcodeTest.php b/test/Object/IdentcodeTest.php
@@ -75,7 +75,7 @@ public function testSetTextWithChecksumNotDisplayed()
 
     public function testBadTextDetectedIfChecksumWished()
     {
-        $this->setExpectedException('\Zend\Barcode\Object\Exception\ExceptionInterface');
+        $this->expectException('\Zend\Barcode\Object\Exception\ExceptionInterface');
         $this->object->setText('a');
         $this->object->setWithChecksum(true);
         $this->object->getText();

diff --git a/test/Object/Itf14Test.php b/test/Object/Itf14Test.php
@@ -75,7 +75,7 @@ public function testSetTextWithChecksumNotDisplayed()
 
     public function testBadTextDetectedIfChecksumWished()
     {
-        $this->setExpectedException('\Zend\Barcode\Object\Exception\ExceptionInterface');
+        $this->expectException('\Zend\Barcode\Object\Exception\ExceptionInterface');
         $this->object->setText('a');
         $this->object->setWithChecksum(true);
         $this->object->getText();
@@ -89,7 +89,7 @@ public function testCheckGoodParams()
 
     public function testCheckParamsWithLowRatio()
     {
-        $this->setExpectedException('\Zend\Barcode\Object\Exception\ExceptionInterface');
+        $this->expectException('\Zend\Barcode\Object\Exception\ExceptionInterface');
         $this->object->setText('0000123456789');
         $this->object->setBarThinWidth(21);
         $this->object->setBarThickWidth(40);
@@ -98,7 +98,7 @@ public function testCheckParamsWithLowRatio()
 
     public function testCheckParamsWithHighRatio()
     {
-        $this->setExpectedException('\Zend\Barcode\Object\Exception\ExceptionInterface');
+        $this->expectException('\Zend\Barcode\Object\Exception\ExceptionInterface');
         $this->object->setText('0000123456789');
         $this->object->setBarThinWidth(20);
         $this->object->setBarThickWidth(61);

diff --git a/test/Object/LeitcodeTest.php b/test/Object/LeitcodeTest.php
@@ -75,7 +75,7 @@ public function testSetTextWithChecksumNotDisplayed()
 
     public function testBadTextDetectedIfChecksumWished()
     {
-        $this->setExpectedException('\Zend\Barcode\Object\Exception\ExceptionInterface');
+        $this->expectException('\Zend\Barcode\Object\Exception\ExceptionInterface');
         $this->object->setText('a');
         $this->object->setWithChecksum(true);
         $this->object->getText();

diff --git a/test/Object/PlanetTest.php b/test/Object/PlanetTest.php
@@ -42,7 +42,7 @@ public function testSetText()
 
     public function testSetTextWithoutGoodNumberOfCharacters()
     {
-        $this->setExpectedException('\Zend\Barcode\Object\Exception\ExceptionInterface');
+        $this->expectException('\Zend\Barcode\Object\Exception\ExceptionInterface');
         $this->object->setText('1234');
         $this->object->getText();
     }
@@ -75,7 +75,7 @@ public function testSetTextWithChecksumNotDisplayed()
 
     public function testBadTextDetectedIfChecksumWished()
     {
-        $this->setExpectedException('\Zend\Barcode\Object\Exception\ExceptionInterface');
+        $this->expectException('\Zend\Barcode\Object\Exception\ExceptionInterface');
         $this->object->setText('a');
         $this->object->setWithChecksum(true);
         $this->object->getText();

diff --git a/test/Object/PostnetTest.php b/test/Object/PostnetTest.php
@@ -42,7 +42,7 @@ public function testSetText()
 
     public function testSetTextWithoutGoodNumberOfCharacters()
     {
-        $this->setExpectedException('\Zend\Barcode\Object\Exception\ExceptionInterface');
+        $this->expectException('\Zend\Barcode\Object\Exception\ExceptionInterface');
         $this->object->setText('1234');
         $this->object->getText();
     }
@@ -75,7 +75,7 @@ public function testSetTextWithChecksumNotDisplayed()
 
     public function testBadTextDetectedIfChecksumWished()
     {
-        $this->setExpectedException('\Zend\Barcode\Object\Exception\ExceptionInterface');
+        $this->expectException('\Zend\Barcode\Object\Exception\ExceptionInterface');
         $this->object->setText('a');
         $this->object->setWithChecksum(true);
         $this->object->getText();

diff --git a/test/Object/RoyalmailTest.php b/test/Object/RoyalmailTest.php
@@ -69,7 +69,7 @@ public function testSetTextWithChecksumNotDisplayed()
 
     public function testBadTextDetectedIfChecksumWished()
     {
-        $this->setExpectedException('\Zend\Barcode\Object\Exception\ExceptionInterface');
+        $this->expectException('\Zend\Barcode\Object\Exception\ExceptionInterface');
         $this->object->setText('a');
         $this->object->setWithChecksum(true);
         $this->object->getText();

diff --git a/test/Object/TestCommon.php b/test/Object/TestCommon.php
@@ -9,10 +9,11 @@
 
 namespace ZendTest\Barcode\Object;
 
+use PHPUnit\Framework\TestCase;
 use Zend\Barcode;
 use Zend\Config;
 
-abstract class TestCommon extends \PHPUnit_Framework_TestCase
+abstract class TestCommon extends TestCase
 {
     /**
      * @var \Zend\Barcode\Object\AbstractObject
@@ -102,7 +103,7 @@ public function testBarHeight()
 
     public function testNegativeBarHeight()
     {
-        $this->setExpectedException('\Zend\Barcode\Object\Exception\ExceptionInterface');
+        $this->expectException('\Zend\Barcode\Object\Exception\ExceptionInterface');
         $this->object->setBarHeight(- 1);
     }
 
@@ -118,7 +119,7 @@ public function testBarThinWidth()
 
     public function testNegativeBarThinWidth()
     {
-        $this->setExpectedException('\Zend\Barcode\Object\Exception\ExceptionInterface');
+        $this->expectException('\Zend\Barcode\Object\Exception\ExceptionInterface');
         $this->object->setBarThinWidth(- 1);
     }
 
@@ -134,7 +135,7 @@ public function testBarThickWidth()
 
     public function testNegativeBarThickWidth()
     {
-        $this->setExpectedException('\Zend\Barcode\Object\Exception\ExceptionInterface');
+        $this->expectException('\Zend\Barcode\Object\Exception\ExceptionInterface');
         $this->object->setBarThickWidth(- 1);
     }
 
@@ -152,7 +153,7 @@ public function testFactor()
 
     public function testNegativeFactor()
     {
-        $this->setExpectedException('\Zend\Barcode\Object\Exception\ExceptionInterface');
+        $this->expectException('\Zend\Barcode\Object\Exception\ExceptionInterface');
         $this->object->setFactor(- 1);
     }
 
@@ -166,13 +167,13 @@ public function testForeColor()
 
     public function testNegativeForeColor()
     {
-        $this->setExpectedException('\Zend\Barcode\Object\Exception\ExceptionInterface');
+        $this->expectException('\Zend\Barcode\Object\Exception\ExceptionInterface');
         $this->object->setForeColor(- 1);
     }
 
     public function testTooHighForeColor()
     {
-        $this->setExpectedException('\Zend\Barcode\Object\Exception\ExceptionInterface');
+        $this->expectException('\Zend\Barcode\Object\Exception\ExceptionInterface');
         $this->object->setForeColor(16777126);
     }
 
@@ -186,13 +187,13 @@ public function testBackgroundColor()
 
     public function testNegativeBackgroundColor()
     {
-        $this->setExpectedException('\Zend\Barcode\Object\Exception\ExceptionInterface');
+        $this->expectException('\Zend\Barcode\Object\Exception\ExceptionInterface');
         $this->object->setBackgroundColor(- 1);
     }
 
     public function testTooHighBackgroundColor()
     {
-        $this->setExpectedException('\Zend\Barcode\Object\Exception\ExceptionInterface');
+        $this->expectException('\Zend\Barcode\Object\Exception\ExceptionInterface');
         $this->object->setBackgroundColor(16777126);
     }
 
@@ -287,13 +288,13 @@ public function testSetFontAsNumberForGdImage()
 
     public function testSetLowFontAsNumberForGdImage()
     {
-        $this->setExpectedException('\Zend\Barcode\Object\Exception\ExceptionInterface');
+        $this->expectException('\Zend\Barcode\Object\Exception\ExceptionInterface');
         $this->object->setFont(0);
     }
 
     public function testSetHighFontAsNumberForGdImage()
     {
-        $this->setExpectedException('\Zend\Barcode\Object\Exception\ExceptionInterface');
+        $this->expectException('\Zend\Barcode\Object\Exception\ExceptionInterface');
         $this->object->setFont(6);
     }
 
@@ -305,7 +306,7 @@ public function testSetFontAsString()
 
     public function testSetFontAsBoolean()
     {
-        $this->setExpectedException('\Zend\Barcode\Object\Exception\ExceptionInterface');
+        $this->expectException('\Zend\Barcode\Object\Exception\ExceptionInterface');
         $this->object->setFont(true);
     }
 
@@ -316,7 +317,7 @@ public function testFontAsNumberWithoutGd()
                 'GD extension must not be loaded to run this test'
             );
         }
-        $this->setExpectedException('\Zend\Barcode\Object\Exception\ExceptionInterface');
+        $this->expectException('\Zend\Barcode\Object\Exception\ExceptionInterface');
         $this->object->setFont(1);
     }
 
@@ -340,7 +341,7 @@ public function testFontSizeWithoutEffectWithGdInternalFont()
 
     public function testStringFontSize()
     {
-        $this->setExpectedException('\Zend\Barcode\Object\Exception\ExceptionInterface');
+        $this->expectException('\Zend\Barcode\Object\Exception\ExceptionInterface');
         $this->object->setFontSize('22a');
     }
 
@@ -438,7 +439,7 @@ public function testAddTextWithDefaultColor()
 
     public function testCheckParamsFontWithOrientation()
     {
-        $this->setExpectedException('\Zend\Barcode\Object\Exception\ExceptionInterface');
+        $this->expectException('\Zend\Barcode\Object\Exception\ExceptionInterface');
         $this->object->setText('0');
         $this->object->setFont(1);
         $this->object->setOrientation(45);

diff --git a/test/Object/UpcaTest.php b/test/Object/UpcaTest.php
@@ -75,7 +75,7 @@ public function testSetTextWithChecksumNotDisplayed()
 
     public function testBadTextDetectedIfChecksumWished()
     {
-        $this->setExpectedException('\Zend\Barcode\Object\Exception\ExceptionInterface');
+        $this->expectException('\Zend\Barcode\Object\Exception\ExceptionInterface');
         $this->object->setText('a');
         $this->object->setWithChecksum(true);
         $this->object->getText();

diff --git a/test/Object/UpceTest.php b/test/Object/UpceTest.php
@@ -83,7 +83,7 @@ public function testSetTextWithChecksumNotDisplayed()
 
     public function testBadTextDetectedIfChecksumWished()
     {
-        $this->setExpectedException('\Zend\Barcode\Object\Exception\ExceptionInterface');
+        $this->expectException('\Zend\Barcode\Object\Exception\ExceptionInterface');
         $this->object->setText('a');
         $this->object->setWithChecksum(true);
         $this->object->getText();

diff --git a/test/ObjectPluginManagerCompatibilityTest.php b/test/ObjectPluginManagerCompatibilityTest.php
@@ -9,7 +9,7 @@
 
 namespace ZendTest\Barcode;
 
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Zend\Barcode\Exception\InvalidArgumentException;
 use Zend\Barcode\Object\AbstractObject;
 use Zend\Barcode\ObjectPluginManager;