From e92bae43aabd8a2b47f24fa8d0eb0479dfcc89f4 Mon Sep 17 00:00:00 2001
From: Mark Tompsett <mtompset@hotmail.com>
Date: Sun, 27 Jul 2014 21:16:38 -0400
Subject: [PATCH] [PASSED QA] Bug 12167: Bad expected results and condition
check for GetNewsToDisplay
This corrected the results expected to a single array reference.
It then determines that it is defined and an array reference.
And lastly, correct the logic that was supposed to check for
valid results.
TEST PLAN
---------
1) Apply patch 1 and 2.
2) prove -v t/db_dependent/NewsChannels.t
-- all tests should pass
-- note the test changes to verify correctly what should
be tested for.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
---
t/db_dependent/NewsChannels.t | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/t/db_dependent/NewsChannels.t b/t/db_dependent/NewsChannels.t
index a70bc3f..332b396 100644
--- a/t/db_dependent/NewsChannels.t
+++ b/t/db_dependent/NewsChannels.t
@@ -132,13 +132,13 @@ my ( $opac_news_count, $arrayref_opac_news ) = get_opac_news( 0, q{}, 'LIB1' );
ok( $opac_news_count >= 2, 'Successfully tested get_opac_news for LIB1!' );
# Test GetNewsToDisplay
-( $opac_news_count, $arrayref_opac_news ) = GetNewsToDisplay( q{}, 'LIB1' );
-ok( !$arrayref_opac_news, 'Second parameter is ' .
+( $arrayref_opac_news ) = GetNewsToDisplay( q{}, 'LIB1' );
+ok( $arrayref_opac_news, '$arrayref_opac_news is ' .
( defined($arrayref_opac_news) ?
- ("Defined as '$arrayref_opac_news'") : "UNDEFINED")
+ ('Defined') : 'UNDEFINED')
);
-ok ( ref $opac_news_count eq 'ARRAY',
- '$opac_news_count is an array reference');
-ok( $opac_news_count >= 2, 'Successfully tested GetNewsToDisplay for LIB1!' );
+ok( ref $arrayref_opac_news eq 'ARRAY',
+ '$arrayref_opac_news is an array reference.' );
+ok( (scalar @$arrayref_opac_news) >= 2, 'Successfully tested GetNewsToDisplay for LIB1!' );
$dbh->rollback;
--
1.9.1