Bugzilla – Attachment 87336 Details for
Bug 22618
Tests in t/Acquisition.t are actually context dependent
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 22618: Move tests to t/db_dependent/Acquisition.t
Bug-22618-Move-tests-to-tdbdependentAcquisitiont.patch (text/plain), 6.35 KB, created by
Michal Denar
on 2019-04-02 22:00:13 UTC
(
hide
)
Description:
Bug 22618: Move tests to t/db_dependent/Acquisition.t
Filename:
MIME Type:
Creator:
Michal Denar
Created:
2019-04-02 22:00:13 UTC
Size:
6.35 KB
patch
obsolete
>From a481ebda6c0642ed21b565e2a1a693cad0dd8972 Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >Date: Tue, 2 Apr 2019 18:02:14 +0000 >Subject: [PATCH] Bug 22618: Move tests to t/db_dependent/Acquisition.t > >prove -v t/db_dependent/Acquisition.t > >Signed-off-by: Michal Denar <black23@gmail.com> >--- > t/Acquisition.t | 68 -------------------------------------------- > t/db_dependent/Acquisition.t | 45 ++++++++++++++++++++++++++++- > 2 files changed, 44 insertions(+), 69 deletions(-) > delete mode 100644 t/Acquisition.t > >diff --git a/t/Acquisition.t b/t/Acquisition.t >deleted file mode 100644 >index 9c5102c9b1..0000000000 >--- a/t/Acquisition.t >+++ /dev/null >@@ -1,68 +0,0 @@ >-#!/usr/bin/perl >- >-# This file is part of Koha. >-# >-# Copyright (C) 2018 Mark Tompsett >-# >-# 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 => 3; >-use t::lib::Mocks; >- >-use_ok( 'C4::Acquisition' ); >- >-subtest 'Tests for get_rounding_sql' => sub { >- >- plan tests => 2; >- >- my $value = '3.141592'; >- >- t::lib::Mocks::mock_preference( 'OrderPriceRounding', q{} ); >- my $no_rounding_result = C4::Acquisition::get_rounding_sql($value); >- t::lib::Mocks::mock_preference( 'OrderPriceRounding', q{nearest_cent} ); >- my $rounding_result = C4::Acquisition::get_rounding_sql($value); >- >- ok( $no_rounding_result eq $value, "Value ($value) not to be rounded" ); >- ok( $rounding_result =~ /CAST/, "Value ($value) will be rounded" ); >- >-}; >- >-subtest 'Test for get_rounded_price' => sub { >- >- plan tests => 6; >- >- my $exact_price = 3.14; >- my $up_price = 3.145592; >- my $down_price = 3.141592; >- my $round_up_price = sprintf( '%0.2f', $up_price ); >- my $round_down_price = sprintf( '%0.2f', $down_price ); >- >- t::lib::Mocks::mock_preference( 'OrderPriceRounding', q{} ); >- my $not_rounded_result1 = C4::Acquisition::get_rounded_price($exact_price); >- my $not_rounded_result2 = C4::Acquisition::get_rounded_price($up_price); >- my $not_rounded_result3 = C4::Acquisition::get_rounded_price($down_price); >- t::lib::Mocks::mock_preference( 'OrderPriceRounding', q{nearest_cent} ); >- my $rounded_result1 = C4::Acquisition::get_rounded_price($exact_price); >- my $rounded_result2 = C4::Acquisition::get_rounded_price($up_price); >- my $rounded_result3 = C4::Acquisition::get_rounded_price($down_price); >- >- is( $not_rounded_result1, $exact_price, "Price ($exact_price) was correctly not rounded ($not_rounded_result1)" ); >- is( $not_rounded_result2, $up_price, "Price ($up_price) was correctly not rounded ($not_rounded_result2)" ); >- is( $not_rounded_result3, $down_price, "Price ($down_price) was correctly not rounded ($not_rounded_result3)" ); >- is( $rounded_result1, $exact_price, "Price ($exact_price) was correctly rounded ($rounded_result1)" ); >- is( $rounded_result2, $round_up_price, "Price ($up_price) was correctly rounded ($rounded_result2)" ); >- is( $rounded_result3, $round_down_price, "Price ($down_price) was correctly rounded ($rounded_result3)" ); >- >-}; >diff --git a/t/db_dependent/Acquisition.t b/t/db_dependent/Acquisition.t >index b997f70345..b6fe38d3e9 100755 >--- a/t/db_dependent/Acquisition.t >+++ b/t/db_dependent/Acquisition.t >@@ -19,7 +19,7 @@ use Modern::Perl; > > use POSIX qw(strftime); > >-use Test::More tests => 75; >+use Test::More tests => 77; > use t::lib::Mocks; > use Koha::Database; > use Koha::Acquisition::Basket; >@@ -795,4 +795,47 @@ subtest 'GetHistory with additional fields' => sub { > is( scalar( @$history ), 1, 'GetHistory returns the order when additional field is set'); > }; > >+subtest 'Tests for get_rounding_sql' => sub { >+ >+ plan tests => 2; >+ >+ my $value = '3.141592'; >+ >+ t::lib::Mocks::mock_preference( 'OrderPriceRounding', q{} ); >+ my $no_rounding_result = C4::Acquisition::get_rounding_sql($value); >+ t::lib::Mocks::mock_preference( 'OrderPriceRounding', q{nearest_cent} ); >+ my $rounding_result = C4::Acquisition::get_rounding_sql($value); >+ >+ ok( $no_rounding_result eq $value, "Value ($value) not to be rounded" ); >+ ok( $rounding_result =~ /CAST/, "Value ($value) will be rounded" ); >+ >+}; >+ >+subtest 'Test for get_rounded_price' => sub { >+ >+ plan tests => 6; >+ >+ my $exact_price = 3.14; >+ my $up_price = 3.145592; >+ my $down_price = 3.141592; >+ my $round_up_price = sprintf( '%0.2f', $up_price ); >+ my $round_down_price = sprintf( '%0.2f', $down_price ); >+ >+ t::lib::Mocks::mock_preference( 'OrderPriceRounding', q{} ); >+ my $not_rounded_result1 = C4::Acquisition::get_rounded_price($exact_price); >+ my $not_rounded_result2 = C4::Acquisition::get_rounded_price($up_price); >+ my $not_rounded_result3 = C4::Acquisition::get_rounded_price($down_price); >+ t::lib::Mocks::mock_preference( 'OrderPriceRounding', q{nearest_cent} ); >+ my $rounded_result1 = C4::Acquisition::get_rounded_price($exact_price); >+ my $rounded_result2 = C4::Acquisition::get_rounded_price($up_price); >+ my $rounded_result3 = C4::Acquisition::get_rounded_price($down_price); >+ >+ is( $not_rounded_result1, $exact_price, "Price ($exact_price) was correctly not rounded ($not_rounded_result1)" ); >+ is( $not_rounded_result2, $up_price, "Price ($up_price) was correctly not rounded ($not_rounded_result2)" ); >+ is( $not_rounded_result3, $down_price, "Price ($down_price) was correctly not rounded ($not_rounded_result3)" ); >+ is( $rounded_result1, $exact_price, "Price ($exact_price) was correctly rounded ($rounded_result1)" ); >+ is( $rounded_result2, $round_up_price, "Price ($up_price) was correctly rounded ($rounded_result2)" ); >+ is( $rounded_result3, $round_down_price, "Price ($down_price) was correctly rounded ($rounded_result3)" ); >+ >+}; > $schema->storage->txn_rollback(); >-- >2.11.0
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=87336">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 22618
:
87328
|
87336
|
87464