add test enqueue and dequeue on flexible table name

nekokak · Nov 26, 2010 · 24db5a4 · 24db5a4
1 parent 894e15a
commit 24db5a4
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 9 deletions.
diff --git a/t/Utils.pm b/t/Utils.pm
@@ -5,18 +5,22 @@ use DBI;
 use Pod::Simple::SimpleTree;
 
 sub _get_schema {
-    my $dbh = shift;
+    my $dbh   = shift;
+    my $table = shift || "job";
 
     my $driver = $dbh->{Driver}{Name};
+    my $sql;
     if ( $driver eq 'mysql' ) {
-        return _read_pod('MySQL');
+        $sql = _read_pod('MySQL');
     } elsif ( $driver eq 'Pg' ) {
-        return _read_pod('PostgreSQL');
+        $sql = _read_pod('PostgreSQL');
     } elsif ( $driver eq 'SQLite' ) {
-        return _read_pod('SQLite');
+        $sql = _read_pod('SQLite');
     } else {
         Carp::croak "this driver unsupport: $driver";
     }
+    $sql =~ s/(CREATE\s+TABLE\s+)job/CREATE TABLE $table/;
+    $sql;
 }
 
 sub _read_pod {
@@ -40,14 +44,16 @@ sub _read_pod {
 }
 
 sub setup {
+    my ($class, $table) = @_;
     my $dbh = DBI->connect('dbi:SQLite:');
-    $dbh->do(_get_schema($dbh));
+    $dbh->do(_get_schema($dbh, $table));
     $dbh;
 }
 
 sub cleanup {
-    my ($class, $dbh) = @_;
-    $dbh->do('DROP TABLE job');
+    my ($class, $dbh, $table) = @_;
+    $table ||= "job";
+    $dbh->do("DROP TABLE $table");
 }
 
 1;

diff --git a/t/client.t b/t/client.t
@@ -67,5 +67,25 @@ subtest 'error handling' => sub {
 
 t::Utils->cleanup($dbh);
 
+
+subtest 'enqueue / flexible job table name' => sub {
+    my $dbh = t::Utils->setup("my_job");
+    my $jonk = Jonk::Client->new($dbh, +{table_name => "my_job"});
+
+    my $job_id = $jonk->enqueue('MyWorker', 'arg');
+    ok $job_id;
+
+    my $sth = $dbh->prepare('SELECT * FROM my_job WHERE id = ?');
+    $sth->execute($job_id);
+    my $row = $sth->fetchrow_hashref;
+
+    is $row->{arg}, 'arg';
+    is $row->{func}, 'MyWorker';
+    ok not $jonk->errstr;
+
+    t::Utils->cleanup($dbh, "my_job");
+    done_testing;
+};
+
 done_testing;
 
diff --git a/t/worker.t b/t/worker.t
@@ -72,5 +72,23 @@ subtest 'error handling' => sub {
 
 t::Utils->cleanup($dbh);
 
+
+subtest 'dequeue / flexible job table name' => sub {
+    my $dbh = t::Utils->setup("my_job");
+    my $client = Jonk::Client->new($dbh, { table_name => "my_job" });
+
+    my $job_id = $client->enqueue('MyWorker', 'arg');
+    ok $job_id;
+
+    my $jonk = Jonk::Worker->new($dbh, { table_name => "my_job", functions => [qw/MyWorker/]});
+    my $job = $jonk->dequeue();
+    is $job->{arg}, 'arg';
+    is $job->{func}, 'MyWorker';
+    ok not $jonk->errstr;
+
+    t::Utils->cleanup($dbh, "my_job");
+    done_testing;
+};
+
 done_testing;
 
diff --git a/xt/Utils/mysql.pm b/xt/Utils/mysql.pm
@@ -12,8 +12,9 @@ my $mysql = Test::mysqld->new
 {
     no warnings "redefine";
     sub t::Utils::setup {
+        my ($class, $table) = @_;
         my $dbh = DBI->connect($mysql->dsn( dbname => "test" ));
-        $dbh->do(t::Utils::_get_schema($dbh));
+        $dbh->do(t::Utils::_get_schema($dbh, $table));
         $dbh;
     }
 }

diff --git a/xt/Utils/postgresql.pm b/xt/Utils/postgresql.pm
@@ -12,9 +12,10 @@ my $pgsql = Test::postgresql->new
 {
     no warnings "redefine";
     sub t::Utils::setup {
+        my ($class, $table) = @_;
         my $dbh = DBI->connect($pgsql->dsn);
         local $dbh->{"Warn"} = 0;
-        $dbh->do(t::Utils::_get_schema($dbh));
+        $dbh->do(t::Utils::_get_schema($dbh, $table));
         $dbh;
     }
 }