[tests] Improve the basic framework of our test suite.

We now have a base test case class for Predis (namely PredisTestCase)
grouping various commonly used utility methods shared by all of the
tests in the suite, greatly improving reusability.

bin/generate-command-test.php

@@ -171,8 +171,6 @@ class CommandTestCaseGenerator
 
 namespace Predis\Command;
 
-use \PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-$realm

tests/PHPUnit/ArrayHasSameValuesConstraint.php

@@ -27,15 +27,14 @@ class ArrayHasSameValuesConstraint extends PHPUnit_Framework_Constraint
     /**
      * {@inheritdoc}
      */
-    public function evaluate($other, $description = '', $returnResult = FALSE)
+    public function matches($other)
     {
-        $description = $description ?: 'Failed asserting that two arrays have the same elements.';
-
         if (count($this->array) !== count($other)) {
-            throw new PHPUnit_Framework_ExpectationFailedException($description);
+            return false;
         }
+
         if (array_diff($this->array, $other)) {
-            throw new PHPUnit_Framework_ExpectationFailedException($description);
+            return false;
         }
 
         return true;
@@ -46,6 +45,14 @@ class ArrayHasSameValuesConstraint extends PHPUnit_Framework_Constraint
      */
     public function toString()
     {
-        return 'two arrays have the same elements.';
+        return 'two arrays contain the same elements.';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function failureDescription($other)
+    {
+        return $this->toString();
     }
 }

tests/PHPUnit/CommandTestCase.php

@@ -11,15 +11,14 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
+use PredisTestCase;
 use Predis\Client;
 use Predis\Profile;
 
 /**
  *
  */
-abstract class CommandTestCase extends StandardTestCase
+abstract class CommandTestCase extends PredisTestCase
 {
     /**
      * Returns the expected command.
@@ -47,46 +46,21 @@ abstract class CommandTestCase extends StandardTestCase
         return $command instanceof CommandInterface ? $command : new $command();
     }
 
-    /**
-     * Return the server profile used during the tests.
-     *
-     * @return Profile\ProfileInterface
-     */
-    public function getProfile()
-    {
-        return Profile\Factory::get(REDIS_SERVER_VERSION);
-    }
-
     /**
      * Returns a new client instance.
      *
-     * @param Boolean $connect Flush selected database before returning the client.
+     * @param bool $connect Flush selected database before returning the client.
      * @return Client
      */
     public function getClient($flushdb = true)
     {
-        $profile = $this->getProfile();
-
-        if (!$profile->supportsCommand($id = $this->getExpectedId())) {
-            $this->markTestSkipped("The profile {$profile->getVersion()} does not support command {$id}");
+        if (!$this->getProfile()->supportsCommand($id = $this->getExpectedId())) {
+            $this->markTestSkipped(
+                "The profile {$profile->getVersion()} does not support command {$id}"
+            );
         }
 
-        $parameters = array(
-            'host' => REDIS_SERVER_HOST,
-            'port' => REDIS_SERVER_PORT,
-        );
-
-        $options = array(
-            'profile' => $profile
-        );
-
-        $client = new Client($parameters, $options);
-        $client->connect();
-        $client->select(REDIS_SERVER_DBNUM);
-
-        if ($flushdb) {
-            $client->flushdb();
-        }
+        $client = $this->createClient(null, null, $flushdb);
 
         return $client;
     }
@@ -126,27 +100,6 @@ abstract class CommandTestCase extends StandardTestCase
         return $command;
     }
 
-    /**
-     * Sleep the test case with microseconds resolution.
-     *
-     * @param float $seconds Seconds to sleep.
-     */
-    protected function sleep($seconds)
-    {
-        usleep($seconds * 1000000);
-    }
-
-    /**
-     * Asserts that two arrays have the same values, even if with different order.
-     *
-     * @param array $expected Expected array.
-     * @param array $actual Actual array.
-     */
-    protected function assertSameValues(array $expected, array $actual)
-    {
-        $this->assertThat($expected, new \ArrayHasSameValuesConstraint($actual));
-    }
-
     /**
      * @group disconnected
      */
@@ -158,69 +111,6 @@ abstract class CommandTestCase extends StandardTestCase
         $this->assertEquals($this->getExpectedId(), $command->getId());
     }
 
-    /**
-     * @param  string $expectedVersion Expected redis version
-     * @param  string $operator Comparison operator.
-     * @throws \PHPUnit_Framework_SkippedTestError when expected redis version is not met
-     */
-    protected function executeOnRedisVersion($expectedVersion, $operator, $callback)
-    {
-        $client = $this->getClient();
-        $info = array_change_key_case($client->info());
-
-        if (isset($info['server']['redis_version'])) {
-            // Redis >= 2.6
-            $version = $info['server']['redis_version'];
-        } else if (isset($info['redis_version'])) {
-            // Redis < 2.6
-            $version = $info['redis_version'];
-        } else {
-            throw new \RuntimeException('Unable to retrieve server info');
-        }
-
-        $comparation = version_compare($version, $expectedVersion);
-
-        if ($match = eval("return $comparation $operator 0;")) {
-            call_user_func($callback, $this, $version);
-        }
-
-        return $match;
-    }
-
-    /**
-     * @param  string $expectedVersion Expected redis version
-     * @param  string $operator Comparison operator.
-     * @throws \PHPUnit_Framework_SkippedTestError when expected redis version is not met
-     */
-    protected function executeOnProfileVersion($expectedVersion, $operator, $callback)
-    {
-        $profile = $this->getProfile();
-        $comparation = version_compare($profile->getVersion(), $expectedVersion);
-
-        if ($match = eval("return $comparation $operator 0;")) {
-            call_user_func($callback, $this, $version);
-        }
-
-        return $match;
-    }
-
-    /**
-     * @param  string $expectedVersion Expected redis version.
-     * @param  string $message Optional message.
-     * @param  bool $remote Based on local profile or remote redis version.
-     * @throws \RuntimeException when unable to retrieve server info or redis version
-     * @throws \PHPUnit_Framework_SkippedTestError when expected redis version is not met
-     */
-    protected function markTestSkippedOnRedisVersionBelow($expectedVersion, $message = '', $remote = true)
-    {
-        $callback = function ($test, $version) use ($message, $expectedVersion) {
-            $test->markTestSkipped($message ?: "Test requires Redis $expectedVersion, current is $version.");
-        };
-
-        $method = $remote ? 'executeOnRedisVersion' : 'executeOnProfileVersion';
-        $this->$method($expectedVersion, '<', $callback);
-    }
-
     /**
      * @group disconnected
      */

tests/PHPUnit/ConnectionTestCase.php

@@ -11,14 +11,13 @@
 
 namespace Predis\Connection;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
+use PredisTestCase;
 use Predis\Profile;
 
 /**
  * @group realm-connection
  */
-abstract class ConnectionTestCase extends StandardTestCase
+abstract class ConnectionTestCase extends PredisTestCase
 {
     /**
      * @group disconnected
@@ -322,31 +321,6 @@ abstract class ConnectionTestCase extends StandardTestCase
         );
     }
 
-    /**
-     * Returns a new instance of connection parameters.
-     *
-     * @param array $additional Additional connection parameters.
-     * @return ConnectionParameters Default connection parameters.
-     */
-    protected function getParameters($additional = array())
-    {
-        $parameters = array_merge($this->getDefaultParametersArray(), $additional);
-        $parameters = new ConnectionParameters($parameters);
-
-        return $parameters;
-    }
-
-    /**
-     * Returns a new instance of server profile.
-     *
-     * @param array $additional Additional connection parameters.
-     * @return Profile\ProfileInterface
-     */
-    protected function getProfile($version = null)
-    {
-        return Profile\Factory::get($version ?: REDIS_SERVER_VERSION);
-    }
-
     /**
      * Returns a new instance of a connection instance.
      *

tests/PHPUnit/DistributorTestCase.php

@@ -11,12 +11,12 @@
 
 namespace Predis\Cluster\Distributor;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
+use PredisTestCase;
 
 /**
  *
  */
-abstract class DistributorTestCase extends StandardTestCase
+abstract class DistributorTestCase extends PredisTestCase
 {
     /**
      * Returns a new instance of the tested distributor.

tests/PHPUnit/PredisTestCase.php

@@ -0,0 +1,232 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) Daniele Alessandri <suppakilla@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Predis\Client;
+use Predis\Command;
+use Predis\Connection;
+use Predis\Profile;
+
+/**
+ * Base test case class for the Predis test suite.
+ */
+abstract class PredisTestCase extends PHPUnit_Framework_TestCase
+{
+    /**
+     * Verifies that a Redis command is a valid Predis\Command\CommandInterface
+     * instance with the specified ID and command arguments.
+     *
+     * @param string|CommandInterface $command Expected command or command ID.
+     * @param array $arguments Expected command arguments.
+     */
+    public function isRedisCommand($command = null, array $arguments = null)
+    {
+        return new RedisCommandConstraint($command, $arguments);
+    }
+
+    /**
+     * Verifies that a Redis command is a valid Predis\Command\CommandInterface
+     * instance with the specified ID and command arguments. The comparison does
+     * not check for identity when passing a Predis\Command\CommandInterface
+     * instance for $expected.
+     *
+     * @param array|string|CommandInterface $expected Expected command.
+     * @param mixed $actual Actual command.
+     */
+    public function assertRedisCommand($expected, $actual)
+    {
+        if (is_array($expected)) {
+            @list($command, $arguments) = $expected;
+        } else {
+            $command = $expected;
+            $arguments = null;
+        }
+
+        $this->assertThat($actual, new RedisCommandConstraint($command, $arguments));
+    }
+
+    /**
+     * Asserts that two arrays have the same values, even if with different order.
+     *
+     * @param array $expected Expected array.
+     * @param array $actual Actual array.
+     */
+    public function assertSameValues(array $expected, array $actual)
+    {
+        $this->assertThat($actual, new ArrayHasSameValuesConstraint($expected));
+    }
+
+    /**
+     * Returns a named array with the default connection parameters and their values.
+     *
+     * @return array Default connection parameters.
+     */
+    protected function getDefaultParametersArray()
+    {
+        return array(
+            'scheme' => 'tcp',
+            'host' => REDIS_SERVER_HOST,
+            'port' => REDIS_SERVER_PORT,
+            'database' => REDIS_SERVER_DBNUM,
+        );
+    }
+
+    /**
+     * Returns a named array with the default client options and their values.
+     *
+     * @return array Default connection parameters.
+     */
+    protected function getDefaultOptionsArray()
+    {
+        return array(
+            'profile' => REDIS_SERVER_VERSION,
+        );
+    }
+
+    /**
+     * Returns a named array with the default connection parameters merged with
+     * the specified additional parameters.
+     *
+     * @param array $additional Additional connection parameters.
+     * @return array Connection parameters.
+     */
+    protected function getParametersArray(array $additional)
+    {
+        return array_merge($this->getDefaultParametersArray(), $additional);
+    }
+
+    /**
+     * Returns a new instance of connection parameters.
+     *
+     * @param array $additional Additional connection parameters.
+     * @return Connection\ConnectionParameters Default connection parameters.
+     */
+    protected function getParameters($additional = array())
+    {
+        $parameters = array_merge($this->getDefaultParametersArray(), $additional);
+        $parameters = new Connection\ConnectionParameters($parameters);
+
+        return $parameters;
+    }
+
+    /**
+     * Returns a new instance of server profile.
+     *
+     * @param array $additional Additional connection parameters.
+     * @return Profile\ProfileInterface
+     */
+    protected function getProfile($version = null)
+    {
+        return Profile\Factory::get($version ?: REDIS_SERVER_VERSION);
+    }
+
+    /**
+     * Returns a new client instance.
+     *
+     * @param bool $connect Flush selected database before returning the client.
+     * @return Client
+     */
+    protected function createClient(array $parameters = null, array $options = null, $flushdb = true)
+    {
+        $parameters = array_merge(
+            $this->getDefaultParametersArray(),
+            $parameters ?: array()
+        );
+
+        $options = array_merge(
+            array(
+                'profile' => $this->getProfile(),
+            ),
+            $options ?: array()
+        );
+
+        $client = new Client($parameters, $options);
+        $client->connect();
+
+        if ($flushdb) {
+            $client->flushdb();
+        }
+
+        return $client;
+    }
+
+    /**
+     * @param  string $expectedVersion Expected redis version
+     * @param  string $operator Comparison operator.
+     * @throws \PHPUnit_Framework_SkippedTestError when expected redis version is not met
+     */
+    protected function executeOnRedisVersion($expectedVersion, $operator, $callback)
+    {
+        $client = $this->createClient(null, null, true);
+        $info = array_change_key_case($client->info());
+
+        if (isset($info['server']['redis_version'])) {
+            // Redis >= 2.6
+            $version = $info['server']['redis_version'];
+        } else if (isset($info['redis_version'])) {
+            // Redis < 2.6
+            $version = $info['redis_version'];
+        } else {
+            throw new RuntimeException('Unable to retrieve server info');
+        }
+
+        $comparation = version_compare($version, $expectedVersion);
+
+        if ($match = eval("return $comparation $operator 0;")) {
+            call_user_func($callback, $this, $version);
+        }
+
+        return $match;
+    }
+
+    /**
+     * @param  string $expectedVersion Expected redis version
+     * @param  string $operator Comparison operator.
+     * @throws \PHPUnit_Framework_SkippedTestError when expected redis version is not met
+     */
+    protected function executeOnProfileVersion($expectedVersion, $operator, $callback)
+    {
+        $profile = $this->getProfile();
+        $comparation = version_compare($profile->getVersion(), $expectedVersion);
+
+        if ($match = eval("return $comparation $operator 0;")) {
+            call_user_func($callback, $this, $version);
+        }
+
+        return $match;
+    }
+
+    /**
+     * @param  string $expectedVersion Expected redis version.
+     * @param  string $message Optional message.
+     * @param  bool $remote Based on local profile or remote redis version.
+     * @throws RuntimeException when unable to retrieve server info or redis version
+     * @throws \PHPUnit_Framework_SkippedTestError when expected redis version is not met
+     */
+    public function markTestSkippedOnRedisVersionBelow($expectedVersion, $message = '', $remote = true)
+    {
+        $callback = function ($test, $version) use ($message, $expectedVersion) {
+            $test->markTestSkipped($message ?: "Test requires Redis $expectedVersion, current is $version.");
+        };
+
+        $method = $remote ? 'executeOnRedisVersion' : 'executeOnProfileVersion';
+        $this->$method($expectedVersion, '<', $callback);
+    }
+
+    /**
+     * Sleep the test case with microseconds resolution.
+     *
+     * @param float $seconds Seconds to sleep.
+     */
+    protected function sleep($seconds)
+    {
+        usleep($seconds * 1000000);
+    }
+}

tests/PHPUnit/RedisProfileTestCase.php

@@ -11,21 +11,23 @@
 
 namespace Predis\Profile;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
+use PredisTestCase;
 use Predis\Command\Processor\ProcessorChain;
 
 /**
  *
  */
-abstract class RedisProfileTestCase extends StandardTestCase
+abstract class RedisProfileTestCase extends PredisTestCase
 {
     /**
      * Returns a new instance of the tested profile.
      *
      * @return ProfileInterface
      */
-    protected abstract function getProfileInstance();
+    protected function getProfile($version = null)
+    {
+        $this->markTestIncomplete("Server profile must be defined in ".get_class($this));
+    }
 
     /**
      * Returns the expected version string for the tested profile.
@@ -60,7 +62,7 @@ abstract class RedisProfileTestCase extends StandardTestCase
      */
     public function testGetVersion()
     {
-        $profile = $this->getProfileInstance();
+        $profile = $this->getProfile();
 
         $this->assertEquals($this->getExpectedVersion(), $profile->getVersion());
     }
@@ -70,7 +72,7 @@ abstract class RedisProfileTestCase extends StandardTestCase
      */
     public function testSupportedCommands()
     {
-        $profile = $this->getProfileInstance();
+        $profile = $this->getProfile();
         $expected = $this->getExpectedCommands();
         $commands = $this->getCommands($profile);
 
@@ -82,7 +84,7 @@ abstract class RedisProfileTestCase extends StandardTestCase
      */
     public function testToString()
     {
-        $this->assertEquals($this->getExpectedVersion(), $this->getProfileInstance());
+        $this->assertEquals($this->getExpectedVersion(), $this->getProfile());
     }
 
     /**
@@ -90,7 +92,7 @@ abstract class RedisProfileTestCase extends StandardTestCase
      */
     public function testSupportCommand()
     {
-        $profile = $this->getProfileInstance();
+        $profile = $this->getProfile();
 
         $this->assertTrue($profile->supportsCommand('info'));
         $this->assertTrue($profile->supportsCommand('INFO'));
@@ -104,7 +106,7 @@ abstract class RedisProfileTestCase extends StandardTestCase
      */
     public function testSupportCommands()
     {
-        $profile = $this->getProfileInstance();
+        $profile = $this->getProfile();
 
         $this->assertTrue($profile->supportsCommands(array('get', 'set')));
         $this->assertTrue($profile->supportsCommands(array('GET', 'SET')));
@@ -119,7 +121,7 @@ abstract class RedisProfileTestCase extends StandardTestCase
      */
     public function testGetCommandClass()
     {
-        $profile = $this->getProfileInstance();
+        $profile = $this->getProfile();
 
         $this->assertSame('Predis\Command\ConnectionPing', $profile->getCommandClass('ping'));
         $this->assertSame('Predis\Command\ConnectionPing', $profile->getCommandClass('PING'));
@@ -133,7 +135,7 @@ abstract class RedisProfileTestCase extends StandardTestCase
      */
     public function testDefineCommand()
     {
-        $profile = $this->getProfileInstance();
+        $profile = $this->getProfile();
         $command = $this->getMock('Predis\Command\CommandInterface');
 
         $profile->defineCommand('mock', get_class($command));
@@ -151,7 +153,7 @@ abstract class RedisProfileTestCase extends StandardTestCase
      */
     public function testDefineInvalidCommand()
     {
-        $profile = $this->getProfileInstance();
+        $profile = $this->getProfile();
 
         $profile->defineCommand('mock', 'stdClass');
     }
@@ -161,7 +163,7 @@ abstract class RedisProfileTestCase extends StandardTestCase
      */
     public function testCreateCommandWithoutArguments()
     {
-        $profile = $this->getProfileInstance();
+        $profile = $this->getProfile();
 
         $command = $profile->createCommand('info');
         $this->assertInstanceOf('Predis\Command\CommandInterface', $command);
@@ -174,7 +176,7 @@ abstract class RedisProfileTestCase extends StandardTestCase
      */
     public function testCreateCommandWithArguments()
     {
-        $profile = $this->getProfileInstance();
+        $profile = $this->getProfile();
         $arguments = array('foo', 'bar');
 
         $command = $profile->createCommand('set', $arguments);
@@ -190,7 +192,7 @@ abstract class RedisProfileTestCase extends StandardTestCase
      */
     public function testCreateUndefinedCommand()
     {
-        $profile = $this->getProfileInstance();
+        $profile = $this->getProfile();
         $profile->createCommand('unknown');
     }
 
@@ -199,7 +201,7 @@ abstract class RedisProfileTestCase extends StandardTestCase
      */
     public function testGetDefaultProcessor()
     {
-        $profile = $this->getProfileInstance();
+        $profile = $this->getProfile();
 
         $this->assertNull($profile->getProcessor());
     }
@@ -211,7 +213,7 @@ abstract class RedisProfileTestCase extends StandardTestCase
     {
         $processor = $this->getMock('Predis\Command\Processor\CommandProcessorInterface');
 
-        $profile = $this->getProfileInstance();
+        $profile = $this->getProfile();
         $profile->setProcessor($processor);
 
         $this->assertSame($processor, $profile->getProcessor());
@@ -223,7 +225,7 @@ abstract class RedisProfileTestCase extends StandardTestCase
     public function testSetAndUnsetProcessor()
     {
         $processor = $this->getMock('Predis\Command\Processor\CommandProcessorInterface');
-        $profile = $this->getProfileInstance();
+        $profile = $this->getProfile();
 
         $profile->setProcessor($processor);
         $this->assertSame($processor, $profile->getProcessor());
@@ -249,7 +251,7 @@ abstract class RedisProfileTestCase extends StandardTestCase
                         $cmd->setRawArguments($argsRef = array_map('strtoupper', $cmd->getArguments()));
                     }));
 
-        $profile = $this->getProfileInstance();
+        $profile = $this->getProfile();
         $profile->setProcessor($processor);
         $command = $profile->createCommand('set', array('foo', 'bar'));
 
@@ -269,7 +271,7 @@ abstract class RedisProfileTestCase extends StandardTestCase
         $chain->add($processor);
         $chain->add($processor);
 
-        $profile = $this->getProfileInstance();
+        $profile = $this->getProfile();
         $profile->setProcessor($chain);
         $profile->createCommand('info');
     }

tests/Predis/ClientExceptionTest.php

@@ -11,12 +11,12 @@
 
 namespace Predis;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
+use PredisTestCase;
 
 /**
  *
  */
-class ClientExceptionTest extends StandardTestCase
+class ClientExceptionTest extends PredisTestCase
 {
     /**
      * @group disconnected

tests/Predis/ClientTest.php

@@ -11,8 +11,7 @@
 
 namespace Predis;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
+use PredisTestCase;
 use Predis\Connection\ConnectionFactory;
 use Predis\Connection\MasterSlaveReplication;
 use Predis\Connection\PredisCluster;
@@ -22,7 +21,7 @@ use Predis\Response;
 /**
  *
  */
-class ClientTest extends StandardTestCase
+class ClientTest extends PredisTestCase
 {
     /**
      * @group disconnected
@@ -756,45 +755,6 @@ class ClientTest extends StandardTestCase
     // ---- HELPER METHODS ------------------------------------------------ //
     // ******************************************************************** //
 
-    /**
-     * Returns a named array with the default connection parameters and their values.
-     *
-     * @return array Default connection parameters.
-     */
-    protected function getDefaultParametersArray()
-    {
-        return array(
-            'scheme' => 'tcp',
-            'host' => REDIS_SERVER_HOST,
-            'port' => REDIS_SERVER_PORT,
-            'database' => REDIS_SERVER_DBNUM,
-        );
-    }
-
-    /**
-     * Returns a named array with the default client options and their values.
-     *
-     * @return array Default connection parameters.
-     */
-    protected function getDefaultOptionsArray()
-    {
-        return array(
-            'profile' => REDIS_SERVER_VERSION,
-        );
-    }
-
-    /**
-     * Returns a named array with the default connection parameters merged with
-     * the specified additional parameters.
-     *
-     * @param array $additional Additional connection parameters.
-     * @return array Connection parameters.
-     */
-    protected function getParametersArray(array $additional)
-    {
-        return array_merge($this->getDefaultParametersArray(), $additional);
-    }
-
     /**
      * Returns an URI string representation of the specified connection parameters.
      *

tests/Predis/Cluster/Distributor/EmptyRingExceptionTest.php

@@ -11,12 +11,12 @@
 
 namespace Predis\Cluster\Distributor;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
+use PredisTestCase;
 
 /**
  * @todo Not really useful right now.
  */
-class EmptyRingExceptionTest extends StandardTestCase
+class EmptyRingExceptionTest extends PredisTestCase
 {
     /**
      * @group disconnected

tests/Predis/Cluster/PredisStrategyTest.php

@@ -11,14 +11,13 @@
 
 namespace Predis\Cluster;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
+use PredisTestCase;
 use Predis\Profile;
 
 /**
  *
  */
-class PredisStrategyTest extends StandardTestCase
+class PredisStrategyTest extends PredisTestCase
 {
     /**
      * @group disconnected

tests/Predis/Cluster/RedisStrategyTest.php

@@ -11,14 +11,13 @@
 
 namespace Predis\Cluster;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
+use PredisTestCase;
 use Predis\Profile;
 
 /**
  *
  */
-class RedisStrategyTest extends StandardTestCase
+class RedisStrategyTest extends PredisTestCase
 {
     /**
      * @group disconnected

tests/Predis/Collection/Iterator/HashKeyTest.php

@@ -11,15 +11,14 @@
 
 namespace Predis\Collection\Iterator;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
+use PredisTestCase;
 use Predis\Client;
 use Predis\Profile;
 
 /**
  * @group realm-iterators
  */
-class HashKeyTest extends StandardTestCase
+class HashKeyTest extends PredisTestCase
 {
     /**
      * @group disconnected

tests/Predis/Collection/Iterator/KeyspaceTest.php

@@ -11,15 +11,14 @@
 
 namespace Predis\Collection\Iterator;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
+use PredisTestCase;
 use Predis\Client;
 use Predis\Profile;
 
 /**
  * @group realm-iterators
  */
-class KeyspaceTest extends StandardTestCase
+class KeyspaceTest extends PredisTestCase
 {
     /**
      * @group disconnected

tests/Predis/Collection/Iterator/ListKeyTest.php

@@ -11,15 +11,14 @@
 
 namespace Predis\Collection\Iterator;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
+use PredisTestCase;
 use Predis\Client;
 use Predis\Profile;
 
 /**
  * @group realm-iterators
  */
-class ListKeyTest extends StandardTestCase
+class ListKeyTest extends PredisTestCase
 {
     /**
      * @group disconnected

tests/Predis/Collection/Iterator/SetKeyTest.php

@@ -11,15 +11,14 @@
 
 namespace Predis\Collection\Iterator;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
+use PredisTestCase;
 use Predis\Client;
 use Predis\Profile;
 
 /**
  * @group realm-iterators
  */
-class SetKeyTest extends StandardTestCase
+class SetKeyTest extends PredisTestCase
 {
     /**
      * @group disconnected

tests/Predis/Collection/Iterator/SortedSetKeyTest.php

@@ -11,15 +11,14 @@
 
 namespace Predis\Collection\Iterator;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
+use PredisTestCase;
 use Predis\Client;
 use Predis\Profile;
 
 /**
  * @group realm-iterators
  */
-class SortedSetTest extends StandardTestCase
+class SortedSetTest extends PredisTestCase
 {
     /**
      * @group disconnected

tests/Predis/Command/CommandTest.php

@@ -11,12 +11,12 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
+use PredisTestCase;
 
 /**
  *
  */
-class CommandTest extends StandardTestCase
+class CommandTest extends PredisTestCase
 {
     /**
      * @group disconnected

tests/Predis/Command/ConnectionAuthTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-connection

tests/Predis/Command/ConnectionEchoTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-connection

tests/Predis/Command/ConnectionPingTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-connection

tests/Predis/Command/ConnectionQuitTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-connection

tests/Predis/Command/ConnectionSelectTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-connection

tests/Predis/Command/HashDeleteTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-hash

tests/Predis/Command/HashExistsTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-hash

tests/Predis/Command/HashGetAllTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-hash

tests/Predis/Command/HashGetMultipleTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-hash

tests/Predis/Command/HashGetTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-hash

tests/Predis/Command/HashIncrementByFloatTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-hash

tests/Predis/Command/HashIncrementByTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-hash

tests/Predis/Command/HashKeysTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-hash

tests/Predis/Command/HashLengthTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-hash

tests/Predis/Command/HashScanTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-hash

tests/Predis/Command/HashSetMultipleTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-hash

tests/Predis/Command/HashSetPreserveTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-hash

tests/Predis/Command/HashSetTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-hash

tests/Predis/Command/HashValuesTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-hash

tests/Predis/Command/KeyDeleteTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-key

tests/Predis/Command/KeyDumpTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-key

tests/Predis/Command/KeyExistsTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-key

tests/Predis/Command/KeyExpireAtTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-key

tests/Predis/Command/KeyExpireTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-key

tests/Predis/Command/KeyKeysTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-key

tests/Predis/Command/KeyKeysV12xTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * We only perform disconnected tests for this commands because
  * it is too old (Redis v1.2) and expects a different response

tests/Predis/Command/KeyMoveTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-key

tests/Predis/Command/KeyPersistTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-key

tests/Predis/Command/KeyPreciseExpireAtTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-key

tests/Predis/Command/KeyPreciseExpireTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-key

tests/Predis/Command/KeyPreciseTimeToLiveTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-key

tests/Predis/Command/KeyRandomTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-key

tests/Predis/Command/KeyRenamePreserveTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-key

tests/Predis/Command/KeyRenameTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-key

tests/Predis/Command/KeyRestoreTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-key

tests/Predis/Command/KeyScanTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-key

tests/Predis/Command/KeySortTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-key

tests/Predis/Command/KeyTimeToLiveTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-key

tests/Predis/Command/KeyTypeTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-key

tests/Predis/Command/ListIndexTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-list

tests/Predis/Command/ListInsertTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-list

tests/Predis/Command/ListLengthTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-list

tests/Predis/Command/ListPopFirstBlockingTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-list

tests/Predis/Command/ListPopFirstTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-list

tests/Predis/Command/ListPopLastBlockingTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-list

tests/Predis/Command/ListPopLastPushHeadBlockingTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-list

tests/Predis/Command/ListPopLastPushHeadTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-list

tests/Predis/Command/ListPopLastTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-list

tests/Predis/Command/ListPushHeadTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-list

tests/Predis/Command/ListPushHeadXTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-list

tests/Predis/Command/ListPushTailTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-list

tests/Predis/Command/ListPushTailXTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-list

tests/Predis/Command/ListRangeTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-list

tests/Predis/Command/ListRemoveTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-list

tests/Predis/Command/ListSetTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-list

tests/Predis/Command/ListTrimTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-list

tests/Predis/Command/Processor/KeyPrefixProcessorTest.php

@@ -12,13 +12,13 @@
 namespace Predis\Command\Processor;
 
 use stdClass;
-use PHPUnit_Framework_TestCase as StandardTestCase;
+use PredisTestCase;
 use Predis\Command\RawCommand;
 
 /**
  *
  */
-class KeyPrefixProcessorTest extends StandardTestCase
+class KeyPrefixProcessorTest extends PredisTestCase
 {
     /**
      * @group disconnected

tests/Predis/Command/Processor/ProcessorChainTest.php

@@ -11,12 +11,12 @@
 
 namespace Predis\Command\Processor;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
+use PredisTestCase;
 
 /**
  *
  */
-class ProcessorChainTest extends StandardTestCase
+class ProcessorChainTest extends PredisTestCase
 {
     /**
      * @group disconnected

tests/Predis/Command/PubSubPublishTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-pubsub

tests/Predis/Command/PubSubPubsubTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-pubsub

tests/Predis/Command/PubSubSubscribeByPatternTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-pubsub

tests/Predis/Command/PubSubSubscribeTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-pubsub

tests/Predis/Command/PubSubUnsubscribeByPatternTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-pubsub

tests/Predis/Command/PubSubUnsubscribeTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-pubsub

tests/Predis/Command/RawCommandTest.php

@@ -11,12 +11,12 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
+use PredisTestCase;
 
 /**
  *
  */
-class RawCommandTest extends StandardTestCase
+class RawCommandTest extends PredisTestCase
 {
     /**
      * @group disconnected

tests/Predis/Command/ScriptedCommandTest.php → tests/Predis/Command/ScriptCommandTest.php

@@ -11,12 +11,12 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
+use PredisTestCase;
 
 /**
  * @group realm-scripting
  */
-class ScriptCommandTest extends StandardTestCase
+class ScriptCommandTest extends PredisTestCase
 {
     const LUA_SCRIPT = 'return { KEYS[1], KEYS[2], ARGV[1], ARGV[2] }';
     const LUA_SCRIPT_SHA1 = '6e07f61f502e36d123fe28523076af588f5c315e';

tests/Predis/Command/ServerBackgroundRewriteAOFTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-server

tests/Predis/Command/ServerBackgroundSaveTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-server

tests/Predis/Command/ServerClientTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-server

tests/Predis/Command/ServerConfigTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-server

tests/Predis/Command/ServerDatabaseSizeTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-server

tests/Predis/Command/ServerEvalSHATest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-scripting

tests/Predis/Command/ServerEvalTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-scripting

tests/Predis/Command/ServerFlushAllTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-server

tests/Predis/Command/ServerFlushDatabaseTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-server

tests/Predis/Command/ServerInfoTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-server

tests/Predis/Command/ServerInfoV26xTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-server

tests/Predis/Command/ServerLastSaveTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-server

tests/Predis/Command/ServerMonitorTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-server

tests/Predis/Command/ServerObjectTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-server

tests/Predis/Command/ServerSaveTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-server

tests/Predis/Command/ServerScriptTest.php

@@ -11,8 +11,6 @@
 
 namespace Predis\Command;
 
-use PHPUnit_Framework_TestCase as StandardTestCase;
-
 /**
  * @group commands
  * @group realm-scripting