Updated to use zend-container-config-test library

All these tests implemented here previously for shared services are moved into separate library so it should be used instead.
zendframework · Apr 16, 2018 · b8b1525 · b8b1525
1 parent e80999b
commit b8b1525
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 85 deletions.
diff --git a/composer.json b/composer.json
@@ -30,7 +30,8 @@
         "ocramius/proxy-manager": "^2.1.1",
         "phpbench/phpbench": "^0.13.0",
         "phpunit/phpunit": "^6.4.4",
-        "zendframework/zend-coding-standard": "~1.0.0"
+        "zendframework/zend-coding-standard": "~1.0.0",
+        "zendframework/zend-container-config-test": "^0.2.1"
     },
     "provide": {
         "psr/container-implementation": "^1.0"

diff --git a/composer.lock b/composer.lock
diff --git a/test/ContainerTest.php b/test/ContainerTest.php
@@ -7,93 +7,16 @@
 
 namespace ZendTest\ServiceManager;
 
-use PHPUnit\Framework\TestCase;
+use Psr\Container\ContainerInterface;
+use Zend\ContainerConfigTest\AbstractExpressiveContainerConfigTest;
+use Zend\ContainerConfigTest\SharedTestTrait;
 use Zend\ServiceManager\ServiceManager;
 
-class ContainerTest extends TestCase
+class ContainerTest extends AbstractExpressiveContainerConfigTest
 {
-    public function config()
-    {
-        yield 'factories' => [['factories' => ['service' => TestAsset\SampleFactory::class]]];
-        yield 'invokables' => [['invokables' => ['service' => TestAsset\InvokableObject::class]]];
-        yield 'aliases-invokables' => [
-            [
-                'aliases' => ['service' => TestAsset\InvokableObject::class],
-                'invokables' => [TestAsset\InvokableObject::class => TestAsset\InvokableObject::class],
-            ],
-        ];
-        yield 'aliases-factories' => [
-            [
-                'aliases' => ['service' => TestAsset\InvokableObject::class],
-                'factories' => [TestAsset\InvokableObject::class => TestAsset\SampleFactory::class],
-            ],
-        ];
-    }
-
-    /**
-     * @dataProvider config
-     */
-    public function testIsSharedByDefault(array $config)
-    {
-        $container = $this->createContainer($config);
-
-        $service1 = $container->get('service');
-        $service2 = $container->get('service');
-
-        $this->assertSame($service1, $service2);
-    }
-
-    /**
-     * @dataProvider config
-     */
-    public function testCanDisableSharedByDefault(array $config)
-    {
-        $container = $this->createContainer(array_merge($config, [
-            'shared_by_default' => false,
-        ]));
-
-        $service1 = $container->get('service');
-        $service2 = $container->get('service');
-
-        $this->assertNotSame($service1, $service2);
-    }
-
-    /**
-     * @dataProvider config
-     */
-    public function testCanDisableSharedForSingleService(array $config)
-    {
-        $container = $this->createContainer(array_merge($config, [
-            'shared' => [
-                'service' => false,
-            ],
-        ]));
-
-        $service1 = $container->get('service');
-        $service2 = $container->get('service');
-
-        $this->assertNotSame($service1, $service2);
-    }
-
-    /**
-     * @dataProvider config
-     */
-    public function testCanEnableSharedForSingleService(array $config)
-    {
-        $container = $this->createContainer(array_merge($config, [
-            'shared_by_default' => false,
-            'shared' => [
-                'service' => true,
-            ],
-        ]));
-
-        $service1 = $container->get('service');
-        $service2 = $container->get('service');
-
-        $this->assertSame($service1, $service2);
-    }
+    use SharedTestTrait;
 
-    private function createContainer(array $config)
+    protected function createContainer(array $config) : ContainerInterface
     {
         return new ServiceManager($config);
     }