--- trunk/t/01-frey-classloader.t	2008/07/15 18:06:27	137
+++ trunk/t/01-frey-classloader.t	2008/11/05 19:13:01	308
@@ -4,7 +4,7 @@
 
 my $debug = @ARGV ? 1 : 0;
 
-use Test::More tests => 13;
+use Test::More tests => 17;
 use lib 'lib';
 
 #use Devel::LeakTrace::Fast;
@@ -24,12 +24,16 @@
 
 ok( defined $o->debug, 'debug' );
 
-ok( my $classes = $o->classes, 'classes' );
-diag dump( $classes ) if $debug;
+ok( my @classes = $o->classes, 'classes' );
+diag dump( @classes ) if $debug;
 
 ok( $o->classes, 'classes again' );
 
-ok( $o->load_all_classes, 'load_all_classes' );
+ok( my $available = $o->load_all_classes, 'load_all_classes' );
+isa_ok( $available, 'HASH' );
+diag dump( $available ) if $debug;
+
+ok( $available->{$_}, "have $_" ) foreach ( qw/Frey Frey::Introspect Frey::Run/ );
 
 # Module::Name => $is_role
 my $test = {
@@ -38,7 +42,7 @@
 };
 
 foreach my $p ( keys %$test ) {
-	ok( my ( $meta, $is_role ) = $o->load_package( $p ), "load_package( $p )" );
+	ok( my ( $meta, $is_role ) = $o->class_meta( $p ), "load_package( $p )" );
 	is( $is_role, $test->{$p}, 'check role' );
 	diag $meta->dump(2) if $debug;
 }