2 files changed, 1 insertions, 104 deletions
diff --git a/tests/Unit/ApplicationTest.php b/tests/Unit/ApplicationTest.php
index 77429f44..53fe3109 100644
--- a/tests/Unit/ApplicationTest.php
+++ b/tests/Unit/ApplicationTest.php
@@ -24,6 +24,7 @@ class ApplicationTest extends TestCase
         $this->assertSame($app, $app->get(Container::class));
         $this->assertSame($app, $app->get(Application::class));
         $this->assertSame($app, $app->get(ContainerInterface::class));
+        $this->assertSame($app, Application::getInstance());
         $this->assertSame($app, Container::getInstance());
     }
 }
diff --git a/tests/Unit/Container/ContainerTest.php b/tests/Unit/Container/ContainerTest.php
deleted file mode 100644
index 89c34209..00000000
--- a/tests/Unit/Container/ContainerTest.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-
-namespace Engelsystem\Test\Config;
-
-use Engelsystem\Container\Container;
-use PHPUnit\Framework\TestCase;
-
-class ContainerTest extends TestCase
-{
-    /**
-     * @covers \Engelsystem\Container\Container::get
-     */
-    public function testGet()
-    {
-        $container = new Container();
-        $class = new class
-        {
-        };
-
-        $container->instance('foo', $class);
-        $this->assertSame($class, $container->get('foo'));
-    }
-
-    /**
-     * @covers \Engelsystem\Container\Container::get
-     * @expectedException \Engelsystem\Container\NotFoundException
-     */
-    public function testGetException()
-    {
-        $container = new Container();
-
-        $container->get('not.registered.service');
-    }
-
-    /**
-     * @covers \Engelsystem\Container\Container::instance
-     * @covers \Engelsystem\Container\Container::resolve
-     */
-    public function testInstance()
-    {
-        $container = new Container();
-        $class = new class
-        {
-        };
-
-        $container->instance('foo', $class);
-        $this->assertSame($class, $container->get('foo'));
-    }
-
-    /**
-     * @covers \Engelsystem\Container\Container::has
-     */
-    public function testHas()
-    {
-        $container = new Container();
-
-        $this->assertFalse($container->has('test'));
-
-        $class = new class
-        {
-        };
-
-        $container->instance('test', $class);
-        $this->assertTrue($container->has('test'));
-    }
-
-    /**
-     * @covers \Engelsystem\Container\Container::singleton
-     */
-    public function testSingleton()
-    {
-        $container = new Container();
-        $class = new class
-        {
-        };
-
-        $container->singleton('foo', $class);
-        $this->assertSame($class, $container->get('foo'));
-        $this->assertSame($class, $container->get('foo'));
-    }
-
-    /**
-     * @covers \Engelsystem\Container\Container::setInstance
-     * @covers \Engelsystem\Container\Container::getInstance
-     */
-    public function testContainerSingleton()
-    {
-        // Ensure that no container has been initialized
-        $reflection = new \ReflectionProperty(Container::class, 'instance');
-        $reflection->setAccessible(true);
-        $reflection->setValue(null, null);
-        $reflection->setAccessible(false);
-
-        $container0 = new Container();
-        $container = Container::getInstance();
-
-        $this->assertNotSame($container0, $container);
-
-        $container1 = new Container;
-        Container::setInstance($container1);
-
-        $this->assertSame($container1, Container::getInstance());
-    }
-}