Bug 26384: Fix executable flags

[koha-ffzg.git] / t / db_dependent / Labels / t_Layout.t

diff --git a/t/db_dependent/Labels/t_Layout.t b/t/db_dependent/Labels/t_Layout.t
old mode 100644 (file)
new mode 100755 (executable)
index fe8ef3a..54be026
--- a/t/db_dependent/Labels/t_Layout.t
+++ b/t/db_dependent/Labels/t_Layout.t
@@ -4,25 +4,23 @@
 #
 # This file is part of Koha.
 #       
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
-use strict;
-use warnings;
+use Modern::Perl;
 
-use Test::More tests => 36;
+use Test::More tests => 38;
 use C4::Context;
-use Data::Dumper;
 
 BEGIN {
     use_ok('C4::Labels::Layout');
@@ -37,6 +35,7 @@ my $default_layout = {
         printing_type   =>      'BAR',
         layout_name     =>      'TEST',
         guidebox        =>      0,
+        oblique_title   =>      1,
         font            =>      'TR',
         font_size       =>      3,
         callnum_split   =>      0,
@@ -46,16 +45,17 @@ my $default_layout = {
 
 my $layout;
 
-diag "Testing Layout->new() method.";
-ok($layout = C4::Labels::Layout->new(layout_name => 'TEST')) || diag "Layout->new() FAILED";
-is_deeply($layout, $default_layout) || diag "New layout object FAILED to verify.";
+# Testing Layout->new()
+ok($layout = C4::Labels::Layout->new(layout_name => 'TEST'), "Layout->new() success");
+is_deeply($layout, $default_layout, "New layout object is the expected");
 
-diag "Testing Layout->get_attr() method.";
+# Testing Layout->get_attr()
 foreach my $key (keys %{$default_layout}) {
-    ok($default_layout->{$key} eq $layout->get_attr($key)) || diag "Layout->get_attr() FAILED on attribute $key.";
+    ok($default_layout->{$key} eq $layout->get_attr($key),
+        "Layout->get_attr() success on attribute $key.");
 }
 
-diag "Testing Layout->set_attr() method.";
+# Testing Layout->set_attr()
 my $new_attr = {
         creator         =>      'Labels',
         layout_xml      =>      '',
@@ -65,6 +65,7 @@ my $new_attr = {
         printing_type   =>      'BIBBAR',
         layout_name     =>      'TEST',
         guidebox        =>      1,
+        oblique_title   =>      0,
         font            =>      'TR',
         font_size       =>      10,
         callnum_split   =>      1,
@@ -74,35 +75,37 @@ my $new_attr = {
 
 foreach my $key (keys %{$new_attr}) {
     $layout->set_attr($key => $new_attr->{$key});
-    ok($new_attr->{$key} eq $layout->get_attr($key)) || diag "Layout->set_attr() FAILED on attribute $key.";
+    ok($new_attr->{$key} eq $layout->get_attr($key),
+        "Layout->set_attr() success on attribute $key.");
 }
 
-diag "Testing Layout->save() method with a new object.";
 
+# Testing Layout->save() method with a new object
 my $sav_results = $layout->save();
-ok($sav_results ne -1) || diag "Layout->save() FAILED";
+ok($sav_results ne -1, "Layout->save() success");
 
 my $saved_layout;
 if ($sav_results ne -1) {
-    diag "Testing Layout->retrieve() method.";
+    # Testing Layout->retrieve()
     $new_attr->{'layout_id'} = $sav_results;
-    ok($saved_layout = C4::Labels::Layout->retrieve(layout_id => $sav_results)) || diag "Layout->retrieve() FAILED";
-    is_deeply($saved_layout, $new_attr) || diag "Retrieved layout object FAILED to verify.";
+    ok($saved_layout = C4::Labels::Layout->retrieve(layout_id => $sav_results),
+        "Layout->retrieve() success");
+    is_deeply($saved_layout, $new_attr,
+        "Retrieved layout object is the expected");
 }
 
-diag "Testing Layout->save() method with an updated object.";
-
+# Testing Layout->save() method with an updated object
 $saved_layout->set_attr(font => 'C');
 my $upd_results = $saved_layout->save();
-ok($upd_results ne -1) || diag "Layout->save() FAILED";
+ok($upd_results ne -1, "Layout->save() success");
 my $updated_layout = C4::Labels::Layout->retrieve(layout_id => $sav_results);
-is_deeply($updated_layout, $saved_layout) || diag "Updated layout object FAILED to verify.";
-
-diag "Testing Layout->get_text_wrap_cols() method.";
+is_deeply($updated_layout, $saved_layout, "Updated layout object is the expected");
 
-ok($updated_layout->get_text_wrap_cols(label_width => 180, left_text_margin => 18) eq 21) || diag "Layout->get_text_wrap_cols() FAILED.";
-
-diag "Testing Layout->delete() method.";
+# Testing Layout->get_text_wrap_cols()
+is($updated_layout->get_text_wrap_cols(label_width => 180, left_text_margin => 18), 21,
+    "Layout->get_text_wrap_cols()");
 
+# Testing Layout->delete()
 my $del_results = $updated_layout->delete();
-ok($del_results ne -1) || diag "Layout->delete() FAILED";
+ok( ! defined($del_results) , "Layout->delete() success");
+