another fix for refresh and report errors

[perl-cwmp.git] / t / 06-queue.t

diff --git a/t/06-queue.t b/t/06-queue.t
index e56b93e..cef5f1c 100755 (executable)
--- a/t/06-queue.t
+++ b/t/06-queue.t
@@ -4,37 +4,46 @@ use warnings;
 
 my $debug = shift @ARGV;
 
-use Test::More tests => 213;
+use Test::More tests => 256;
 use Data::Dump qw/dump/;
 use lib 'lib';
 
+#use Devel::LeakTrace::Fast;
+
 BEGIN {
        use_ok('CWMP::Queue');
 }
 
-#use Cwd qw/abs_path/;
-#ok(my $abs_path = abs_path($0), "abs_path");
-#$abs_path =~ s!/[^/]*$!/!;    #!fix-vim
+use Cwd qw/abs_path/;
+ok(my $abs_path = abs_path($0), "abs_path");
+$abs_path =~ s!/[^/]*$!/!;     #!fix-vim
 
 ok( my $obj = CWMP::Queue->new({
        id => 'test',
+       dir => "$abs_path/queue",
+       clean => 1,
        debug => $debug,
 }), 'new' );
 isa_ok( $obj, 'CWMP::Queue' );
 
 for my $i ( 1 .. 42 ) {
-       ok( $obj->enqueue({
-               i => $i,
-               foo => 'bar',
-       }), "enqueue $i" );
+       ok( $obj->enqueue(
+               "command-$i",
+               {
+                       i => $i,
+                       foo => 'bar',
+               }
+       ), "enqueue $i" );
 };
 
 my $i = 1;
 
 while ( my $job = $obj->dequeue ) {
        ok( $job, "dequeue $i" );
-       ok( my $dispatch = $job->dispatch, "dispatch $i" );
-       cmp_ok( $dispatch->{i}, '==', $i, "i == $i" );
+       ok( my ( $dispatch, $args ) = $job->dispatch, "job->dispatch $i" );
+       cmp_ok( $dispatch, 'eq', "command-$i", "dispatch $i" );
+       diag "args = ",dump( $args ) if $debug;
+       cmp_ok( $args->{i}, '==', $i, "args i == $i" );
        ok( $job->finish, "finish $i" );
        $i++;
 }