mcndave/spout
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove @expectedException annotation

Browse Source
This commit is contained in:
Adrien Loison committed 2017-11-05 02:21:09 +01:00
1 parent 7274226b75
commit 3851e05f83
20 files changed
+173 -74
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tests/Spout/Common/Helper/EncodingHelperTest.php
+9 -6
View File
@@ -2,6 +2,7 @@
namespace Box\Spout\Common\Helper;
use Box\Spout\Common\Exception\EncodingConversionException;
use Box\Spout\TestUsingResource;
/**
@@ -57,13 +58,14 @@ class EncodingHelperTest extends \PHPUnit_Framework_TestCase
/**
* @dataProvider dataProviderForIconvOrMbstringUsage
* @expectedException \Box\Spout\Common\Exception\EncodingConversionException
*
* @param bool $shouldUseIconv
* @return void
*/
public function testAttemptConversionToUTF8ShouldThrowIfConversionFailed($shouldUseIconv)
{
$this->expectException(EncodingConversionException::class);
$helperStub = $this->getMockBuilder('\Box\Spout\Common\Helper\GlobalFunctionsHelper')
->setMethods(['iconv', 'mb_convert_encoding'])
->getMock();
@@ -82,12 +84,12 @@ class EncodingHelperTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException \Box\Spout\Common\Exception\EncodingConversionException
*
* @return void
*/
public function testAttemptConversionToUTF8ShouldThrowIfConversionNotSupported()
{
$this->expectException(EncodingConversionException::class);
/** @var EncodingHelper $encodingHelperStub */
$encodingHelperStub = $this->getMockBuilder('\Box\Spout\Common\Helper\EncodingHelper')
->disableOriginalConstructor()
@@ -139,13 +141,14 @@ class EncodingHelperTest extends \PHPUnit_Framework_TestCase
/**
* @dataProvider dataProviderForIconvOrMbstringUsage
* @expectedException \Box\Spout\Common\Exception\EncodingConversionException
*
* @param bool $shouldUseIconv
* @return void
*/
public function testAttemptConversionFromUTF8ShouldThrowIfConversionFailed($shouldUseIconv)
{
$this->expectException(EncodingConversionException::class);
$helperStub = $this->getMockBuilder('\Box\Spout\Common\Helper\GlobalFunctionsHelper')
->setMethods(['iconv', 'mb_convert_encoding'])
->getMock();
@@ -164,12 +167,12 @@ class EncodingHelperTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException \Box\Spout\Common\Exception\EncodingConversionException
*
* @return void
*/
public function testAttemptConversionFromUTF8ShouldThrowIfConversionNotSupported()
{
$this->expectException(EncodingConversionException::class);
/** @var EncodingHelper $encodingHelperStub */
$encodingHelperStub = $this->getMockBuilder('\Box\Spout\Common\Helper\EncodingHelper')
->disableOriginalConstructor()