made db_colinfo test less fragile, changed test on @ISA to work with different ordering

git-svn-id: http://svn.maypole.perl.org/Maypole/trunk@525 48953598-375a-da11-a14b-00016c27c3ee

diff --git a/Changes b/Changes
index 3ba29b6ef8e46211486517c892a4d7656f803ee9..ae9113ab214aa8f49e48e7075de4c22d97180104 100644 (file)
--- a/Changes
+++ b/Changes
@@ -6,7 +6,9 @@ For information about current developments and future releases, see:
    Fixed some db_colinfo test bugs
    Fixed typo in edit form template
    Now uses Class::C3 in all Classes to simplify inheritence
+   Inheritence simpler and nicer and less hacked
    add_model_superclass method moves @ISA munging into the model
+   new Class::DBI::DFV based model
 
 2.11 Mon 31 July 2006
 

diff --git a/lib/Maypole/View/Base.pm b/lib/Maypole/View/Base.pm
index 5a99580e514f01a0c914f677a2b96a8028cfc47a..277a0c93d95dcb30db2649acd57db9f1548e7957 100644 (file)
--- a/lib/Maypole/View/Base.pm
+++ b/lib/Maypole/View/Base.pm
@@ -1,4 +1,5 @@
 package Maypole::View::Base;
+use Class::C3;
 use File::Spec;
 use UNIVERSAL::moniker;
 use strict;

diff --git a/lib/Maypole/View/TT.pm b/lib/Maypole/View/TT.pm
index ac2aceb1b190e777e7e0200f28182f72d9890cc1..3ab23be31da7c14740d41ad80e666bddf376c180 100644 (file)
--- a/lib/Maypole/View/TT.pm
+++ b/lib/Maypole/View/TT.pm
@@ -1,4 +1,5 @@
 package Maypole::View::TT;
+use Class::C3;
 use base 'Maypole::View::Base';
 use Maypole::Constants;
 use Template;

diff --git a/t/01basics.t b/t/01basics.t
index 848898593c889aa66978e8aec5e4ad0ed194239f..6fa0c1e1241f1b410004e797600bac45456cb800 100644 (file)
--- a/t/01basics.t
+++ b/t/01basics.t
@@ -48,4 +48,5 @@ is ($classdata{related_accessors},'pubs','classdata.related_accessors');
 # test Maypole::load_custom_class()
 can_ok(BeerDB::Beer => 'fooey');     # defined in BeerDB::Beer
 can_ok(BeerDB::Beer => 'floob');     # defined in BeerDB::Base
-is_deeply( [@BeerDB::Beer::ISA], [qw/Maypole::Model::CDBI Class::DBI::SQLite BeerDB::Base/] );
+
+is_deeply( [@BeerDB::Beer::ISA], [qw/Class::DBI::SQLite  Maypole::Model::CDBI BeerDB::Base/] );

diff --git a/t/db_colinfo.t b/t/db_colinfo.t
index 50f885f5971aa1d67b75df227837b2ba4a28b5ef..8f38f3bea85b3b901807b81f029a5be019ace354 100755 (executable)
--- a/t/db_colinfo.t
+++ b/t/db_colinfo.t
@@ -4,7 +4,12 @@ use Data::Dumper;
 use DBI;
 use lib 'examples'; # Where BeerDB should live
 BEGIN {
-       my $drh = eval { DBI->install_driver("mysql"); };
+       my $drh = eval {
+         DBI->install_driver("mysql");
+         my @databases = DBI->data_sources("mysql");
+         die "couldn't connect to mysql" unless (@databases);
+       };
+       warn "error : $@ \n" if ($@);
         my $testcount = ($@) ? 45 : 65 ;
         plan tests => $testcount;
 }