=================================================================== RCS file: /cvs/todotxt/Text-Todo-REST-API/t/formats/md5.t,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- todotxt/Text-Todo-REST-API/t/formats/md5.t 2010/01/19 03:18:34 1.4 +++ todotxt/Text-Todo-REST-API/t/formats/md5.t 2010/01/23 07:04:43 1.5 @@ -2,35 +2,38 @@ # # FILE: md5.t # -# DESCRIPTION: Test Text::Todo::REST::API::md5 +# DESCRIPTION: Test Text::Todo::REST::API::Representations::md5 # # AUTHOR: Andrew Fresh (AAF), andrew@cpan.org # COMPANY: Red River Communications # CREATED: 01/07/10 19:11 -# REVISION: $AFresh1: md5.t,v 1.3 2010/01/18 13:47:53 andrew Exp $ +# REVISION: $AFresh1: md5.t,v 1.4 2010/01/19 03:18:34 andrew Exp $ #=============================================================================== use strict; use warnings; -use Test::More tests => 38; +use Test::More tests => 17; my $class; -my $ext; +my $format; BEGIN { - $ext = 'md5'; - - $class = 'Text::Todo::REST::API'; + $format = 'md5'; + $class = 'Text::Todo::REST::API::Representations::' . $format; use_ok( $class, "use $class" ); } -diag("Testing entry $class $Text::Todo::REST::API::VERSION"); +diag( + "Testing entry $class $Text::Todo::REST::API::Representations::md5::VERSION" +); -my $api = new_ok( $class, - [ { todo_dir => 't/lists', path_info => '/todo.' . $ext } ] ); +my $result; +my $api = new_ok($class); -my $list_should_be = [ +is( $api->content_type, 'text/plain', 'Check content_type' ); + +my $list = [ { 'text' => '(A) entry 1 @one +uno', 'md5' => '931e0831c31a70928b29de55778dc294', 'line' => 1 @@ -57,39 +60,19 @@ } ]; -my $list_dump_should_be = join q{}, - map { 'MD5 (' . $_->{text} . ') = ' . $_->{md5} . "\n" } - @{$list_should_be}; +my $list_render = join q{}, + map { 'MD5 (' . $_->{text} . ') = ' . $_->{md5} . "\n" } @{$list}; -my $result; -ok( !eval { $result = $api->_handle_representation('load') }, 'Load method' ); -like( $@, '/^Unable to load \[list\]/', 'Failed Load as expected' ); - $result = undef; -ok( !( $result = $api->Dump() ), 'Dump method' ); -is( $result, undef, 'Dump returned undef' ); +ok( $result = $api->render_list( $format, $list ), 'render_list' ); +is( $result, $list_render, 'List rendered properly' ); -$result = undef; -ok( eval { $result = $api->Dump( @{$list_should_be} ) }, 'Dump method' ); -is( $result, $list_dump_should_be, 'Got expected Dump result' ); -$result = undef; - -foreach my $e ( @{$list_should_be} ) { - my $api = new_ok( - $class, - [ { todo_dir => 't/lists', - path_info => '/todo/entry/' . $e->{md5} . '.' . $ext - } - ] - ); - my @entry; - ok( @entry = $api->GET(), "get_entry by GET()" ); - is_deeply( \@entry, [$e], 'got correct entry' ); - +foreach my $e ( @{$list} ) { my $result; - ok( $result = $api->Dump(@entry), 'Dump output' ); + ok( eval { $result = $api->render_entry( $format, $e ) }, + 'render_entry' ); is( $result, 'MD5 (' . $e->{text} . ') = ' . $e->{md5} . "\n", - 'Got correct Dump result' + 'entry rendered properly' ); }