Attachment 153438 Details for Bug 33869 – Bug 33869: Matcher.t - use TestBuilder

[patch] Bug 33869: Matcher.t - use TestBuilder

Bug-33869-Matchert---use-TestBuilder.patch (text/plain), 3.13 KB, created by Matt Blenkinsop on 2023-07-14 08:24:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matt Blenkinsop

Created: 2023-07-14 08:24:21 UTC

Size: 3.13 KB

patch

obsolete

>From 1b0efb5e8f5b13f3d82dde03eb575928bc1d57e8 Mon Sep 17 00:00:00 2001
>From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>Date: Mon, 29 May 2023 07:08:19 +0000
>Subject: [PATCH] Bug 33869: Matcher.t - use TestBuilder
>
>Remove T::D::C
>
>Test plan:
>Run t/Matcher.t
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
>---
> t/Matcher.t | 52 ++++++++++++++++++++++++----------------------------
> 1 file changed, 24 insertions(+), 28 deletions(-)
>
>diff --git a/t/Matcher.t b/t/Matcher.t
>index 2c7b288769..bc5ccb7659 100755
>--- a/t/Matcher.t
>+++ b/t/Matcher.t
>@@ -16,47 +16,40 @@
> # along with Koha; if not, see <http://www.gnu.org/licenses>.
> 
> use Modern::Perl;
>-
>-use Test::More;
>-use Test::MockModule;
>-use Test::Warn;
>-
> use MARC::Record;
>+use Test::More tests => 3;
>+use Test::Warn;
> 
>-use Module::Load::Conditional qw/check_install/;
>-
>-BEGIN {
>-    if ( check_install( module => 'Test::DBIx::Class' ) ) {
>-        plan tests => 13;
>-    } else {
>-        plan skip_all => "Need Test::DBIx::Class"
>-    }
>-}
>+use t::lib::TestBuilder;
>+use t::lib::Mocks;
> 
>-use Test::DBIx::Class;
>+use Koha::Database;
>+use C4::Matcher qw( GetMatcherList GetMatcherId );
> 
>-my $db = Test::MockModule->new('Koha::Database');
>-$db->mock( _new_schema => sub { return Schema(); } );
>+my $schema  = Koha::Database->new->schema;
>+my $builder = t::lib::TestBuilder->new;
>+$schema->storage->txn_begin;
> 
>-use_ok('C4::Matcher', qw( GetMatcherList GetMatcherId ));
>+subtest 'GetMatcherList' => sub {
>+    plan tests => 9;
> 
>-fixtures_ok [
>-    MarcMatcher => [
>-        [ 'matcher_id', 'code', 'description', 'record_type', 'threshold' ],
>-        [ 1,            'ISBN', 'ISBN',        'red',         1 ],
>-        [ 2,            'ISSN', 'ISSN',        'blue',        0 ]
>-    ],
>-], 'add fixtures';
>+    $schema->resultset('MarcMatcher')->delete_all;
>+    my $matcher1 = $builder->build({ source => 'MarcMatcher',
>+        value => { code => 'ISBN', description => 'ISBN', record_type => 'red', threshold => 1 },
>+    });
>+    my $matcher2 = $builder->build({ source => 'MarcMatcher',
>+        value => { code => 'ISSN', description => 'ISSN', record_type => 'blue', threshold => 0 },
>+    });
> 
> my @matchers = C4::Matcher::GetMatcherList();
> 
>-is( $matchers[0]->{'matcher_id'}, 1, 'First matcher_id value is 1' );
>+is( $matchers[0]->{'matcher_id'}, $matcher1->{matcher_id}, 'First matcher_id value' );
> 
>-is( $matchers[1]->{'matcher_id'}, 2, 'Second matcher_id value is 2' );
>+is( $matchers[1]->{'matcher_id'}, $matcher2->{matcher_id}, 'Second matcher_id value' );
> 
> my $matcher_id = C4::Matcher::GetMatcherId('ISBN');
> 
>-is( $matcher_id, 1, 'testing getmatcherid' );
>+is( $matcher_id, $matcher1->{matcher_id}, 'testing getmatcherid' );
> 
> my $testmatcher;
> 
>@@ -79,6 +72,7 @@ is( $testmatcher->code(), 'match on ISBN', 'testing code accessor' );
> $testmatcher->description('match on ISSN');
> 
> is( $testmatcher->description(), 'match on ISSN', 'testing code accessor' );
>+};
> 
> subtest '_get_match_keys() tests' => sub {
> 
>@@ -402,3 +396,5 @@ sub get_leader_matchpoint {
> 
>     return $matchpoint;
> }
>+
>+$schema->storage->txn_rollback;
>-- 
>2.37.1 (Apple Git-137.1)

Actions: View | Diff | Splinter Review

Attachments on bug 33869: 151872 | 151873 | 151874 | 153438 | 153439 | 153440 | 155104 | 155105 | 155106