X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Flib%2FTestAppCustomContainer%2FNoSugarContainer.pm;h=f4ad4d648a325d2d99576a569a530f8301051a2f;hb=7230e93f36be5b4b197a0c5acc26af07c4680ec0;hp=cfb5e36cd6a0cd890a91e73c2e1f63345a34f424;hpb=ced6f9e2e0e0b6e04249634b1ce8455bba9aa959;p=catagits%2FCatalyst-Runtime.git

diff --git a/t/lib/TestAppCustomContainer/NoSugarContainer.pm b/t/lib/TestAppCustomContainer/NoSugarContainer.pm
index cfb5e36..f4ad4d6 100644
--- a/t/lib/TestAppCustomContainer/NoSugarContainer.pm
+++ b/t/lib/TestAppCustomContainer/NoSugarContainer.pm
@@ -10,74 +10,77 @@ sub BUILD {
 
     $self->get_sub_container('model')->add_service(
         Catalyst::IOC::ConstructorInjection->new(
-            name             => 'Bar',
+            name             => 'SingletonLifeCycle',
             lifecycle        => 'Singleton',
-            class            => 'TestAppCustomContainer::Model::Bar',
+            class            => 'TestAppCustomContainer::Model::SingletonLifeCycle',
+            catalyst_component_name => 'TestAppCustomContainer::Model::SingletonLifeCycle',
             dependencies     => {
-                application_name => depends_on( '/application_name' ),
-                config => depends_on( '/config' ),
-                foo => depends_on('/model/Foo'),
+                application => depends_on( '/application' ),
             },
         )
     );
 
     $self->get_sub_container('model')->add_service(
-        # FIXME - i think it should be a ConstructorInjection
-        # but only BlockInjection gets ctx parameter
-        Catalyst::IOC::BlockInjection->new(
-            name         => 'Baz',
+        Catalyst::IOC::ConstructorInjection->new(
+            name         => 'RequestLifeCycle',
             lifecycle    => '+Catalyst::IOC::LifeCycle::Request',
-            dependencies => [
-                Bread::Board::Dependency->new(
-                    service_name => 'foo',
-                    service_path => 'Foo',
-
-                    # FIXME - same as above
-                    service_params => {
-                        ctx => +{},
-                        accept_context_args => [ +{} ],
-                    },
-                ),
-            ],
-            block => sub {
-                TestAppCustomContainer::Model::Baz->new(foo => shift->param('foo'));
+            class        => 'TestAppCustomContainer::Model::RequestLifeCycle',
+            catalyst_component_name => 'TestAppCustomContainer::Model::RequestLifeCycle',
+            dependencies => {
+                application => depends_on( '/application' ),
             },
         )
     );
 
-    $self->get_sub_container('model')->add_service(
-        Catalyst::IOC::BlockInjection->new(
-            name         => 'Quux',
-            lifecycle    => 'Singleton',
-            dependencies => [
-                depends_on( '/component/model_Quux' ),
-            ],
-            block => sub { shift->param('model_Bar') },
-        )
-    );
+#    $self->get_sub_container('model')->add_service(
+#        Catalyst::IOC::ConstructorInjection->new(
+#            name             => 'DependsOnDefaultSetup',
+#            class            => 'TestAppCustomContainer::Model::DependsOnDefaultSetup',
+#            catalyst_component_name => 'TestAppCustomContainer::Model::DependsOnDefaultSetup',
+#            dependencies     => {
+#                application => depends_on( '/application' ),
+#                # FIXME - this is what is blowing up everything:
+#                # DefaultSetup needs the context. It's not getting it here!
+#                foo => depends_on('/model/DefaultSetup'),
+#            },
+#        )
+#    );
 
-    $self->get_sub_container('component')->add_service(
-        Catalyst::IOC::ConstructorInjection->new(
-            name         => 'model_Fnar',
-            lifecycle    => 'Singleton',
-            class        => 'TestAppCustomContainer::External::Class',
-            dependencies => [
-                depends_on( '/application_name' ),
-                depends_on( '/config' ),
-            ],
-        )
-    );
-    $self->get_sub_container('model')->add_service(
-        Catalyst::IOC::BlockInjection->new(
-            name         => 'model_Fnar',
-            lifecycle    => 'Singleton',
-            dependencies => [
-                depends_on( '/config' ),
-                depends_on( '/component/model_Fnar' ),
-            ],
-            block => sub { shift->param('model_Fnar') },
-        )
-    );
+# Broken deps!?!
+#    $self->get_sub_container('model')->add_service(
+#        Catalyst::IOC::BlockInjection->new(
+#            name         => 'Quux',
+#            lifecycle    => 'Singleton',
+#            dependencies => [
+#                depends_on( '/component/model_Quux' ),
+#            ],
+#            block => sub { shift->param('model_Bar') },
+#        )
+#    );
+
+#    my $fnar_config = $self->resolve(service => 'config')->{'Model::Fnar'} || {};
+#    $self->get_sub_container('component')->add_service(
+#        Catalyst::IOC::ConstructorInjection->new(
+#            name         => 'model_Fnar',
+#            lifecycle    => 'Singleton',
+#            class        => 'TestAppCustomContainer::External::Class',
+#            dependencies => [
+#                depends_on( '/application' ),
+#            ],
+#            config => $fnar_config,
+#        )
+#    );
+#    $self->get_sub_container('model')->add_service(
+#        Catalyst::IOC::BlockInjection->new(
+#            name         => 'model_Fnar',
+#            lifecycle    => 'Singleton',
+#            dependencies => [
+#                depends_on( '/config' ),
+#                depends_on( '/component/model_Fnar' ),
+#            ],
+#            block => sub { shift->param('model_Fnar') },
+#        )
+#    );
 }
 
 __PACKAGE__->meta->make_immutable;