Attachment 53407 Details for Bug 16870 – [SIGNED-OFF] Bug 16870 - Move and rename class files and unit tests

[patch] [SIGNED-OFF] Bug 16870 - Move and rename class files and unit tests

Bug-16870---Move-and-rename-class-files-and-unit-t.patch (text/plain), 7.51 KB, created by Srdjan Jankovic on 2016-07-15 02:20:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Srdjan Jankovic

Created: 2016-07-15 02:20:52 UTC

Size: 7.51 KB

patch

obsolete

>From 2c4a95af3294d461c8b3f208ce0758b9ab8eae18 Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>Date: Thu, 7 Jul 2016 14:30:53 +0000
>Subject: [PATCH] Bug 16870 - Move and rename class files and unit tests
>
>Signed-off-by: Srdjan <srdjan@catalyst.net.nz>
>---
> Koha/Issue.pm                   | 28 -------------------
> Koha/Issues.pm                  | 33 -----------------------
> t/db_dependent/Koha/Checkouts.t | 29 +++++++++-----------
> t/db_dependent/Koha/Issues.t    | 60 -----------------------------------------
> 4 files changed, 13 insertions(+), 137 deletions(-)
> delete mode 100644 Koha/Issue.pm
> delete mode 100644 Koha/Issues.pm
> delete mode 100644 t/db_dependent/Koha/Issues.t
>
>diff --git a/Koha/Issue.pm b/Koha/Issue.pm
>deleted file mode 100644
>index 8b67235..0000000
>--- a/Koha/Issue.pm
>+++ /dev/null
>@@ -1,28 +0,0 @@
>-package Koha::Issue;
>-
>-# 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 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.
>-#
>-# 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.
>-
>-use Modern::Perl;
>-
>-use Koha::Database;
>-
>-use base qw(Koha::Object);
>-
>-sub _type {
>-    return 'Issue';
>-}
>-
>-1;
>diff --git a/Koha/Issues.pm b/Koha/Issues.pm
>deleted file mode 100644
>index f0b2216..0000000
>--- a/Koha/Issues.pm
>+++ /dev/null
>@@ -1,33 +0,0 @@
>-package Koha::Issues;
>-
>-# 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 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.
>-#
>-# 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.
>-
>-use Modern::Perl;
>-
>-use Koha::Database;
>-use Koha::Issue;
>-
>-use base qw(Koha::Objects);
>-
>-sub _type {
>-    return 'Issue';
>-}
>-
>-sub object_class {
>-    return 'Koha::Issue';
>-}
>-
>-1;
>diff --git a/t/db_dependent/Koha/Checkouts.t b/t/db_dependent/Koha/Checkouts.t
>index e8b1341..30cdf9d 100644
>--- a/t/db_dependent/Koha/Checkouts.t
>+++ b/t/db_dependent/Koha/Checkouts.t
>@@ -30,33 +30,30 @@ use t::lib::TestBuilder;
> my $schema = Koha::Database->new->schema;
> $schema->storage->txn_begin;
> 
>-my $builder         = t::lib::TestBuilder->new;
>-my $library         = $builder->build( { source => 'Branch' } );
>-my $patron          = $builder->build( { source => 'Borrower', value => { branchcode => $library->{branchcode} } } );
>-my $item_1          = $builder->build( { source => 'Item' } );
>-my $item_2          = $builder->build( { source => 'Item' } );
>-my $nb_of_checkouts = Koha::Checkouts->search->count;
>-my $new_checkout_1  = Koha::Checkout->new(
>+my $builder      = t::lib::TestBuilder->new;
>+my $patron       = $builder->build( { source => 'Borrower' } );
>+my $item_1       = $builder->build( { source => 'Item' } );
>+my $item_2       = $builder->build( { source => 'Item' } );
>+my $nb_of_issues = Koha::Checkouts->search->count;
>+my $new_issue_1  = Koha::Checkout->new(
>     {   borrowernumber => $patron->{borrowernumber},
>         itemnumber     => $item_1->{itemnumber},
>-        branchcode     => $library->{branchcode},
>     }
> )->store;
>-my $new_checkout_2 = Koha::Checkout->new(
>+my $new_issue_2 = Koha::Checkout->new(
>     {   borrowernumber => $patron->{borrowernumber},
>         itemnumber     => $item_2->{itemnumber},
>-        branchcode     => $library->{branchcode},
>     }
> )->store;
> 
>-like( $new_checkout_1->issue_id, qr|^\d+$|, 'Adding a new checkout should have set the issue_id' );
>-is( Koha::Checkouts->search->count, $nb_of_checkouts + 2, 'The 2 checkouts should have been added' );
>+like( $new_issue_1->issue_id, qr|^\d+$|, 'Adding a new issue should have set the issue_id' );
>+is( Koha::Checkouts->search->count, $nb_of_issues + 2, 'The 2 issues should have been added' );
> 
>-my $retrieved_checkout_1 = Koha::Checkouts->find( $new_checkout_1->issue_id );
>-is( $retrieved_checkout_1->itemnumber, $new_checkout_1->itemnumber, 'Find a checkout by id should return the correct checkout' );
>+my $retrieved_issue_1 = Koha::Checkouts->find( $new_issue_1->issue_id );
>+is( $retrieved_issue_1->itemnumber, $new_issue_1->itemnumber, 'Find a issue by id should return the correct issue' );
> 
>-$retrieved_checkout_1->delete;
>-is( Koha::Checkouts->search->count, $nb_of_checkouts + 1, 'Delete should have deleted the checkout' );
>+$retrieved_issue_1->delete;
>+is( Koha::Checkouts->search->count, $nb_of_issues + 1, 'Delete should delete the issue' );
> 
> $schema->storage->txn_rollback;
> 
>diff --git a/t/db_dependent/Koha/Issues.t b/t/db_dependent/Koha/Issues.t
>deleted file mode 100644
>index 38023c8..0000000
>--- a/t/db_dependent/Koha/Issues.t
>+++ /dev/null
>@@ -1,60 +0,0 @@
>-#!/usr/bin/perl
>-
>-# Copyright 2015 Koha Development team
>-#
>-# 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 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.
>-#
>-# You should have received a copy of the GNU General Public License
>-# along with Koha; if not, see <http://www.gnu.org/licenses>.
>-
>-use Modern::Perl;
>-
>-use Test::More tests => 4;
>-
>-use Koha::Issue;
>-use Koha::Issues;
>-use Koha::Database;
>-
>-use t::lib::TestBuilder;
>-
>-my $schema = Koha::Database->new->schema;
>-$schema->storage->txn_begin;
>-
>-my $builder      = t::lib::TestBuilder->new;
>-my $patron       = $builder->build( { source => 'Borrower' } );
>-my $item_1       = $builder->build( { source => 'Item' } );
>-my $item_2       = $builder->build( { source => 'Item' } );
>-my $nb_of_issues = Koha::Issues->search->count;
>-my $new_issue_1  = Koha::Issue->new(
>-    {   borrowernumber => $patron->{borrowernumber},
>-        itemnumber     => $item_1->{itemnumber},
>-    }
>-)->store;
>-my $new_issue_2 = Koha::Issue->new(
>-    {   borrowernumber => $patron->{borrowernumber},
>-        itemnumber     => $item_2->{itemnumber},
>-    }
>-)->store;
>-
>-like( $new_issue_1->issue_id, qr|^\d+$|, 'Adding a new issue should have set the issue_id' );
>-is( Koha::Issues->search->count, $nb_of_issues + 2, 'The 2 issues should have been added' );
>-
>-my $retrieved_issue_1 = Koha::Issues->find( $new_issue_1->issue_id );
>-is( $retrieved_issue_1->itemnumber, $new_issue_1->itemnumber, 'Find a issue by id should return the correct issue' );
>-
>-$retrieved_issue_1->delete;
>-is( Koha::Issues->search->count, $nb_of_issues + 1, 'Delete should delete the issue' );
>-
>-$schema->storage->txn_rollback;
>-
>-1;
>-- 
>2.7.4

Actions: View | Diff | Splinter Review

Attachments on bug 16870: 53188 | 53189 | 53373 | 53374 | 53375 | 53376 | 53407 | 53408