This is an automated email from the git hooks/post-receive script.
js pushed a commit to tag v0.2101
in repository libdancer-plugin-dbic-perl.
commit 9270cfe02c06f1de469d6e19171c3e8d1ecb2f47
Author: Patrice Clement <monsie...@gentoo.org>
Date: Sat Jan 10 20:32:36 2015 +0100
test code refactoring and import tyding.
---
t/02-multiple-schemas.t | 18 +++++++++++-------
t/04-testapp.t | 5 +++--
t/05-schema-aliases.t | 3 ++-
t/06-replicated.t | 40 ++++++++++++++++++++++++----------------
4 files changed, 40 insertions(+), 26 deletions(-)
diff --git a/t/02-multiple-schemas.t b/t/02-multiple-schemas.t
index e9ea62f..49a7101 100644
--- a/t/02-multiple-schemas.t
+++ b/t/02-multiple-schemas.t
@@ -9,19 +9,23 @@ use Test::Exception;
eval { require DBD::SQLite };
plan skip_all => 'DBD::SQLite required to run these tests' if $@;
-my (undef, $dbfile1) = tempfile(SUFFIX => '.db');
-my (undef, $dbfile2) = tempfile(SUFFIX => '.db');
+# tempfile() returns a file handler + a filename.
+# We're only interested in storing the filename.
+my $dbfiles = [
+ (tempfile(SUFFIX => '.db'))[1],
+ (tempfile(SUFFIX => '.db'))[1]
+];
subtest 'two schemas' => sub {
set plugins => {
DBIC => {
foo => {
schema_class => 'Foo',
- dsn => "dbi:SQLite:dbname=$dbfile1",
+ dsn => "dbi:SQLite:dbname=$dbfiles->[0]",
},
bar => {
schema_class => 'Foo',
- dsn => "dbi:SQLite:dbname=$dbfile2",
+ dsn => "dbi:SQLite:dbname=$dbfiles->[1]",
},
}
};
@@ -52,11 +56,11 @@ subtest 'two schemas with a default schema' => sub {
DBIC => {
default => {
schema_class => 'Foo',
- dsn => "dbi:SQLite:dbname=$dbfile1",
+ dsn => "dbi:SQLite:dbname=$dbfiles->[0]",
},
bar => {
schema_class => 'Foo',
- dsn => "dbi:SQLite:dbname=$dbfile2",
+ dsn => "dbi:SQLite:dbname=$dbfiles->[1]",
},
}
};
@@ -65,4 +69,4 @@ subtest 'two schemas with a default schema' => sub {
is $bob->age => 30;
};
-unlink $dbfile1, $dbfile2;
+unlink @$dbfiles;
diff --git a/t/04-testapp.t b/t/04-testapp.t
index 0303bb7..2e275e7 100644
--- a/t/04-testapp.t
+++ b/t/04-testapp.t
@@ -1,10 +1,11 @@
use Test::More;
use lib 't/lib';
-use Dancer qw(:syntax :tests);
+
+use Dancer::Test apps => [ 't::lib::TestApp' ];
use Dancer::Plugin::DBIC qw(rset schema);
+use Dancer qw(:syntax :tests);
use t::lib::TestApp;
-use Dancer::Test apps => [ 't::lib::TestApp' ];
eval { require DBD::SQLite };
plan skip_all => 'DBD::SQLite required to run these tests' if $@;
diff --git a/t/05-schema-aliases.t b/t/05-schema-aliases.t
index b9b52d3..f7e5e66 100644
--- a/t/05-schema-aliases.t
+++ b/t/05-schema-aliases.t
@@ -1,8 +1,9 @@
use Test::More tests => 4;
use lib 't/lib';
-use Dancer qw(:syntax :tests);
+
use Dancer::Plugin::DBIC qw(rset schema);
+use Dancer qw(:syntax :tests);
use Test::Exception;
eval { require DBD::SQLite };
diff --git a/t/06-replicated.t b/t/06-replicated.t
index e797cf1..31dafe2 100644
--- a/t/06-replicated.t
+++ b/t/06-replicated.t
@@ -1,11 +1,12 @@
use Test::More;
use lib 't/lib';
-use Dancer qw(:syntax set);
+
+use Module::Load::Conditional qw(can_load);
use Dancer::Plugin::DBIC qw(schema rset);
-use DBI;
use File::Temp qw(tempfile);
-use Module::Load::Conditional qw(can_load);
+use Dancer qw(:syntax set);
+use DBI;
my $reqs = {
'DBD::SQLite' => 0,
@@ -20,26 +21,33 @@ if ( can_load modules => $reqs ) {
plan skip_all => "required modules to run these tests are not available";
}
-my (undef, $dbfile1) = tempfile(SUFFIX => '.db');
-my (undef, $dbfile2) = tempfile(SUFFIX => '.db');
-my (undef, $dbfile3) = tempfile(SUFFIX => '.db');
-my $dbh2 = DBI->connect("dbi:SQLite:dbname=$dbfile2");
-my $dbh3 = DBI->connect("dbi:SQLite:dbname=$dbfile3");
-ok $dbh2->do('create table user (name varchar(100) primary key, age int)');
-ok $dbh3->do('create table user (name varchar(100) primary key, age int)');
-$dbh2->do('insert into user values(?,?)', {}, 'bob', 20);
-$dbh3->do('insert into user values(?,?)', {}, 'bob', 30);
+my $dbfiles = [
+ (tempfile(SUFFIX => '.db'))[1],
+ (tempfile(SUFFIX => '.db'))[1],
+ (tempfile(SUFFIX => '.db'))[1]
+];
+
+my $dbhandlers = [
+ DBI->connect("dbi:SQLite:dbname=$dbfiles->[1]"),
+ DBI->connect("dbi:SQLite:dbname=$dbfiles->[2]")
+];
+
+ok $dbhandlers->[0]->do('create table user (name varchar(100) primary key, age
int)');
+ok $dbhandlers->[1]->do('create table user (name varchar(100) primary key, age
int)');
+
+$dbhandlers->[0]->do('insert into user values(?,?)', {}, 'bob', 20);
+$dbhandlers->[1]->do('insert into user values(?,?)', {}, 'bob', 30);
set plugins => {
DBIC => {
default => {
- dsn => "dbi:SQLite:dbname=$dbfile1",
+ dsn => "dbi:SQLite:dbname=$dbfiles->[0]",
schema_class => 'Foo',
replicated => {
balancer_type => '::Random',
replicants => [
- [ "dbi:SQLite:dbname=$dbfile2" ],
- [ "dbi:SQLite:dbname=$dbfile3" ],
+ [ "dbi:SQLite:dbname=$dbfiles->[1]" ],
+ [ "dbi:SQLite:dbname=$dbfiles->[2]" ],
],
},
},
@@ -68,4 +76,4 @@ is keys %set => 2, 'random balancer accessed both replicants'
or diag explain \%set;
ok $set{20} && $set{30};
-unlink $dbfile1, $dbfile2, $dbfile3;
+unlink @$dbfiles;
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-perl/packages/libdancer-plugin-dbic-perl.git
_______________________________________________
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
