Skip to content

Commit 61d198b

Browse files
markstorymarkstory
committed
Update tests to not use test stub.
Also try and fix sasl test on travis, which does have sasl.
1 parent 94b4174 commit 61d198b

File tree

1 file changed

+30
-54
lines changed

1 file changed

+30
-54
lines changed

‎tests/TestCase/Cache/Engine/MemcachedEngineTest.php

Lines changed: 30 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -19,34 +19,6 @@
1919
use Cake\TestSuite\TestCase;
2020
use Memcached;
2121

22-
/**
23-
* TestMemcachedEngine
24-
*/
25-
class TestMemcachedEngine extends MemcachedEngine
26-
{
27-
28-
/**
29-
* public accessor to _parseServerString
30-
*
31-
* @param string $server
32-
* @return array
33-
*/
34-
public function parseServerString($server)
35-
{
36-
return $this->_parseServerString($server);
37-
}
38-
39-
public function setMemcached($memcached)
40-
{
41-
$this->_Memcached = $memcached;
42-
}
43-
44-
public function getMemcached()
45-
{
46-
return $this->_Memcached;
47-
}
48-
}
49-
5022
/**
5123
* MemcachedEngineTest class
5224
*/
@@ -140,23 +112,23 @@ public function testConfig()
140112
*/
141113
public function testCompressionSetting()
142114
{
143-
$Memcached = new TestMemcachedEngine();
115+
$Memcached = new MemcachedEngine();
144116
$Memcached->init([
145117
'engine' => 'Memcached',
146118
'servers' => ['127.0.0.1:11211'],
147119
'compress' => false
148120
]);
149121

150-
$this->assertFalse($Memcached->getMemcached()->getOption(\Memcached::OPT_COMPRESSION));
122+
$this->assertFalse($Memcached->getOption(\Memcached::OPT_COMPRESSION));
151123

152-
$MemcachedCompressed = new TestMemcachedEngine();
124+
$MemcachedCompressed = new MemcachedEngine();
153125
$MemcachedCompressed->init([
154126
'engine' => 'Memcached',
155127
'servers' => ['127.0.0.1:11211'],
156128
'compress' => true
157129
]);
158130

159-
$this->assertTrue($MemcachedCompressed->getMemcached()->getOption(\Memcached::OPT_COMPRESSION));
131+
$this->assertTrue($MemcachedCompressed->getOption(\Memcached::OPT_COMPRESSION));
160132
}
161133

162134
/**
@@ -166,34 +138,33 @@ public function testCompressionSetting()
166138
*/
167139
public function testOptionsSetting()
168140
{
169-
$memcached = new TestMemcachedEngine();
141+
$memcached = new MemcachedEngine();
170142
$memcached->init([
171143
'engine' => 'Memcached',
172144
'servers' => ['127.0.0.1:11211'],
173145
'options' => [
174146
Memcached::OPT_BINARY_PROTOCOL => true
175147
]
176148
]);
177-
$this->assertEquals(1, $memcached->getMemcached()->getOption(Memcached::OPT_BINARY_PROTOCOL));
149+
$this->assertEquals(1, $memcached->getOption(Memcached::OPT_BINARY_PROTOCOL));
178150
}
179151

180152
/**
181153
* test accepts only valid serializer engine
182154
*
155+
* @expectedException InvalidArgumentException
156+
* @expectedExceptionMessage invalid_serializer is not a valid serializer engine for Memcached
183157
* @return void
184158
*/
185159
public function testInvalidSerializerSetting()
186160
{
187-
$Memcached = new TestMemcachedEngine();
161+
$Memcached = new MemcachedEngine();
188162
$config = [
189163
'className' => 'Memcached',
190164
'servers' => ['127.0.0.1:11211'],
191165
'persistent' => false,
192166
'serialize' => 'invalid_serializer'
193167
];
194-
195-
$this->expectException(\InvalidArgumentException::class);
196-
$this->expectExceptionMessage('invalid_serializer is not a valid serializer engine for Memcached');
197168
$Memcached->init($config);
198169
}
199170

@@ -204,7 +175,7 @@ public function testInvalidSerializerSetting()
204175
*/
205176
public function testPhpSerializerSetting()
206177
{
207-
$Memcached = new TestMemcachedEngine();
178+
$Memcached = new MemcachedEngine();
208179
$config = [
209180
'className' => 'Memcached',
210181
'servers' => ['127.0.0.1:11211'],
@@ -213,7 +184,7 @@ public function testPhpSerializerSetting()
213184
];
214185

215186
$Memcached->init($config);
216-
$this->assertEquals(Memcached::SERIALIZER_PHP, $Memcached->getMemcached()->getOption(Memcached::OPT_SERIALIZER));
187+
$this->assertEquals(Memcached::SERIALIZER_PHP, $Memcached->getOption(Memcached::OPT_SERIALIZER));
217188
}
218189

219190
/**
@@ -228,7 +199,7 @@ public function testJsonSerializerSetting()
228199
'Memcached extension is not compiled with json support'
229200
);
230201

231-
$Memcached = new TestMemcachedEngine();
202+
$Memcached = new MemcachedEngine();
232203
$config = [
233204
'engine' => 'Memcached',
234205
'servers' => ['127.0.0.1:11211'],
@@ -237,7 +208,7 @@ public function testJsonSerializerSetting()
237208
];
238209

239210
$Memcached->init($config);
240-
$this->assertEquals(Memcached::SERIALIZER_JSON, $Memcached->getMemcached()->getOption(Memcached::OPT_SERIALIZER));
211+
$this->assertEquals(Memcached::SERIALIZER_JSON, $Memcached->getOption(Memcached::OPT_SERIALIZER));
241212
}
242213

243214
/**
@@ -252,7 +223,7 @@ public function testIgbinarySerializerSetting()
252223
'Memcached extension is not compiled with igbinary support'
253224
);
254225

255-
$Memcached = new TestMemcachedEngine();
226+
$Memcached = new MemcachedEngine();
256227
$config = [
257228
'engine' => 'Memcached',
258229
'servers' => ['127.0.0.1:11211'],
@@ -261,7 +232,7 @@ public function testIgbinarySerializerSetting()
261232
];
262233

263234
$Memcached->init($config);
264-
$this->assertEquals(Memcached::SERIALIZER_IGBINARY, $Memcached->getMemcached()->getOption(Memcached::OPT_SERIALIZER));
235+
$this->assertEquals(Memcached::SERIALIZER_IGBINARY, $Memcached->getOption(Memcached::OPT_SERIALIZER));
265236
}
266237

267238
/**
@@ -276,7 +247,7 @@ public function testMsgpackSerializerSetting()
276247
'Memcached extension is not compiled with msgpack support'
277248
);
278249

279-
$Memcached = new TestMemcachedEngine();
250+
$Memcached = new MemcachedEngine();
280251
$config = [
281252
'engine' => 'Memcached',
282253
'servers' => ['127.0.0.1:11211'],
@@ -285,7 +256,7 @@ public function testMsgpackSerializerSetting()
285256
];
286257

287258
$Memcached->init($config);
288-
$this->assertEquals(Memcached::SERIALIZER_MSGPACK, $Memcached->getMemcached()->getOption(Memcached::OPT_SERIALIZER));
259+
$this->assertEquals(Memcached::SERIALIZER_MSGPACK, $Memcached->getOption(Memcached::OPT_SERIALIZER));
289260
}
290261

291262
/**
@@ -300,7 +271,7 @@ public function testJsonSerializerThrowException()
300271
'Memcached extension is compiled with json support'
301272
);
302273

303-
$Memcached = new TestMemcachedEngine();
274+
$Memcached = new MemcachedEngine();
304275
$config = [
305276
'className' => 'Memcached',
306277
'servers' => ['127.0.0.1:11211'],
@@ -325,7 +296,7 @@ public function testMsgpackSerializerThrowException()
325296
'Memcached extension is compiled with msgpack support'
326297
);
327298

328-
$Memcached = new TestMemcachedEngine();
299+
$Memcached = new MemcachedEngine();
329300
$config = [
330301
'engine' => 'Memcached',
331302
'servers' => ['127.0.0.1:11211'],
@@ -350,7 +321,7 @@ public function testIgbinarySerializerThrowException()
350321
'Memcached extension is compiled with igbinary support'
351322
);
352323

353-
$Memcached = new TestMemcachedEngine();
324+
$Memcached = new MemcachedEngine();
354325
$config = [
355326
'engine' => 'Memcached',
356327
'servers' => ['127.0.0.1:11211'],
@@ -373,15 +344,20 @@ public function testIgbinarySerializerThrowException()
373344
*/
374345
public function testSaslAuthException()
375346
{
376-
$MemcachedEngine = new TestMemcachedEngine();
347+
$this->skipIf(
348+
method_exists('setSaslAuthData', Memcached::class),
349+
'Cannot test exception when sasl has been compiled in.'
350+
);
351+
$MemcachedEngine = new MemcachedEngine();
377352
$config = [
378353
'engine' => 'Memcached',
379354
'servers' => ['127.0.0.1:11211'],
380355
'persistent' => false,
381356
'username' => 'test',
382357
'password' => 'password'
383358
];
384-
359+
$this->expectException(\InvalidArgumentException::class);
360+
$this->expectExceptionMessage('Memcached extension is not built with SASL support');
385361
$MemcachedEngine->init($config);
386362
}
387363

@@ -441,7 +417,7 @@ public function testConnectIpv6()
441417
*/
442418
public function testParseServerStringWithU()
443419
{
444-
$Memcached = new TestMemcachedEngine();
420+
$Memcached = new MemcachedEngine();
445421
$result = $Memcached->parseServerString('udomain.net:13211');
446422
$this->assertEquals(['udomain.net', '13211'], $result);
447423
}
@@ -453,7 +429,7 @@ public function testParseServerStringWithU()
453429
*/
454430
public function testParseServerStringNonLatin()
455431
{
456-
$Memcached = new TestMemcachedEngine();
432+
$Memcached = new MemcachedEngine();
457433
$result = $Memcached->parseServerString('schülervz.net:13211');
458434
$this->assertEquals(['schülervz.net', '13211'], $result);
459435

@@ -468,7 +444,7 @@ public function testParseServerStringNonLatin()
468444
*/
469445
public function testParseServerStringUnix()
470446
{
471-
$Memcached = new TestMemcachedEngine();
447+
$Memcached = new MemcachedEngine();
472448
$result = $Memcached->parseServerString('unix:///path/to/memcachedd.sock');
473449
$this->assertEquals(['/path/to/memcachedd.sock', 0], $result);
474450
}

0 commit comments

Comments
 (0)