Merge 120285c into bf399dd

LibreCat · Oct 19, 2018 · c37d176 · c37d176
2 parents bf399dd + 120285c
commit c37d176
Show file tree

Hide file tree

Showing 32 changed files with 513 additions and 49 deletions.
diff --git a/lib/LibreCat/Cmd/file_store.pm b/lib/LibreCat/Cmd/file_store.pm
@@ -256,7 +256,7 @@ sub _exists {
 
     printf "$key %s\n", $ans ? "EXISTS" : "NOT_FOUND";
 
-    exit($ans ? 0 : 2);
+    $ans ? return 0 : return 2;
 }
 
 sub _get {

diff --git a/lib/LibreCat/Cmd/queue.pm b/lib/LibreCat/Cmd/queue.pm
@@ -176,7 +176,7 @@ LibreCat::Cmd::queue - show job queue status
     librecat queue status
 
     # Submit a YAML file job to the WORKER
-    librecat [--background] queue add_job WORKER FILE
+    librecat queue [--background] add_job WORKER FILE
 
     # Start all configured workers
     librecat queue start

diff --git a/t/LibreCat/Cmd/audit.t b/t/LibreCat/Cmd/audit.t
@@ -11,6 +11,32 @@ my $pkg;
 BEGIN {
     $pkg = 'LibreCat::Cmd::audit';
     use_ok $pkg;
+
+    # add some test data
+    my $data = [
+        {
+            id      => 1,
+            process => 'batch',
+            action  => 'update',
+            message => 'test1',
+            time    => '2018-01-01T12:00:00Z'
+        },
+        {
+            id      => 2,
+            process => 'web',
+            action  => 'update',
+            time    => '2018-01-01T12:00:02Z'
+        },
+        {id => 3, time => '2018-01-01T12:00:04Z'},
+        {
+            id      => 1,
+            process => 'batch',
+            action  => 'update',
+            message => 'change ID 1 again',
+            time    => '2018-01-01T12:00:06Z'
+        },
+    ];
+    Catmandu->store('main')->bag('audit')->add_many($data);
 }
 
 require_ok $pkg;
@@ -23,6 +49,14 @@ require_ok $pkg;
     ok $result->error, 'ok threw an exception: invalid nonsense';
 }
 
+{
+    my $result = test_app(qq|LibreCat::CLI| => ['help', 'audit']);
+    ok !$result->error, 'ok threw no exception';
+
+    my $output = $result->stdout;
+    like $output, qr/Usage:/, "Help message";
+}
+
 {
     my $result = test_app(qq|LibreCat::CLI| => ['audit', 'list']);
 
@@ -31,6 +65,19 @@ require_ok $pkg;
     my $output = $result->stdout;
 
     ok $output , 'got an output';
+
+    like $output, qr/count: 4/, 'list count';
+
+    $result = test_app(qq|LibreCat::CLI| => ['audit', 'list', '1']);
+
+    ok !$result->error, 'ok threw no exception';
+
+    like $result->output, qr/count: 2/, 'list count';
+}
+
+END {
+    # cleanup test data
+    Catmandu->store('main')->bag('audit')->delete_all;
 }
 
 done_testing;
diff --git a/t/LibreCat/Cmd/config.t b/t/LibreCat/Cmd/config.t
@@ -1,7 +1,9 @@
 use Catmandu::Sane;
 use LibreCat -load => {layer_paths => [qw(t/layer)]};
+use LibreCat::CLI;
 use Test::More;
 use Test::Exception;
+use App::Cmd::Tester;
 use warnings FATAL => 'all';
 
 my $pkg;
@@ -13,4 +15,12 @@ BEGIN {
 
 require_ok $pkg;
 
+{
+    my $result = test_app(qq|LibreCat::CLI| => ['help', 'copy']);
+    ok !$result->error, 'ok threw no exception';
+
+    my $output = $result->stdout;
+    like $output, qr/Usage:/, "Help message";
+}
+
 done_testing;
diff --git a/t/LibreCat/Cmd/convert.t b/t/LibreCat/Cmd/convert.t
@@ -1,7 +1,9 @@
 use Catmandu::Sane;
 use LibreCat -load => {layer_paths => [qw(t/layer)]};
+use LibreCat::CLI;
 use Test::More;
 use Test::Exception;
+use App::Cmd::Tester;
 use warnings FATAL => 'all';
 
 my $pkg;
@@ -13,4 +15,12 @@ BEGIN {
 
 require_ok $pkg;
 
+{
+    my $result = test_app(qq|LibreCat::CLI| => ['help', 'copy']);
+    ok !$result->error, 'ok threw no exception';
+
+    my $output = $result->stdout;
+    like $output, qr/Usage:/, "Help message";
+}
+
 done_testing;
diff --git a/t/LibreCat/Cmd/copy.t b/t/LibreCat/Cmd/copy.t
@@ -1,7 +1,9 @@
 use Catmandu::Sane;
 use LibreCat -load => {layer_paths => [qw(t/layer)]};
+use LibreCat::CLI;
 use Test::More;
 use Test::Exception;
+use App::Cmd::Tester;
 use warnings FATAL => 'all';
 
 my $pkg;
@@ -13,4 +15,10 @@ BEGIN {
 
 require_ok $pkg;
 
+my $result = test_app(qq|LibreCat::CLI| => ['help', 'copy']);
+ok !$result->error, 'ok threw no exception';
+
+my $output = $result->stdout;
+like $output, qr/WARNING - Low level command/, "Help message";
+
 done_testing;
diff --git a/t/LibreCat/Cmd/count.t b/t/LibreCat/Cmd/count.t
@@ -1,7 +1,9 @@
 use Catmandu::Sane;
 use LibreCat -load => {layer_paths => [qw(t/layer)]};
+use LibreCat::CLI;
 use Test::More;
 use Test::Exception;
+use App::Cmd::Tester;
 use warnings FATAL => 'all';
 
 my $pkg;
@@ -13,4 +15,10 @@ BEGIN {
 
 require_ok $pkg;
 
+my $result = test_app(qq|LibreCat::CLI| => ['help', 'count']);
+ok !$result->error, 'ok threw no exception';
+
+my $output = $result->stdout;
+like $output, qr/WARNING - Low level command/, "Help message";
+
 done_testing;
diff --git a/t/LibreCat/Cmd/delete.t b/t/LibreCat/Cmd/delete.t
@@ -1,7 +1,9 @@
 use Catmandu::Sane;
 use LibreCat -load => {layer_paths => [qw(t/layer)]};
+use LibreCat::CLI;
 use Test::More;
 use Test::Exception;
+use App::Cmd::Tester;
 use warnings FATAL => 'all';
 
 my $pkg;
@@ -13,4 +15,10 @@ BEGIN {
 
 require_ok $pkg;
 
+my $result = test_app(qq|LibreCat::CLI| => ['help', 'delete']);
+ok !$result->error, 'ok threw no exception';
+
+my $output = $result->stdout;
+like $output, qr/WARNING - Low level command/, "Help message";
+
 done_testing;
diff --git a/t/LibreCat/Cmd/department.t b/t/LibreCat/Cmd/department.t
@@ -7,7 +7,6 @@ use LibreCat::CLI;
 use Test::More;
 use Test::Exception;
 use App::Cmd::Tester;
-use Cpanel::JSON::XS;
 
 my $pkg;
 
@@ -28,7 +27,22 @@ subtest 'initial cmd' => sub {
     ok $result->error, 'missing command: threw an exception';
 };
 
-subtest 'list' => sub {
+subtest 'invalid cmd' => sub {
+    my $result = test_app(qq|LibreCat::CLI| => ['department', 'do_nonsense']);
+    ok $result->error,   'missing command: threw an exception';
+    like $result->error, qr/should be one of/,
+        "error message for invalid command";
+};
+
+subtest 'help' => sub {
+    my $result = test_app(qq|LibreCat::CLI| => ['help', 'department']);
+    ok !$result->error, 'ok threw no exception';
+
+    my $output = $result->stdout;
+    like $output, qr/Usage:/, "Help message";
+};
+
+subtest 'list empty' => sub {
     my $result = test_app(qq|LibreCat::CLI| => ['department', 'list']);
 
     ok !$result->error, 'list: threw no exception';
@@ -98,6 +112,44 @@ subtest 'get' => sub {
     is $record->{name}, 'Test faculty', 'got a valid department';
 };
 
+subtest 'get via id_file' => sub {
+    my $result = test_app(qq|LibreCat::CLI| =>
+            ['department', 'get', 't/records/department_ids.txt']);
+
+    ok !$result->error, 'ok threw no exception';
+
+    my $output = $result->stdout;
+
+    ok $output , 'got an output';
+
+    my $importer = Catmandu->importer('YAML', file => \$output);
+
+    my $record = $importer->first;
+
+    is $record->{_id},  999000999,      'got really a 999000999 record';
+    is $record->{name}, 'Test faculty', 'got a valid department';
+};
+
+subtest 'list with options' => sub {
+    my $result = test_app(qq|LibreCat::CLI| => ['department', 'list']);
+
+    ok !$result->error, 'list: threw no exception';
+
+    my $output = $result->stdout;
+    ok $output , 'list departments: got an output';
+
+    my $count = count_department($output);
+
+    ok $count > 0, 'got some departments';
+
+    $result = test_app(
+        qq|LibreCat::CLI| => ['department', 'list', 'name=relativity']);
+
+    ok !$result->error, 'list: threw no exception';
+    $output = $result->stdout;
+    count_department($output) == 1, "got one department";
+};
+
 subtest 'tree' => sub {
     my $result = test_app(qq|LibreCat::CLI| => ['department', 'tree']);
 
@@ -110,6 +162,13 @@ subtest 'export' => sub {
 
     ok !$result->error, "threw no exception";
     like $result->output, qr/_id:/, "export output";
+
+    $result = test_app(
+        qq|LibreCat::CLI| => ['department', 'export', 'name=relativity']);
+
+    ok !$result->error, "threw no exception";
+
+    count_department($result->output) == 1, "got one department";
 };
 
 subtest 'delete' => sub {
@@ -130,6 +189,21 @@ subtest 'delete' => sub {
 
     $output = $result->stdout;
     ok length($output) == 0, 'got no result';
+
+    $result = test_app(qq|LibreCat::CLI| =>
+            ['department', 'delete', 'does-not-exist-123434']);
+
+    ok $result->error, 'throw exception: delete invalid id';
+    like $result->output, qr/ERROR: delete/, 'error message delete failed';
+};
+
+subtest 'tree with file' => sub {
+    my $result = test_app(qq|LibreCat::CLI| =>
+            ['department', 'tree', 't/records/department-tree.yml']);
+
+    ok !$result->error, "threw no exception";
+    ok $result->output;
+    like $result->output, qr/added \d+/, "add tree via file";
 };
 
 done_testing;

diff --git a/t/LibreCat/Cmd/drop.t b/t/LibreCat/Cmd/drop.t
@@ -1,7 +1,9 @@
 use Catmandu::Sane;
 use LibreCat -load => {layer_paths => [qw(t/layer)]};
+use LibreCat::CLI;
 use Test::More;
 use Test::Exception;
+use App::Cmd::Tester;
 use warnings FATAL => 'all';
 
 my $pkg;
@@ -13,4 +15,10 @@ BEGIN {
 
 require_ok $pkg;
 
+my $result = test_app(qq|LibreCat::CLI| => ['help', 'drop']);
+ok !$result->error, 'ok threw no exception';
+
+my $output = $result->stdout;
+like $output, qr/WARNING - Low level command/, "Help message";
+
 done_testing;
diff --git a/t/LibreCat/Cmd/export.t b/t/LibreCat/Cmd/export.t
@@ -1,7 +1,9 @@
 use Catmandu::Sane;
 use LibreCat -load => {layer_paths => [qw(t/layer)]};
+use LibreCat::CLI;
 use Test::More;
 use Test::Exception;
+use App::Cmd::Tester;
 use warnings FATAL => 'all';
 
 my $pkg;
@@ -13,4 +15,10 @@ BEGIN {
 
 require_ok $pkg;
 
+my $result = test_app(qq|LibreCat::CLI| => ['help', 'export']);
+ok !$result->error, 'ok threw no exception';
+
+my $output = $result->stdout;
+like $output, qr/WARNING - Low level command/, "Help message";
+
 done_testing;
diff --git a/t/LibreCat/Cmd/file_store.t b/t/LibreCat/Cmd/file_store.t
@@ -21,6 +21,21 @@ require_ok $pkg;
     ok $result->error, 'ok threw an exception';
 }
 
+{
+    my $result = test_app(qq|LibreCat::CLI| => ['help', 'file_store']);
+    ok !$result->error, 'ok threw no exception';
+
+    my $output = $result->stdout;
+    like $output, qr/Usage:/, "Help message";
+}
+
+{
+    my $result = test_app(qq|LibreCat::CLI| => ['file_store', 'do_nonsense']);
+    ok $result->error, 'invalid command threw an exception';
+
+    like $result->error, qr/should be one of/, "error message of invalid command";
+}
+
 {
     my $result = test_app(qq|LibreCat::CLI| => ['file_store', 'list']);
 
@@ -64,7 +79,18 @@ require_ok $pkg;
     my $output = $result->stdout;
     ok $output , 'got an output';
 
-    like $output , qr/^key: 1234/, 'added 1234';
+    like $output , qr/^key: 1234/, 'get 1234';
+}
+
+{
+    my $result = test_app(qq|LibreCat::CLI| => ['file_store', 'exists', '1234']);
+
+    ok !$result->error, 'exists threw no exception';
+
+    my $output = $result->stdout;
+    ok $output , 'got an output';
+
+    like $output , qr/\d+ EXISTS/, 'exists 1234';
 }
 
 {