From 2d74db1bde1b21c8482ed181cfcf825bf05332ca Mon Sep 17 00:00:00 2001 From: Vladyslav Vildanov <117659936+vladvildanov@users.noreply.github.com> Date: Wed, 16 Aug 2023 18:18:45 +0300 Subject: [PATCH] Changes related to Redis 7.2 image update (#1366) * Added new assertion, fixed RESP3 JSON responses and versions * Removed expectations for error messages * Changed tests group for RESP3 not supported tests * Removed 3.x test case * Added missing test decorators * Fixed typo * Removed redisgraph module upload, as not a part of a redis-stack anymore --- docker/unstable_cluster/redis.conf | 1 - phpunit.relay.xml | 1 + .../AssertSameWithPrecisionConstraint.php | 81 +++++++++++++++++++ tests/PHPUnit/PredisTestCase.php | 15 ++++ .../Command/Redis/BloomFilter/BFADD_Test.php | 6 +- .../Redis/BloomFilter/BFEXISTS_Test.php | 3 +- .../Command/Redis/BloomFilter/BFINFO_Test.php | 4 +- .../Redis/BloomFilter/BFINSERT_Test.php | 3 + .../Redis/BloomFilter/BFLOADCHUNK_Test.php | 1 + .../Command/Redis/BloomFilter/BFMADD_Test.php | 6 +- .../Redis/BloomFilter/BFMEXISTS_Test.php | 3 +- .../Redis/BloomFilter/BFRESERVE_Test.php | 4 +- .../Redis/BloomFilter/BFSCANDUMP_Test.php | 1 + .../Redis/CountMinSketch/CMSINCRBY_Test.php | 1 + .../Redis/CountMinSketch/CMSINFO_Test.php | 1 + .../CountMinSketch/CMSINITBYDIM_Test.php | 1 + .../CountMinSketch/CMSINITBYPROB_Test.php | 1 + .../Redis/CountMinSketch/CMSMERGE_Test.php | 3 + .../Redis/CountMinSketch/CMSQUERY_Test.php | 1 + .../Redis/CuckooFilter/CFADDNX_Test.php | 1 + .../Command/Redis/CuckooFilter/CFADD_Test.php | 1 + .../Redis/CuckooFilter/CFCOUNT_Test.php | 1 + .../Command/Redis/CuckooFilter/CFDEL_Test.php | 1 + .../Redis/CuckooFilter/CFEXISTS_Test.php | 1 + .../Redis/CuckooFilter/CFINFO_Test.php | 1 + .../Redis/CuckooFilter/CFINSERTNX_Test.php | 3 + .../Redis/CuckooFilter/CFINSERT_Test.php | 4 + .../Redis/CuckooFilter/CFLOADCHUNK_Test.php | 1 + .../Redis/CuckooFilter/CFMEXISTS_Test.php | 3 +- .../Redis/CuckooFilter/CFRESERVE_Test.php | 1 + .../Redis/CuckooFilter/CFSCANDUMP_Test.php | 1 + .../Command/Redis/Json/JSONARRAPPEND_Test.php | 1 + .../Command/Redis/Json/JSONARRINDEX_Test.php | 1 + .../Command/Redis/Json/JSONARRINSERT_Test.php | 1 + .../Command/Redis/Json/JSONARRLEN_Test.php | 1 + .../Command/Redis/Json/JSONARRPOP_Test.php | 1 + .../Command/Redis/Json/JSONARRTRIM_Test.php | 1 + .../Command/Redis/Json/JSONCLEAR_Test.php | 1 + .../Command/Redis/Json/JSONDEBUG_Test.php | 1 + .../Command/Redis/Json/JSONDEL_Test.php | 1 + .../Command/Redis/Json/JSONFORGET_Test.php | 1 + .../Command/Redis/Json/JSONGET_Test.php | 2 + .../Command/Redis/Json/JSONMERGE_Test.php | 1 + .../Command/Redis/Json/JSONMGET_Test.php | 1 + .../Command/Redis/Json/JSONMSET_Test.php | 2 + .../Command/Redis/Json/JSONNUMINCRBY_Test.php | 1 + .../Command/Redis/Json/JSONOBJKEYS_Test.php | 1 + .../Command/Redis/Json/JSONOBJLEN_Test.php | 1 + .../Command/Redis/Json/JSONRESP_Test.php | 1 + .../Command/Redis/Json/JSONSET_Test.php | 1 + .../Command/Redis/Json/JSONSTRAPPEND_Test.php | 1 + .../Command/Redis/Json/JSONSTRLEN_Test.php | 1 + .../Command/Redis/Json/JSONTOGGLE_Test.php | 1 + .../Command/Redis/Json/JSONTYPE_Test.php | 1 + .../Command/Redis/Search/FTAGGREGATE_Test.php | 1 + .../Command/Redis/Search/FTALIASADD_Test.php | 2 + .../Command/Redis/Search/FTALIASDEL_Test.php | 1 + .../Redis/Search/FTALIASUPDATE_Test.php | 2 + .../Command/Redis/Search/FTALTER_Test.php | 1 + .../Command/Redis/Search/FTCONFIG_Test.php | 4 + .../Command/Redis/Search/FTCREATE_Test.php | 1 + .../Command/Redis/Search/FTCURSOR_Test.php | 3 + .../Command/Redis/Search/FTDICTADD_Test.php | 1 + .../Command/Redis/Search/FTDICTDEL_Test.php | 1 + .../Command/Redis/Search/FTDICTDUMP_Test.php | 1 + .../Command/Redis/Search/FTDROPINDEX_Test.php | 1 + .../Command/Redis/Search/FTEXPLAIN_Test.php | 1 + .../Command/Redis/Search/FTINFO_Test.php | 3 +- .../Command/Redis/Search/FTPROFILE_Test.php | 1 + .../Command/Redis/Search/FTSEARCH_Test.php | 6 +- .../Redis/Search/FTSPELLCHECK_Test.php | 1 + .../Command/Redis/Search/FTSUGADD_Test.php | 1 + .../Command/Redis/Search/FTSUGDEL_Test.php | 1 + .../Command/Redis/Search/FTSUGGET_Test.php | 2 + .../Command/Redis/Search/FTSUGLEN_Test.php | 1 + .../Command/Redis/Search/FTSYNDUMP_Test.php | 1 + .../Command/Redis/Search/FTSYNUPDATE_Test.php | 2 + .../Command/Redis/Search/FTTAGVALS_Test.php | 1 + .../Command/Redis/TDigest/TDIGESTADD_Test.php | 1 + .../Redis/TDigest/TDIGESTBYRANK_Test.php | 1 + .../Redis/TDigest/TDIGESTBYREVRANK_Test.php | 1 + .../Command/Redis/TDigest/TDIGESTCDF_Test.php | 5 +- .../Redis/TDigest/TDIGESTCREATE_Test.php | 1 + .../Redis/TDigest/TDIGESTINFO_Test.php | 1 + .../Command/Redis/TDigest/TDIGESTMAX_Test.php | 1 + .../Redis/TDigest/TDIGESTMERGE_Test.php | 5 ++ .../Command/Redis/TDigest/TDIGESTMIN_Test.php | 1 + .../Redis/TDigest/TDIGESTQUANTILE_Test.php | 1 + .../Redis/TDigest/TDIGESTRANK_Test.php | 1 + .../Redis/TDigest/TDIGESTRESET_Test.php | 1 + .../Redis/TDigest/TDIGESTREVRANK_Test.php | 1 + .../TDigest/TDIGESTTRIMMED_MEAN_Test.php | 2 + .../Command/Redis/TimeSeries/TSADD_Test.php | 1 + .../Command/Redis/TimeSeries/TSALTER_Test.php | 1 + .../Redis/TimeSeries/TSCREATERULE_Test.php | 2 + .../Redis/TimeSeries/TSCREATE_Test.php | 1 + .../Redis/TimeSeries/TSDECRBY_Test.php | 3 +- .../Redis/TimeSeries/TSDELETERULE_Test.php | 1 + .../Command/Redis/TimeSeries/TSDEL_Test.php | 1 + .../Command/Redis/TimeSeries/TSGET_Test.php | 1 + .../Redis/TimeSeries/TSINCRBY_Test.php | 3 +- .../Command/Redis/TimeSeries/TSINFO_Test.php | 1 + .../Command/Redis/TimeSeries/TSMADD_Test.php | 2 +- .../Command/Redis/TimeSeries/TSMGET_Test.php | 1 + .../Redis/TimeSeries/TSMRANGE_Test.php | 1 + .../Redis/TimeSeries/TSMREVRANGE_Test.php | 1 + .../Redis/TimeSeries/TSQUERYINDEX_Test.php | 1 + .../Command/Redis/TimeSeries/TSRANGE_Test.php | 1 + .../Redis/TimeSeries/TSREVRANGE_Test.php | 1 + .../Command/Redis/TopK/TOPKADD_Test.php | 1 + .../Command/Redis/TopK/TOPKINCRBY_Test.php | 1 + .../Command/Redis/TopK/TOPKINFO_Test.php | 6 +- .../Command/Redis/TopK/TOPKLIST_Test.php | 1 + .../Command/Redis/TopK/TOPKQUERY_Test.php | 1 + .../Command/Redis/TopK/TOPKRESERVE_Test.php | 3 +- tests/bootstrap.php | 1 + 116 files changed, 259 insertions(+), 22 deletions(-) create mode 100644 tests/PHPUnit/AssertSameWithPrecisionConstraint.php diff --git a/docker/unstable_cluster/redis.conf b/docker/unstable_cluster/redis.conf index 71928253..a676f577 100644 --- a/docker/unstable_cluster/redis.conf +++ b/docker/unstable_cluster/redis.conf @@ -3,7 +3,6 @@ # port, cluster-enabled, daemonize, logfile, dir protected-mode no loadmodule /opt/redis-stack/lib/redisearch.so -loadmodule /opt/redis-stack/lib/redisgraph.so loadmodule /opt/redis-stack/lib/redistimeseries.so loadmodule /opt/redis-stack/lib/rejson.so loadmodule /opt/redis-stack/lib/redisbloom.so diff --git a/phpunit.relay.xml b/phpunit.relay.xml index f8926a4f..1b66a893 100644 --- a/phpunit.relay.xml +++ b/phpunit.relay.xml @@ -20,6 +20,7 @@ relay-incompatible + relay-resp3 realm-webdis realm-stack ext-curl diff --git a/tests/PHPUnit/AssertSameWithPrecisionConstraint.php b/tests/PHPUnit/AssertSameWithPrecisionConstraint.php new file mode 100644 index 00000000..a96ea5c7 --- /dev/null +++ b/tests/PHPUnit/AssertSameWithPrecisionConstraint.php @@ -0,0 +1,81 @@ +expectedValue = $expectedValue; + $this->precision = $precision; + } + + /** + * {@inheritdoc} + */ + public function matches($other): bool + { + if (gettype($this->expectedValue) !== gettype($other)) { + return false; + } + + if (is_array($other)) { + $other = array_map([$this, 'roundToPrecision'], $other); + $this->expectedValue = array_map([$this, 'roundToPrecision'], $this->expectedValue); + + return !array_diff($this->expectedValue, $other); + } + + $other = $this->roundToPrecision($other); + $this->expectedValue = $this->roundToPrecision($this->expectedValue); + + return $other === $this->expectedValue; + } + + /** + * {@inheritDoc} + */ + public function toString(): string + { + return 'given value matches another value with given precision'; + } + + /** + * {@inheritdoc} + */ + protected function failureDescription($other): string + { + return $this->toString(); + } + + /** + * @param mixed $numeric + * @return float + */ + private function roundToPrecision($numeric): float + { + return round((float) $numeric, $this->precision); + } +} diff --git a/tests/PHPUnit/PredisTestCase.php b/tests/PHPUnit/PredisTestCase.php index 3dcdc1a4..4ad148c1 100644 --- a/tests/PHPUnit/PredisTestCase.php +++ b/tests/PHPUnit/PredisTestCase.php @@ -10,6 +10,7 @@ * file that was distributed with this source code. */ +use PHPUnit\AssertSameWithPrecisionConstraint; use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\OneOfConstraint; use PHPUnit\Util\Test as TestUtil; @@ -131,6 +132,20 @@ abstract class PredisTestCase extends \PHPUnit\Framework\TestCase $this->assertThat($actual, new OneOfConstraint($expected), $message); } + /** + * Asserts that two values (of the same type) have the same values with given precision. + * + * @param mixed $expected Expected value + * @param mixed $actual Actual value + * @param int $precision Precision value should be round to + * @param string $message Optional assertion message + * @return void + */ + public function assertSameWithPrecision($expected, $actual, int $precision = 0, string $message = ''): void + { + $this->assertThat($actual, new AssertSameWithPrecisionConstraint($expected, $precision), $message); + } + /** * Asserts that a string matches a given regular expression. * diff --git a/tests/Predis/Command/Redis/BloomFilter/BFADD_Test.php b/tests/Predis/Command/Redis/BloomFilter/BFADD_Test.php index 81bf9a90..81487c2f 100644 --- a/tests/Predis/Command/Redis/BloomFilter/BFADD_Test.php +++ b/tests/Predis/Command/Redis/BloomFilter/BFADD_Test.php @@ -61,8 +61,9 @@ class BFADD_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void - * @requiresRedisBfVersion >= 1.0 + * @requiresRedisBfVersion >= 1.0.0 */ public function testAddGivenItemIntoBloomFilter(): void { @@ -75,7 +76,8 @@ class BFADD_Test extends PredisCommandTestCase /** * @group connected - * @requiresRedisBfVersion >= 1.0 + * @group relay-incompatible + * @requiresRedisBfVersion >= 1.0.0 */ public function testThrowsExceptionOnWrongType(): void { diff --git a/tests/Predis/Command/Redis/BloomFilter/BFEXISTS_Test.php b/tests/Predis/Command/Redis/BloomFilter/BFEXISTS_Test.php index 52845332..32e55fd5 100644 --- a/tests/Predis/Command/Redis/BloomFilter/BFEXISTS_Test.php +++ b/tests/Predis/Command/Redis/BloomFilter/BFEXISTS_Test.php @@ -60,8 +60,9 @@ class BFEXISTS_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void - * @requiresRedisBfVersion >= 1.0 + * @requiresRedisBfVersion >= 1.0.0 */ public function testExistsReturnsExistingItemWithinBloomFilter(): void { diff --git a/tests/Predis/Command/Redis/BloomFilter/BFINFO_Test.php b/tests/Predis/Command/Redis/BloomFilter/BFINFO_Test.php index e83e17ce..06f67379 100644 --- a/tests/Predis/Command/Redis/BloomFilter/BFINFO_Test.php +++ b/tests/Predis/Command/Redis/BloomFilter/BFINFO_Test.php @@ -61,6 +61,7 @@ class BFINFO_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @dataProvider filtersProvider * @param array $filter * @param string $key @@ -98,7 +99,8 @@ class BFINFO_Test extends PredisCommandTestCase /** * @group connected - * @requiresRedisBfVersion >= 1.0 + * @group relay-resp3 + * @requiresRedisBfVersion >= 1.0.0 */ public function testThrowsExceptionOnWrongType(): void { diff --git a/tests/Predis/Command/Redis/BloomFilter/BFINSERT_Test.php b/tests/Predis/Command/Redis/BloomFilter/BFINSERT_Test.php index a53bcc89..421174cd 100644 --- a/tests/Predis/Command/Redis/BloomFilter/BFINSERT_Test.php +++ b/tests/Predis/Command/Redis/BloomFilter/BFINSERT_Test.php @@ -60,6 +60,7 @@ class BFINSERT_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @dataProvider filtersProvider * @param array $arguments * @param string $key @@ -101,6 +102,7 @@ class BFINSERT_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisBfVersion >= 1.0.0 */ @@ -134,6 +136,7 @@ class BFINSERT_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @dataProvider unexpectedValuesProvider * @param array $arguments * @param string $expectedExceptionMessage diff --git a/tests/Predis/Command/Redis/BloomFilter/BFLOADCHUNK_Test.php b/tests/Predis/Command/Redis/BloomFilter/BFLOADCHUNK_Test.php index 4e443aa1..1c1133a9 100644 --- a/tests/Predis/Command/Redis/BloomFilter/BFLOADCHUNK_Test.php +++ b/tests/Predis/Command/Redis/BloomFilter/BFLOADCHUNK_Test.php @@ -61,6 +61,7 @@ class BFLOADCHUNK_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisBfVersion >= 1.0.0 */ diff --git a/tests/Predis/Command/Redis/BloomFilter/BFMADD_Test.php b/tests/Predis/Command/Redis/BloomFilter/BFMADD_Test.php index 5b0b4968..da0def03 100644 --- a/tests/Predis/Command/Redis/BloomFilter/BFMADD_Test.php +++ b/tests/Predis/Command/Redis/BloomFilter/BFMADD_Test.php @@ -61,8 +61,9 @@ class BFMADD_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void - * @requiresRedisBfVersion >= 1.0 + * @requiresRedisBfVersion >= 1.0.0 */ public function testAddGivenItemsIntoBloomFilter(): void { @@ -75,7 +76,8 @@ class BFMADD_Test extends PredisCommandTestCase /** * @group connected - * @requiresRedisBfVersion >= 1.0 + * @group relay-incompatible + * @requiresRedisBfVersion >= 1.0.0 */ public function testThrowsExceptionOnWrongType(): void { diff --git a/tests/Predis/Command/Redis/BloomFilter/BFMEXISTS_Test.php b/tests/Predis/Command/Redis/BloomFilter/BFMEXISTS_Test.php index df151381..d78cef77 100644 --- a/tests/Predis/Command/Redis/BloomFilter/BFMEXISTS_Test.php +++ b/tests/Predis/Command/Redis/BloomFilter/BFMEXISTS_Test.php @@ -60,8 +60,9 @@ class BFMEXISTS_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void - * @requiresRedisBfVersion >= 1.0 + * @requiresRedisBfVersion >= 1.0.0 */ public function testExistsReturnsExistingItemsWithinBloomFilter(): void { diff --git a/tests/Predis/Command/Redis/BloomFilter/BFRESERVE_Test.php b/tests/Predis/Command/Redis/BloomFilter/BFRESERVE_Test.php index 1ac80529..c5d8918f 100644 --- a/tests/Predis/Command/Redis/BloomFilter/BFRESERVE_Test.php +++ b/tests/Predis/Command/Redis/BloomFilter/BFRESERVE_Test.php @@ -60,6 +60,7 @@ class BFRESERVE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @dataProvider filtersProvider * @param array $filter * @param string $key @@ -98,7 +99,8 @@ class BFRESERVE_Test extends PredisCommandTestCase /** * @group connected - * @requiresRedisBfVersion >= 1.0 + * @group relay-resp3 + * @requiresRedisBfVersion >= 1.0.0 */ public function testThrowsExceptionOnWrongType(): void { diff --git a/tests/Predis/Command/Redis/BloomFilter/BFSCANDUMP_Test.php b/tests/Predis/Command/Redis/BloomFilter/BFSCANDUMP_Test.php index 78f4a9ec..3d64db40 100644 --- a/tests/Predis/Command/Redis/BloomFilter/BFSCANDUMP_Test.php +++ b/tests/Predis/Command/Redis/BloomFilter/BFSCANDUMP_Test.php @@ -61,6 +61,7 @@ class BFSCANDUMP_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisBfVersion >= 1.0.0 */ diff --git a/tests/Predis/Command/Redis/CountMinSketch/CMSINCRBY_Test.php b/tests/Predis/Command/Redis/CountMinSketch/CMSINCRBY_Test.php index d58779f1..f41104bd 100644 --- a/tests/Predis/Command/Redis/CountMinSketch/CMSINCRBY_Test.php +++ b/tests/Predis/Command/Redis/CountMinSketch/CMSINCRBY_Test.php @@ -61,6 +61,7 @@ class CMSINCRBY_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @dataProvider sketchesProvider * @param array $incrementArguments * @param array $queryArguments diff --git a/tests/Predis/Command/Redis/CountMinSketch/CMSINFO_Test.php b/tests/Predis/Command/Redis/CountMinSketch/CMSINFO_Test.php index 3f44471f..0d343df1 100644 --- a/tests/Predis/Command/Redis/CountMinSketch/CMSINFO_Test.php +++ b/tests/Predis/Command/Redis/CountMinSketch/CMSINFO_Test.php @@ -64,6 +64,7 @@ class CMSINFO_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisBfVersion >= 2.0.0 */ diff --git a/tests/Predis/Command/Redis/CountMinSketch/CMSINITBYDIM_Test.php b/tests/Predis/Command/Redis/CountMinSketch/CMSINITBYDIM_Test.php index 4449ba62..35b901b9 100644 --- a/tests/Predis/Command/Redis/CountMinSketch/CMSINITBYDIM_Test.php +++ b/tests/Predis/Command/Redis/CountMinSketch/CMSINITBYDIM_Test.php @@ -61,6 +61,7 @@ class CMSINITBYDIM_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisBfVersion >= 2.0.0 */ diff --git a/tests/Predis/Command/Redis/CountMinSketch/CMSINITBYPROB_Test.php b/tests/Predis/Command/Redis/CountMinSketch/CMSINITBYPROB_Test.php index f280456f..28e4fac0 100644 --- a/tests/Predis/Command/Redis/CountMinSketch/CMSINITBYPROB_Test.php +++ b/tests/Predis/Command/Redis/CountMinSketch/CMSINITBYPROB_Test.php @@ -61,6 +61,7 @@ class CMSINITBYPROB_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisBfVersion >= 2.0.0 */ diff --git a/tests/Predis/Command/Redis/CountMinSketch/CMSMERGE_Test.php b/tests/Predis/Command/Redis/CountMinSketch/CMSMERGE_Test.php index 42eb687c..7b3d3f9d 100644 --- a/tests/Predis/Command/Redis/CountMinSketch/CMSMERGE_Test.php +++ b/tests/Predis/Command/Redis/CountMinSketch/CMSMERGE_Test.php @@ -59,6 +59,7 @@ class CMSMERGE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @dataProvider sketchesProvider * @param array $mergeArguments * @param string $destinationKey @@ -107,6 +108,7 @@ class CMSMERGE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisBfVersion >= 2.0.0 */ @@ -125,6 +127,7 @@ class CMSMERGE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisBfVersion >= 2.0.0 */ diff --git a/tests/Predis/Command/Redis/CountMinSketch/CMSQUERY_Test.php b/tests/Predis/Command/Redis/CountMinSketch/CMSQUERY_Test.php index f3335a61..bf7aa51f 100644 --- a/tests/Predis/Command/Redis/CountMinSketch/CMSQUERY_Test.php +++ b/tests/Predis/Command/Redis/CountMinSketch/CMSQUERY_Test.php @@ -61,6 +61,7 @@ class CMSQUERY_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @dataProvider sketchesProvider * @param array $queryArguments * @param array $expectedResponse diff --git a/tests/Predis/Command/Redis/CuckooFilter/CFADDNX_Test.php b/tests/Predis/Command/Redis/CuckooFilter/CFADDNX_Test.php index 94a6960b..be99b8ea 100644 --- a/tests/Predis/Command/Redis/CuckooFilter/CFADDNX_Test.php +++ b/tests/Predis/Command/Redis/CuckooFilter/CFADDNX_Test.php @@ -61,6 +61,7 @@ class CFADDNX_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisBfVersion >= 1.0.0 */ diff --git a/tests/Predis/Command/Redis/CuckooFilter/CFADD_Test.php b/tests/Predis/Command/Redis/CuckooFilter/CFADD_Test.php index 95f72990..cf720a3a 100644 --- a/tests/Predis/Command/Redis/CuckooFilter/CFADD_Test.php +++ b/tests/Predis/Command/Redis/CuckooFilter/CFADD_Test.php @@ -61,6 +61,7 @@ class CFADD_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisBfVersion >= 1.0.0 */ diff --git a/tests/Predis/Command/Redis/CuckooFilter/CFCOUNT_Test.php b/tests/Predis/Command/Redis/CuckooFilter/CFCOUNT_Test.php index 76306df7..1b86098f 100644 --- a/tests/Predis/Command/Redis/CuckooFilter/CFCOUNT_Test.php +++ b/tests/Predis/Command/Redis/CuckooFilter/CFCOUNT_Test.php @@ -60,6 +60,7 @@ class CFCOUNT_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisBfVersion >= 1.0.0 */ diff --git a/tests/Predis/Command/Redis/CuckooFilter/CFDEL_Test.php b/tests/Predis/Command/Redis/CuckooFilter/CFDEL_Test.php index 70f2c098..8045b3e1 100644 --- a/tests/Predis/Command/Redis/CuckooFilter/CFDEL_Test.php +++ b/tests/Predis/Command/Redis/CuckooFilter/CFDEL_Test.php @@ -61,6 +61,7 @@ class CFDEL_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisBfVersion >= 1.0.0 */ diff --git a/tests/Predis/Command/Redis/CuckooFilter/CFEXISTS_Test.php b/tests/Predis/Command/Redis/CuckooFilter/CFEXISTS_Test.php index 78f6d021..dceb0963 100644 --- a/tests/Predis/Command/Redis/CuckooFilter/CFEXISTS_Test.php +++ b/tests/Predis/Command/Redis/CuckooFilter/CFEXISTS_Test.php @@ -60,6 +60,7 @@ class CFEXISTS_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisBfVersion >= 1.0.0 */ diff --git a/tests/Predis/Command/Redis/CuckooFilter/CFINFO_Test.php b/tests/Predis/Command/Redis/CuckooFilter/CFINFO_Test.php index 72ab27f2..f0f75f56 100644 --- a/tests/Predis/Command/Redis/CuckooFilter/CFINFO_Test.php +++ b/tests/Predis/Command/Redis/CuckooFilter/CFINFO_Test.php @@ -62,6 +62,7 @@ class CFINFO_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisBfVersion >= 1.0.0 */ diff --git a/tests/Predis/Command/Redis/CuckooFilter/CFINSERTNX_Test.php b/tests/Predis/Command/Redis/CuckooFilter/CFINSERTNX_Test.php index 1f8a1da4..7763fd9a 100644 --- a/tests/Predis/Command/Redis/CuckooFilter/CFINSERTNX_Test.php +++ b/tests/Predis/Command/Redis/CuckooFilter/CFINSERTNX_Test.php @@ -51,6 +51,7 @@ class CFINSERTNX_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @dataProvider filtersProvider * @param array $filterArguments * @param string $key @@ -76,6 +77,7 @@ class CFINSERTNX_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisBfVersion >= 1.0.0 */ @@ -107,6 +109,7 @@ class CFINSERTNX_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisBfVersion >= 1.0.0 */ diff --git a/tests/Predis/Command/Redis/CuckooFilter/CFINSERT_Test.php b/tests/Predis/Command/Redis/CuckooFilter/CFINSERT_Test.php index 90104060..9c4bd79b 100644 --- a/tests/Predis/Command/Redis/CuckooFilter/CFINSERT_Test.php +++ b/tests/Predis/Command/Redis/CuckooFilter/CFINSERT_Test.php @@ -52,6 +52,7 @@ class CFINSERT_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @dataProvider filtersProvider * @param array $filterArguments * @param string $key @@ -77,6 +78,7 @@ class CFINSERT_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisBfVersion >= 1.0.0 */ @@ -110,6 +112,7 @@ class CFINSERT_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisBfVersion >= 1.0.0 */ @@ -125,6 +128,7 @@ class CFINSERT_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisBfVersion >= 1.0.0 */ diff --git a/tests/Predis/Command/Redis/CuckooFilter/CFLOADCHUNK_Test.php b/tests/Predis/Command/Redis/CuckooFilter/CFLOADCHUNK_Test.php index aaa738f9..0383c82b 100644 --- a/tests/Predis/Command/Redis/CuckooFilter/CFLOADCHUNK_Test.php +++ b/tests/Predis/Command/Redis/CuckooFilter/CFLOADCHUNK_Test.php @@ -61,6 +61,7 @@ class CFLOADCHUNK_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisBfVersion >= 1.0.0 */ diff --git a/tests/Predis/Command/Redis/CuckooFilter/CFMEXISTS_Test.php b/tests/Predis/Command/Redis/CuckooFilter/CFMEXISTS_Test.php index a1b91ca0..75c4fe22 100644 --- a/tests/Predis/Command/Redis/CuckooFilter/CFMEXISTS_Test.php +++ b/tests/Predis/Command/Redis/CuckooFilter/CFMEXISTS_Test.php @@ -60,8 +60,9 @@ class CFMEXISTS_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void - * @requiresRedisBfVersion >= 1.0 + * @requiresRedisBfVersion >= 1.0.0 */ public function testExistsReturnsExistingItemsWithinCuckooFilter(): void { diff --git a/tests/Predis/Command/Redis/CuckooFilter/CFRESERVE_Test.php b/tests/Predis/Command/Redis/CuckooFilter/CFRESERVE_Test.php index eef7b021..1b88687f 100644 --- a/tests/Predis/Command/Redis/CuckooFilter/CFRESERVE_Test.php +++ b/tests/Predis/Command/Redis/CuckooFilter/CFRESERVE_Test.php @@ -51,6 +51,7 @@ class CFRESERVE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @dataProvider filtersProvider * @param array $filterArguments * @param int $expectedCapacity diff --git a/tests/Predis/Command/Redis/CuckooFilter/CFSCANDUMP_Test.php b/tests/Predis/Command/Redis/CuckooFilter/CFSCANDUMP_Test.php index 1e6b5983..cad36468 100644 --- a/tests/Predis/Command/Redis/CuckooFilter/CFSCANDUMP_Test.php +++ b/tests/Predis/Command/Redis/CuckooFilter/CFSCANDUMP_Test.php @@ -61,6 +61,7 @@ class CFSCANDUMP_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisBfVersion >= 1.0.0 */ diff --git a/tests/Predis/Command/Redis/Json/JSONARRAPPEND_Test.php b/tests/Predis/Command/Redis/Json/JSONARRAPPEND_Test.php index 67846355..84a69a41 100644 --- a/tests/Predis/Command/Redis/Json/JSONARRAPPEND_Test.php +++ b/tests/Predis/Command/Redis/Json/JSONARRAPPEND_Test.php @@ -60,6 +60,7 @@ class JSONARRAPPEND_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @dataProvider jsonProvider * @param array $jsonArguments * @param string $key diff --git a/tests/Predis/Command/Redis/Json/JSONARRINDEX_Test.php b/tests/Predis/Command/Redis/Json/JSONARRINDEX_Test.php index 43e91ca4..3a27c16c 100644 --- a/tests/Predis/Command/Redis/Json/JSONARRINDEX_Test.php +++ b/tests/Predis/Command/Redis/Json/JSONARRINDEX_Test.php @@ -60,6 +60,7 @@ class JSONARRINDEX_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @dataProvider jsonProvider * @param array $jsonArguments * @param string $key diff --git a/tests/Predis/Command/Redis/Json/JSONARRINSERT_Test.php b/tests/Predis/Command/Redis/Json/JSONARRINSERT_Test.php index 5bb2c758..61298d3e 100644 --- a/tests/Predis/Command/Redis/Json/JSONARRINSERT_Test.php +++ b/tests/Predis/Command/Redis/Json/JSONARRINSERT_Test.php @@ -60,6 +60,7 @@ class JSONARRINSERT_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @dataProvider jsonProvider * @param array $jsonArguments * @param string $key diff --git a/tests/Predis/Command/Redis/Json/JSONARRLEN_Test.php b/tests/Predis/Command/Redis/Json/JSONARRLEN_Test.php index 6565e347..e9025500 100644 --- a/tests/Predis/Command/Redis/Json/JSONARRLEN_Test.php +++ b/tests/Predis/Command/Redis/Json/JSONARRLEN_Test.php @@ -60,6 +60,7 @@ class JSONARRLEN_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @dataProvider jsonProvider * @param array $jsonArguments * @param string $key diff --git a/tests/Predis/Command/Redis/Json/JSONARRPOP_Test.php b/tests/Predis/Command/Redis/Json/JSONARRPOP_Test.php index 6d80fd99..8bf1f37d 100644 --- a/tests/Predis/Command/Redis/Json/JSONARRPOP_Test.php +++ b/tests/Predis/Command/Redis/Json/JSONARRPOP_Test.php @@ -60,6 +60,7 @@ class JSONARRPOP_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @dataProvider jsonProvider * @param array $jsonArguments * @param string $key diff --git a/tests/Predis/Command/Redis/Json/JSONARRTRIM_Test.php b/tests/Predis/Command/Redis/Json/JSONARRTRIM_Test.php index a40de6a0..7ca36231 100644 --- a/tests/Predis/Command/Redis/Json/JSONARRTRIM_Test.php +++ b/tests/Predis/Command/Redis/Json/JSONARRTRIM_Test.php @@ -60,6 +60,7 @@ class JSONARRTRIM_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @dataProvider jsonProvider * @param array $jsonArguments * @param string $key diff --git a/tests/Predis/Command/Redis/Json/JSONCLEAR_Test.php b/tests/Predis/Command/Redis/Json/JSONCLEAR_Test.php index 5e53cfa6..4cffb5a1 100644 --- a/tests/Predis/Command/Redis/Json/JSONCLEAR_Test.php +++ b/tests/Predis/Command/Redis/Json/JSONCLEAR_Test.php @@ -60,6 +60,7 @@ class JSONCLEAR_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @dataProvider jsonProvider * @param array $jsonArguments * @param string $key diff --git a/tests/Predis/Command/Redis/Json/JSONDEBUG_Test.php b/tests/Predis/Command/Redis/Json/JSONDEBUG_Test.php index b13feec9..0cde3a12 100644 --- a/tests/Predis/Command/Redis/Json/JSONDEBUG_Test.php +++ b/tests/Predis/Command/Redis/Json/JSONDEBUG_Test.php @@ -56,6 +56,7 @@ class JSONDEBUG_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @dataProvider jsonProvider * @param array $jsonArguments * @param string $key diff --git a/tests/Predis/Command/Redis/Json/JSONDEL_Test.php b/tests/Predis/Command/Redis/Json/JSONDEL_Test.php index 4d48d82f..f8e2d001 100644 --- a/tests/Predis/Command/Redis/Json/JSONDEL_Test.php +++ b/tests/Predis/Command/Redis/Json/JSONDEL_Test.php @@ -60,6 +60,7 @@ class JSONDEL_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @dataProvider jsonProvider * @param array $jsonArguments * @param string $key diff --git a/tests/Predis/Command/Redis/Json/JSONFORGET_Test.php b/tests/Predis/Command/Redis/Json/JSONFORGET_Test.php index 9e5ef474..0646b74d 100644 --- a/tests/Predis/Command/Redis/Json/JSONFORGET_Test.php +++ b/tests/Predis/Command/Redis/Json/JSONFORGET_Test.php @@ -60,6 +60,7 @@ class JSONFORGET_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @dataProvider jsonProvider * @param array $jsonArguments * @param string $key diff --git a/tests/Predis/Command/Redis/Json/JSONGET_Test.php b/tests/Predis/Command/Redis/Json/JSONGET_Test.php index 39c6cea8..b1a27860 100644 --- a/tests/Predis/Command/Redis/Json/JSONGET_Test.php +++ b/tests/Predis/Command/Redis/Json/JSONGET_Test.php @@ -59,6 +59,7 @@ class JSONGET_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @dataProvider jsonProvider * @param array $jsonData * @param string $key @@ -101,6 +102,7 @@ class JSONGET_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @dataProvider unexpectedValuesProvider * @param array $arguments * @param string $expectedExceptionMessage diff --git a/tests/Predis/Command/Redis/Json/JSONMERGE_Test.php b/tests/Predis/Command/Redis/Json/JSONMERGE_Test.php index b9cb7a74..57ef01f4 100644 --- a/tests/Predis/Command/Redis/Json/JSONMERGE_Test.php +++ b/tests/Predis/Command/Redis/Json/JSONMERGE_Test.php @@ -57,6 +57,7 @@ class JSONMERGE_Test extends PredisCommandTestCase /** * @dataProvider jsonProvider * @group connected + * @group relay-resp3 * @param array $setArguments * @param array $mergeArguments * @param string $expectedResponse diff --git a/tests/Predis/Command/Redis/Json/JSONMGET_Test.php b/tests/Predis/Command/Redis/Json/JSONMGET_Test.php index 5700bfee..19c703f2 100644 --- a/tests/Predis/Command/Redis/Json/JSONMGET_Test.php +++ b/tests/Predis/Command/Redis/Json/JSONMGET_Test.php @@ -60,6 +60,7 @@ class JSONMGET_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @dataProvider jsonProvider * @param array $firstJson * @param array $secondJson diff --git a/tests/Predis/Command/Redis/Json/JSONMSET_Test.php b/tests/Predis/Command/Redis/Json/JSONMSET_Test.php index 2083d39c..68fcbdb7 100644 --- a/tests/Predis/Command/Redis/Json/JSONMSET_Test.php +++ b/tests/Predis/Command/Redis/Json/JSONMSET_Test.php @@ -57,6 +57,7 @@ class JSONMSET_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisJsonVersion >= 2.6.0 */ @@ -70,6 +71,7 @@ class JSONMSET_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisJsonVersion >= 2.6.0 */ diff --git a/tests/Predis/Command/Redis/Json/JSONNUMINCRBY_Test.php b/tests/Predis/Command/Redis/Json/JSONNUMINCRBY_Test.php index 3dc87189..918f382d 100644 --- a/tests/Predis/Command/Redis/Json/JSONNUMINCRBY_Test.php +++ b/tests/Predis/Command/Redis/Json/JSONNUMINCRBY_Test.php @@ -60,6 +60,7 @@ class JSONNUMINCRBY_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @dataProvider jsonProvider * @param array $jsonArguments * @param string $key diff --git a/tests/Predis/Command/Redis/Json/JSONOBJKEYS_Test.php b/tests/Predis/Command/Redis/Json/JSONOBJKEYS_Test.php index 5726e9a1..706b1f7c 100644 --- a/tests/Predis/Command/Redis/Json/JSONOBJKEYS_Test.php +++ b/tests/Predis/Command/Redis/Json/JSONOBJKEYS_Test.php @@ -60,6 +60,7 @@ class JSONOBJKEYS_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @dataProvider jsonProvider * @param array $jsonArguments * @param string $key diff --git a/tests/Predis/Command/Redis/Json/JSONOBJLEN_Test.php b/tests/Predis/Command/Redis/Json/JSONOBJLEN_Test.php index 0380bc93..79f5ff5e 100644 --- a/tests/Predis/Command/Redis/Json/JSONOBJLEN_Test.php +++ b/tests/Predis/Command/Redis/Json/JSONOBJLEN_Test.php @@ -60,6 +60,7 @@ class JSONOBJLEN_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @dataProvider jsonProvider * @param array $jsonArguments * @param string $key diff --git a/tests/Predis/Command/Redis/Json/JSONRESP_Test.php b/tests/Predis/Command/Redis/Json/JSONRESP_Test.php index 5fa15aaf..5df53354 100644 --- a/tests/Predis/Command/Redis/Json/JSONRESP_Test.php +++ b/tests/Predis/Command/Redis/Json/JSONRESP_Test.php @@ -61,6 +61,7 @@ class JSONRESP_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @dataProvider jsonProvider * @param array $jsonArguments * @param string $key diff --git a/tests/Predis/Command/Redis/Json/JSONSET_Test.php b/tests/Predis/Command/Redis/Json/JSONSET_Test.php index dc1715f8..3037058a 100644 --- a/tests/Predis/Command/Redis/Json/JSONSET_Test.php +++ b/tests/Predis/Command/Redis/Json/JSONSET_Test.php @@ -59,6 +59,7 @@ class JSONSET_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @dataProvider jsonProvider * @param string $key * @param string $defaultJson diff --git a/tests/Predis/Command/Redis/Json/JSONSTRAPPEND_Test.php b/tests/Predis/Command/Redis/Json/JSONSTRAPPEND_Test.php index 3f2b1e32..4cd19af4 100644 --- a/tests/Predis/Command/Redis/Json/JSONSTRAPPEND_Test.php +++ b/tests/Predis/Command/Redis/Json/JSONSTRAPPEND_Test.php @@ -60,6 +60,7 @@ class JSONSTRAPPEND_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @dataProvider jsonProvider * @param array $jsonArguments * @param string $key diff --git a/tests/Predis/Command/Redis/Json/JSONSTRLEN_Test.php b/tests/Predis/Command/Redis/Json/JSONSTRLEN_Test.php index 4058d89a..03fb285c 100644 --- a/tests/Predis/Command/Redis/Json/JSONSTRLEN_Test.php +++ b/tests/Predis/Command/Redis/Json/JSONSTRLEN_Test.php @@ -60,6 +60,7 @@ class JSONSTRLEN_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @dataProvider jsonProvider * @param array $jsonArguments * @param string $key diff --git a/tests/Predis/Command/Redis/Json/JSONTOGGLE_Test.php b/tests/Predis/Command/Redis/Json/JSONTOGGLE_Test.php index 40dc8950..8d8aced4 100644 --- a/tests/Predis/Command/Redis/Json/JSONTOGGLE_Test.php +++ b/tests/Predis/Command/Redis/Json/JSONTOGGLE_Test.php @@ -60,6 +60,7 @@ class JSONTOGGLE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @dataProvider jsonProvider * @param array $jsonArguments * @param string $key diff --git a/tests/Predis/Command/Redis/Json/JSONTYPE_Test.php b/tests/Predis/Command/Redis/Json/JSONTYPE_Test.php index f40d4e13..c90c76c6 100644 --- a/tests/Predis/Command/Redis/Json/JSONTYPE_Test.php +++ b/tests/Predis/Command/Redis/Json/JSONTYPE_Test.php @@ -60,6 +60,7 @@ class JSONTYPE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @dataProvider jsonProvider * @param array $jsonArguments * @param string $key diff --git a/tests/Predis/Command/Redis/Search/FTAGGREGATE_Test.php b/tests/Predis/Command/Redis/Search/FTAGGREGATE_Test.php index 5518709e..94312651 100644 --- a/tests/Predis/Command/Redis/Search/FTAGGREGATE_Test.php +++ b/tests/Predis/Command/Redis/Search/FTAGGREGATE_Test.php @@ -64,6 +64,7 @@ class FTAGGREGATE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRediSearchVersion >= 1.1.0 */ diff --git a/tests/Predis/Command/Redis/Search/FTALIASADD_Test.php b/tests/Predis/Command/Redis/Search/FTALIASADD_Test.php index fb659acf..cfdbbb60 100644 --- a/tests/Predis/Command/Redis/Search/FTALIASADD_Test.php +++ b/tests/Predis/Command/Redis/Search/FTALIASADD_Test.php @@ -63,6 +63,7 @@ class FTALIASADD_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRediSearchVersion >= 1.0.0 */ @@ -100,6 +101,7 @@ class FTALIASADD_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRediSearchVersion >= 1.0.0 */ diff --git a/tests/Predis/Command/Redis/Search/FTALIASDEL_Test.php b/tests/Predis/Command/Redis/Search/FTALIASDEL_Test.php index c448c799..d5a599db 100644 --- a/tests/Predis/Command/Redis/Search/FTALIASDEL_Test.php +++ b/tests/Predis/Command/Redis/Search/FTALIASDEL_Test.php @@ -62,6 +62,7 @@ class FTALIASDEL_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRediSearchVersion >= 1.0.0 */ diff --git a/tests/Predis/Command/Redis/Search/FTALIASUPDATE_Test.php b/tests/Predis/Command/Redis/Search/FTALIASUPDATE_Test.php index e21531bb..da383369 100644 --- a/tests/Predis/Command/Redis/Search/FTALIASUPDATE_Test.php +++ b/tests/Predis/Command/Redis/Search/FTALIASUPDATE_Test.php @@ -62,6 +62,7 @@ class FTALIASUPDATE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRediSearchVersion >= 1.0.0 */ @@ -99,6 +100,7 @@ class FTALIASUPDATE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRediSearchVersion >= 1.0.0 */ diff --git a/tests/Predis/Command/Redis/Search/FTALTER_Test.php b/tests/Predis/Command/Redis/Search/FTALTER_Test.php index 06e815e5..14665269 100644 --- a/tests/Predis/Command/Redis/Search/FTALTER_Test.php +++ b/tests/Predis/Command/Redis/Search/FTALTER_Test.php @@ -61,6 +61,7 @@ class FTALTER_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRediSearchVersion >= 1.0.0 */ diff --git a/tests/Predis/Command/Redis/Search/FTCONFIG_Test.php b/tests/Predis/Command/Redis/Search/FTCONFIG_Test.php index 8b75363e..14a93dbe 100644 --- a/tests/Predis/Command/Redis/Search/FTCONFIG_Test.php +++ b/tests/Predis/Command/Redis/Search/FTCONFIG_Test.php @@ -89,6 +89,7 @@ class FTCONFIG_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRediSearchVersion >= 1.0.0 */ @@ -101,6 +102,7 @@ class FTCONFIG_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRediSearchVersion >= 1.0.0 */ @@ -114,6 +116,7 @@ class FTCONFIG_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRediSearchVersion >= 1.0.0 */ @@ -136,6 +139,7 @@ class FTCONFIG_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRediSearchVersion >= 1.0.0 */ diff --git a/tests/Predis/Command/Redis/Search/FTCREATE_Test.php b/tests/Predis/Command/Redis/Search/FTCREATE_Test.php index 746d3d7b..d154b79c 100644 --- a/tests/Predis/Command/Redis/Search/FTCREATE_Test.php +++ b/tests/Predis/Command/Redis/Search/FTCREATE_Test.php @@ -62,6 +62,7 @@ class FTCREATE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRediSearchVersion >= 1.0.0 */ diff --git a/tests/Predis/Command/Redis/Search/FTCURSOR_Test.php b/tests/Predis/Command/Redis/Search/FTCURSOR_Test.php index a814eaac..8044cb0d 100644 --- a/tests/Predis/Command/Redis/Search/FTCURSOR_Test.php +++ b/tests/Predis/Command/Redis/Search/FTCURSOR_Test.php @@ -79,6 +79,7 @@ class FTCURSOR_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRediSearchVersion >= 1.1.0 */ @@ -178,6 +179,7 @@ class FTCURSOR_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRediSearchVersion >= 1.1.0 */ @@ -193,6 +195,7 @@ class FTCURSOR_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRediSearchVersion >= 1.1.0 */ diff --git a/tests/Predis/Command/Redis/Search/FTDICTADD_Test.php b/tests/Predis/Command/Redis/Search/FTDICTADD_Test.php index 577fda96..d4a4bfb1 100644 --- a/tests/Predis/Command/Redis/Search/FTDICTADD_Test.php +++ b/tests/Predis/Command/Redis/Search/FTDICTADD_Test.php @@ -60,6 +60,7 @@ class FTDICTADD_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRediSearchVersion >= 1.4.0 */ diff --git a/tests/Predis/Command/Redis/Search/FTDICTDEL_Test.php b/tests/Predis/Command/Redis/Search/FTDICTDEL_Test.php index 566add53..46544465 100644 --- a/tests/Predis/Command/Redis/Search/FTDICTDEL_Test.php +++ b/tests/Predis/Command/Redis/Search/FTDICTDEL_Test.php @@ -60,6 +60,7 @@ class FTDICTDEL_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @dataProvider dictionariesProvider * @param array $addArguments * @param array $deleteArguments diff --git a/tests/Predis/Command/Redis/Search/FTDICTDUMP_Test.php b/tests/Predis/Command/Redis/Search/FTDICTDUMP_Test.php index 7c260dc7..d95a6c40 100644 --- a/tests/Predis/Command/Redis/Search/FTDICTDUMP_Test.php +++ b/tests/Predis/Command/Redis/Search/FTDICTDUMP_Test.php @@ -61,6 +61,7 @@ class FTDICTDUMP_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRediSearchVersion >= 1.4.0 */ diff --git a/tests/Predis/Command/Redis/Search/FTDROPINDEX_Test.php b/tests/Predis/Command/Redis/Search/FTDROPINDEX_Test.php index d026db7a..d229f051 100644 --- a/tests/Predis/Command/Redis/Search/FTDROPINDEX_Test.php +++ b/tests/Predis/Command/Redis/Search/FTDROPINDEX_Test.php @@ -61,6 +61,7 @@ class FTDROPINDEX_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRediSearchVersion >= 2.0.0 */ diff --git a/tests/Predis/Command/Redis/Search/FTEXPLAIN_Test.php b/tests/Predis/Command/Redis/Search/FTEXPLAIN_Test.php index 8d6dcead..ac474ca6 100644 --- a/tests/Predis/Command/Redis/Search/FTEXPLAIN_Test.php +++ b/tests/Predis/Command/Redis/Search/FTEXPLAIN_Test.php @@ -61,6 +61,7 @@ class FTEXPLAIN_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRediSearchVersion >= 1.0.0 */ diff --git a/tests/Predis/Command/Redis/Search/FTINFO_Test.php b/tests/Predis/Command/Redis/Search/FTINFO_Test.php index 6915e006..98cc2170 100644 --- a/tests/Predis/Command/Redis/Search/FTINFO_Test.php +++ b/tests/Predis/Command/Redis/Search/FTINFO_Test.php @@ -63,7 +63,7 @@ class FTINFO_Test extends PredisCommandTestCase /** * @group connected - * @group relay-incompatible + * @group relay-resp3 * @return void * @requiresRediSearchVersion >= 1.0.0 * @@ -96,7 +96,6 @@ class FTINFO_Test extends PredisCommandTestCase $redis = $this->getClient(); $this->expectException(ServerException::class); - $this->expectExceptionMessage('Unknown Index name'); $redis->ftinfo('index'); } diff --git a/tests/Predis/Command/Redis/Search/FTPROFILE_Test.php b/tests/Predis/Command/Redis/Search/FTPROFILE_Test.php index 78c83c69..694ab2af 100644 --- a/tests/Predis/Command/Redis/Search/FTPROFILE_Test.php +++ b/tests/Predis/Command/Redis/Search/FTPROFILE_Test.php @@ -61,6 +61,7 @@ class FTPROFILE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @dataProvider queryProvider * @param array $createArguments * @param array $profileArguments diff --git a/tests/Predis/Command/Redis/Search/FTSEARCH_Test.php b/tests/Predis/Command/Redis/Search/FTSEARCH_Test.php index dfca91d5..f7c690eb 100644 --- a/tests/Predis/Command/Redis/Search/FTSEARCH_Test.php +++ b/tests/Predis/Command/Redis/Search/FTSEARCH_Test.php @@ -54,6 +54,7 @@ class FTSEARCH_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRediSearchVersion >= 1.0.0 * @requiresRedisJsonVersion >= 1.0.0 @@ -80,7 +81,7 @@ class FTSEARCH_Test extends PredisCommandTestCase $this->assertEquals('OK', $ftCreateResponse); // Timeout to make sure that index created before search performed. - usleep(2000); + usleep(10000); $ftSearchArguments = new SearchArguments(); $ftSearchArguments->addReturn(2, 'arr', 'val'); @@ -91,6 +92,7 @@ class FTSEARCH_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRediSearchVersion >= 1.0.0 */ @@ -114,7 +116,7 @@ class FTSEARCH_Test extends PredisCommandTestCase $this->assertEquals('OK', $ftCreateResponse); // Timeout to make sure that index created before search performed. - usleep(2000); + usleep(10000); $ftSearchArguments = new SearchArguments(); $ftSearchArguments->addReturn(1, 'should_return'); diff --git a/tests/Predis/Command/Redis/Search/FTSPELLCHECK_Test.php b/tests/Predis/Command/Redis/Search/FTSPELLCHECK_Test.php index 16ee1f70..55d91fcf 100644 --- a/tests/Predis/Command/Redis/Search/FTSPELLCHECK_Test.php +++ b/tests/Predis/Command/Redis/Search/FTSPELLCHECK_Test.php @@ -62,6 +62,7 @@ class FTSPELLCHECK_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRediSearchVersion >= 1.4.0 */ diff --git a/tests/Predis/Command/Redis/Search/FTSUGADD_Test.php b/tests/Predis/Command/Redis/Search/FTSUGADD_Test.php index f858796c..5a0d3d05 100644 --- a/tests/Predis/Command/Redis/Search/FTSUGADD_Test.php +++ b/tests/Predis/Command/Redis/Search/FTSUGADD_Test.php @@ -59,6 +59,7 @@ class FTSUGADD_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRediSearchVersion >= 1.0.0 */ diff --git a/tests/Predis/Command/Redis/Search/FTSUGDEL_Test.php b/tests/Predis/Command/Redis/Search/FTSUGDEL_Test.php index 3a52e420..edb5a02c 100644 --- a/tests/Predis/Command/Redis/Search/FTSUGDEL_Test.php +++ b/tests/Predis/Command/Redis/Search/FTSUGDEL_Test.php @@ -60,6 +60,7 @@ class FTSUGDEL_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRediSearchVersion >= 1.0.0 */ diff --git a/tests/Predis/Command/Redis/Search/FTSUGGET_Test.php b/tests/Predis/Command/Redis/Search/FTSUGGET_Test.php index 3239d53d..90f83e85 100644 --- a/tests/Predis/Command/Redis/Search/FTSUGGET_Test.php +++ b/tests/Predis/Command/Redis/Search/FTSUGGET_Test.php @@ -60,6 +60,7 @@ class FTSUGGET_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @dataProvider suggestionProvider * @param array $addArguments * @param array $getArguments @@ -83,6 +84,7 @@ class FTSUGGET_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRediSearchVersion >= 1.0.0 */ diff --git a/tests/Predis/Command/Redis/Search/FTSUGLEN_Test.php b/tests/Predis/Command/Redis/Search/FTSUGLEN_Test.php index 214ed246..b23a6aec 100644 --- a/tests/Predis/Command/Redis/Search/FTSUGLEN_Test.php +++ b/tests/Predis/Command/Redis/Search/FTSUGLEN_Test.php @@ -60,6 +60,7 @@ class FTSUGLEN_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRediSearchVersion >= 1.0.0 */ diff --git a/tests/Predis/Command/Redis/Search/FTSYNDUMP_Test.php b/tests/Predis/Command/Redis/Search/FTSYNDUMP_Test.php index 2821f65a..f74d1992 100644 --- a/tests/Predis/Command/Redis/Search/FTSYNDUMP_Test.php +++ b/tests/Predis/Command/Redis/Search/FTSYNDUMP_Test.php @@ -62,6 +62,7 @@ class FTSYNDUMP_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRediSearchVersion >= 1.2.0 */ diff --git a/tests/Predis/Command/Redis/Search/FTSYNUPDATE_Test.php b/tests/Predis/Command/Redis/Search/FTSYNUPDATE_Test.php index 21c5eb1b..c015d79c 100644 --- a/tests/Predis/Command/Redis/Search/FTSYNUPDATE_Test.php +++ b/tests/Predis/Command/Redis/Search/FTSYNUPDATE_Test.php @@ -61,6 +61,7 @@ class FTSYNUPDATE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRediSearchVersion >= 1.2.0 */ @@ -106,6 +107,7 @@ class FTSYNUPDATE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRediSearchVersion >= 1.2.0 */ diff --git a/tests/Predis/Command/Redis/Search/FTTAGVALS_Test.php b/tests/Predis/Command/Redis/Search/FTTAGVALS_Test.php index 80a7813a..4bf809b3 100644 --- a/tests/Predis/Command/Redis/Search/FTTAGVALS_Test.php +++ b/tests/Predis/Command/Redis/Search/FTTAGVALS_Test.php @@ -63,6 +63,7 @@ class FTTAGVALS_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRediSearchVersion >= 1.0.0 */ diff --git a/tests/Predis/Command/Redis/TDigest/TDIGESTADD_Test.php b/tests/Predis/Command/Redis/TDigest/TDIGESTADD_Test.php index fa76ee6a..896fa24f 100644 --- a/tests/Predis/Command/Redis/TDigest/TDIGESTADD_Test.php +++ b/tests/Predis/Command/Redis/TDigest/TDIGESTADD_Test.php @@ -61,6 +61,7 @@ class TDIGESTADD_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisBfVersion >= 2.4.0 */ diff --git a/tests/Predis/Command/Redis/TDigest/TDIGESTBYRANK_Test.php b/tests/Predis/Command/Redis/TDigest/TDIGESTBYRANK_Test.php index 4aadeb79..8549c56a 100644 --- a/tests/Predis/Command/Redis/TDigest/TDIGESTBYRANK_Test.php +++ b/tests/Predis/Command/Redis/TDigest/TDIGESTBYRANK_Test.php @@ -61,6 +61,7 @@ class TDIGESTBYRANK_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisBfVersion >= 2.4.0 */ diff --git a/tests/Predis/Command/Redis/TDigest/TDIGESTBYREVRANK_Test.php b/tests/Predis/Command/Redis/TDigest/TDIGESTBYREVRANK_Test.php index 7fc8a3a1..232508f2 100644 --- a/tests/Predis/Command/Redis/TDigest/TDIGESTBYREVRANK_Test.php +++ b/tests/Predis/Command/Redis/TDigest/TDIGESTBYREVRANK_Test.php @@ -61,6 +61,7 @@ class TDIGESTBYREVRANK_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisBfVersion >= 2.4.0 */ diff --git a/tests/Predis/Command/Redis/TDigest/TDIGESTCDF_Test.php b/tests/Predis/Command/Redis/TDigest/TDIGESTCDF_Test.php index 2b23e6ae..56215084 100644 --- a/tests/Predis/Command/Redis/TDigest/TDIGESTCDF_Test.php +++ b/tests/Predis/Command/Redis/TDigest/TDIGESTCDF_Test.php @@ -61,6 +61,7 @@ class TDIGESTCDF_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisBfVersion >= 2.4.0 */ @@ -76,8 +77,8 @@ class TDIGESTCDF_Test extends PredisCommandTestCase $actualResponse = $redis->tdigestcdf('key', 0, 1, 2, 3, 4); - $this->assertEquals($expectedResponse, $actualResponse); - $this->assertEquals(['nan', 'nan'], $redis->tdigestcdf('empty_key', 0, 1)); + $this->assertSameWithPrecision($expectedResponse, $actualResponse, 5); + $this->assertSame(['nan', 'nan'], $redis->tdigestcdf('empty_key', 0, 1)); } /** diff --git a/tests/Predis/Command/Redis/TDigest/TDIGESTCREATE_Test.php b/tests/Predis/Command/Redis/TDigest/TDIGESTCREATE_Test.php index 39bcc23c..2ead7c26 100644 --- a/tests/Predis/Command/Redis/TDigest/TDIGESTCREATE_Test.php +++ b/tests/Predis/Command/Redis/TDigest/TDIGESTCREATE_Test.php @@ -59,6 +59,7 @@ class TDIGESTCREATE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @dataProvider sketchesProvider * @param array $createArguments * @param string $key diff --git a/tests/Predis/Command/Redis/TDigest/TDIGESTINFO_Test.php b/tests/Predis/Command/Redis/TDigest/TDIGESTINFO_Test.php index 86072cc2..121b2d23 100644 --- a/tests/Predis/Command/Redis/TDigest/TDIGESTINFO_Test.php +++ b/tests/Predis/Command/Redis/TDigest/TDIGESTINFO_Test.php @@ -77,6 +77,7 @@ class TDIGESTINFO_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisBfVersion >= 2.4.0 */ diff --git a/tests/Predis/Command/Redis/TDigest/TDIGESTMAX_Test.php b/tests/Predis/Command/Redis/TDigest/TDIGESTMAX_Test.php index 62b0a7a8..9e9b7c20 100644 --- a/tests/Predis/Command/Redis/TDigest/TDIGESTMAX_Test.php +++ b/tests/Predis/Command/Redis/TDigest/TDIGESTMAX_Test.php @@ -61,6 +61,7 @@ class TDIGESTMAX_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisBfVersion >= 2.4.0 */ diff --git a/tests/Predis/Command/Redis/TDigest/TDIGESTMERGE_Test.php b/tests/Predis/Command/Redis/TDigest/TDIGESTMERGE_Test.php index b4d73071..aa6cf45b 100644 --- a/tests/Predis/Command/Redis/TDigest/TDIGESTMERGE_Test.php +++ b/tests/Predis/Command/Redis/TDigest/TDIGESTMERGE_Test.php @@ -51,6 +51,7 @@ class TDIGESTMERGE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @dataProvider sketchesProvider * @param string $sourceKey1 * @param string $sourceKey2 @@ -92,6 +93,7 @@ class TDIGESTMERGE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisBfVersion >= 2.4.0 */ @@ -118,6 +120,7 @@ class TDIGESTMERGE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisBfVersion >= 2.4.0 */ @@ -156,6 +159,7 @@ class TDIGESTMERGE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisBfVersion >= 2.4.0 */ @@ -184,6 +188,7 @@ class TDIGESTMERGE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisBfVersion >= 2.4.0 */ diff --git a/tests/Predis/Command/Redis/TDigest/TDIGESTMIN_Test.php b/tests/Predis/Command/Redis/TDigest/TDIGESTMIN_Test.php index c7062995..49050832 100644 --- a/tests/Predis/Command/Redis/TDigest/TDIGESTMIN_Test.php +++ b/tests/Predis/Command/Redis/TDigest/TDIGESTMIN_Test.php @@ -61,6 +61,7 @@ class TDIGESTMIN_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisBfVersion >= 2.4.0 */ diff --git a/tests/Predis/Command/Redis/TDigest/TDIGESTQUANTILE_Test.php b/tests/Predis/Command/Redis/TDigest/TDIGESTQUANTILE_Test.php index b43cc533..8a3622b3 100644 --- a/tests/Predis/Command/Redis/TDigest/TDIGESTQUANTILE_Test.php +++ b/tests/Predis/Command/Redis/TDigest/TDIGESTQUANTILE_Test.php @@ -61,6 +61,7 @@ class TDIGESTQUANTILE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisBfVersion >= 2.4.0 */ diff --git a/tests/Predis/Command/Redis/TDigest/TDIGESTRANK_Test.php b/tests/Predis/Command/Redis/TDigest/TDIGESTRANK_Test.php index b3e2502f..3afb63e1 100644 --- a/tests/Predis/Command/Redis/TDigest/TDIGESTRANK_Test.php +++ b/tests/Predis/Command/Redis/TDigest/TDIGESTRANK_Test.php @@ -61,6 +61,7 @@ class TDIGESTRANK_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisBfVersion >= 2.4.0 */ diff --git a/tests/Predis/Command/Redis/TDigest/TDIGESTRESET_Test.php b/tests/Predis/Command/Redis/TDigest/TDIGESTRESET_Test.php index bc3ebe25..5ad1f76b 100644 --- a/tests/Predis/Command/Redis/TDigest/TDIGESTRESET_Test.php +++ b/tests/Predis/Command/Redis/TDigest/TDIGESTRESET_Test.php @@ -61,6 +61,7 @@ class TDIGESTRESET_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisBfVersion >= 2.4.0 */ diff --git a/tests/Predis/Command/Redis/TDigest/TDIGESTREVRANK_Test.php b/tests/Predis/Command/Redis/TDigest/TDIGESTREVRANK_Test.php index 67b4799d..370fb1b6 100644 --- a/tests/Predis/Command/Redis/TDigest/TDIGESTREVRANK_Test.php +++ b/tests/Predis/Command/Redis/TDigest/TDIGESTREVRANK_Test.php @@ -61,6 +61,7 @@ class TDIGESTREVRANK_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisBfVersion >= 2.4.0 */ diff --git a/tests/Predis/Command/Redis/TDigest/TDIGESTTRIMMED_MEAN_Test.php b/tests/Predis/Command/Redis/TDigest/TDIGESTTRIMMED_MEAN_Test.php index 15490426..001e07c9 100644 --- a/tests/Predis/Command/Redis/TDigest/TDIGESTTRIMMED_MEAN_Test.php +++ b/tests/Predis/Command/Redis/TDigest/TDIGESTTRIMMED_MEAN_Test.php @@ -61,6 +61,7 @@ class TDIGESTTRIMMED_MEAN_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @dataProvider sketchesProvider * @param array $addArguments * @param string $key @@ -102,6 +103,7 @@ class TDIGESTTRIMMED_MEAN_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisBfVersion >= 2.4.0 */ diff --git a/tests/Predis/Command/Redis/TimeSeries/TSADD_Test.php b/tests/Predis/Command/Redis/TimeSeries/TSADD_Test.php index a969e88e..a5995049 100644 --- a/tests/Predis/Command/Redis/TimeSeries/TSADD_Test.php +++ b/tests/Predis/Command/Redis/TimeSeries/TSADD_Test.php @@ -61,6 +61,7 @@ class TSADD_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisTimeSeriesVersion >= 1.0.0 */ diff --git a/tests/Predis/Command/Redis/TimeSeries/TSALTER_Test.php b/tests/Predis/Command/Redis/TimeSeries/TSALTER_Test.php index 01f6fd3e..9680448f 100644 --- a/tests/Predis/Command/Redis/TimeSeries/TSALTER_Test.php +++ b/tests/Predis/Command/Redis/TimeSeries/TSALTER_Test.php @@ -62,6 +62,7 @@ class TSALTER_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisTimeSeriesVersion >= 1.0.0 */ diff --git a/tests/Predis/Command/Redis/TimeSeries/TSCREATERULE_Test.php b/tests/Predis/Command/Redis/TimeSeries/TSCREATERULE_Test.php index 25a448f2..5119a51e 100644 --- a/tests/Predis/Command/Redis/TimeSeries/TSCREATERULE_Test.php +++ b/tests/Predis/Command/Redis/TimeSeries/TSCREATERULE_Test.php @@ -60,6 +60,7 @@ class TSCREATERULE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisTimeSeriesVersion >= 1.0.0 */ @@ -95,6 +96,7 @@ class TSCREATERULE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisTimeSeriesVersion >= 1.0.0 */ diff --git a/tests/Predis/Command/Redis/TimeSeries/TSCREATE_Test.php b/tests/Predis/Command/Redis/TimeSeries/TSCREATE_Test.php index ef7c66ce..3e2183c4 100644 --- a/tests/Predis/Command/Redis/TimeSeries/TSCREATE_Test.php +++ b/tests/Predis/Command/Redis/TimeSeries/TSCREATE_Test.php @@ -61,6 +61,7 @@ class TSCREATE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisTimeSeriesVersion >= 1.0.0 */ diff --git a/tests/Predis/Command/Redis/TimeSeries/TSDECRBY_Test.php b/tests/Predis/Command/Redis/TimeSeries/TSDECRBY_Test.php index b2d7e210..1dbc91bd 100644 --- a/tests/Predis/Command/Redis/TimeSeries/TSDECRBY_Test.php +++ b/tests/Predis/Command/Redis/TimeSeries/TSDECRBY_Test.php @@ -63,6 +63,7 @@ class TSDECRBY_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisTimeSeriesVersion >= 1.0.0 */ @@ -121,6 +122,7 @@ class TSDECRBY_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisTimeSeriesVersion >= 1.0.0 */ @@ -147,7 +149,6 @@ class TSDECRBY_Test extends PredisCommandTestCase ); $this->expectException(ServerException::class); - $this->expectExceptionMessage('TSDB: for incrby/decrby, timestamp should be newer than the'); $redis->tsdecrby('temperature:2:32', 27, (new DecrByArguments())->timestamp(123123123122)); } diff --git a/tests/Predis/Command/Redis/TimeSeries/TSDELETERULE_Test.php b/tests/Predis/Command/Redis/TimeSeries/TSDELETERULE_Test.php index ac581894..eba72719 100644 --- a/tests/Predis/Command/Redis/TimeSeries/TSDELETERULE_Test.php +++ b/tests/Predis/Command/Redis/TimeSeries/TSDELETERULE_Test.php @@ -62,6 +62,7 @@ class TSDELETERULE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisTimeSeriesVersion >= 1.0.0 */ diff --git a/tests/Predis/Command/Redis/TimeSeries/TSDEL_Test.php b/tests/Predis/Command/Redis/TimeSeries/TSDEL_Test.php index a9506eab..74418059 100644 --- a/tests/Predis/Command/Redis/TimeSeries/TSDEL_Test.php +++ b/tests/Predis/Command/Redis/TimeSeries/TSDEL_Test.php @@ -63,6 +63,7 @@ class TSDEL_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisTimeSeriesVersion >= 1.6.0 */ diff --git a/tests/Predis/Command/Redis/TimeSeries/TSGET_Test.php b/tests/Predis/Command/Redis/TimeSeries/TSGET_Test.php index 4ab298df..d429dd88 100644 --- a/tests/Predis/Command/Redis/TimeSeries/TSGET_Test.php +++ b/tests/Predis/Command/Redis/TimeSeries/TSGET_Test.php @@ -62,6 +62,7 @@ class TSGET_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisTimeSeriesVersion >= 1.0.0 */ diff --git a/tests/Predis/Command/Redis/TimeSeries/TSINCRBY_Test.php b/tests/Predis/Command/Redis/TimeSeries/TSINCRBY_Test.php index fbfceaca..77ca7ff3 100644 --- a/tests/Predis/Command/Redis/TimeSeries/TSINCRBY_Test.php +++ b/tests/Predis/Command/Redis/TimeSeries/TSINCRBY_Test.php @@ -63,6 +63,7 @@ class TSINCRBY_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisTimeSeriesVersion >= 1.0.0 */ @@ -121,6 +122,7 @@ class TSINCRBY_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisTimeSeriesVersion >= 1.0.0 */ @@ -147,7 +149,6 @@ class TSINCRBY_Test extends PredisCommandTestCase ); $this->expectException(ServerException::class); - $this->expectExceptionMessage('TSDB: for incrby/decrby, timestamp should be newer than the'); $redis->tsincrby('temperature:2:32', 27, (new IncrByArguments())->timestamp(123123123122)); } diff --git a/tests/Predis/Command/Redis/TimeSeries/TSINFO_Test.php b/tests/Predis/Command/Redis/TimeSeries/TSINFO_Test.php index 20566d53..c796eebf 100644 --- a/tests/Predis/Command/Redis/TimeSeries/TSINFO_Test.php +++ b/tests/Predis/Command/Redis/TimeSeries/TSINFO_Test.php @@ -61,6 +61,7 @@ class TSINFO_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisTimeSeriesVersion >= 1.0.0 */ diff --git a/tests/Predis/Command/Redis/TimeSeries/TSMADD_Test.php b/tests/Predis/Command/Redis/TimeSeries/TSMADD_Test.php index a9f8a11a..860750eb 100644 --- a/tests/Predis/Command/Redis/TimeSeries/TSMADD_Test.php +++ b/tests/Predis/Command/Redis/TimeSeries/TSMADD_Test.php @@ -63,6 +63,7 @@ class TSMADD_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisTimeSeriesVersion >= 1.0.0 */ @@ -101,7 +102,6 @@ class TSMADD_Test extends PredisCommandTestCase $redis = $this->getClient(); $this->expectException(ServerException::class); - $this->expectExceptionMessage("ERR wrong number of arguments for 'TS.MADD' command"); $redis->tsmadd('temperature:2:32', 123123123123, 27, 'temperature:2:33', 123123123124); } diff --git a/tests/Predis/Command/Redis/TimeSeries/TSMGET_Test.php b/tests/Predis/Command/Redis/TimeSeries/TSMGET_Test.php index 74d5b981..50f18ca6 100644 --- a/tests/Predis/Command/Redis/TimeSeries/TSMGET_Test.php +++ b/tests/Predis/Command/Redis/TimeSeries/TSMGET_Test.php @@ -61,6 +61,7 @@ class TSMGET_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisTimeSeriesVersion >= 1.0.0 */ diff --git a/tests/Predis/Command/Redis/TimeSeries/TSMRANGE_Test.php b/tests/Predis/Command/Redis/TimeSeries/TSMRANGE_Test.php index cd7c126e..cc13025a 100644 --- a/tests/Predis/Command/Redis/TimeSeries/TSMRANGE_Test.php +++ b/tests/Predis/Command/Redis/TimeSeries/TSMRANGE_Test.php @@ -60,6 +60,7 @@ class TSMRANGE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisTimeSeriesVersion >= 1.0.0 */ diff --git a/tests/Predis/Command/Redis/TimeSeries/TSMREVRANGE_Test.php b/tests/Predis/Command/Redis/TimeSeries/TSMREVRANGE_Test.php index 8d5a9adb..5bfab8a9 100644 --- a/tests/Predis/Command/Redis/TimeSeries/TSMREVRANGE_Test.php +++ b/tests/Predis/Command/Redis/TimeSeries/TSMREVRANGE_Test.php @@ -60,6 +60,7 @@ class TSMREVRANGE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisTimeSeriesVersion >= 1.4.0 */ diff --git a/tests/Predis/Command/Redis/TimeSeries/TSQUERYINDEX_Test.php b/tests/Predis/Command/Redis/TimeSeries/TSQUERYINDEX_Test.php index 0630300c..0c75f93b 100644 --- a/tests/Predis/Command/Redis/TimeSeries/TSQUERYINDEX_Test.php +++ b/tests/Predis/Command/Redis/TimeSeries/TSQUERYINDEX_Test.php @@ -54,6 +54,7 @@ class TSQUERYINDEX_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisTimeSeriesVersion >= 1.0.0 */ diff --git a/tests/Predis/Command/Redis/TimeSeries/TSRANGE_Test.php b/tests/Predis/Command/Redis/TimeSeries/TSRANGE_Test.php index b4c7b0df..56caaa09 100644 --- a/tests/Predis/Command/Redis/TimeSeries/TSRANGE_Test.php +++ b/tests/Predis/Command/Redis/TimeSeries/TSRANGE_Test.php @@ -61,6 +61,7 @@ class TSRANGE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisTimeSeriesVersion >= 1.0.0 */ diff --git a/tests/Predis/Command/Redis/TimeSeries/TSREVRANGE_Test.php b/tests/Predis/Command/Redis/TimeSeries/TSREVRANGE_Test.php index 1615f5c6..004615bc 100644 --- a/tests/Predis/Command/Redis/TimeSeries/TSREVRANGE_Test.php +++ b/tests/Predis/Command/Redis/TimeSeries/TSREVRANGE_Test.php @@ -61,6 +61,7 @@ class TSREVRANGE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisTimeSeriesVersion >= 1.0.0 */ diff --git a/tests/Predis/Command/Redis/TopK/TOPKADD_Test.php b/tests/Predis/Command/Redis/TopK/TOPKADD_Test.php index 19dd7e03..ac568f6d 100644 --- a/tests/Predis/Command/Redis/TopK/TOPKADD_Test.php +++ b/tests/Predis/Command/Redis/TopK/TOPKADD_Test.php @@ -61,6 +61,7 @@ class TOPKADD_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @dataProvider structuresProvider * @param array $reserveArguments * @param array $addArguments diff --git a/tests/Predis/Command/Redis/TopK/TOPKINCRBY_Test.php b/tests/Predis/Command/Redis/TopK/TOPKINCRBY_Test.php index 06f605f2..bdd06c85 100644 --- a/tests/Predis/Command/Redis/TopK/TOPKINCRBY_Test.php +++ b/tests/Predis/Command/Redis/TopK/TOPKINCRBY_Test.php @@ -61,6 +61,7 @@ class TOPKINCRBY_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisBfVersion >= 2.0.0 */ diff --git a/tests/Predis/Command/Redis/TopK/TOPKINFO_Test.php b/tests/Predis/Command/Redis/TopK/TOPKINFO_Test.php index 2a0ca4c9..6d7d2a05 100644 --- a/tests/Predis/Command/Redis/TopK/TOPKINFO_Test.php +++ b/tests/Predis/Command/Redis/TopK/TOPKINFO_Test.php @@ -64,6 +64,7 @@ class TOPKINFO_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisBfVersion >= 2.0.0 */ @@ -73,9 +74,10 @@ class TOPKINFO_Test extends PredisCommandTestCase $redis->topkreserve('key', 50); - $this->assertEquals( + $this->assertSameWithPrecision( ['k' => 50, 'width' => 8, 'depth' => 7, 'decay' => '0.90000000000000002'], - $redis->topkinfo('key') + $redis->topkinfo('key'), + 1 ); } diff --git a/tests/Predis/Command/Redis/TopK/TOPKLIST_Test.php b/tests/Predis/Command/Redis/TopK/TOPKLIST_Test.php index 795a0de3..e20f5cad 100644 --- a/tests/Predis/Command/Redis/TopK/TOPKLIST_Test.php +++ b/tests/Predis/Command/Redis/TopK/TOPKLIST_Test.php @@ -63,6 +63,7 @@ class TOPKLIST_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @dataProvider structureProvider * @param array $reserveArguments * @param array $addArguments diff --git a/tests/Predis/Command/Redis/TopK/TOPKQUERY_Test.php b/tests/Predis/Command/Redis/TopK/TOPKQUERY_Test.php index 721150e0..77977586 100644 --- a/tests/Predis/Command/Redis/TopK/TOPKQUERY_Test.php +++ b/tests/Predis/Command/Redis/TopK/TOPKQUERY_Test.php @@ -61,6 +61,7 @@ class TOPKQUERY_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @return void * @requiresRedisBfVersion >= 2.0.0 */ diff --git a/tests/Predis/Command/Redis/TopK/TOPKRESERVE_Test.php b/tests/Predis/Command/Redis/TopK/TOPKRESERVE_Test.php index 08a978ee..a8261de1 100644 --- a/tests/Predis/Command/Redis/TopK/TOPKRESERVE_Test.php +++ b/tests/Predis/Command/Redis/TopK/TOPKRESERVE_Test.php @@ -59,6 +59,7 @@ class TOPKRESERVE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-resp3 * @dataProvider structureProvider * @param array $topKArguments * @param string $key @@ -77,7 +78,7 @@ class TOPKRESERVE_Test extends PredisCommandTestCase $actualInfoResponse = $redis->topkinfo($key); $this->assertEquals('OK', $actualResponse); - $this->assertEquals($expectedInfoResponse, $actualInfoResponse); + $this->assertSameWithPrecision($expectedInfoResponse, $actualInfoResponse, 1); } /** diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 1e21c357..be3b405a 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -20,6 +20,7 @@ if (file_exists(__DIR__ . '/../autoload.php')) { require __DIR__ . '/PHPUnit/ArrayHasSameValuesConstraint.php'; require __DIR__ . '/PHPUnit/OneOfConstraint.php'; +require __DIR__ . '/PHPUnit/AssertSameWithPrecisionConstraint.php'; require __DIR__ . '/PHPUnit/RedisCommandConstraint.php'; require __DIR__ . '/PHPUnit/PredisTestCase.php'; require __DIR__ . '/PHPUnit/PredisCommandTestCase.php';