From 7446ce99c6dc47fae7af5eab3ce5df7ba3036790 Mon Sep 17 00:00:00 2001
From: TomasVotruba <tomas.vot@gmail.com>
Date: Sat, 15 Jul 2017 19:03:14 +0200
Subject: [PATCH] [tests] move AbstractReconstructorTestCase to src/Testing

---
 .../AbstractReconstructorTestCase.php         | 13 ++++++--
 tests/AbstractContainerAwareTestCase.php      | 33 -------------------
 ...notationToConstructorReconstructorTest.php |  2 +-
 3 files changed, 12 insertions(+), 36 deletions(-)
 rename {tests => src/Testing/PHPUnit}/AbstractReconstructorTestCase.php (73%)
 delete mode 100644 tests/AbstractContainerAwareTestCase.php

diff --git a/tests/AbstractReconstructorTestCase.php b/src/Testing/PHPUnit/AbstractReconstructorTestCase.php
similarity index 73%
rename from tests/AbstractReconstructorTestCase.php
rename to src/Testing/PHPUnit/AbstractReconstructorTestCase.php
index 74a6605a746..0826131a9ff 100644
--- a/tests/AbstractReconstructorTestCase.php
+++ b/src/Testing/PHPUnit/AbstractReconstructorTestCase.php
@@ -1,20 +1,29 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Tests;
+namespace Rector\Testing\PHPUnit;
 
+use PHPUnit\Framework\TestCase;
+use Psr\Container\ContainerInterface;
 use Rector\Contract\Dispatcher\ReconstructorInterface;
+use Rector\DependencyInjection\ContainerFactory;
 use Rector\Testing\Application\FileReconstructor;
 use SplFileInfo;
 
-abstract class AbstractReconstructorTestCase extends AbstractContainerAwareTestCase
+abstract class AbstractReconstructorTestCase extends TestCase
 {
     /**
      * @var FileReconstructor
      */
     private $fileReconstructor;
 
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
     protected function setUp(): void
     {
+        $this->container = (new ContainerFactory)->create();
         $this->fileReconstructor = $this->container->get(FileReconstructor::class);
     }
 
diff --git a/tests/AbstractContainerAwareTestCase.php b/tests/AbstractContainerAwareTestCase.php
deleted file mode 100644
index ae1387a8e3d..00000000000
--- a/tests/AbstractContainerAwareTestCase.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace Rector\Tests;
-
-use PHPUnit\Framework\TestCase;
-use Psr\Container\ContainerInterface;
-use Rector\DependencyInjection\ContainerFactory;
-
-abstract class AbstractContainerAwareTestCase extends TestCase
-{
-    /**
-     * @var ContainerInterface
-     */
-    protected $container;
-
-    /**
-     * @var ContainerInterface
-     */
-    private static $cachedContainer;
-
-    /**
-     * @param mixed[] $data
-     */
-    public function __construct(?string $name = null, array $data = [], string $dataName = '')
-    {
-        if (! self::$cachedContainer) {
-            self::$cachedContainer = (new ContainerFactory)->create();
-        }
-        $this->container = self::$cachedContainer;
-
-        parent::__construct($name, $data, $dataName);
-    }
-}
diff --git a/tests/Reconstructor/DependencyInjection/InjectAnnotationToConstructorReconstructorTest.php b/tests/Reconstructor/DependencyInjection/InjectAnnotationToConstructorReconstructorTest.php
index b74181abf30..8ec494c9774 100644
--- a/tests/Reconstructor/DependencyInjection/InjectAnnotationToConstructorReconstructorTest.php
+++ b/tests/Reconstructor/DependencyInjection/InjectAnnotationToConstructorReconstructorTest.php
@@ -3,7 +3,7 @@
 namespace Rector\Tests\Reconstructor\DependencyInjection;
 
 use Rector\Reconstructor\DependencyInjection\InjectAnnotationToConstructorReconstructor;
-use Rector\Tests\AbstractReconstructorTestCase;
+use Rector\Testing\PHPUnit\AbstractReconstructorTestCase;
 
 final class InjectAnnotationToConstructorReconstructorTest extends AbstractReconstructorTestCase
 {