Bugzilla – Attachment 47771 Details for
Bug 12748
Serials - two issues with status of "Expected"
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 12748 - Add test for step 7 and 8 and rename findSerialByStatus
Bug-12748---Add-test-for-step-7-and-8-and-rename-f.patch (text/plain), 4.40 KB, created by
Rémi Mayrand-Provencher
on 2016-02-08 20:11:56 UTC
(
hide
)
Description:
Bug 12748 - Add test for step 7 and 8 and rename findSerialByStatus
Filename:
MIME Type:
Creator:
Rémi Mayrand-Provencher
Created:
2016-02-08 20:11:56 UTC
Size:
4.40 KB
patch
obsolete
>From 24b70bfd74adb95261d5b2e7517dcb30e0335023 Mon Sep 17 00:00:00 2001 >From: remi <remi.mayrand-provencher@inLibro.com> >Date: Mon, 8 Feb 2016 15:04:07 -0500 >Subject: [PATCH] Bug 12748 - Add test for step 7 and 8 and rename > findSerialByStatus > >https://bugs.koha-community.org/show_bug.cgi?id=12478 >--- > C4/Serials.pm | 7 +++---- > t/db_dependent/Serials.t | 23 ++++++++++++++++++++--- > 2 files changed, 23 insertions(+), 7 deletions(-) > >diff --git a/C4/Serials.pm b/C4/Serials.pm >index 029c10d..f09f9ac 100644 >--- a/C4/Serials.pm >+++ b/C4/Serials.pm >@@ -1176,8 +1176,7 @@ sub ModSerialStatus { > } > > # create new expected entry if needed (ie : was "expected" and has changed) >- # BUG 12748: Check if there are no other expected issues. >- my $otherIssueExpected = scalar findSerialByStatus(EXPECTED, $subscriptionid); >+ my $otherIssueExpected = scalar findSerialsByStatus(EXPECTED, $subscriptionid); > if ( !$otherIssueExpected && $oldstatus == EXPECTED && $status != EXPECTED ) { > my $subscription = GetSubscription($subscriptionid); > my $pattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($subscription->{numberpattern}); >@@ -2689,7 +2688,7 @@ sub _can_do_on_subscription { > return 0; > } > >-=head2 findSerialByStatus >+=head2 findSerialsByStatus > > @serials = findSerialByStatus($status, $subscriptionid); > >@@ -2697,7 +2696,7 @@ sub _can_do_on_subscription { > > =cut > >-sub findSerialByStatus{ >+sub findSerialsByStatus{ > my($status, $subscriptionid) = @_; > my $dbh = C4::Context->dbh; > my $query = q| SELECT * from serial >diff --git a/t/db_dependent/Serials.t b/t/db_dependent/Serials.t >index b350ccd..dac804f 100755 >--- a/t/db_dependent/Serials.t >+++ b/t/db_dependent/Serials.t >@@ -15,7 +15,7 @@ use C4::Bookseller; > use C4::Biblio; > use C4::Budgets; > use Koha::DateUtils; >-use Test::More tests => 48; >+use Test::More tests => 49; > > BEGIN { > use_ok('C4::Serials'); >@@ -173,7 +173,8 @@ is(C4::Serials::ModSubscriptionHistory(), undef, 'test modding subscription hist > > is(C4::Serials::ModSerialStatus(),undef, 'test modding serials'); > >-is(C4::Serials::findSerialByStatus(), 0, 'test finding serial by status with no parameters'); >+is(C4::Serials::findSerialsByStatus(), 0, 'test finding serial by status with no parameters'); >+ > is(C4::Serials::NewIssue(), undef, 'test getting 0 when nothing is entered'); > > is(C4::Serials::HasSubscriptionStrictlyExpired(), undef, 'test if the subscriptions has expired'); >@@ -219,7 +220,7 @@ for my $status ( @statuses ) { > $counter++; > } > # Here we have 15 serials with statuses : 2*2 + 5*3 + 2*4 + 1*41 + 1*42 + 1*43 + 1*44 + 1*5 + 1*1 >-my @serialsByStatus = C4::Serials::findSerialByStatus(2,$subscriptionid); >+my @serialsByStatus = C4::Serials::findSerialsByStatus(2,$subscriptionid); > is(@serialsByStatus,2,"findSerialByStatus returns all serials with chosen status"); > ( $total_issues, @serials ) = C4::Serials::GetSerials( $subscriptionid ); > is( $total_issues, @statuses + 1, "GetSerials returns total_issues" ); >@@ -247,4 +248,20 @@ for my $am ( @arrived_missing ) { > } > is( $subscription->{missinglist}, join('; ', @serialseqs), "subscription missinglist is updated after ModSerialStatus" ); > >+my ( $expected_serial ) = GetSerials2( $subscriptionid, [1] ); >+#Find serialid for serial with status Expected >+my $serialexpected = (C4::Serials::findSerialsByStatus(1,$subscriptionid))[0]; >+#delete serial with status Expected >+C4::Serials::ModSerialStatus( $serialexpected->{serialid},$serialexpected->{serialseq},$publisheddate,$publisheddate, $publisheddate,'1','an useless note'); >+my @serialsByStatus = C4::Serials::findSerialsByStatus(1,$subscriptionid); >+is (@serialsByStatus,1,"ModSerialStatus delete corectly serial expected and create another if not exist"); >+# add 1 serial with status=Expected 1 >+C4::Serials::ModSerialStatus( $expected_serial->{serialid}, 'NO.20', $publisheddate, $publisheddate, $publisheddate, '1', 'an useless note' ); >+#Now we have two serials it have status expected >+#put status delete for last serial >+C4::Serials::ModSerialStatus( $serialexpected->{serialid},$serialexpected->{serialseq},$publisheddate,$publisheddate, $publisheddate,'1','an useless note'); >+#try if create or note another serial with status is expected >+@serialsByStatus = C4::Serials::findSerialsByStatus(1,$subscriptionid); >+is(@serialsByStatus,1,"ModSerialStatus delete corectly serial expected and not create another if exist"); >+ > $dbh->rollback; >-- >1.9.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 12748
:
41228
|
41230
|
41371
|
41451
|
44533
|
46091
|
47770
|
47771
|
47773
|
47774
|
47775
|
47776
|
52356
|
52357
|
52358
|
52359
|
52360