--- trunk/t/02-frey-introspect.t	2008/07/08 16:18:39	65
+++ trunk/t/02-Frey-Introspect.t	2009/01/09 19:33:26	972
@@ -4,23 +4,32 @@
 
 my $debug = @ARGV ? 1 : 0;
 
-use Test::More tests => 66;
+use Test::More tests => 35;
 use lib 'lib';
 
 #use Devel::LeakTrace::Fast;
 use Data::Dump qw/dump/;
 
 BEGIN {
+	use_ok('Frey::Class::Loader');
 	use_ok('Frey::Introspect');
-	use_ok('Strix::User');
 	use_ok('Frey');
 }
 
-my $f = Frey->new;
+my $f = Frey::Class::Loader->new;
 
-foreach my $package ( map { warn dump( $_ ); keys %$_ } @{ $f->classes } ) {
+ok( my $classes = $f->classes, 'classes' );
+diag dump( $classes ) if $debug;
 
-	ok( my $o = Frey::Introspect->new( debug => $debug, package => $package ), 'new' );
+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;
 
@@ -29,13 +38,11 @@
 	is( $o->meta->name, 'Frey::Introspect', 'meta->name' );
 
 	ok( defined $o->debug, 'debug' );
-	ok( ! $o->path, 'no path' );
 
 	ok( my $js = $o->joose, 'joose' );
 	diag dump( $js ) if $debug;
 
-	ok( $o->path, 'path' );
+	ok( $o->as_markup, 'as_markup' ) if $debug;
 
-	ok( my @methods = $o->methods, 'methods' );
-	diag dump( @methods ) if $debug;
+	last if ! $debug && --$more == 0;
 }