Add test

dunglas · dunglas · commit 7988dec6500f · 2016-01-19T23:22:00.000+01:00
diff --git a/src/Symfony/Component/Serializer/Mapping/Factory/CacheClassMetadataFactory.php b/src/Symfony/Component/Serializer/Mapping/Factory/CacheClassMetadataFactory.php
@@ -18,7 +18,7 @@
  *
  * @author Kévin Dunglas <dunglas@gmail.com>
  */
-class Psr6CacheDecorator implements ClassMetadataFactoryInterface
+class CacheClassMetadataFactory implements ClassMetadataFactoryInterface
 {
     use ClassResolverTrait;
 
diff --git a/src/Symfony/Component/Serializer/Tests/Mapping/Factory/CacheMetadataFactoryTest.php b/src/Symfony/Component/Serializer/Tests/Mapping/Factory/CacheMetadataFactoryTest.php
@@ -0,0 +1,65 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Tests\Mapping\Factory;
+
+use Symfony\Component\Cache\Adapter\ArrayAdapter;
+use Symfony\Component\Serializer\Mapping\ClassMetadata;
+use Symfony\Component\Serializer\Mapping\Factory\CacheClassMetadataFactory;
+
+/**
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+class CacheMetadataFactoryTest extends \PHPUnit_Framework_TestCase
+{
+    public function testGetMetadataFor()
+    {
+        $metadata = new ClassMetadata('Symfony\Component\Serializer\Tests\Fixtures\Dummy');
+
+        $decorated = $this->getMock('Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface');
+        $decorated
+            ->expects($this->once())
+            ->method('getMetadataFor')
+            ->will($this->returnValue($metadata))
+        ;
+
+        $factory = new CacheClassMetadataFactory($decorated, new ArrayAdapter());
+
+        $this->assertEquals($metadata, $factory->getMetadataFor('Symfony\Component\Serializer\Tests\Fixtures\Dummy'));
+        // The second call should retrieve the value from the cache
+        $this->assertEquals($metadata, $factory->getMetadataFor('Symfony\Component\Serializer\Tests\Fixtures\Dummy'));
+    }
+
+    public function testHasMetadataFor()
+    {
+        $decorated = $this->getMock('Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface');
+        $decorated
+            ->expects($this->once())
+            ->method('hasMetadataFor')
+            ->will($this->returnValue(true))
+        ;
+
+        $factory = new CacheClassMetadataFactory($decorated, new ArrayAdapter());
+
+        $this->assertTrue($factory->hasMetadataFor('Symfony\Component\Serializer\Tests\Fixtures\Dummy'));
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Serializer\Exception\InvalidArgumentException
+     */
+    public function testInvalidClassThrowsException()
+    {
+        $decorated = $this->getMock('Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface');
+        $factory = new CacheClassMetadataFactory($decorated, new ArrayAdapter());
+
+        $factory->getMetadataFor('Not\Exist');
+    }
+}
diff --git a/src/Symfony/Component/Serializer/Tests/Mapping/Factory/ClassMetadataFactoryTest.php b/src/Symfony/Component/Serializer/Tests/Mapping/Factory/ClassMetadataFactoryTest.php
@@ -25,7 +25,7 @@ class ClassMetadataFactoryTest extends \PHPUnit_Framework_TestCase
     public function testInterface()
     {
         $classMetadata = new ClassMetadataFactory(new LoaderChain(array()));
-        $this->assertInstanceOf('Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory', $classMetadata);
+        $this->assertInstanceOf('Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface', $classMetadata);
     }
 
     public function testGetMetadataFor()
diff --git a/src/Symfony/Component/Serializer/composer.json b/src/Symfony/Component/Serializer/composer.json
@@ -22,15 +22,17 @@
         "symfony/yaml": "~2.8|~3.0",
         "symfony/config": "~2.8|~3.0",
         "symfony/property-access": "~2.8|~3.0",
+        "symfony/cache": "~3.1",
         "doctrine/annotations": "~1.0",
         "doctrine/cache": "~1.0"
     },
     "suggest": {
-        "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
-        "doctrine/cache": "For using the default cached annotation reader and metadata cache.",
+        "symfony/cache": "For using the metadata cache.",
         "symfony/yaml": "For using the default YAML mapping loader.",
         "symfony/config": "For using the XML mapping loader.",
-        "symfony/property-access": "For using the ObjectNormalizer."
+        "symfony/property-access": "For using the ObjectNormalizer.",
+        "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
+        "doctrine/cache": "For using the default cached annotation reader and metadata cache."
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Serializer\\": "" },

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`*`
`19`	`19`	`* @author Kévin Dunglas <dunglas@gmail.com>`
`20`	`20`	`*/`
`21`		`-class Psr6CacheDecorator implements ClassMetadataFactoryInterface`
	`21`	`+class CacheClassMetadataFactory implements ClassMetadataFactoryInterface`
`22`	`22`	`{`
`23`	`23`	`use ClassResolverTrait;`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class ClassMetadataFactoryTest extends \PHPUnit_Framework_TestCase`
`25`	`25`	`public function testInterface()`
`26`	`26`	`{`
`27`	`27`	`$classMetadata = new ClassMetadataFactory(new LoaderChain(array()));`
`28`		`- $this->assertInstanceOf('Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory', $classMetadata);`
	`28`	`+ $this->assertInstanceOf('Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface', $classMetadata);`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`public function testGetMetadataFor()`