Skip to content

Commit b4d981f

Browse files
dorrogeraydorrogeray
committed
Add cluster tests for GET, SET, HGET, HGETALL, HSET
1 parent 97a9754 commit b4d981f

File tree

5 files changed

+165
-4
lines changed

5 files changed

+165
-4
lines changed

‎tests/Predis/Command/Redis/GET_Test.php

+40
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,16 @@ public function testReturnsStringValue(): void
6767
$this->assertEquals('bar', $redis->get('foo'));
6868
}
6969

70+
/**
71+
* @group connected
72+
* @group cluster
73+
* @requiresRedisVersion >= 6.0.0
74+
*/
75+
public function testReturnsStringValueUsingCluster(): void
76+
{
77+
$this->testReturnsStringValue();
78+
}
79+
7080
/**
7181
* @group connected
7282
*/
@@ -80,6 +90,16 @@ public function testReturnsEmptyStringOnEmptyStrings(): void
8090
$this->assertSame('', $redis->get('foo'));
8191
}
8292

93+
/**
94+
* @group connected
95+
* @group cluster
96+
* @requiresRedisVersion >= 6.0.0
97+
*/
98+
public function testReturnsEmptyStringOnEmptyStringsUsingCluster(): void
99+
{
100+
$this->testReturnsEmptyStringOnEmptyStrings();
101+
}
102+
83103
/**
84104
* @group connected
85105
*/
@@ -91,6 +111,16 @@ public function testReturnsNullOnNonExistingKeys(): void
91111
$this->assertNull($redis->get('foo'));
92112
}
93113

114+
/**
115+
* @group connected
116+
* @group cluster
117+
* @requiresRedisVersion >= 6.0.0
118+
*/
119+
public function testReturnsNullOnNonExistingKeysUsingCluster(): void
120+
{
121+
$this->testReturnsNullOnNonExistingKeys();
122+
}
123+
94124
/**
95125
* @group connected
96126
*/
@@ -104,4 +134,14 @@ public function testThrowsExceptionOnWrongType(): void
104134
$redis->rpush('metavars', 'foo');
105135
$redis->get('metavars');
106136
}
137+
138+
/**
139+
* @group connected
140+
* @group cluster
141+
* @requiresRedisVersion >= 6.0.0
142+
*/
143+
public function testThrowsExceptionOnWrongTypeUsingCluster(): void
144+
{
145+
$this->testThrowsExceptionOnWrongType();
146+
}
107147
}

‎tests/Predis/Command/Redis/HGETALL_Test.php

+25-1
Original file line numberDiff line numberDiff line change
@@ -75,18 +75,42 @@ public function testReturnsAllTheFieldsAndTheirValues(): void
7575
$this->assertSame([], $redis->hgetall('unknown'));
7676
}
7777

78+
/**
79+
* @group connected
80+
* @group cluster
81+
* @requiresRedisVersion >= 6.0.0
82+
*/
83+
public function testReturnsAllTheFieldsAndTheirValuesUsingCluster(): void
84+
{
85+
$redis = $this->getClient();
86+
87+
$redis->del('metavars');
88+
89+
$this->testReturnsAllTheFieldsAndTheirValues();
90+
}
91+
7892
/**
7993
* @group connected
8094
* @requiresRedisVersion >= 2.0.0
8195
*/
8296
public function testThrowsExceptionOnWrongType(): void
8397
{
8498
$this->expectException('Predis\Response\ServerException');
85-
$this->expectExceptionMessage('Operation against a key holding the wrong kind of value');
99+
$this->expectExceptionMessageMatches('/.*Operation against a key holding the wrong kind of value.*/');
86100

87101
$redis = $this->getClient();
88102

89103
$redis->set('foo', 'bar');
90104
$redis->hgetall('foo');
91105
}
106+
107+
/**
108+
* @group connected
109+
* @group cluster
110+
* @requiresRedisVersion >= 6.0.0
111+
*/
112+
public function testThrowsExceptionOnWrongTypeUsingCluster(): void
113+
{
114+
$this->testThrowsExceptionOnWrongType();
115+
}
92116
}

‎tests/Predis/Command/Redis/HGET_Test.php

+25-1
Original file line numberDiff line numberDiff line change
@@ -71,18 +71,42 @@ public function testReturnsValueOfSpecifiedField(): void
7171
$this->assertNull($redis->hget('unknown', 'foo'));
7272
}
7373

74+
/**
75+
* @group connected
76+
* @group cluster
77+
* @requiresRedisVersion >= 6.0.0
78+
*/
79+
public function testReturnsValueOfSpecifiedFieldUsingCluster(): void
80+
{
81+
$redis = $this->getClient();
82+
83+
$redis->del('metavars');
84+
85+
$this->testReturnsValueOfSpecifiedField();
86+
}
87+
7488
/**
7589
* @group connected
7690
* @requiresRedisVersion >= 2.0.0
7791
*/
7892
public function testThrowsExceptionOnWrongType(): void
7993
{
8094
$this->expectException('Predis\Response\ServerException');
81-
$this->expectExceptionMessage('Operation against a key holding the wrong kind of value');
95+
$this->expectExceptionMessageMatches('/.*Operation against a key holding the wrong kind of value.*/');
8296

8397
$redis = $this->getClient();
8498

8599
$redis->set('foo', 'bar');
86100
$redis->hget('foo', 'bar');
87101
}
102+
103+
/**
104+
* @group connected
105+
* @group cluster
106+
* @requiresRedisVersion >= 6.0.0
107+
*/
108+
public function testThrowsExceptionOnWrongTypeUsingCluster(): void
109+
{
110+
$this->testThrowsExceptionOnWrongType();
111+
}
88112
}

‎tests/Predis/Command/Redis/HSET_Test.php

+25-1
Original file line numberDiff line numberDiff line change
@@ -73,18 +73,42 @@ public function testSetsValueOfSpecifiedField(): void
7373
$this->assertSame(['bar', 'piyo'], $redis->hmget('metavars', 'foo', 'hoge'));
7474
}
7575

76+
/**
77+
* @group connected
78+
* @group cluster
79+
* @requiresRedisVersion >= 6.0.0
80+
*/
81+
public function testSetsValueOfSpecifiedFieldUsingCluster(): void
82+
{
83+
$redis = $this->getClient();
84+
85+
$redis->del('metavars');
86+
87+
$this->testSetsValueOfSpecifiedField();
88+
}
89+
7690
/**
7791
* @group connected
7892
* @requiresRedisVersion >= 2.0.0
7993
*/
8094
public function testThrowsExceptionOnWrongType(): void
8195
{
8296
$this->expectException('Predis\Response\ServerException');
83-
$this->expectExceptionMessage('Operation against a key holding the wrong kind of value');
97+
$this->expectExceptionMessageMatches('/.*Operation against a key holding the wrong kind of value.*/');
8498

8599
$redis = $this->getClient();
86100

87101
$redis->set('metavars', 'foo');
88102
$redis->hset('metavars', 'foo', 'bar');
89103
}
104+
105+
/**
106+
* @group connected
107+
* @group cluster
108+
* @requiresRedisVersion >= 6.0.0
109+
*/
110+
public function testThrowsExceptionOnWrongTypeUsingCluster(): void
111+
{
112+
$this->testThrowsExceptionOnWrongType();
113+
}
90114
}

‎tests/Predis/Command/Redis/SET_Test.php

+50-1
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,16 @@ public function testSetStringValue(): void
8282
$this->assertSame('bar', $redis->get('foo'));
8383
}
8484

85+
/**
86+
* @group connected
87+
* @group cluster
88+
* @requiresRedisVersion >= 6.0.0
89+
*/
90+
public function testSetStringValueUsingCluster(): void
91+
{
92+
$this->testSetStringValue();
93+
}
94+
8595
/**
8696
* @group connected
8797
* @requiresRedisVersion >= 2.6.12
@@ -94,6 +104,16 @@ public function testSetStringValueWithModifierEX(): void
94104
$this->assertSame(1, $redis->ttl('foo'));
95105
}
96106

107+
/**
108+
* @group connected
109+
* @group cluster
110+
* @requiresRedisVersion >= 6.0.0
111+
*/
112+
public function testSetStringValueWithModifierEXUsingCluster(): void
113+
{
114+
$this->testSetStringValueWithModifierEX();
115+
}
116+
97117
/**
98118
* @group connected
99119
* @requiresRedisVersion >= 2.6.12
@@ -109,6 +129,16 @@ public function testSetStringValueWithModifierPX(): void
109129
$this->assertLessThanOrEqual(1000, $pttl);
110130
}
111131

132+
/**
133+
* @group connected
134+
* @group cluster
135+
* @requiresRedisVersion >= 6.0.0
136+
*/
137+
public function testSetStringValueWithModifierPXUsingCluster(): void
138+
{
139+
$this->testSetStringValueWithModifierPX();
140+
}
141+
112142
/**
113143
* @group connected
114144
* @requiresRedisVersion >= 2.6.12
@@ -121,6 +151,16 @@ public function testSetStringValueWithModifierNX(): void
121151
$this->assertNull($redis->set('foo', 'bar', 'NX'));
122152
}
123153

154+
/**
155+
* @group connected
156+
* @group cluster
157+
* @requiresRedisVersion >= 6.0.0
158+
*/
159+
public function testSetStringValueWithModifierNXUsingCluster(): void
160+
{
161+
$this->testSetStringValueWithModifierNX();
162+
}
163+
124164
/**
125165
* @group connected
126166
* @requiresRedisVersion >= 2.6.12
@@ -135,11 +175,20 @@ public function testSetStringValueWithModifierXX(): void
135175
$this->assertNull($redis->set('foofoo', 'barbar', 'XX'));
136176
}
137177

178+
/**
179+
* @group connected
180+
* @group cluster
181+
* @requiresRedisVersion >= 6.0.0
182+
*/
183+
public function testSetStringValueWithModifierXXUsingCluster(): void
184+
{
185+
$this->testSetStringValueWithModifierXX();
186+
}
187+
138188
/**
139189
* @group connected
140190
* @group cluster
141191
* @requiresRedisVersion >= 3.0.0
142-
* @return void
143192
*/
144193
public function testSetStringValueInClusterMode(): void
145194
{

0 commit comments

Comments
 (0)