=================================================================== RCS file: /cvs/todotxt/Text-Todo-REST-API/t/formats/text.t,v retrieving revision 1.2 retrieving revision 1.10 diff -u -r1.2 -r1.10 --- todotxt/Text-Todo-REST-API/t/formats/text.t 2010/01/17 21:08:55 1.2 +++ todotxt/Text-Todo-REST-API/t/formats/text.t 2010/01/23 07:04:43 1.10 @@ -2,37 +2,45 @@ # # FILE: text.t # -# DESCRIPTION: Test Text::Todo::REST::API::text +# DESCRIPTION: Test Text::Todo::REST::API::Representations::text # # AUTHOR: Andrew Fresh (AAF), andrew@cpan.org # COMPANY: Red River Communications # CREATED: 01/07/10 19:11 -# REVISION: $AFresh1: text.t,v 1.1 2010/01/17 19:57:16 andrew Exp $ +# REVISION: $AFresh1: text.t,v 1.9 2010/01/19 03:18:34 andrew Exp $ #=============================================================================== use strict; use warnings; -use Test::More tests => 10; +use Test::More tests => 19; my $class; -my $subclass; +my $format; BEGIN { - $class = 'Text::Todo::REST::API'; + $format = 'text'; + $class = 'Text::Todo::REST::API::Representations::' . $format; use_ok( $class, "use $class" ); - - $subclass = $class . '::text'; - use_ok( $subclass, "use $subclass" ); } -diag("Testing entry $class $Text::Todo::REST::API::text::VERSION"); +diag( + "Testing entry $class $Text::Todo::REST::API::Representations::text::VERSION" +); -my $api = new_ok( $class, - [ { basedir => 't', path_info => '/lists/todo.txt' } ] ); -isa_ok( $api, $subclass, 'isa ' . $subclass ); +my $result; +my $api = new_ok($class); -my $list_should_be = [ +is( $api->content_type, 'text/plain', 'Check content_type' ); + +my $files = ['todo.txt']; +my $files_render = join q{}, map "$_\n", @{$files}; + +$result = undef; +ok( ($result) = $api->render_files( $format, $files ), 'render files' ); +is_deeply( $result, $files_render, 'files render as expected' ); + +my $list = [ { 'text' => '(A) entry 1 @one +uno', 'md5' => '931e0831c31a70928b29de55778dc294', 'line' => 1 @@ -59,33 +67,15 @@ } ]; -my $list_dump_should_be = join q{}, - map { $_->{text} . "\n" } @{$list_should_be}; +my $list_render = join q{}, map { $_->{text} . "\n" } @{$list}; -my $result; -ok( !eval { $result = $api->Load('test') }, 'Load method (test)' ); -like( $@, '/^Unable to Load \[test\]/', 'Failed Load as expected' ); - $result = undef; -ok( !eval { $result = $api->Dump('test') }, 'Dump method (test)' ); -like( $@, '/^Unable to Dump \[test\]/', 'Failed Dump test as expected' ); +ok( eval { $result = $api->render_list( $format, $list ) }, 'render_list' ); +is( $result, $list_render, 'Got expected render_list result' ); -$result = undef; -ok( eval { $result = $api->Dump( 'list', @{$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, - [ { basedir => 't', - path_info => '/lists/todo/entry/' . $e->{md5} . '.txt' - } - ] - ); - my $entry; - ok( $entry = $api->GET(), "get_entry by GET()" ); - is_deeply( $entry, $e->{text} . "\n", 'got correct entry' ); - +foreach my $e ( @{$list} ) { + my $result; + ok( eval { $result = $api->render_entry( $format, $e ) }, + 'render_entry' ); + is( $result, $e->{text} . "\n", 'Got correct render_entry result' ); }