Bugzilla – Attachment 43874 Details for
Bug 14778
DBIC should create/own the DB handler
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PASSED QA] Bug 14778: Make Barcodes_ValueBuilder.t db dependent
PASSED-QA-Bug-14778-Make-BarcodesValueBuildert-db-.patch (text/plain), 2.97 KB, created by
Kyle M Hall (khall)
on 2015-10-23 14:57:13 UTC
(
hide
)
Description:
[PASSED QA] Bug 14778: Make Barcodes_ValueBuilder.t db dependent
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2015-10-23 14:57:13 UTC
Size:
2.97 KB
patch
obsolete
>From d4b7abb78ac36ac2e131a9b9ab9402b8f453bf01 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Tue, 20 Oct 2015 14:45:11 +0100 >Subject: [PATCH] [PASSED QA] Bug 14778: Make Barcodes_ValueBuilder.t db dependent > >The get_barcode subroutines call very mysql specific functions and it's >not possible to easily use fixtures here. > >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> > >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> >--- > t/{ => db_dependent}/Barcodes_ValueBuilder.t | 64 ++++++++++---------------- > 1 files changed, 25 insertions(+), 39 deletions(-) > rename t/{ => db_dependent}/Barcodes_ValueBuilder.t (52%) > >diff --git a/t/Barcodes_ValueBuilder.t b/t/db_dependent/Barcodes_ValueBuilder.t >similarity index 52% >rename from t/Barcodes_ValueBuilder.t >rename to t/db_dependent/Barcodes_ValueBuilder.t >index da90101..29f0b12 100644 >--- a/t/Barcodes_ValueBuilder.t >+++ b/t/db_dependent/Barcodes_ValueBuilder.t >@@ -1,34 +1,35 @@ > #!/usr/bin/perl > > use Modern::Perl; >-use Test::More tests => 10; >+use Test::More tests => 7; > use Test::MockModule; >+use t::lib::TestBuilder; > > BEGIN { > use_ok('C4::Barcodes::ValueBuilder'); >-} >- >-use Test::DBIx::Class { >- schema_class => 'Koha::Schema', >- connect_info => ['dbi:SQLite:dbname=:memory:','',''], >- connect_opts => { name_sep => '.', quote_char => '`', }, >- fixture_class => '::Populate', >-}, 'Biblio' ; >- >-sub fixtures { >- my ( $data ) = @_; >- fixtures_ok [ >- Item => [ >- @$data >- ], >- ], 'add fixtures'; >-} >- >-my $db = Test::MockModule->new('Koha::Database'); >-$db->mock( >- _new_schema => sub { return Schema(); } >-); >- >+}; >+ >+my $builder = t::lib::TestBuilder->new; >+my $dbh = C4::Context->dbh; >+$dbh->do(q|DELETE FROM items|); >+my $item_1 = $builder->build({ >+ source => 'Item', >+ value => { >+ barcode => '33333074344563' >+ } >+}); >+my $item_2 = $builder->build({ >+ source => 'Item', >+ value => { >+ barcode => 'hb12070890' >+ } >+}); >+my $item_3 = $builder->build({ >+ source => 'Item', >+ value => { >+ barcode => '2012-0034' >+ } >+}); > > my %args = ( > year => '2012', >@@ -40,29 +41,14 @@ my %args = ( > locsubfield => 'a' > ); > >-fixtures([ >- [ qw/ itemnumber barcode / ], >- [ 1, 33333074344563 ] >-]); > my ($nextnum, $scr) = C4::Barcodes::ValueBuilder::incremental::get_barcode(\%args); > is($nextnum, 33333074344564, 'incremental barcode'); > is($scr, undef, 'incremental javascript'); > >-fixtures([ >- ['barcode'], >- ['890'], >-]); >- > ($nextnum, $scr) = C4::Barcodes::ValueBuilder::hbyymmincr::get_barcode(\%args); > is($nextnum, '12070891', 'hbyymmincr barcode'); > ok(length($scr) > 0, 'hbyymmincr javascript'); > >-fixtures([ >- ['barcode'], >- #max(cast( substring_index(barcode, \'-\',-1) as signed))'], >- ['34'], >-]); >- > ($nextnum, $scr) = C4::Barcodes::ValueBuilder::annual::get_barcode(\%args); > is($nextnum, '2012-0035', 'annual barcode'); > is($scr, undef, 'annual javascript'); >-- >1.7.2.5
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 14778
:
42326
|
42388
|
43247
|
43248
|
43249
|
43250
|
43440
|
43631
|
43632
|
43633
|
43634
|
43635
|
43636
|
43637
|
43638
|
43639
|
43640
|
43641
|
43642
|
43643
|
43644
|
43645
|
43834
|
43835
|
43836
|
43837
|
43838
|
43839
|
43840
|
43841
|
43842
|
43843
|
43844
|
43845
|
43846
|
43847
|
43848
|
43849
|
43850
|
43851
|
43852
|
43853
|
43857
|
43858
|
43859
|
43860
|
43861
|
43862
|
43863
|
43864
|
43865
|
43866
|
43867
|
43868
|
43869
|
43870
|
43871
|
43872
|
43873
| 43874 |
43875
|
43876
|
44003