X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F04file%2Cfh%2Cstring.t;h=91214122795074a700f75cdae227dc3016fd2086;hb=aa4301a7a673eb7206bb6c837a2adaaf33d9c6d9;hp=7674f4e2a375c1e63e05538c34244c9248f69de4;hpb=30df963a7a827b63b279087e60634f5699dd4f49;p=dbsrgits%2FSQL-Translator.git

diff --git a/t/04file,fh,string.t b/t/04file,fh,string.t
index 7674f4e..9121412 100644
--- a/t/04file,fh,string.t
+++ b/t/04file,fh,string.t
@@ -13,34 +13,32 @@ use strict;
 
 use IO::File;
 use SQL::Translator;
-
-# How many tests
-BEGIN { print "1..3\n"; }
-
-$SQL::Translator::DEBUG = 0;
-
-# Our object; uses the default parser and producer
-my $tr = SQL::Translator->new;
+use Test::More tests => 3;
 
 # The filename, holder for all the data, and the filehandle
 my $datafile = "t/data/mysql/Apache-Session-MySQL.sql";
 my $data;
 my $fh = IO::File->new($datafile);
 
-# Pass filename: simplest way
-my $translated_datafile = $tr->translate($datafile);
-#warn "Data from filename method is\n$translated_datafile\n\n\n";
-
-# Pass string reference
-read($fh, $data, -s $datafile);
-my $translated_data = $tr->translate(\$data);
-#warn "Data from string is\n$translated_data\n\n\n";
-
-print "not " unless length $translated_datafile;
-print "ok 1 # passing string (filename) works\n";
-
-print "not " unless length $translated_data;
-print "ok 2 # passing string as SCALAR reference\n";
-
-print "not " unless ($translated_datafile eq $translated_data);
-print "ok 3 # from file == from string\n";
+my ($v1, $v2);
+{
+    my $tr = SQL::Translator->new;
+    # Pass filename: simplest way
+    $tr->translate($datafile);
+    $v1 = $tr->schema;
+}
+
+{
+    my $tr = SQL::Translator->new;
+    # Pass string reference
+    read($fh, $data, -s $datafile);
+    $tr->translate(\$data);
+    $v2 = $tr->schema;
+}
+
+# XXX- Hack to remove Graph hack!
+$_->translator (undef) for ($v1, $v2);
+
+ok(length $v1, "passing string (filename) works");
+ok(length $v2, "passing string as SCALAR reference");
+is_deeply($v1, $v2, "from file == from string");