===================================================================
RCS file: /cvs/todotxt/Text-Todo-REST-API/t/formats/json.t,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- todotxt/Text-Todo-REST-API/t/formats/json.t	2010/01/31 03:58:58	1.1
+++ todotxt/Text-Todo-REST-API/t/formats/json.t	2010/01/31 04:24:55	1.2
@@ -1,23 +1,26 @@
 #===============================================================================
 #
-#         FILE:  text.t
+#         FILE:  json.t
 #
-#  DESCRIPTION:  Test Text::Todo::REST::API::Representations::text
+#  DESCRIPTION:  Test Text::Todo::REST::API::Representations::json
 #
 #       AUTHOR:  Andrew Fresh (AAF), andrew@cpan.org
 #      COMPANY:  Red River Communications
 #      CREATED:  01/07/10 19:11
-#     REVISION:  $AFresh1: text.t,v 1.10 2010/01/23 07:04:43 andrew Exp $
+#     REVISION:  $AFresh1: json.t,v 1.1 2010/01/31 03:58:58 andrew Exp $
 #===============================================================================
 
 use strict;
 use warnings;
 
-use Test::More tests => 19;
+use Test::More tests => 27;
 
 my $class;
 my $format;
 
+use JSON;
+use Test::JSON;
+
 BEGIN {
     $format = 'json';
     $class  = 'Text::Todo::REST::API::Representations::' . $format;
@@ -34,11 +37,11 @@
 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' );
+is_valid_json($result, 'files json is valid');
+is_json( $result, to_json($files), 'files render as expected' );
 
 my $list = [
     {   'text' => '(A) entry 1 @one +uno',
@@ -67,15 +70,14 @@
     }
 ];
 
-my $list_render = join q{}, map { $_->{text} . "\n" } @{$list};
-
 $result = undef;
 ok( eval { $result = $api->render_list( $format, $list ) }, 'render_list' );
-is( $result, $list_render, 'Got expected render_list result' );
+is_valid_json($result, 'list json is valid');
+is_json( $result, to_json($list), 'Got expected render_list result' );
 
 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' );
+    ok( $result = $api->render_entry( $format, $e ), 'render_entry' );
+    is_valid_json($result, 'entry json is valid');
+    is_json( $result, to_json($e), 'Got correct render_entry result' );
 }