===================================================================
RCS file: /cvs/todotxt/Text-Todo-REST-API/t/formats/text.t,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- todotxt/Text-Todo-REST-API/t/formats/text.t	2010/01/19 03:18:34	1.9
+++ todotxt/Text-Todo-REST-API/t/formats/text.t	2010/01/23 07:04:43	1.10
@@ -2,48 +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.8 2010/01/18 13:47:53 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 => 43;
+use Test::More tests => 19;
 
 my $class;
-my $ext;
+my $format;
 
 BEGIN {
-    $ext = 'txt';
-
-    $class = 'Text::Todo::REST::API';
+    $format = 'text';
+    $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::text::VERSION"
+);
 
-my $api = new_ok( $class,
-    [ { todo_dir => 't/lists', path_info => '/.' . $ext } ] );
+my $result;
+my $api = new_ok($class);
 
-my $files_should_be = ['todo.txt'];
-my @files;
-ok( @files = $api->get_files, 'get files' );
-is_deeply( \@files, $files_should_be, 'Got correct files' );
+is( $api->content_type, 'text/plain', 'Check content_type' );
 
-my $files_dump_should_be = join q{}, map "$_\n", @{ $files_should_be };
-my $result;
-ok( ($result) = $api->Dump( @files ), 'Dump files' );
-is_deeply( $result, $files_dump_should_be, 'files Dump as expected' );
+my $files = ['todo.txt'];
+my $files_render = join q{}, map "$_\n", @{$files};
 
-$api = new_ok( $class,
-    [ { todo_dir => 't/lists', path_info => '/todo.' . $ext } ] );
+$result = undef;
+ok( ($result) = $api->render_files( $format, $files ), 'render files' );
+is_deeply( $result, $files_render, 'files render as expected' );
 
-my $list_should_be = [
+my $list = [
     {   'text' => '(A) entry 1 @one +uno',
         'md5'  => '931e0831c31a70928b29de55778dc294',
         'line' => 1
@@ -70,35 +67,15 @@
     }
 ];
 
-my $list_dump_should_be = join q{},
-    map { $_->{text} . "\n" } @{$list_should_be};
+my $list_render = join q{}, map { $_->{text} . "\n" } @{$list};
 
 $result = undef;
-ok( !eval { $result = $api->_handle_representation('load') }, 'Load method' );
-like( $@, '/^Unable to load \[list\]/', 'Failed Load as expected' );
+ok( eval { $result = $api->render_list( $format, $list ) }, 'render_list' );
+is( $result, $list_render, 'Got expected render_list result' );
 
-$result = undef;
-ok( !( $result = $api->Dump() ), 'Dump method' );
-is( $result, undef, 'Dump returned undef' );
-
-$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' );
-    is( $result, $e->{text} . "\n", 'Got correct Dump result' );
+    ok( eval { $result = $api->render_entry( $format, $e ) },
+        'render_entry' );
+    is( $result, $e->{text} . "\n", 'Got correct render_entry result' );
 }