Skip to content

S
solarium
Commit 8b18fcb6 authored by Stéphane Goetz's avatar Stéphane Goetz
Browse files
Options

Call setDispatcher only if it exists (if it doesn't exist, it isnt needed)

parent fc453b87
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 30 deletions
tests/Solarium/Tests/Core/Client/ClientTest.php
View file @ 8b18fcb6
...@@ -570,8 +570,10 @@ class ClientTest extends \PHPUnit_Framework_TestCase ...@@ -570,8 +570,10 @@ class ClientTest extends \PHPUnit_Framework_TestCase
{ {
$query = new SelectQuery(); $query = new SelectQuery();
$expectedEvent = new PreCreateRequestEvent($query); $expectedEvent = new PreCreateRequestEvent($query);
$expectedEvent->setDispatcher($this->client->getEventDispatcher()); if (method_exists($expectedEvent, 'setDispatcher')) {
$expectedEvent->setName(Events::PRE_CREATE_REQUEST); $expectedEvent->setDispatcher($this->client->getEventDispatcher());
$expectedEvent->setName(Events::PRE_CREATE_REQUEST);
}
$observer = $this->getMock('Solarium\Core\Plugin\AbstractPlugin', array('preCreateRequest')); $observer = $this->getMock('Solarium\Core\Plugin\AbstractPlugin', array('preCreateRequest'));
$observer->expects($this->once()) $observer->expects($this->once())
...@@ -592,8 +594,10 @@ class ClientTest extends \PHPUnit_Framework_TestCase ...@@ -592,8 +594,10 @@ class ClientTest extends \PHPUnit_Framework_TestCase
$query = new SelectQuery(); $query = new SelectQuery();
$request = $this->client->createRequest($query); $request = $this->client->createRequest($query);
$expectedEvent = new PostCreateRequestEvent($query, $request); $expectedEvent = new PostCreateRequestEvent($query, $request);
$expectedEvent->setDispatcher($this->client->getEventDispatcher()); if (method_exists($expectedEvent, 'setDispatcher')) {
$expectedEvent->setName(Events::POST_CREATE_REQUEST); $expectedEvent->setDispatcher($this->client->getEventDispatcher());
$expectedEvent->setName(Events::POST_CREATE_REQUEST);
}
$observer = $this->getMock('Solarium\Core\Plugin\AbstractPlugin', array('postCreateRequest')); $observer = $this->getMock('Solarium\Core\Plugin\AbstractPlugin', array('postCreateRequest'));
$observer->expects($this->once()) $observer->expects($this->once())
...@@ -616,8 +620,10 @@ class ClientTest extends \PHPUnit_Framework_TestCase ...@@ -616,8 +620,10 @@ class ClientTest extends \PHPUnit_Framework_TestCase
$query = new SelectQuery(); $query = new SelectQuery();
$expectedEvent = new PreCreateRequestEvent($query); $expectedEvent = new PreCreateRequestEvent($query);
$expectedEvent->setDispatcher($this->client->getEventDispatcher()); if (method_exists($expectedEvent, 'setDispatcher')) {
$expectedEvent->setName(Events::PRE_CREATE_REQUEST); $expectedEvent->setDispatcher($this->client->getEventDispatcher());
$expectedEvent->setName(Events::PRE_CREATE_REQUEST);
}
$test = $this; $test = $this;
$this->client->getEventDispatcher()->addListener( $this->client->getEventDispatcher()->addListener(
...@@ -653,8 +659,10 @@ class ClientTest extends \PHPUnit_Framework_TestCase ...@@ -653,8 +659,10 @@ class ClientTest extends \PHPUnit_Framework_TestCase
$query = new SelectQuery(); $query = new SelectQuery();
$response = new Response('', array('HTTP 1.0 200 OK')); $response = new Response('', array('HTTP 1.0 200 OK'));
$expectedEvent = new PreCreateResultEvent($query, $response); $expectedEvent = new PreCreateResultEvent($query, $response);
$expectedEvent->setDispatcher($this->client->getEventDispatcher()); if (method_exists($expectedEvent, 'setDispatcher')) {
$expectedEvent->setName(Events::PRE_CREATE_RESULT); $expectedEvent->setDispatcher($this->client->getEventDispatcher());
$expectedEvent->setName(Events::PRE_CREATE_RESULT);
}
$observer = $this->getMock('Solarium\Core\Plugin\AbstractPlugin', array('preCreateResult')); $observer = $this->getMock('Solarium\Core\Plugin\AbstractPlugin', array('preCreateResult'));
$observer->expects($this->once()) $observer->expects($this->once())
...@@ -676,8 +684,10 @@ class ClientTest extends \PHPUnit_Framework_TestCase ...@@ -676,8 +684,10 @@ class ClientTest extends \PHPUnit_Framework_TestCase
$response = new Response('', array('HTTP 1.0 200 OK')); $response = new Response('', array('HTTP 1.0 200 OK'));
$result = $this->client->createResult($query, $response); $result = $this->client->createResult($query, $response);
$expectedEvent = new PostCreateResultEvent($query, $response, $result); $expectedEvent = new PostCreateResultEvent($query, $response, $result);
$expectedEvent->setDispatcher($this->client->getEventDispatcher()); if (method_exists($expectedEvent, 'setDispatcher')) {
$expectedEvent->setName(Events::POST_CREATE_RESULT); $expectedEvent->setDispatcher($this->client->getEventDispatcher());
$expectedEvent->setName(Events::POST_CREATE_RESULT);
}
$observer = $this->getMock('Solarium\Core\Plugin\AbstractPlugin', array('postCreateResult')); $observer = $this->getMock('Solarium\Core\Plugin\AbstractPlugin', array('postCreateResult'));
$observer->expects($this->once()) $observer->expects($this->once())
...@@ -698,8 +708,10 @@ class ClientTest extends \PHPUnit_Framework_TestCase ...@@ -698,8 +708,10 @@ class ClientTest extends \PHPUnit_Framework_TestCase
$query = new SelectQuery(); $query = new SelectQuery();
$response = new Response('test 1234', array('HTTP 1.0 200 OK')); $response = new Response('test 1234', array('HTTP 1.0 200 OK'));
$expectedEvent = new PreCreateResultEvent($query, $response); $expectedEvent = new PreCreateResultEvent($query, $response);
$expectedEvent->setDispatcher($this->client->getEventDispatcher()); if (method_exists($expectedEvent, 'setDispatcher')) {
$expectedEvent->setName(Events::PRE_CREATE_RESULT); $expectedEvent->setDispatcher($this->client->getEventDispatcher());
$expectedEvent->setName(Events::PRE_CREATE_RESULT);
}
$expectedResult = new Result($this->client, $query, $response); $expectedResult = new Result($this->client, $query, $response);
$test = $this; $test = $this;
...@@ -768,7 +780,7 @@ class ClientTest extends \PHPUnit_Framework_TestCase ...@@ -768,7 +780,7 @@ class ClientTest extends \PHPUnit_Framework_TestCase
$response = new Response('', array('HTTP 1.0 200 OK')); $response = new Response('', array('HTTP 1.0 200 OK'));
$result = new Result($this->client, $query, $response); $result = new Result($this->client, $query, $response);
$expectedEvent = new PreExecuteEvent($query); $expectedEvent = new PreExecuteEvent($query);
$expectedEvent->setName(Events::PRE_EXECUTE);
$mock = $this->getMock('Solarium\Core\Client\Client', array('createRequest', 'executeRequest', 'createResult')); $mock = $this->getMock('Solarium\Core\Client\Client', array('createRequest', 'executeRequest', 'createResult'));
...@@ -791,7 +803,10 @@ class ClientTest extends \PHPUnit_Framework_TestCase ...@@ -791,7 +803,10 @@ class ClientTest extends \PHPUnit_Framework_TestCase
$mock->getEventDispatcher()->addListener(Events::PRE_EXECUTE, array($observer, 'preExecute')); $mock->getEventDispatcher()->addListener(Events::PRE_EXECUTE, array($observer, 'preExecute'));
$expectedEvent->setDispatcher($mock->getEventDispatcher()); if (method_exists($expectedEvent, 'setDispatcher')) {
$expectedEvent->setName(Events::PRE_EXECUTE);
$expectedEvent->setDispatcher($mock->getEventDispatcher());
}
$mock->execute($query); $mock->execute($query);
} }
...@@ -802,7 +817,6 @@ class ClientTest extends \PHPUnit_Framework_TestCase ...@@ -802,7 +817,6 @@ class ClientTest extends \PHPUnit_Framework_TestCase
$response = new Response('', array('HTTP 1.0 200 OK')); $response = new Response('', array('HTTP 1.0 200 OK'));
$result = new Result($this->client, $query, $response); $result = new Result($this->client, $query, $response);
$expectedEvent = new PostExecuteEvent($query, $result); $expectedEvent = new PostExecuteEvent($query, $result);
$expectedEvent->setName(Events::POST_EXECUTE);
$mock = $this->getMock('Solarium\Core\Client\Client', array('createRequest', 'executeRequest', 'createResult')); $mock = $this->getMock('Solarium\Core\Client\Client', array('createRequest', 'executeRequest', 'createResult'));
...@@ -825,7 +839,10 @@ class ClientTest extends \PHPUnit_Framework_TestCase ...@@ -825,7 +839,10 @@ class ClientTest extends \PHPUnit_Framework_TestCase
$mock->getEventDispatcher()->addListener(Events::POST_EXECUTE, array($observer, 'postExecute')); $mock->getEventDispatcher()->addListener(Events::POST_EXECUTE, array($observer, 'postExecute'));
$expectedEvent->setDispatcher($mock->getEventDispatcher()); if (method_exists($expectedEvent, 'setDispatcher')) {
$expectedEvent->setName(Events::POST_EXECUTE);
$expectedEvent->setDispatcher($mock->getEventDispatcher());
}
$mock->execute($query); $mock->execute($query);
} }
...@@ -836,8 +853,10 @@ class ClientTest extends \PHPUnit_Framework_TestCase ...@@ -836,8 +853,10 @@ class ClientTest extends \PHPUnit_Framework_TestCase
$response = new Response('', array('HTTP 1.0 200 OK')); $response = new Response('', array('HTTP 1.0 200 OK'));
$expectedResult = new Result($this->client, $query, $response); $expectedResult = new Result($this->client, $query, $response);
$expectedEvent = new PreExecuteEvent($query); $expectedEvent = new PreExecuteEvent($query);
$expectedEvent->setDispatcher($this->client->getEventDispatcher()); if (method_exists($expectedEvent, 'setDispatcher')) {
$expectedEvent->setName(Events::PRE_EXECUTE); $expectedEvent->setDispatcher($this->client->getEventDispatcher());
$expectedEvent->setName(Events::PRE_EXECUTE);
}
$test = $this; $test = $this;
$this->client->getEventDispatcher()->addListener( $this->client->getEventDispatcher()->addListener(
...@@ -882,8 +901,10 @@ class ClientTest extends \PHPUnit_Framework_TestCase ...@@ -882,8 +901,10 @@ class ClientTest extends \PHPUnit_Framework_TestCase
$endpoint = $this->client->createEndpoint('s1'); $endpoint = $this->client->createEndpoint('s1');
$response = new Response('', array('HTTP 1.0 200 OK')); $response = new Response('', array('HTTP 1.0 200 OK'));
$expectedEvent = new PreExecuteRequestEvent($request, $endpoint); $expectedEvent = new PreExecuteRequestEvent($request, $endpoint);
$expectedEvent->setDispatcher($this->client->getEventDispatcher()); if (method_exists($expectedEvent, 'setDispatcher')) {
$expectedEvent->setName(Events::PRE_EXECUTE_REQUEST); $expectedEvent->setDispatcher($this->client->getEventDispatcher());
$expectedEvent->setName(Events::PRE_EXECUTE_REQUEST);
}
$mockAdapter = $this->getMock('Solarium\Core\Client\Adapter\Http', array('execute')); $mockAdapter = $this->getMock('Solarium\Core\Client\Adapter\Http', array('execute'));
$mockAdapter->expects($this->once()) $mockAdapter->expects($this->once())
...@@ -910,8 +931,10 @@ class ClientTest extends \PHPUnit_Framework_TestCase ...@@ -910,8 +931,10 @@ class ClientTest extends \PHPUnit_Framework_TestCase
$endpoint = $this->client->createEndpoint('s1'); $endpoint = $this->client->createEndpoint('s1');
$response = new Response('', array('HTTP 1.0 200 OK')); $response = new Response('', array('HTTP 1.0 200 OK'));
$expectedEvent = new PostExecuteRequestEvent($request, $endpoint, $response); $expectedEvent = new PostExecuteRequestEvent($request, $endpoint, $response);
$expectedEvent->setDispatcher($this->client->getEventDispatcher()); if (method_exists($expectedEvent, 'setDispatcher')) {
$expectedEvent->setName(Events::POST_EXECUTE_REQUEST); $expectedEvent->setDispatcher($this->client->getEventDispatcher());
$expectedEvent->setName(Events::POST_EXECUTE_REQUEST);
}
$mockAdapter = $this->getMock('Solarium\Core\Client\Adapter\Http', array('execute')); $mockAdapter = $this->getMock('Solarium\Core\Client\Adapter\Http', array('execute'));
$mockAdapter->expects($this->any()) $mockAdapter->expects($this->any())
...@@ -938,8 +961,10 @@ class ClientTest extends \PHPUnit_Framework_TestCase ...@@ -938,8 +961,10 @@ class ClientTest extends \PHPUnit_Framework_TestCase
$response = new Response('', array('HTTP 1.0 200 OK')); $response = new Response('', array('HTTP 1.0 200 OK'));
$endpoint = $this->client->createEndpoint('s1'); $endpoint = $this->client->createEndpoint('s1');
$expectedEvent = new PreExecuteRequestEvent($request, $endpoint); $expectedEvent = new PreExecuteRequestEvent($request, $endpoint);
$expectedEvent->setDispatcher($this->client->getEventDispatcher()); if (method_exists($expectedEvent, 'setDispatcher')) {
$expectedEvent->setName(Events::PRE_EXECUTE_REQUEST); $expectedEvent->setDispatcher($this->client->getEventDispatcher());
$expectedEvent->setName(Events::PRE_EXECUTE_REQUEST);
}
$test = $this; $test = $this;
$this->client->getEventDispatcher()->addListener( $this->client->getEventDispatcher()->addListener(
...@@ -1088,8 +1113,10 @@ class ClientTest extends \PHPUnit_Framework_TestCase ...@@ -1088,8 +1113,10 @@ class ClientTest extends \PHPUnit_Framework_TestCase
$type = Client::QUERY_SELECT; $type = Client::QUERY_SELECT;
$options = array('optionA' => 1, 'optionB' => 2); $options = array('optionA' => 1, 'optionB' => 2);
$expectedEvent = new PreCreateQueryEvent($type, $options); $expectedEvent = new PreCreateQueryEvent($type, $options);
$expectedEvent->setDispatcher($this->client->getEventDispatcher()); if (method_exists($expectedEvent, 'setDispatcher')) {
$expectedEvent->setName(Events::PRE_CREATE_QUERY); $expectedEvent->setDispatcher($this->client->getEventDispatcher());
$expectedEvent->setName(Events::PRE_CREATE_QUERY);
}
$observer = $this->getMock('Solarium\Core\Plugin\AbstractPlugin', array('preCreateQuery')); $observer = $this->getMock('Solarium\Core\Plugin\AbstractPlugin', array('preCreateQuery'));
$observer->expects($this->once()) $observer->expects($this->once())
...@@ -1107,8 +1134,10 @@ class ClientTest extends \PHPUnit_Framework_TestCase ...@@ -1107,8 +1134,10 @@ class ClientTest extends \PHPUnit_Framework_TestCase
$expectedQuery = new SelectQuery(); $expectedQuery = new SelectQuery();
$expectedQuery->setQuery('test789'); $expectedQuery->setQuery('test789');
$expectedEvent = new PreCreateQueryEvent($type, $options); $expectedEvent = new PreCreateQueryEvent($type, $options);
$expectedEvent->setDispatcher($this->client->getEventDispatcher()); if (method_exists($expectedEvent, 'setDispatcher')) {
$expectedEvent->setName(Events::PRE_CREATE_QUERY); $expectedEvent->setDispatcher($this->client->getEventDispatcher());
$expectedEvent->setName(Events::PRE_CREATE_QUERY);
}
$test = $this; $test = $this;
$this->client->getEventDispatcher()->addListener( $this->client->getEventDispatcher()->addListener(
...@@ -1133,8 +1162,10 @@ class ClientTest extends \PHPUnit_Framework_TestCase ...@@ -1133,8 +1162,10 @@ class ClientTest extends \PHPUnit_Framework_TestCase
$options = array('optionA' => 1, 'optionB' => 2); $options = array('optionA' => 1, 'optionB' => 2);
$query = $this->client->createQuery($type, $options); $query = $this->client->createQuery($type, $options);
$expectedEvent = new PostCreateQueryEvent($type, $options, $query); $expectedEvent = new PostCreateQueryEvent($type, $options, $query);
$expectedEvent->setDispatcher($this->client->getEventDispatcher()); if (method_exists($expectedEvent, 'setDispatcher')) {
$expectedEvent->setName(Events::POST_CREATE_QUERY); $expectedEvent->setDispatcher($this->client->getEventDispatcher());
$expectedEvent->setName(Events::POST_CREATE_QUERY);
}
$observer = $this->getMock('Solarium\Core\Plugin\AbstractPlugin', array('postCreateQuery')); $observer = $this->getMock('Solarium\Core\Plugin\AbstractPlugin', array('postCreateQuery'));
$observer->expects($this->once()) $observer->expects($this->once())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment