we can reuse the same test app for container with and without sugar

diff --git a/t/lib/TestAppCustomContainerNoSugar.pm b/t/lib/TestAppCustomContainer.pm
similarity index 54%
rename from t/lib/TestAppCustomContainerNoSugar.pm
rename to t/lib/TestAppCustomContainer.pm
index 3dc475b..eb57069 100644 (file)
--- a/t/lib/TestAppCustomContainerNoSugar.pm
+++ b/t/lib/TestAppCustomContainer.pm
@@ -1,7 +1,8 @@
-package TestAppCustomContainerNoSugar;
+package TestAppCustomContainer;
 use Moose;
 use Catalyst;
 extends 'Catalyst';
+use namespace::autoclean;
 
 __PACKAGE__->setup;
 

diff --git a/t/lib/TestAppCustomContainerNoSugar/Controller/Root.pm b/t/lib/TestAppCustomContainer/Controller/Root.pm
similarity index 63%
rename from t/lib/TestAppCustomContainerNoSugar/Controller/Root.pm
rename to t/lib/TestAppCustomContainer/Controller/Root.pm
index 0bc72b3..891a63a 100644 (file)
--- a/t/lib/TestAppCustomContainerNoSugar/Controller/Root.pm
+++ b/t/lib/TestAppCustomContainer/Controller/Root.pm
@@ -1,4 +1,4 @@
-package TestAppCustomContainerNoSugar::Controller::Root;
+package TestAppCustomContainer::Controller::Root;
 use Moose;
 BEGIN { extends 'Catalyst::Controller' }
 

diff --git a/t/lib/TestAppCustomContainerNoSugar/Model/Bar.pm b/t/lib/TestAppCustomContainer/Model/Bar.pm
similarity index 63%
rename from t/lib/TestAppCustomContainerNoSugar/Model/Bar.pm
rename to t/lib/TestAppCustomContainer/Model/Bar.pm
index cad3286..4e79b36 100644 (file)
--- a/t/lib/TestAppCustomContainerNoSugar/Model/Bar.pm
+++ b/t/lib/TestAppCustomContainer/Model/Bar.pm
@@ -1,4 +1,4 @@
-package TestAppCustomContainerNoSugar::Model::Bar;
+package TestAppCustomContainer::Model::Bar;
 use Moose;
 extends 'Catalyst::Model';
 

diff --git a/t/lib/TestAppCustomContainerNoSugar/Model/Baz.pm b/t/lib/TestAppCustomContainer/Model/Baz.pm
similarity index 63%
rename from t/lib/TestAppCustomContainerNoSugar/Model/Baz.pm
rename to t/lib/TestAppCustomContainer/Model/Baz.pm
index 06913de..bb525ac 100644 (file)
--- a/t/lib/TestAppCustomContainerNoSugar/Model/Baz.pm
+++ b/t/lib/TestAppCustomContainer/Model/Baz.pm
@@ -1,4 +1,4 @@
-package TestAppCustomContainerNoSugar::Model::Baz;
+package TestAppCustomContainer::Model::Baz;
 use Moose;
 extends 'Catalyst::Model';
 

diff --git a/t/lib/TestAppCustomContainerNoSugar/Model/Foo.pm b/t/lib/TestAppCustomContainer/Model/Foo.pm
similarity index 63%
rename from t/lib/TestAppCustomContainerNoSugar/Model/Foo.pm
rename to t/lib/TestAppCustomContainer/Model/Foo.pm
index 3b32cb9..e1341d3 100644 (file)
--- a/t/lib/TestAppCustomContainerNoSugar/Model/Foo.pm
+++ b/t/lib/TestAppCustomContainer/Model/Foo.pm
@@ -1,4 +1,4 @@
-package TestAppCustomContainerNoSugar::Model::Foo;
+package TestAppCustomContainer::Model::Foo;
 use Moose;
 extends 'Catalyst::Model';
 

diff --git a/t/lib/TestAppCustomContainerNoSugar/Container.pm b/t/lib/TestAppCustomContainer/NoSugarContainer.pm
similarity index 83%
copy from t/lib/TestAppCustomContainerNoSugar/Container.pm
copy to t/lib/TestAppCustomContainer/NoSugarContainer.pm
index d8f3bde..8fb17eb 100644 (file)
--- a/t/lib/TestAppCustomContainerNoSugar/Container.pm
+++ b/t/lib/TestAppCustomContainer/NoSugarContainer.pm
@@ -1,5 +1,7 @@
-package TestAppCustomContainerNoSugar::Container;
+package TestAppCustomContainer::NoSugarContainer;
 use Moose;
+use namespace::autoclean;
+use Catalyst::IOC;
 
 extends 'Catalyst::IOC::Container';
 
@@ -8,7 +10,7 @@ sub BUILD {
     $self->get_sub_container('component')->add_service(
         Catalyst::IOC::ConstructorInjection->new(
             name         => 'model_Baz',
-            class        => 'TestAppCustomContainerNoSugar::Model::Baz',
+            class        => 'TestAppCustomContainer::Model::Baz',
             lifecycle    => 'InstancePerContext',
             dependencies => [
                 depends_on( '/application_name' ),
@@ -34,4 +36,6 @@ sub BUILD {
     );
 }
 
+__PACKAGE__->meta->make_immutable;
+
 1;

diff --git a/t/lib/TestAppCustomContainerNoSugar/Container.pm b/t/lib/TestAppCustomContainer/SugarContainer.pm
similarity index 82%
rename from t/lib/TestAppCustomContainerNoSugar/Container.pm
rename to t/lib/TestAppCustomContainer/SugarContainer.pm
index d8f3bde..39e0c07 100644 (file)
--- a/t/lib/TestAppCustomContainerNoSugar/Container.pm
+++ b/t/lib/TestAppCustomContainer/SugarContainer.pm
@@ -1,14 +1,17 @@
-package TestAppCustomContainerNoSugar::Container;
+package TestAppCustomContainer::SugarContainer;
 use Moose;
+use namespace::autoclean;
+use Catalyst::IOC;
 
 extends 'Catalyst::IOC::Container';
 
+# translate to sugar
 sub BUILD {
     my $self = shift;
     $self->get_sub_container('component')->add_service(
         Catalyst::IOC::ConstructorInjection->new(
             name         => 'model_Baz',
-            class        => 'TestAppCustomContainerNoSugar::Model::Baz',
+            class        => 'TestAppCustomContainer::Model::Baz',
             lifecycle    => 'InstancePerContext',
             dependencies => [
                 depends_on( '/application_name' ),
@@ -34,4 +37,6 @@ sub BUILD {
     );
 }
 
+__PACKAGE__->meta->make_immutable;
+
 1;

diff --git a/t/lib/TestAppCustomContainerNoSugar/View/MyView.pm b/t/lib/TestAppCustomContainer/View/MyView.pm
similarity index 62%
rename from t/lib/TestAppCustomContainerNoSugar/View/MyView.pm
rename to t/lib/TestAppCustomContainer/View/MyView.pm
index ccf8fbe..9f07297 100644 (file)
--- a/t/lib/TestAppCustomContainerNoSugar/View/MyView.pm
+++ b/t/lib/TestAppCustomContainer/View/MyView.pm
@@ -1,4 +1,4 @@
-package TestAppCustomContainerNoSugar::View::MyView;
+package TestAppCustomContainer::View::MyView;
 use Moose;
 extends 'Catalyst::View';