X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F10excel.t;h=0414d943c06d1db2f9a38cac36a13c8d52300133;hb=06f34bdf19a94eacc1a3bb33534a3cd9879e12e7;hp=ed5a833e32ca23e1c99cd68cd86f4d4e0c14bd52;hpb=dd105736d6d0dafb1a6407a9ecc05cedd09bc799;p=dbsrgits%2FSQL-Translator.git

diff --git a/t/10excel.t b/t/10excel.t
index ed5a833..0414d94 100644
--- a/t/10excel.t
+++ b/t/10excel.t
@@ -1,11 +1,16 @@
 #!/usr/bin/perl
 # vim: set ft=perl:
 
-use Test::More tests => 31;
+use Test::More;
 use SQL::Translator;
-use SQL::Translator::Parser::Excel 'parse';
 use SQL::Translator::Schema::Constants;
+use Test::SQL::Translator qw(maybe_plan);
 
+BEGIN {
+    maybe_plan(31, 'SQL::Translator::Parser::Excel');
+    SQL::Translator::Parser::Excel->import('parse');
+}
+ 
 my $tr     = SQL::Translator->new(parser => "Excel");
 my $t      = $tr->translate(filename => "t/data/Excel/t.xls");
 my $schema = $tr->schema;
@@ -21,43 +26,43 @@ is( scalar @fields, 7, 'Table has 7 fields' );
 
 my $f1 = shift @fields;
 is( $f1->name, 'ID', 'First field name is "ID"' );
-is( $f1->data_type, 'VARCHAR', 'Data type is "VARCHAR"' );
-is( $f1->size, 255, 'Size is "255"' );
+is( lc $f1->data_type, 'integer', 'Data type is "integer"' );
+is( $f1->size, 5, 'Size is "5"' );
 is( $f1->is_primary_key, 1, 'Field is PK' );
 
 my $f2 = shift @fields;
 is( $f2->name, 'text', 'Second field name is "text"' );
-is( $f2->data_type, 'VARCHAR', 'Data type is "VARCHAR"' );
-is( $f2->size, 255, 'Size is "255"' );
+is( lc $f2->data_type, 'char', 'Data type is "char"' );
+is( $f2->size, 7, 'Size is "7"' );
 is( $f2->is_primary_key, 0, 'Field is not PK' );
 
 my $f3 = shift @fields;
 is( $f3->name, 'number', 'Third field name is "number"' );
-is( $f3->data_type, 'VARCHAR', 'Data type is "VARCHAR"' );
-is( $f3->size, 255, 'Size is "255"' );
+is( lc $f3->data_type, 'integer', 'Data type is "integer"' );
+is( $f3->size, 1, 'Size is "1"' );
 is( $f3->is_primary_key, 0, 'Field is not PK' );
 
 my $f4 = shift @fields;
 is( $f4->name, 'math', 'Fourth field name is "math"' );
-is( $f4->data_type, 'VARCHAR', 'Data type is "VARCHAR"' );
-is( $f4->size, 255, 'Size is "255"' );
+is( lc $f4->data_type, 'float', 'Data type is "float"' );
+is( $f4->size, '3,1', 'Size is "3,1"' );
 is( $f4->is_primary_key, 0, 'Field is not PK' );
 
 my $f5 = shift @fields;
 is( $f5->name, 'bitmap', 'Fifth field name is "bitmap"' );
-is( $f5->data_type, 'VARCHAR', 'Data type is "VARCHAR"' );
-is( $f5->size, 255, 'Size is "255"' );
+is( lc $f5->data_type, 'char', 'Data type is "char"' );
+is( $f5->size, 1, 'Size is "1"' );
 is( $f5->is_primary_key, 0, 'Field is not PK' );
 
 my $f6 = shift @fields;
 is( $f6->name, 'today', 'Sixth field name is "today"' );
-is( $f6->data_type, 'VARCHAR', 'Data type is "VARCHAR"' );
-is( $f6->size, 255, 'Size is "255"' );
+is( lc $f6->data_type, 'char', 'Data type is "CHAR"' );
+is( $f6->size, 10, 'Size is "10"' );
 is( $f6->is_primary_key, 0, 'Field is not PK' );
 
 my $f7 = shift @fields;
 is( $f7->name, 'silly_field_with_random_characters', 
     'Seventh field name is "silly_field_with_random_characters"' );
-is( $f7->data_type, 'VARCHAR', 'Data type is "VARCHAR"' );
-is( $f7->size, 255, 'Size is "255"' );
+is( lc $f7->data_type, 'char', 'Data type is "CHAR"' );
+is( $f7->size, 11, 'Size is "11"' );
 is( $f7->is_primary_key, 0, 'Field is not PK' );