upped Class::DBI::SQLite requirement, quiettened tests and build, cleaned up document...

[maypole.git] / t / db_colinfo.t

diff --git a/t/db_colinfo.t b/t/db_colinfo.t
index cb1b4361e1f91c0b6629a6a517b2c7390097cba8..471d05986906b9be754d0462131088471fbbd909 100755 (executable)
--- a/t/db_colinfo.t
+++ b/t/db_colinfo.t
@@ -2,7 +2,7 @@
 use Test::More;
 use lib 'ex'; # Where BeerDB should live
 BEGIN {
-   plan tests => 26;
+   plan tests => 35;
 }
 
 $db            = 'test';
@@ -12,7 +12,7 @@ $table = "beer_test";
 $sql = "
 create table $table (
     id integer auto_increment primary key,
-    name char(30),
+    name char(30) NOT NULL default 'noname',
     url varchar(120),
     score smallint(2),
     price decimal(3,2),
@@ -22,7 +22,7 @@ create table $table (
     tasted date NOT NULL,
     created timestamp default CURRENT_TIMESTAMP,
     modified datetime  default NULL,
-    style mediumint(8) default 1,
+    style mediumint(8) NOT NULL default 1,
     brewery integer default NULL
 );";
 
@@ -32,22 +32,42 @@ create table $table (
                  brewery       =>      'int',
                  style         =>      'int',
                  name          =>      'char',
-                 url           =>      'varchar',
+                 url           =>  'varchar',
                  tasted        =>      'date',
                  created       =>      '(time|time)',
                  modified      =>      '(date|time)',
                  score         =>      'smallint',
                  price         =>      'decimal',
                  abv           =>      'varchar',
-                 notes         =>      '(text|blob)',
+                 notes         =>  '(text|blob)',
                  image         =>      'blob',
 );
 
+# correct defaults 
+%correct_defaults = (
+                 created       =>      'CURRENT_TIMESTAMP', 
+                 modified      =>      undef, 
+                 style         => 1,   
+                 name      => 'noname',
+);
+
+# correct nullables 
+%correct_nullables = (
+                 brewery   => 1, 
+                 modified      => 1,
+                 style         => 0,   
+                     name      => 0, 
+                 tasted    => 0,
+);
+
+
 # Runs tests on column_* method of $class using %correct data hash  
 # usage: run_method_tests ($class, $method, %correct);
 sub run_method_tests { 
   ($class, $method,  %correct)  = @_;
   for $col (sort keys %correct) {
+#    warn "class : $class\n";
+#    warn "ISA : ", join(', ',@BeerDB::BeerTestmysql::ISA);
     $val = $class->$method($col);
 
     # Hacks for various val types
@@ -86,16 +106,16 @@ if ($databases{test}) {
   $skip_msg = "Could not connect to MySQL using database 'test' as it doesn't exist, sorry";
 }
 
-$skip_howmany = 13;
+$skip_howmany = 22;
 
 SKIP: {
        skip $skip_msg, $skip_howmany  if $err;
        $DB_Class->db_Main->do("drop table if exists $table;");
        $DB_Class->db_Main->do($sql);
-       $DB_Class->table($table); 
+       $DB_Class->table($table);
        run_method_tests($DB_Class,'column_type', %correct_types);
-       #run_method_tests($DB_Class,'column_default', %correct_defaults);
-       #run_method_tests($DB_Class,'column_nullable', %correct_defaults);
+       run_method_tests($DB_Class,'column_default', %correct_defaults);
+       run_method_tests($DB_Class,'column_nullable', %correct_nullables);
 };
 
 # SQLite  test
@@ -103,11 +123,11 @@ SKIP: {
 package BeerDB::BeerTestsqlite;
 use base Maypole::Model::CDBI;
 package main;
+use Cwd;
 
 $DB_Class = 'BeerDB::BeerTestsqlite';
 
 $err = undef;
-#unlink "t/test.db";
 if ( !-e "t/test.db" ) {
        eval {make_sqlite_db($sql)};
        $err = $@;
@@ -116,7 +136,9 @@ if ( !-e "t/test.db" ) {
 }
 unless ($err) {
        my $driver = sqlite_driver();
-       eval { $DB_Class->connection("dbi:$driver:dbname='t/test.db'");};
+       warn "using driver : $driver";
+       my $cwd = cwd;
+       eval { $DB_Class->connection("dbi:$driver:dbname=$cwd/t/test.db");};
        $err = $@;
 }
 
@@ -126,15 +148,16 @@ $skip_howmany = 13;
 SKIP: {
        skip $skip_msg, $skip_howmany  if $err; 
        $DB_Class->table($table); 
+#use Data::Dumper; 
        run_method_tests($DB_Class,'column_type', %correct_types);
+       # No support default
        #run_method_tests($DB_Class,'column_default', %correct_defaults);
-       #run_method_tests($DB_Class,'column_nullable', %correct_defaults);
+       # I think sqlite driver allows everything to be nullable.
+       #run_method_tests($DB_Class,'column_nullable', %correct_nullables);
 
 };
 
 
-
-
 # Helper methods, TODO -- put these somewhere where tests can use them.
 
 # returns "best" available sqlite driver or dies