From d08f3cb3ec24620a293df2f8bf932cda69174e6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simonas=20=C5=A0erlinskas?= <simonas.serlinskas@nfq.com>
Date: Mon, 21 Nov 2016 09:09:47 +0200
Subject: [PATCH] support phpunit 5 new mock reference logic
---
tests/Unit/Query/IndicesQueryTest.php | 33 ++++++++++++++++-----------
1 file changed, 20 insertions(+), 13 deletions(-)
diff --git a/tests/Unit/Query/IndicesQueryTest.php b/tests/Unit/Query/IndicesQueryTest.php
index 8618830..f1de671 100644
--- a/tests/Unit/Query/IndicesQueryTest.php
+++ b/tests/Unit/Query/IndicesQueryTest.php
@@ -11,44 +11,51 @@
namespace ONGR\ElasticsearchDSL\Tests\Unit\Query;
+use ONGR\ElasticsearchDSL\BuilderInterface;
use ONGR\ElasticsearchDSL\Query\IndicesQuery;
class IndicesQueryTest extends \PHPUnit_Framework_TestCase
{
/**
- * Data provider for testToArray().
- *
- * @return array
+ * @return \PHPUnit_Framework_MockObject_MockObject|BuilderInterface
*/
- public function getTestToArrayData()
+ private function getQueryMock()
{
- $mock = $this->getMock('ONGR\ElasticsearchDSL\BuilderInterface');
+ $mock = $this->getMockBuilder('ONGR\ElasticsearchDSL\BuilderInterface')->setMethods(['toArray', 'getType'])->getMock();
$mock
->expects($this->any())
->method('toArray')
->willReturn(['term' => ['foo' => 'bar']]);
-
+ return $mock;
+ }
+ /**
+ * Data provider for testToArray().
+ *
+ * @return array
+ */
+ public function getTestToArrayData()
+ {
return [
[
- $mock,
- $mock,
+ $this->getQueryMock(),
+ 'all',
[
'indices' => ['foo', 'bar'],
'query' => ['term' => ['foo' => 'bar']],
- 'no_match_query' => ['term' => ['foo' => 'bar']],
+ 'no_match_query' => 'all',
]
],
[
- $mock,
- 'all',
+ $this->getQueryMock(),
+ $this->getQueryMock(),
[
'indices' => ['foo', 'bar'],
'query' => ['term' => ['foo' => 'bar']],
- 'no_match_query' => 'all',
+ 'no_match_query' => ['term' => ['foo' => 'bar']],
]
],
[
- $mock,
+ $this->getQueryMock(),
null,
[
'indices' => ['foo', 'bar'],
--
GitLab