--- trunk/t/02-frey-introspect.t	2008/07/05 15:19:55	53
+++ trunk/t/02-frey-introspect.t	2008/11/18 14:10:57	413
@@ -4,21 +4,32 @@
 
 my $debug = @ARGV ? 1 : 0;
 
-use Test::More tests => 21;
+use Test::More tests => 45;
 use lib 'lib';
 
 #use Devel::LeakTrace::Fast;
 use Data::Dump qw/dump/;
 
 BEGIN {
+	use_ok('Frey::ClassLoader');
 	use_ok('Frey::Introspect');
-	use_ok('Strix::User');
 	use_ok('Frey');
 }
 
-foreach my $package ( 'Strix::User', 'Frey' ) {
+my $f = Frey::ClassLoader->new;
 
-	ok( my $o = Frey::Introspect->new( debug => $debug, package => $package ), 'new' );
+ok( my $classes = $f->classes, 'classes' );
+diag dump( $classes ) if $debug;
+
+ok( $f->classes, 'classes again' );
+
+my $more = 5;
+
+foreach my $class ( $f->classes ) {
+
+	diag $class;
+
+	ok( my $o = Frey::Introspect->new( debug => $debug, class => $class ), 'new' );
 	isa_ok( $o, 'Frey::Introspect' );
 	diag dump( $o ) if $debug;
 
@@ -34,6 +45,5 @@
 
 	ok( $o->path, 'path' );
 
-	ok( my @methods = $o->methods, 'methods' );
-	diag dump( @methods ) if $debug;
+	last unless --$more;
 }