--- trunk/t/04-frey-pipe.t	2008/11/19 04:13:36	450
+++ trunk/t/04-frey-pipe.t	2008/11/19 15:28:23	455
@@ -14,18 +14,18 @@
 }
 
 my $pipes = {
-'00 Frey::Feed/data+uri=http://blog.rot13.org/index.xml|Frey::Dumper/markup' => qr/<.+>/,
-'01 Frey::DelIcioUs/data' => qr/HASH/,
-'02 Frey::DelIcioUs/data|Frey::JSON/markup' => qr/^{/,
-'03 Frey::DelIcioUs/sponge|Frey::SQL/data?query=select description,href,tag,extended,time from sponge order by time desc limit 2|Frey::Dumper/markup' => qr/<.+>/,
-'04 Frey::DelIcioUs/sponge|Frey::View::Exhibit/data|Frey::JSON/markup' => qr/^{/,
+'00 Frey::Feed/as_data+uri=http://blog.rot13.org/index.xml|Frey::Dumper/as_markup' => qr/<.+>/,
+'01 Frey::DelIcioUs/as_data' => qr/HASH/,
+'02 Frey::DelIcioUs/as_data|Frey::JSON/as_markup' => qr/^{/,
+'03 Frey::DelIcioUs/as_sponge|Frey::SQL/as_data?query=select description,href,tag,extended,time from sponge order by time desc limit 2|Frey::Dumper/as_markup' => qr/<.+>/,
+'04 Frey::DelIcioUs/as_sponge|Frey::View::Exhibit/as_data|Frey::JSON/as_markup' => qr/^{/,
 };
 
 foreach my $pipe ( sort keys %$pipes ) {
 	my $real_pipe = $pipe;
 	$real_pipe =~ s{^\d+\s+}{};
 	ok( my $o = Frey::Pipe->new( pipe => $real_pipe ), "pipe $pipe" );
-	ok( my $markup = $o->markup, 'markup' );
+	ok( my $markup = $o->as_markup, 'markup' );
 	diag dump( $markup ) if $debug;
 	like( $markup, $pipes->{$pipe}, 'validate' );
 }