#53 Removed useless/duplicate tests

PHP-DI · Apr 7, 2013 · dd4de2a · dd4de2a
1 parent 23f19fe
commit dd4de2a
Show file tree

Hide file tree

Showing 16 changed files with 10 additions and 430 deletions.
diff --git a/tests/IntegrationTests/DI/ConstructorInjectionTest.php b/tests/IntegrationTests/DI/ConstructorInjectionTest.php
@@ -22,31 +22,6 @@ public function setUp()
     {
         // Reset the singleton instance to ensure all tests are independent
         Container::reset();
-        $container = Container::getInstance();
-        $container->getConfiguration()->addDefinitions(
-            array(
-                'IntegrationTests\DI\Fixtures\ConstructorInjectionTest\Interface1' => array(
-                    'class' => 'IntegrationTests\DI\Fixtures\ConstructorInjectionTest\Class3',
-                )
-            )
-        );
-    }
-
-    public function testBasicInjection()
-    {
-        /** @var $class1 Class1 */
-        $class1 = Container::getInstance()->get('IntegrationTests\DI\Fixtures\ConstructorInjectionTest\Class1');
-        $dependency = $class1->getDependency();
-        $this->assertInstanceOf('IntegrationTests\DI\Fixtures\ConstructorInjectionTest\Class2', $dependency);
-    }
-
-    public function testInterfaceInjection()
-    {
-        /** @var $class1 Class1 */
-        $class1 = Container::getInstance()->get('IntegrationTests\DI\Fixtures\ConstructorInjectionTest\Class1');
-        $dependency = $class1->getInterface1();
-        $this->assertInstanceOf('IntegrationTests\DI\Fixtures\ConstructorInjectionTest\Interface1', $dependency);
-        $this->assertInstanceOf('IntegrationTests\DI\Fixtures\ConstructorInjectionTest\Class3', $dependency);
     }
 
     /**

diff --git a/tests/IntegrationTests/DI/Fixtures/ConstructorInjectionTest/Buggy1.php b/tests/IntegrationTests/DI/Fixtures/ConstructorInjectionTest/Buggy1.php
@@ -9,30 +9,15 @@
 
 namespace IntegrationTests\DI\Fixtures\ConstructorInjectionTest;
 
-use IntegrationTests\DI\Fixtures\ConstructorInjectionTest\Class2;
-
 /**
  * Fixture class
  */
 class Buggy1
 {
 
-    /**
-     * @var Class2
-     */
-    private $dependency;
-
     public function __construct($dependency)
     {
         $this->dependency = $dependency;
     }
 
-    /**
-     * @return Class2
-     */
-    public function getDependency()
-    {
-        return $this->dependency;
-    }
-
 }
diff --git a/tests/IntegrationTests/DI/Fixtures/ConstructorInjectionTest/Class1.php b/tests/IntegrationTests/DI/Fixtures/ConstructorInjectionTest/Class1.php
diff --git a/tests/IntegrationTests/DI/Fixtures/ConstructorInjectionTest/Class2.php b/tests/IntegrationTests/DI/Fixtures/ConstructorInjectionTest/Class2.php
diff --git a/tests/IntegrationTests/DI/Fixtures/ConstructorInjectionTest/Class3.php b/tests/IntegrationTests/DI/Fixtures/ConstructorInjectionTest/Class3.php
diff --git a/tests/IntegrationTests/DI/Fixtures/ConstructorInjectionTest/Interface1.php b/tests/IntegrationTests/DI/Fixtures/ConstructorInjectionTest/Interface1.php
diff --git a/tests/IntegrationTests/DI/Fixtures/PropertyInjectionTest/Class1.php b/tests/IntegrationTests/DI/Fixtures/PropertyInjectionTest/Class1.php
diff --git a/tests/IntegrationTests/DI/Fixtures/SetterInjectionTest/Buggy1.php b/tests/IntegrationTests/DI/Fixtures/SetterInjectionTest/Buggy1.php
@@ -10,19 +10,13 @@
 namespace IntegrationTests\DI\Fixtures\SetterInjectionTest;
 
 use DI\Annotation\Inject;
-use IntegrationTests\DI\Fixtures\SetterInjectionTest\Class2;
 
 /**
  * Fixture class
  */
 class Buggy1
 {
 
-    /**
-     * @var Class2
-     */
-    private $dependency;
-
     /**
      * @Inject
      * @param $dependency
@@ -32,12 +26,4 @@ public function setDependency($dependency)
         $this->dependency = $dependency;
     }
 
-    /**
-     * @return Class2
-     */
-    public function getDependency()
-    {
-        return $this->dependency;
-    }
-
 }
diff --git a/tests/IntegrationTests/DI/Fixtures/SetterInjectionTest/Class1.php b/tests/IntegrationTests/DI/Fixtures/SetterInjectionTest/Class1.php
diff --git a/tests/IntegrationTests/DI/Fixtures/SetterInjectionTest/NamedBean.php b/tests/IntegrationTests/DI/Fixtures/SetterInjectionTest/NamedBean.php
diff --git a/tests/IntegrationTests/DI/Fixtures/SetterInjectionTest/NamedInjectionClass.php b/tests/IntegrationTests/DI/Fixtures/SetterInjectionTest/NamedInjectionClass.php
@@ -20,11 +20,6 @@ class NamedInjectionClass
     /**
      * @Inject(name="namedDependency")
      */
-    private $dependency;
-
-    public function getDependency()
-    {
-        return $this->dependency;
-    }
+    public $dependency;
 
 }
diff --git a/tests/IntegrationTests/DI/Fixtures/ValueInjectionTest/ValueInjectionClass.php b/tests/IntegrationTests/DI/Fixtures/ValueInjectionTest/ValueInjectionClass.php
@@ -21,14 +21,6 @@ class ValueInjectionClass
      * @Inject("db.host")
      * @var string
      */
-    private $value;
-
-    /**
-     * @return string
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
+    public $value;
 
 }
diff --git a/tests/IntegrationTests/DI/PreConstructorInjectionTest.php b/tests/IntegrationTests/DI/PreConstructorInjectionTest.php
@@ -18,15 +18,9 @@
 class PreConstructorInjectionInjectionTest extends \PHPUnit_Framework_TestCase
 {
 
-    public function setUp()
-    {
-        // Reset the singleton instance to ensure all tests are independent
-        Container::reset();
-    }
-
     public function testDependenciesAreInjectedBeforeConstructorIsCalled()
     {
-        $container = Container::getInstance();
+        $container = new Container();
         /** @var $class1 Class1 */
         $class1 = $container->get('IntegrationTests\DI\Fixtures\PreConstructorInjection\Class1');
         $this->assertTrue($class1->dependencyInjected);