diff --git a/tests/TestCase/Cache/Engine/MemcachedEngineTest.php b/tests/TestCase/Cache/Engine/MemcachedEngineTest.php index ffa769286bd..4adb6ac87e9 100644 --- a/tests/TestCase/Cache/Engine/MemcachedEngineTest.php +++ b/tests/TestCase/Cache/Engine/MemcachedEngineTest.php @@ -19,34 +19,6 @@ use Cake\TestSuite\TestCase; use Memcached; -/** - * TestMemcachedEngine - */ -class TestMemcachedEngine extends MemcachedEngine -{ - - /** - * public accessor to _parseServerString - * - * @param string $server - * @return array - */ - public function parseServerString($server) - { - return $this->_parseServerString($server); - } - - public function setMemcached($memcached) - { - $this->_Memcached = $memcached; - } - - public function getMemcached() - { - return $this->_Memcached; - } -} - /** * MemcachedEngineTest class */ @@ -140,23 +112,23 @@ public function testConfig() */ public function testCompressionSetting() { - $Memcached = new TestMemcachedEngine(); + $Memcached = new MemcachedEngine(); $Memcached->init([ 'engine' => 'Memcached', 'servers' => ['127.0.0.1:11211'], 'compress' => false ]); - $this->assertFalse($Memcached->getMemcached()->getOption(\Memcached::OPT_COMPRESSION)); + $this->assertFalse($Memcached->getOption(\Memcached::OPT_COMPRESSION)); - $MemcachedCompressed = new TestMemcachedEngine(); + $MemcachedCompressed = new MemcachedEngine(); $MemcachedCompressed->init([ 'engine' => 'Memcached', 'servers' => ['127.0.0.1:11211'], 'compress' => true ]); - $this->assertTrue($MemcachedCompressed->getMemcached()->getOption(\Memcached::OPT_COMPRESSION)); + $this->assertTrue($MemcachedCompressed->getOption(\Memcached::OPT_COMPRESSION)); } /** @@ -166,7 +138,7 @@ public function testCompressionSetting() */ public function testOptionsSetting() { - $memcached = new TestMemcachedEngine(); + $memcached = new MemcachedEngine(); $memcached->init([ 'engine' => 'Memcached', 'servers' => ['127.0.0.1:11211'], @@ -174,26 +146,25 @@ public function testOptionsSetting() Memcached::OPT_BINARY_PROTOCOL => true ] ]); - $this->assertEquals(1, $memcached->getMemcached()->getOption(Memcached::OPT_BINARY_PROTOCOL)); + $this->assertEquals(1, $memcached->getOption(Memcached::OPT_BINARY_PROTOCOL)); } /** * test accepts only valid serializer engine * + * @expectedException InvalidArgumentException + * @expectedExceptionMessage invalid_serializer is not a valid serializer engine for Memcached * @return void */ public function testInvalidSerializerSetting() { - $Memcached = new TestMemcachedEngine(); + $Memcached = new MemcachedEngine(); $config = [ 'className' => 'Memcached', 'servers' => ['127.0.0.1:11211'], 'persistent' => false, 'serialize' => 'invalid_serializer' ]; - - $this->expectException(\InvalidArgumentException::class); - $this->expectExceptionMessage('invalid_serializer is not a valid serializer engine for Memcached'); $Memcached->init($config); } @@ -204,7 +175,7 @@ public function testInvalidSerializerSetting() */ public function testPhpSerializerSetting() { - $Memcached = new TestMemcachedEngine(); + $Memcached = new MemcachedEngine(); $config = [ 'className' => 'Memcached', 'servers' => ['127.0.0.1:11211'], @@ -213,7 +184,7 @@ public function testPhpSerializerSetting() ]; $Memcached->init($config); - $this->assertEquals(Memcached::SERIALIZER_PHP, $Memcached->getMemcached()->getOption(Memcached::OPT_SERIALIZER)); + $this->assertEquals(Memcached::SERIALIZER_PHP, $Memcached->getOption(Memcached::OPT_SERIALIZER)); } /** @@ -228,7 +199,7 @@ public function testJsonSerializerSetting() 'Memcached extension is not compiled with json support' ); - $Memcached = new TestMemcachedEngine(); + $Memcached = new MemcachedEngine(); $config = [ 'engine' => 'Memcached', 'servers' => ['127.0.0.1:11211'], @@ -237,7 +208,7 @@ public function testJsonSerializerSetting() ]; $Memcached->init($config); - $this->assertEquals(Memcached::SERIALIZER_JSON, $Memcached->getMemcached()->getOption(Memcached::OPT_SERIALIZER)); + $this->assertEquals(Memcached::SERIALIZER_JSON, $Memcached->getOption(Memcached::OPT_SERIALIZER)); } /** @@ -252,7 +223,7 @@ public function testIgbinarySerializerSetting() 'Memcached extension is not compiled with igbinary support' ); - $Memcached = new TestMemcachedEngine(); + $Memcached = new MemcachedEngine(); $config = [ 'engine' => 'Memcached', 'servers' => ['127.0.0.1:11211'], @@ -261,7 +232,7 @@ public function testIgbinarySerializerSetting() ]; $Memcached->init($config); - $this->assertEquals(Memcached::SERIALIZER_IGBINARY, $Memcached->getMemcached()->getOption(Memcached::OPT_SERIALIZER)); + $this->assertEquals(Memcached::SERIALIZER_IGBINARY, $Memcached->getOption(Memcached::OPT_SERIALIZER)); } /** @@ -276,7 +247,7 @@ public function testMsgpackSerializerSetting() 'Memcached extension is not compiled with msgpack support' ); - $Memcached = new TestMemcachedEngine(); + $Memcached = new MemcachedEngine(); $config = [ 'engine' => 'Memcached', 'servers' => ['127.0.0.1:11211'], @@ -285,7 +256,7 @@ public function testMsgpackSerializerSetting() ]; $Memcached->init($config); - $this->assertEquals(Memcached::SERIALIZER_MSGPACK, $Memcached->getMemcached()->getOption(Memcached::OPT_SERIALIZER)); + $this->assertEquals(Memcached::SERIALIZER_MSGPACK, $Memcached->getOption(Memcached::OPT_SERIALIZER)); } /** @@ -300,7 +271,7 @@ public function testJsonSerializerThrowException() 'Memcached extension is compiled with json support' ); - $Memcached = new TestMemcachedEngine(); + $Memcached = new MemcachedEngine(); $config = [ 'className' => 'Memcached', 'servers' => ['127.0.0.1:11211'], @@ -325,7 +296,7 @@ public function testMsgpackSerializerThrowException() 'Memcached extension is compiled with msgpack support' ); - $Memcached = new TestMemcachedEngine(); + $Memcached = new MemcachedEngine(); $config = [ 'engine' => 'Memcached', 'servers' => ['127.0.0.1:11211'], @@ -350,7 +321,7 @@ public function testIgbinarySerializerThrowException() 'Memcached extension is compiled with igbinary support' ); - $Memcached = new TestMemcachedEngine(); + $Memcached = new MemcachedEngine(); $config = [ 'engine' => 'Memcached', 'servers' => ['127.0.0.1:11211'], @@ -373,7 +344,11 @@ public function testIgbinarySerializerThrowException() */ public function testSaslAuthException() { - $MemcachedEngine = new TestMemcachedEngine(); + $this->skipIf( + method_exists('setSaslAuthData', Memcached::class), + 'Cannot test exception when sasl has been compiled in.' + ); + $MemcachedEngine = new MemcachedEngine(); $config = [ 'engine' => 'Memcached', 'servers' => ['127.0.0.1:11211'], @@ -381,7 +356,8 @@ public function testSaslAuthException() 'username' => 'test', 'password' => 'password' ]; - + $this->expectException(\InvalidArgumentException::class); + $this->expectExceptionMessage('Memcached extension is not built with SASL support'); $MemcachedEngine->init($config); } @@ -441,7 +417,7 @@ public function testConnectIpv6() */ public function testParseServerStringWithU() { - $Memcached = new TestMemcachedEngine(); + $Memcached = new MemcachedEngine(); $result = $Memcached->parseServerString('udomain.net:13211'); $this->assertEquals(['udomain.net', '13211'], $result); } @@ -453,7 +429,7 @@ public function testParseServerStringWithU() */ public function testParseServerStringNonLatin() { - $Memcached = new TestMemcachedEngine(); + $Memcached = new MemcachedEngine(); $result = $Memcached->parseServerString('schülervz.net:13211'); $this->assertEquals(['schülervz.net', '13211'], $result); @@ -468,7 +444,7 @@ public function testParseServerStringNonLatin() */ public function testParseServerStringUnix() { - $Memcached = new TestMemcachedEngine(); + $Memcached = new MemcachedEngine(); $result = $Memcached->parseServerString('unix:///path/to/memcachedd.sock'); $this->assertEquals(['/path/to/memcachedd.sock', 0], $result); }