[FrameworkBundle] decouple some cache-warmer's test from internal details

Author: nicolas-grekas

Tests/CacheWarmer/SerializerCacheWarmerTest.php

@@ -14,6 +14,8 @@
 use Symfony\Bundle\FrameworkBundle\CacheWarmer\SerializerCacheWarmer;
 use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
+use Symfony\Component\Cache\Adapter\NullAdapter;
+use Symfony\Component\Cache\Adapter\PhpArrayAdapter;
 use Symfony\Component\Serializer\Mapping\Factory\CacheClassMetadataFactory;
 use Symfony\Component\Serializer\Mapping\Loader\XmlFileLoader;
 use Symfony\Component\Serializer\Mapping\Loader\YamlFileLoader;
@@ -41,12 +43,10 @@ public function testWarmUp()
 
         $this->assertFileExists($file);
 
-        $values = require $file;
+        $arrayPool = new PhpArrayAdapter($file, new NullAdapter());
 
-        $this->assertInternalType('array', $values);
-        $this->assertCount(2, $values);
-        $this->assertArrayHasKey('Symfony_Bundle_FrameworkBundle_Tests_Fixtures_Serialization_Person', $values);
-        $this->assertArrayHasKey('Symfony_Bundle_FrameworkBundle_Tests_Fixtures_Serialization_Author', $values);
+        $this->assertTrue($arrayPool->getItem('Symfony_Bundle_FrameworkBundle_Tests_Fixtures_Serialization_Person')->isHit());
+        $this->assertTrue($arrayPool->getItem('Symfony_Bundle_FrameworkBundle_Tests_Fixtures_Serialization_Author')->isHit());
 
         $values = $fallbackPool->getValues();
 
@@ -72,11 +72,6 @@ public function testWarmUpWithoutLoader()
 
         $this->assertFileExists($file);
 
-        $values = require $file;
-
-        $this->assertInternalType('array', $values);
-        $this->assertCount(0, $values);
-
         $values = $fallbackPool->getValues();
 
         $this->assertInternalType('array', $values);

Tests/CacheWarmer/ValidatorCacheWarmerTest.php

@@ -14,6 +14,9 @@
 use Symfony\Bundle\FrameworkBundle\CacheWarmer\ValidatorCacheWarmer;
 use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
+use Symfony\Component\Cache\Adapter\NullAdapter;
+use Symfony\Component\Cache\Adapter\PhpArrayAdapter;
+use Symfony\Component\Validator\Mapping\ClassMetadata;
 use Symfony\Component\Validator\ValidatorBuilder;
 
 class ValidatorCacheWarmerTest extends TestCase
@@ -36,12 +39,10 @@ public function testWarmUp()
 
         $this->assertFileExists($file);
 
-        $values = require $file;
+        $arrayPool = new PhpArrayAdapter($file, new NullAdapter());
 
-        $this->assertInternalType('array', $values);
-        $this->assertCount(2, $values);
-        $this->assertArrayHasKey('Symfony.Bundle.FrameworkBundle.Tests.Fixtures.Validation.Person', $values);
-        $this->assertArrayHasKey('Symfony.Bundle.FrameworkBundle.Tests.Fixtures.Validation.Author', $values);
+        $this->assertTrue($arrayPool->getItem('Symfony.Bundle.FrameworkBundle.Tests.Fixtures.Validation.Person')->isHit());
+        $this->assertTrue($arrayPool->getItem('Symfony.Bundle.FrameworkBundle.Tests.Fixtures.Validation.Author')->isHit());
 
         $values = $fallbackPool->getValues();
 
@@ -67,14 +68,12 @@ public function testWarmUpWithAnnotations()
 
         $this->assertFileExists($file);
 
-        $values = require $file;
+        $arrayPool = new PhpArrayAdapter($file, new NullAdapter());
 
-        $this->assertInternalType('array', $values);
-        $this->assertCount(1, $values);
-        $this->assertArrayHasKey('Symfony.Bundle.FrameworkBundle.Tests.Fixtures.Validation.Category', $values);
+        $item = $arrayPool->getItem('Symfony.Bundle.FrameworkBundle.Tests.Fixtures.Validation.Category');
+        $this->assertTrue($item->isHit());
 
-        // Simple check to make sure that at least one constraint is actually cached, in this case the "id" property Type.
-        $this->assertContains('"int"', $values['Symfony.Bundle.FrameworkBundle.Tests.Fixtures.Validation.Category']);
+        $this->assertInstanceOf(ClassMetadata::class, $item->get());
 
         $values = $fallbackPool->getValues();
 
@@ -98,11 +97,6 @@ public function testWarmUpWithoutLoader()
 
         $this->assertFileExists($file);
 
-        $values = require $file;
-
-        $this->assertInternalType('array', $values);
-        $this->assertCount(0, $values);
-
         $values = $fallbackPool->getValues();
 
         $this->assertInternalType('array', $values);