Added a lot more tests, now using the Schema object.

diff --git a/t/10excel.t b/t/10excel.t
index 17a6cec..58c39be 100644 (file)
--- a/t/10excel.t
+++ b/t/10excel.t
@@ -2,22 +2,68 @@
 # vim: set ft=perl:
 #
 
-use Test::More;
+use Test::More 'no_plan'; # tests => 6;
 use SQL::Translator;
-use SQL::Translator::Validator;
+use SQL::Translator::Parser::Excel 'parse';
+use SQL::Translator::Schema::Constants;
 
-plan tests => 6;
+my $tr     = SQL::Translator->new(parser => "Excel");
+my $t      = $tr->translate(filename => "t/data/Excel/t.xls");
+my $schema = $tr->schema;
 
-# Basic test
-use_ok("SQL::Translator::Parser::Excel");
+#use Data::Dumper;
+#print Dumper($schema), "\n";
 
-my $tr = SQL::Translator->new(parser => "Excel");
-my $t = $tr->translate(filename => "t/data/Excel/t.xls");
+#ok(scalar $tr->translate(producer => "MySQL"));
 
-ok(scalar $tr->translate(producer => "MySQL"));
+my @tables = $schema->get_tables;
+is( scalar @tables, 1, 'Parsed 1 table' );
 
-ok($t->{Sheet1});
-ok(not defined $t->{Sheet2});
-ok(not defined $t->{Sheet3});
+my $table = shift @tables;
+is( $table->name, 'Sheet1', 'Table name is "Sheet1"' );
 
-ok($t->{Sheet1}->{fields}->{ID}->{is_primary_key});
+my @fields = $table->get_fields;
+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( $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( $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( $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( $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( $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( $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( $f7->is_primary_key, 0, 'Field is not PK' );