geckon01/predis
1
0
Fork 0
mirror of https://github.com/predis/predis.git synced 2026-10-10 13:57:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

[tests] Adapt after changes in aggregate connection initialization.

Browse Source 
See commit dd5d665 for the above mentioned changes.

Tests for Option\Aggregate, Option\Replication and Option\Cluster should
be refactored because code is a bit too repetitive and a bunch of tests
are shared among them (replication and cluster options extend aggregate
and share the same logic after all).
This commit is contained in:
Daniele Alessandri
2020-09-03 12:56:28 +02:00
parent dd5d665156
commit 9e48aef4b0
5 changed files with 687 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Predis/ClientTest.php
+34 -12
View File
@@ -210,7 +210,8 @@ class ClientTest extends PredisTestCase
$cluster = new Connection\Cluster\PredisCluster();
$factory = new Connection\Factory();
$factory->aggregate($cluster, array('tcp://localhost:7000', 'tcp://localhost:7001'));
$cluster->add($factory->create('tcp://localhost:7000'));
$cluster->add($factory->create('tcp://localhost:7001'));
$client = new Client($cluster);
@@ -226,7 +227,8 @@ class ClientTest extends PredisTestCase
$replication = new Connection\Replication\MasterSlaveReplication();
$factory = new Connection\Factory();
$factory->aggregate($replication, array('tcp://host1?alias=master', 'tcp://host2?alias=slave'));
$replication->add($factory->create('tcp://host1?alias=master'));
$replication->add($factory->create('tcp://host2?alias=slave'));
$client = new Client($replication);
@@ -329,7 +331,11 @@ class ClientTest extends PredisTestCase
$fncluster
->expects($this->once())
->method('__invoke')
->with($this->isInstanceOf('Predis\Configuration\OptionsInterface'), $arg1)
->with(
$arg1,
$this->isInstanceOf('Predis\Configuration\OptionsInterface'),
$this->isInstanceOf('Predis\Configuration\OptionInterface')
)
->willReturn($connection);
$fnreplication = $this->getMockBuilder('stdClass')
@@ -372,7 +378,11 @@ class ClientTest extends PredisTestCase
$fnreplication
->expects($this->once())
->method('__invoke')
->with($this->isInstanceOf('Predis\Configuration\OptionsInterface'), $arg1)
->with(
$arg1,
$this->isInstanceOf('Predis\Configuration\OptionsInterface'),
$this->isInstanceOf('Predis\Configuration\OptionInterface')
)
->willReturn($connection);
$fnaggregate = $this->getMockBuilder('stdClass')
@@ -397,7 +407,16 @@ class ClientTest extends PredisTestCase
{
$arg1 = array('tcp://host1', 'tcp://host2');
$connection = $this->getMockBuilder('Predis\Connection\AggregateConnectionInterface')->getMock();
$connections = $this->getMockBuilder('Predis\Connection\FactoryInterface')->getMock();
$connections
->expects($this->never())
->method('create');
$connection = $this->getMockBuilder('Predis\Connection\AggregateConnectionInterface')
->getMock();
$connection
->expects($this->never())
->method('add');
$fnaggregate = $this->getMockBuilder('stdClass')
->addMethods(array('__invoke'))
@@ -405,14 +424,13 @@ class ClientTest extends PredisTestCase
$fnaggregate
->expects($this->once())
->method('__invoke')
->with($this->isInstanceOf('Predis\Configuration\OptionsInterface'), $arg1)
->with(
$arg1,
$this->isInstanceOf('Predis\Configuration\OptionsInterface'),
$this->isInstanceOf('Predis\Configuration\OptionInterface')
)
->willReturn($connection);
$connections = $this->getMockBuilder('Predis\Connection\FactoryInterface')->getMock();
$connections
->expects($this->never())
->method('aggregate');
$arg2 = array('aggregate' => $fnaggregate, 'connections' => $connections);
$client = new Client($arg1, $arg2);
@@ -1280,7 +1298,11 @@ class ClientTest extends PredisTestCase
$callable
->expects($this->once())
->method('__invoke')
->with($this->isInstanceOf('Predis\Configuration\OptionsInterface'), $parameters)
->with(
$parameters,
$this->isInstanceOf('Predis\Configuration\OptionsInterface'),
$this->isInstanceOf('Predis\Configuration\OptionInterface')
)
->willReturn($connection);
return $callable;