X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Faggregate%2Funit_core_component_setup_components.t;h=ffbbb99656ae8f59dbb94ac68363ec88a25f9341;hb=41c0e09a56ab8ea4cc2dc249e7989101169189d0;hp=5586b42d5b84c341e5d72c36649f78f994333d74;hpb=54f67b25141963430c287464dba556f55ebce86a;p=catagits%2FCatalyst-Runtime.git

diff --git a/t/aggregate/unit_core_component_setup_components.t b/t/aggregate/unit_core_component_setup_components.t
index 5586b42..ffbbb99 100644
--- a/t/aggregate/unit_core_component_setup_components.t
+++ b/t/aggregate/unit_core_component_setup_components.t
@@ -39,12 +39,16 @@ for my $component (@comps) {
 
     ok( !$@, "setup_components doesnt die" );
     ok( $warnings, "it warns about deprecated names" );
-    is_deeply( \@comps, \@loaded_comps, 'all components loaded' );
+
+    # FIXME - do I need the original sort in locate_components service?
+    is_deeply( [ sort @comps ], [ sort @loaded_comps ], 'all components loaded' );
 }
 
-my @controllers = @comps[0..7];
-my @models      = @comps[8..15];
-my @views       = @comps[16..23];
+my @comps_copy  = @comps;
+
+my @controllers = map { s/^TestAppComponents::(C|Controller):://; $_; } @comps_copy[0..7];
+my @models      = map { s/^TestAppComponents::(M|Model):://; $_; }      @comps_copy[8..15];
+my @views       = map { s/^TestAppComponents::(V|View):://; $_; }       @comps_copy[16..23];
 my $container   = TestAppComponents->container;
 
 is_deeply(