--- trunk/t/02-frey-ppi.t	2008/11/08 23:01:45	335
+++ trunk/t/02-frey-ppi.t	2008/11/16 19:50:36	364
@@ -4,7 +4,7 @@
 
 my $debug = @ARGV ? 1 : 0;
 
-use Test::More tests => 5;
+use Test::More tests => 13;
 use lib 'lib';
 
 use Data::Dump qw/dump/;
@@ -14,17 +14,35 @@
 }
 
 my $test = {
-	'Frey::DelIcioUs' => [ 'username', 'password' ],
-	'Frey::Feed' => [ 'uri' ],
+	'Frey::DelIcioUs' => {
+		attribute_order => ["username", "password"],
+		includes => {
+			"use" => ["Moose", "LWP::UserAgent", "XML::Simple", "Data::Dump"],
+		},
+	},
+	'Frey::Feed' => {
+		attribute_order => ["uri", "feed", "title"],
+		includes => {
+			"use" => [ "Moose", "Frey::Types", "Frey::Mirror", "Data::Feed", "Data::Dump" ],
+		},
+	},
 };
 
 foreach my $class ( keys %$test ) {
 
 	ok( my $o = Frey::PPI->new( class => $class, debug => $debug ), "new $class" );
-	ok( my @order = $o->attribute_order, 'attribute_order' );
-	diag dump( @order ) if $debug;
-	is_deeply( [ @order ], $test->{$class}, 'order correct' );
-	ok( my $data = $o->data, 'data' );
+
+	my $data;
+
+	ok( $data->{attribute_order} = $o->attribute_order, 'attribute_order' );
+	ok( $data->{includes} = $o->includes, 'includes' );
+	diag "data $class = ",dump( $data ) if $debug;
+
+	foreach ( keys %$data ) {
+		is_deeply( $data->{$_}, $test->{$class}->{$_}, $_ );
+	}
+
+	ok( $data = $o->data, 'data' );
 	diag dump( $data ) if $debug;
 
 }