tidy up

Author: devosc

src/Plugin/FilterTest.php

@@ -152,14 +152,4 @@ function($foo, $baz, $bar) {
 
         $this->assertNull($app->plugin(new Filter('foo', new Param('filters.foo'), ['bar']), ['s']));
     }
-
-    /**
-     *
-     */
-    function test_resolvable_closure()
-    {
-        $maybe = new Filter(function() {});
-
-        $this->assertInstanceOf(Call::class, $maybe->config());
-    }
 }

src/Plugin/MaybeTest.php

@@ -22,19 +22,8 @@ function test()
     {
         $maybe = new Maybe('foo');
 
-        $this->assertEquals('foo', $maybe->config());
-        $this->assertEquals([], $maybe->args());
-        $this->assertEquals([[Maybe::class, 'nothing']], $maybe->filter());
-        $this->assertNull($maybe->param());
-    }
-
-    /**
-     *
-     */
-    function test_nothing()
-    {
-        $this->assertEquals('foo', Maybe::nothing('foo'));
-        $this->assertInstanceOf(Nothing::class, Maybe::nothing(null));
+        $this->assertEquals([$maybe, '__invoke'], $maybe->config());
+        $this->assertEquals(['foo'], $maybe->args());
     }
 
     /**
@@ -50,22 +39,6 @@ function test_plugin_returns_false()
         $this->assertFalse($app->plugin('foo'));
     }
 
-    /**
-     *
-     */
-    function test_plugin_returns_nothing()
-    {
-        $app = new App(['services' => [
-            'foo' => new Nothing,
-            'foobar' => new Nullable(new Plugin('foo'))
-        ]]);
-
-        $this->assertInstanceOf(Nothing::class, $app->plugin('foo'));
-        $this->assertInstanceOf(Nothing::class, $app->shared('foo'));
-        $this->assertNull($app['foobar']);
-        $this->assertNull($app->get('foobar'));
-    }
-
     /**
      *
      */

src/Plugin/NothingTest.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ *
+ */
+
+namespace Mvc5\Test\Plugin;
+
+use Mvc5\App;
+use Mvc5\Plugin\Nothing;
+use Mvc5\Test\Test\TestCase;
+
+class NothingTest
+    extends TestCase
+{
+    /**
+     *
+     */
+    function test()
+    {
+        $app = new App;
+
+        $app['foo'] = new Nothing;
+
+        $this->assertTrue(isset($app['foo']));
+        $this->assertInstanceOf(Nothing::class, $app['foo']);
+    }
+}

src/Plugin/NullableTest.php

@@ -0,0 +1,50 @@
+<?php
+/**
+ *
+ */
+
+namespace Mvc5\Test\Plugin;
+
+use Mvc5\App;
+use Mvc5\Plugin\Call;
+use Mvc5\Plugin\Maybe;
+use Mvc5\Plugin\Nullable;
+use Mvc5\Plugin\Shared;
+use Mvc5\Test\Test\TestCase;
+
+class NullableTest
+    extends TestCase
+{
+    /**
+     *
+     */
+    function test()
+    {
+        $maybe = new Nullable('foo');
+
+        $this->assertEquals([$maybe, '__invoke'], $maybe->config());
+        $this->assertEquals(['foo'], $maybe->args());
+    }
+
+    /**
+     *
+     */
+    function test_shared_null_value()
+    {
+        $count = 0;
+
+        $app = new App(['services' => [
+            'foo' => new Maybe(new Call(function() use (&$count) {
+                ++$count;
+                return null;
+            })),
+            'foobar' => new Nullable(new Shared('foo'))
+        ]]);
+
+        $this->assertNull($app->plugin('foobar'));
+        $this->assertNull($app->shared('foobar'));
+        $this->assertNull($app->get('foobar'));
+        $this->assertNull($app['foobar']);
+        $this->assertEquals(1, $count);
+    }
+}

src/Resolver/ContainerTest.php

@@ -7,11 +7,6 @@
 
 use Mvc5\App;
 use Mvc5\Config;
-use Mvc5\Plugin\Maybe;
-use Mvc5\Plugin\Nothing;
-use Mvc5\Plugin\Nullable;
-use Mvc5\Plugin\Plugin;
-use Mvc5\Plugin\Shared;
 use Mvc5\Test\Test\TestCase;
 
 class ContainerTest
@@ -193,19 +188,6 @@ function test_next_iterator()
         $this->assertEquals('bat', $app->current());
     }
 
-    /**
-     *
-     */
-    function test_nothing_isset()
-    {
-        $app = new App;
-
-        $app['foo'] = new Nothing;
-
-        $this->assertTrue(isset($app['foo']));
-        $this->assertNull(Maybe::nullable($app['foo']));
-    }
-
     /**
      *
      */
@@ -222,120 +204,17 @@ function test_null_not_isset()
     /**
      *
      */
-    function test_shared_method_returns_nothing()
-    {
-        $count = 0;
-
-        $app = new App;
-
-        $foo = $app->shared('foo', function() use(&$count) {
-            ++$count;
-            return new Nothing;
-        });
-
-        $this->assertInstanceOf(Nothing::class, $foo);
-        $this->assertNull(Maybe::nullable($app->get('foo')));
-        $this->assertNull(Maybe::nullable($app->shared('foo')));
-        $this->assertEquals(1, $count);
-    }
-
-    /**
-     *
-     */
-    function test_shared_method_returns_null()
+    function test_null_unset()
     {
         $app = new App;
 
-        $this->assertNull($app->shared('foo', function() {
-            return null;
-        }));
+        $app['foo'] = 'foobar';
 
-        $this->assertFalse($app->has('foo'));
-    }
+        $this->assertEquals('foobar', $app['foo']);
 
-    /**
-     *
-     */
-    function test_shared_maybe_plugin_returns_nothing()
-    {
-        $count = 0;
-
-        $app = new App(['services' => [
-            'foo' => new Maybe(function() use (&$count) {
-                ++$count;
-                return new Nothing;
-            }),
-            'foobar' => new Nullable(new Shared('foo'))
-        ]]);
-
-        $this->assertNull($app->plugin('foobar'));
-        $this->assertNull($app->shared('foobar'));
-        $this->assertNull($app->get('foobar'));
-        $this->assertNull($app['foobar']);
-        $this->assertEquals(1, $count);
-    }
-
-    /**
-     *
-     */
-    function test_shared_maybe_plugin_returns_null()
-    {
-        $count = 0;
-
-        $app = new App(['services' => [
-            'foo' => new Maybe(function() use (&$count) {
-                ++$count;
-                return null;
-            }),
-            'foobar' => new Nullable(new Shared('foo'))
-        ]]);
-
-        $this->assertNull($app->plugin('foobar'));
-        $this->assertNull($app->shared('foobar'));
-        $this->assertNull($app->get('foobar'));
-        $this->assertNull($app['foobar']);
-        $this->assertEquals(1, $count);
-    }
-
-    /**
-     *
-     */
-    function test_shared_plugin_returns_nothing()
-    {
-        $count = 0;
-
-        $app = new App(['services' => [
-            'foo' => new Shared('foo', function() use(&$count) {
-                ++$count;
-                return new Nothing;
-            }),
-            'foobar' => new Nullable(new Plugin('foo'))
-        ]]);
-
-        $this->assertNull($app->plugin('foobar'));
-        $this->assertNull($app->shared('foobar'));
-        $this->assertNull(Maybe::nullable($app->get('foo')));
-        $this->assertEquals(1, $count);
-    }
-
-    /**
-     *
-     */
-    function test_shared_plugin_returns_null()
-    {
-        $count = 0;
-
-        $app = new App(['services' => [
-            'foo' => new Shared('foo', function() use(&$count) {
-                ++$count;
-                return null;
-            })
-        ]]);
+        $app['foo'] = null;
 
-        $this->assertNull($app->plugin('foo'));
-        $this->assertNull($app->shared('foo'));
-        $this->assertNull($app->get('foo'));
-        $this->assertEquals(3, $count);
+        $this->assertNull($app['foo']);
     }
 
     /**