summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2011-02-05 00:38:15 +0100
committerDaniel Friesel <derf@finalrewind.org>2011-02-05 00:38:15 +0100
commit2b64734e7a51ff556326df2991d9e71dda9d2a80 (patch)
treea42f84aec494416666e99cea1cb4a8b8c1d20727
parentc9077797656d710d24b84d9a8523c4ffc8515b38 (diff)
Add test for --recursive
-rw-r--r--test/feh.t10
-rw-r--r--test/list/filename_recursive6
-rw-r--r--test/ok/recursive/pngbin0 -> 403 bytes
-rw-r--r--test/status2
4 files changed, 16 insertions, 2 deletions
diff --git a/test/feh.t b/test/feh.t
index c868382..67b6f36 100644
--- a/test/feh.t
+++ b/test/feh.t
@@ -2,7 +2,7 @@
use strict;
use warnings;
use 5.010;
-use Test::Command tests => 60;
+use Test::Command tests => 63;
$ENV{HOME} = 'test';
@@ -119,6 +119,14 @@ $cmd->exit_is_num(0);
$cmd->stdout_is_file('test/list/format_reverse');
$cmd->stderr_like($re_warning);
+$cmd = Test::Command->new(
+ cmd => "$feh --list --recursive --sort filename test/ok"
+);
+
+$cmd->exit_is_num(0);
+$cmd->stdout_is_file('test/list/filename_recursive');
+$cmd->stderr_is_eq('');
+
$cmd = Test::Command->new(cmd => "$feh --customlist '%f; %h; %l; %m; %n; %p; "
. "%s; %t; %u; %w' $images");
diff --git a/test/list/filename_recursive b/test/list/filename_recursive
new file mode 100644
index 0000000..5ffa63e
--- /dev/null
+++ b/test/list/filename_recursive
@@ -0,0 +1,6 @@
+NUM FORMAT WIDTH HEIGHT PIXELS SIZE(bytes) ALPHA FILENAME
+1 gif 16 16 256 953 - test/ok/gif
+2 jpeg 16 16 256 354 - test/ok/jpg
+3 png 16 16 256 403 X test/ok/png
+4 pnm 16 16 256 269 - test/ok/pnm
+5 png 16 16 256 403 X test/ok/recursive/png
diff --git a/test/ok/recursive/png b/test/ok/recursive/png
new file mode 100644
index 0000000..2f06506
--- /dev/null
+++ b/test/ok/recursive/png
Binary files differ
diff --git a/test/status b/test/status
index 9d57aaf..81cf852 100644
--- a/test/status
+++ b/test/status
@@ -259,7 +259,7 @@ Overall test status, what's covered / missing
--recursive
- [ ] recurses into subdirectories
+ [x] recurses into subdirectories
--reload