Skip to content

Fix test suite forward compatibility with upcoming EventLoop releases #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
WyriHaximus merged 1 commit into from
Dec 23, 2017
Merged

Fix test suite forward compatibility with upcoming EventLoop releases #88

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions tests/Query/ExecutorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public function setUp()
/** @test */
public function queryShouldCreateUdpRequest()
{
$timer = $this->getMockBuilder('React\EventLoop\Timer\TimerInterface')->getMock();
$timer = $this->createTimerMock();
$this->loop
->expects($this->any())
->method('addTimer')
Expand Down Expand Up @@ -62,7 +62,7 @@ public function resolveShouldCloseConnectionWhenCancelled()
$conn = $this->createConnectionMock(false);
$conn->expects($this->once())->method('close');

$timer = $this->getMockBuilder('React\EventLoop\Timer\TimerInterface')->getMock();
$timer = $this->createTimerMock();
$this->loop
->expects($this->any())
->method('addTimer')
Expand Down Expand Up @@ -105,7 +105,7 @@ public function resolveShouldNotStartOrCancelTimerWhenCancelledWithTimeoutIsNull
/** @test */
public function resolveShouldRejectIfResponseIsTruncated()
{
$timer = $this->getMockBuilder('React\EventLoop\Timer\TimerInterface')->getMock();
$timer = $this->createTimerMock();

$this->loop
->expects($this->any())
Expand Down Expand Up @@ -171,7 +171,7 @@ public function resolveShouldCancelTimerWhenFullResponseIsReceived()
->will($this->returnNewConnectionMock());


$timer = $this->getMockBuilder('React\EventLoop\Timer\TimerInterface')->getMock();
$timer = $this->createTimerMock();

$this->loop
->expects($this->once())
Expand All @@ -198,10 +198,11 @@ public function resolveShouldCloseConnectionOnTimeout()
->with('8.8.8.8:53', 'udp')
->will($this->returnNewConnectionMock(false));

$timer = $this->getMockBuilder('React\EventLoop\Timer\TimerInterface')->getMock();
$timer
$timer = $this->createTimerMock();

$this->loop
->expects($this->never())
->method('cancel');
->method('cancelTimer');

$this->loop
->expects($this->once())
Expand Down Expand Up @@ -290,6 +291,13 @@ private function createConnectionMock($emitData = true)
return $conn;
}

private function createTimerMock()
{
return $this->getMockBuilder(
interface_exists('React\EventLoop\TimerInterface') ? 'React\EventLoop\TimerInterface' : 'React\EventLoop\Timer\TimerInterface'
)->getMock();
}

private function createExecutorMock()
{
return $this->getMockBuilder('React\Dns\Query\Executor')
Expand Down