Attachment 31084 Details for Bug 11577 – Bug 11577: Unit tests

[patch] Bug 11577: Unit tests

Bug-11577-Unit-tests.patch (text/plain), 6.12 KB, created by Holger Meißner on 2014-08-22 11:48:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Holger Meißner

Created: 2014-08-22 11:48:01 UTC

Size: 6.12 KB

patch

obsolete

>From eabda2ae22fd743afd2b2344a2c11214972b884b Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Holger=20Mei=C3=9Fner?= <h.meissner.82@web.de>
>Date: Mon, 19 May 2014 14:00:48 +0200
>Subject: [PATCH] Bug 11577: Unit tests
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>This patch fixes two unit tests that broke because of the new feature.
>Also adds some new test cases.
>
>To test:
>
>1) prove t/db_dependent/Circulation.t
>2) prove t/db_dependent/Circulation_Issuingrule.t
>
>Sponsored-by: Hochschule fÃ¼r Gesundheit (hsg), Germany
>Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
>---
> t/db_dependent/Circulation.t             |   32 +++++++++++++++++++++++++++++-
> t/db_dependent/Circulation_Issuingrule.t |    9 ++++++++-
> 2 files changed, 39 insertions(+), 2 deletions(-)
>
>diff --git a/t/db_dependent/Circulation.t b/t/db_dependent/Circulation.t
>index 4bc565f..3e2d357 100755
>--- a/t/db_dependent/Circulation.t
>+++ b/t/db_dependent/Circulation.t
>@@ -25,7 +25,7 @@ use C4::Members;
> use C4::Reserves;
> use Koha::DateUtils;
> 
>-use Test::More tests => 49;
>+use Test::More tests => 53;
> 
> BEGIN {
>     use_ok('C4::Circulation');
>@@ -149,10 +149,12 @@ $dbh->do(
>     q{INSERT INTO issuingrules (categorycode, branchcode, itemtype, reservesallowed,
>                                 maxissueqty, issuelength, lengthunit,
>                                 renewalsallowed, renewalperiod,
>+                                norenewalbefore, auto_renew,
>                                 fine, chargeperiod)
>       VALUES (?, ?, ?, ?,
>               ?, ?, ?,
>               ?, ?,
>+              ?, ?,
>               ?, ?
>              )
>     },
>@@ -160,6 +162,7 @@ $dbh->do(
>     '*', '*', '*', 25,
>     20, 14, 'days',
>     1, 7,
>+    '', 0,
>     .10, 1
> );
> 
>@@ -321,6 +324,25 @@ C4::Context->dbh->do("DELETE FROM accountlines");
>     $reserveid = C4::Reserves::GetReserveId({ biblionumber => $biblionumber, itemnumber => $itemnumber, borrowernumber => $reserving_borrowernumber});
>     CancelReserve({ reserve_id => $reserveid });
> 
>+    # Test automatic renewal before value for "norenewalbefore" in policy is set
>+    my $barcode4 = '11235813';
>+    my ( $item_bibnum4, $item_bibitemnum4, $itemnumber4 ) = AddItem(
>+        {
>+            homebranch       => $branch,
>+            holdingbranch    => $branch,
>+            barcode          => $barcode4,
>+            replacementprice => 16.00
>+        },
>+        $biblionumber
>+    );
>+
>+    AddIssue( $renewing_borrower, $barcode4, undef, undef, undef, undef, 1 );
>+    ( $renewokay, $error ) =
>+      CanBookBeRenewed( $renewing_borrowernumber, $itemnumber4 );
>+    is( $renewokay, 0, 'Cannot renew, renewal is automatic' );
>+    is( $error, 'auto_renew',
>+        'Cannot renew, renewal is automatic (returned code is auto_renew)' );
>+
>     # set policy to require that loans cannot be
>     # renewed until seven days prior to the due date
>     $dbh->do('UPDATE issuingrules SET norenewalbefore = 7');
>@@ -333,6 +355,14 @@ C4::Context->dbh->do("DELETE FROM accountlines");
>         'renewals permitted 7 days before due date, as expected',
>     );
> 
>+    # Test automatic renewal again
>+    ( $renewokay, $error ) =
>+      CanBookBeRenewed( $renewing_borrowernumber, $itemnumber4 );
>+    is( $renewokay, 0, 'Cannot renew, renewal is automatic and premature' );
>+    is( $error, 'auto_too_soon',
>+'Cannot renew, renewal is automatic and premature (returned code is auto_too_soon)'
>+    );
>+
>     # Too many renewals
> 
>     # set policy to forbid renewals
>diff --git a/t/db_dependent/Circulation_Issuingrule.t b/t/db_dependent/Circulation_Issuingrule.t
>index 09a36f8..4c52a99 100644
>--- a/t/db_dependent/Circulation_Issuingrule.t
>+++ b/t/db_dependent/Circulation_Issuingrule.t
>@@ -117,6 +117,7 @@ my $sampleissuingrule1 = {
>     lengthunit         => 'Null',
>     renewalperiod      => 5,
>     norenewalbefore    => 6,
>+    auto_renew         => 0,
>     issuelength        => 5,
>     chargeperiod       => 0,
>     rentaldiscount     => '2.000000',
>@@ -140,6 +141,7 @@ my $sampleissuingrule2 = {
>     renewalsallowed    => 'Null',
>     renewalperiod      => 2,
>     norenewalbefore    => 7,
>+    auto_renew         => 0,
>     reservesallowed    => 'Null',
>     issuelength        => 2,
>     lengthunit         => 'Null',
>@@ -165,6 +167,7 @@ my $sampleissuingrule3 = {
>     renewalsallowed    => 'Null',
>     renewalperiod      => 3,
>     norenewalbefore    => 8,
>+    auto_renew         => 0,
>     reservesallowed    => 'Null',
>     issuelength        => 3,
>     lengthunit         => 'Null',
>@@ -190,6 +193,7 @@ $query = 'INSERT INTO issuingrules (
>                 renewalsallowed,
>                 renewalperiod,
>                 norenewalbefore,
>+                auto_renew,
>                 reservesallowed,
>                 issuelength,
>                 lengthunit,
>@@ -206,7 +210,7 @@ $query = 'INSERT INTO issuingrules (
>                 chargename,
>                 restrictedtype,
>                 maxsuspensiondays
>-                ) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)';
>+                ) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)';
> my $sth = $dbh->prepare($query);
> $sth->execute(
>     $sampleissuingrule1->{branchcode},
>@@ -216,6 +220,7 @@ $sth->execute(
>     $sampleissuingrule1->{renewalsallowed},
>     $sampleissuingrule1->{renewalperiod},
>     $sampleissuingrule1->{norenewalbefore},
>+    $sampleissuingrule1->{auto_renew},
>     $sampleissuingrule1->{reservesallowed},
>     $sampleissuingrule1->{issuelength},
>     $sampleissuingrule1->{lengthunit},
>@@ -241,6 +246,7 @@ $sth->execute(
>     $sampleissuingrule2->{renewalsallowed},
>     $sampleissuingrule2->{renewalperiod},
>     $sampleissuingrule2->{norenewalbefore},
>+    $sampleissuingrule1->{auto_renew},
>     $sampleissuingrule2->{reservesallowed},
>     $sampleissuingrule2->{issuelength},
>     $sampleissuingrule2->{lengthunit},
>@@ -266,6 +272,7 @@ $sth->execute(
>     $sampleissuingrule3->{renewalsallowed},
>     $sampleissuingrule3->{renewalperiod},
>     $sampleissuingrule3->{norenewalbefore},
>+    $sampleissuingrule1->{auto_renew},
>     $sampleissuingrule3->{reservesallowed},
>     $sampleissuingrule3->{issuelength},
>     $sampleissuingrule3->{lengthunit},
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 11577: 28425 | 28426 | 28427 | 28428 | 28429 | 28430 | 28431 | 28432 | 28433 | 28434 | 28454 | 28595 | 28596 | 28597 | 28598 | 28599 | 28600 | 28601 | 28602 | 28603 | 28604 | 29393 | 29394 | 29395 | 29396 | 29397 | 29398 | 29399 | 29400 | 29401 | 29402 | 29966 | 29967 | 29968 | 29969 | 29970 | 29971 | 29972 | 29973 | 29974 | 29975 | 30248 | 30249 | 30250 | 30251 | 30252 | 30253 | 30254 | 30255 | 30256 | 30257 | 30258 | 30692 | 30693 | 30694 | 30695 | 30696 | 30697 | 30698 | 30699 | 30700 | 30701 | 30702 | 31076 | 31077 | 31078 | 31079 | 31080 | 31081 | 31082 | 31083 | 31084 | 31085 | 31086 | 31198 | 31199 | 31200 | 31201 | 31202 | 31203 | 31204 | 31205 | 31206 | 31207 | 31208 | 31209 | 31640 | 31641 | 31642 | 31643 | 31644 | 31645 | 31646 | 31647 | 31648 | 31649 | 31650 | 31651 | 31652 | 31653 | 31654 | 31655 | 31656 | 31657 | 31658 | 31659 | 31660 | 31661 | 31662 | 31663 | 57734