From e1b1dceabb52e72c6b899e625f7e9308aba8f15b Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Mon, 16 Dec 2013 11:55:56 -0300 Subject: [PATCH] Bug 11402: make Labels::_guide_box return undef if undefned data is passed That's it. A guide box cannot be created if invalid data is passed. Sponsored-by: Universidad Nacional de Cordoba Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Passes all tests and QA script, includes new unit tests. Signed-off-by: Galen Charlton (cherry picked from commit 4720cbc4145223f1ffd653efdefd1a4f724d3144) Signed-off-by: Fridolin Somers (cherry picked from commit c129755ce41fcc3712c987149d5cbc4dec696cf6) Signed-off-by: Tomas Cohen Arazi --- C4/Labels/Label.pm | 2 ++ t/Labels.t | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/C4/Labels/Label.pm b/C4/Labels/Label.pm index f62d50c0c8..cb6a631d9f 100644 --- a/C4/Labels/Label.pm +++ b/C4/Labels/Label.pm @@ -62,6 +62,8 @@ sub _check_params { sub _guide_box { my ( $llx, $lly, $width, $height ) = @_; + return unless ( defined $llx and defined $lly and + defined $width and defined $height ); my $obj_stream = "q\n"; # save the graphic state $obj_stream .= "0.5 w\n"; # border line width $obj_stream .= "1.0 0.0 0.0 RG\n"; # border color red diff --git a/t/Labels.t b/t/Labels.t index 823511b5be..0b2b804300 100644 --- a/t/Labels.t +++ b/t/Labels.t @@ -20,7 +20,7 @@ use strict; use warnings; -use Test::More tests => 6; +use Test::More tests => 10; BEGIN { use_ok('C4::Labels::Label'); @@ -36,7 +36,17 @@ is_deeply($parsed_fields, $expected_fields, '"callnumber" in label layout alias is(C4::Labels::Label::_check_params(),"0",'test checking parameters'); -ok(C4::Labels::Label::_guide_box(), 'test guide box with nothing entered'); +my ($llx,$lly,$width,$height) = ( 0, 0, 10, 10 ); +ok(!defined C4::Labels::Label::_guide_box(), + "Test guide box with undefined parameters returns undef"); +ok(!defined C4::Labels::Label::_guide_box(undef,$lly,$width,$height), + "Test guide box with undefined 'x' coordinate returns undef"); +ok(!defined C4::Labels::Label::_guide_box($llx,undef,$width,$height), + "Test guide box with undefined 'y' coordinate returns undef"); +ok(!defined C4::Labels::Label::_guide_box($llx,$lly,undef,$height), + "Test guide box with undefined 'width' returns undef"); +ok(!defined C4::Labels::Label::_guide_box($llx,$lly,$width,undef), + "Test guide box with undefined 'height' returns undef"); ok(C4::Labels::Label::_get_text_fields(), 'test getting textx fields'); -- 2.39.5