X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Flib%2FTestCustomContainer.pm;h=8481b0c0effad16bb1e169aa7bbe0d0fee193ec8;hb=6329bfe593d5ea3891011333f7d7984b4e5e7910;hp=d7b1e6affe73c8c375c5a061a35daa5e94cb2fdc;hpb=54f4b8d1e194e2dc00d71677e3d9db03e07e76cd;p=catagits%2FCatalyst-Runtime.git

diff --git a/t/lib/TestCustomContainer.pm b/t/lib/TestCustomContainer.pm
index d7b1e6a..8481b0c 100644
--- a/t/lib/TestCustomContainer.pm
+++ b/t/lib/TestCustomContainer.pm
@@ -39,56 +39,43 @@ sub BUILD {
     require Catalyst::Test;
     Catalyst::Test->import($app);
 
-    is($app->config('container_class'), $self->container_class, 'config is set properly');
+    is($app->config->{container_class}, $self->container_class, 'config is set properly');
     isa_ok($app->container, $self->container_class, 'and container isa our container class');
 
+    # RequestLifeCycle
     {
-        # DefaultSetup ACCEPT_CONTEXT called - total: 1
-        ok(my ($res, $c) = ctx_request('/get_model_baz'), 'request');
+        # just to be sure the app is not broken
+        ok(my ($res, $ctx) = ctx_request('/'), 'request');
         ok($res->is_success, 'request 2xx');
-        is($res->content, 'TestAppCustomContainer::Model::RequestLifeCycle', 'content is expected');
+        is($res->content, 'foo', 'content is expected');
 
-        ok(my $baz = $c->container->get_sub_container('model')->resolve(service => 'RequestLifeCycle', parameters => { ctx => $c, accept_context_args => [$c] } ), 'fetching RequestLifeCycle');
-        isa_ok($baz, 'TestAppCustomContainer::Model::RequestLifeCycle');
-        is($baz->accept_context_called, 1, 'ACCEPT_CONTEXT called');
-        isa_ok($baz->foo, 'TestAppCustomContainer::Model::Foo', 'RequestLifeCycle got Foo ok');
+        ok(my $model = $ctx->container->get_sub_container('model')->resolve(service => 'RequestLifeCycle', parameters => { ctx => $ctx, accept_context_args => [$ctx] } ), 'fetching RequestLifeCycle');
+        isa_ok($model, 'TestAppCustomContainer::Model::RequestLifeCycle');
 
-        # DefaultSetup ACCEPT_CONTEXT called - total: 2
-        ok(get('/get_model_baz'), 'another request');
-        is($baz->accept_context_called, 1, 'ACCEPT_CONTEXT not called again (instance per context)');
-#        is($foo->baz_got_it, 2, 'Baz accessed Foo again');
+        ok(my $model2 = $ctx->model('RequestLifeCycle'), 'fetching RequestLifeCycle again');
+        is($model, $model2, 'object is not recreated during the same request');
+
+        # another request
+        my ($res2, $ctx2) = ctx_request('/');
+        ok($model2 = $ctx2->model('RequestLifeCycle'), 'fetching RequestLifeCycle again');
+        isnt($model, $model2, 'object is recreated in a different request');
     }
 
+    # SingletonLifeCycle
     {
-        # DefaultSetup ACCEPT_CONTEXT called - total: 3
-        ok(my ($res, $c) = ctx_request('/get_model_bar'), 'request');
-        ok($res->is_success, 'request 2xx');
-        is($res->content, 'TestAppCustomContainer::Model::Bar', 'content is expected');
+        # already tested, I only need the $ctx
+        my ($res, $ctx) = ctx_request('/');
 
-        ok(my $bar = $c->container->get_sub_container('component')->resolve(service => 'model_Bar'), 'fetching Bar');
-        isa_ok($bar, 'TestAppCustomContainer::Model::Bar');
+        ok(my $model = $ctx->container->get_sub_container('model')->resolve(service => 'SingletonLifeCycle', parameters => { ctx => $ctx, accept_context_args => [$ctx] } ), 'fetching SingletonLifeCycle');
+        isa_ok($model, 'TestAppCustomContainer::Model::SingletonLifeCycle');
 
-        # FIXME - is this expected behavior?
-        is($bar->accept_context_called, 1, 'ACCEPT_CONTEXT called');
-        isa_ok($bar->foo, 'TestAppCustomContainer::Model::Foo', 'Bar got Foo ok');
-
-        # DefaultSetup ACCEPT_CONTEXT *not* called - total: 3
-        ok(get('/get_model_bar'), 'another request');
-        is($bar->accept_context_called, 1, 'ACCEPT_CONTEXT not called again (lifecycle is Singleton)');
-#        is($foo->bar_got_it, 1, 'Bar didn\'t access Foo again');
-    }
-
-    {
-        # DefaultSetup ACCEPT_CONTEXT called - total: 4
-        ok(my ($res, $c) = ctx_request('/get_model_foo'), 'request');
-        ok($res->is_success, 'request 2xx');
-        is($res->content, 'TestAppCustomContainer::Model::Foo', 'content is expected');
+        ok(my $model2 = $ctx->model('SingletonLifeCycle'), 'fetching SingletonLifeCycle again');
+        is($model, $model2, 'object is not recreated during the same request');
 
-#        ok(my $foo = $c->container->get_sub_container('component')->resolve(service => 'model_Foo'), 'fetching Foo');
-#        isa_ok($foo, 'TestAppCustomContainer::Model::Foo');
-#        is($foo->accept_context_called, 4, 'ACCEPT_CONTEXT called');
-#        is($foo->bar_got_it, 1, 'Bar accessed Foo once');
-#        is($foo->baz_got_it, 2, 'Baz accessed Foo twice');
+        # another request
+        my ($res2, $ctx2) = ctx_request('/');
+        ok($model2 = $ctx2->model('SingletonLifeCycle'), 'fetching SingletonLifeCycle again');
+        is($model, $model2, 'object is not recreated in a different request');
     }
 
     done_testing;