Skip to content

Commit cb8f0d6

Browse files
fixed unit test for php7
1 parent 43eeb8e commit cb8f0d6

File tree

3 files changed

+41
-9
lines changed

3 files changed

+41
-9
lines changed

phpunit.xml.dist

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,21 @@
1515
colors="false">
1616
<testsuites>
1717
<testsuite name="Zend Server DepH Deployment Suite">
18-
<directory>./tests/Deployment</directory>
18+
<directory>./tests/Deployment</directory>
1919
</testsuite>
2020
<testsuite name="Zend Server DepH File Suite">
21-
<directory>./tests/File</directory>
21+
<directory>./tests/File</directory>
2222
</testsuite>
2323
<testsuite name="Zend Server DepH Params Suite">
24-
<directory>./tests/Params</directory>
24+
<directory>./tests/Params</directory>
25+
<file phpVersion="7.0" phpVersionOperator="&lt;">./tests/Params/ParamsTest.php</file>
26+
<file phpVersion="7.0" phpVersionOperator=">=">./tests/Params/PHP7ParamsTest.php</file>
2527
</testsuite>
2628
<testsuite name="Zend Server DepH Path Suite">
27-
<directory>./tests/Path</directory>
29+
<directory>./tests/Path</directory>
2830
</testsuite>
2931
<testsuite name="Zend Server DepH SystemCall Suite">
30-
<directory>./tests/SystemCall</directory>
32+
<directory>./tests/SystemCall</directory>
3133
</testsuite>
3234
</testsuites>
3335

@@ -50,7 +52,7 @@
5052
<php>
5153
<ini name="date.timezone" value="UTC"/>
5254
<ini name="memory_limit" value="128M"/>
53-
<ini name="error_reporting" value="-1" />
55+
<ini name="error_reporting" value="-1"/>
5456
<ini name="zend.enable_gc" value="0"/>
5557
</php>
5658

tests/Params/PHP7ParamsTest.php

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?php
2+
3+
namespace ZendServerTest\DepH\Params;
4+
5+
use Mockery;
6+
use \ZendServer\DepH\Params\Params;
7+
use Zend\EventManager\SharedEventManager;
8+
use PHPUnit_Framework_TestCase as TestCase;
9+
10+
/**
11+
* Params test case.
12+
*/
13+
class PHP7ParamsTest extends ParamsTest
14+
{
15+
/**
16+
* Tests Params->setSharedManager()
17+
*
18+
* @expectedException \TypeError
19+
*/
20+
public function testSetSharedManagerException ()
21+
{
22+
$sharedManager = \Mockery::mock('NoSharedEventManager');
23+
24+
$this->Params->setSharedManager($sharedManager);
25+
}
26+
}
27+

tests/Params/ParamsTest.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class ParamsTest extends TestCase
1717
*
1818
* @var Params
1919
*/
20-
private $Params;
20+
protected $Params;
2121

2222
/**
2323
* Prepares the environment before running a test.
@@ -49,17 +49,20 @@ public function testSetSharedManager ()
4949
$sharedManager = new SharedEventManager();
5050

5151
$this->Params->setSharedManager($sharedManager);
52+
53+
$this->assertSame($sharedManager, $this->Params->getSharedManager());
5254
}
5355

5456
/**
5557
* Tests Params->setSharedManager()
56-
*
58+
*
5759
* @expectedException \PHPUnit_Framework_Error
5860
*/
5961
public function testSetSharedManagerException ()
6062
{
63+
6164
$sharedManager = \Mockery::mock('NoSharedEventManager');
62-
65+
6366
$this->Params->setSharedManager($sharedManager);
6467
}
6568

0 commit comments

Comments
 (0)