Bugzilla – Attachment 64786 Details for
Bug 18434
Elasticsearch indexing broken with newer catmandu version
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 18434: Add tests for K:SE:E::get_fixer_rules
Bug-18434-Add-tests-for-KSEEgetfixerrules.patch (text/plain), 9.50 KB, created by
Tomás Cohen Arazi (tcohen)
on 2017-07-03 19:07:20 UTC
(
hide
)
Description:
Bug 18434: Add tests for K:SE:E::get_fixer_rules
Filename:
MIME Type:
Creator:
Tomás Cohen Arazi (tcohen)
Created:
2017-07-03 19:07:20 UTC
Size:
9.50 KB
patch
obsolete
>From 3124bd79eb18fccf14a39396d0ade0fcdc204701 Mon Sep 17 00:00:00 2001 >From: Tomas Cohen Arazi <tomascohen@theke.io> >Date: Fri, 12 May 2017 15:39:25 -0300 >Subject: [PATCH] Bug 18434: Add tests for K:SE:E::get_fixer_rules > >This patch tries to introduce exhaustive tests for this class method. >I didn't try to provide a regression test for the current bug per-se, but >cover the current method behaviour as much as I could. > >(kidclamp) I added a quick test of _convert_marc_to_json to use the mocking here >and illuminate what the change does, before the patches this should >fail (fields are indexed in place of one another), after it should succeed (new indexed fields are appended). > >A minor bug is highlighted by this new tests, I'll provide a followup for it. > >To test: >- Run: > $ sudo koha-shell kohadev > k$ de kohaclone > k$ prove t/db_dependent/Koha_Elasticsearch.t >=> FAIL: The returned fixer rules are not the expected ones > >Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> >--- > t/db_dependent/Koha_Elasticsearch.t | 155 +++++++++++++++++++++++++++++++++++- > 1 file changed, 152 insertions(+), 3 deletions(-) > >diff --git a/t/db_dependent/Koha_Elasticsearch.t b/t/db_dependent/Koha_Elasticsearch.t >index eb24cbb..b8fdfa6 100644 >--- a/t/db_dependent/Koha_Elasticsearch.t >+++ b/t/db_dependent/Koha_Elasticsearch.t >@@ -15,9 +15,158 @@ > # You should have received a copy of the GNU General Public License > # along with Koha; if not, see <http://www.gnu.org/licenses> > >-use strict; >-use warnings; >+use Modern::Perl; > >-use Test::More tests => 1; # last test to print >+use Test::More tests => 2; >+use Test::MockModule; >+ >+use t::lib::Mocks; >+use MARC::Record; >+use Koha::SearchEngine::Elasticsearch::Indexer; >+use JSON::XS; >+ >+my $schema = Koha::Database->schema; > > use_ok('Koha::SearchEngine::Elasticsearch'); >+ >+subtest 'get_fixer_rules() tests' => sub { >+ >+ plan tests => 47; >+ >+ $schema->storage->txn_begin; >+ >+ t::lib::Mocks::mock_preference( 'marcflavour', 'MARC21' ); >+ >+ my @mappings; >+ >+ my $se = Test::MockModule->new( 'Koha::SearchEngine::Elasticsearch' ); >+ $se->mock( '_foreach_mapping', sub { >+ my ($self, $sub ) = @_; >+ >+ foreach my $map ( @mappings ) { >+ $sub->( >+ $map->{name}, >+ $map->{type}, >+ $map->{facet}, >+ $map->{suggestible}, >+ $map->{sort}, >+ $map->{marc_type}, >+ $map->{marc_field} >+ ); >+ } >+ }); >+ >+ my $see = Koha::SearchEngine::Elasticsearch->new({ index => 'biblios' }); >+ >+ @mappings = ( >+ { >+ name => 'author', >+ type => 'string', >+ facet => 1, >+ suggestible => 1, >+ sort => '~', >+ marc_type => 'marc21', >+ marc_field => '100a', >+ }, >+ { >+ name => 'author', >+ type => 'string', >+ facet => 1, >+ suggestible => 1, >+ sort => '~', >+ marc_type => 'marc21', >+ marc_field => '110a', >+ }, >+ ); >+ >+ my $marc_record = MARC::Record->new(); >+ $marc_record->append_fields( >+ MARC::Field->new( '001', '1234567' ), >+ MARC::Field->new( '020', '', '', 'a' => '1234567890123' ), >+ MARC::Field->new( '100', '', '', 'a' => 'Author' ), >+ MARC::Field->new( '110', '', '', 'a' => 'Corp Author' ), >+ MARC::Field->new( '245', '', '', 'a' => 'Title' ), >+ ); >+ my @records = ( $marc_record ); >+ >+ my $importer = Koha::SearchEngine::Elasticsearch::Indexer->new({ index => 'biblios' }); >+ my $conv = $importer->_convert_marc_to_json( \@records )->next(); >+ is( $conv->{author}[0][0], "Author", "First mapped author should be 100a"); >+ is( $conv->{author}[1][0], "Corp Author", "Second mapped author should be 110a"); >+ >+ my $result = $see->get_fixer_rules(); >+ is( $result->[0], q{marc_map('} . $mappings[0]->{marc_field} . q{','} . $mappings[0]->{name} . q{.$append', -split => 1)}); >+ is( $result->[1], q{marc_map('} . $mappings[0]->{marc_field} . q{','} . $mappings[0]->{name} . q{__facet', -split => 1)}); >+ is( $result->[2], q{marc_map('} . $mappings[0]->{marc_field} . q{','} . $mappings[0]->{name} . q{__suggestion.input.$append')}); >+ is( $result->[3], q{marc_map('} . $mappings[0]->{marc_field} . q{','} . $mappings[0]->{name} . q{__sort', -split => 1)}); >+ is( $result->[4], q{marc_map('} . $mappings[1]->{marc_field} . q{','} . $mappings[1]->{name} . q{.$append', -split => 1)}); >+ is( $result->[5], q{marc_map('} . $mappings[1]->{marc_field} . q{','} . $mappings[1]->{name} . q{__facet', -split => 1)}); >+ is( $result->[6], q{marc_map('} . $mappings[1]->{marc_field} . q{','} . $mappings[1]->{name} . q{__suggestion.input.$append')}); >+ is( $result->[7], q{marc_map('} . $mappings[1]->{marc_field} . q{','} . $mappings[1]->{name} . q{__sort', -split => 1)}); >+ is( $result->[8], q{move_field(_id,es_id)}); >+ >+ $mappings[0]->{type} = 'boolean'; >+ $mappings[1]->{type} = 'boolean'; >+ $result = $see->get_fixer_rules(); >+ is( $result->[0], q{marc_map('} . $mappings[0]->{marc_field} . q{','} . $mappings[0]->{name} . q{.$append', -split => 1)}); >+ is( $result->[1], q{marc_map('} . $mappings[0]->{marc_field} . q{','} . $mappings[0]->{name} . q{__facet', -split => 1)}); >+ is( $result->[2], q{marc_map('} . $mappings[0]->{marc_field} . q{','} . $mappings[0]->{name} . q{__suggestion.input.$append')}); >+ is( $result->[3], q{unless exists('} . $mappings[0]->{name} . q{') add_field('} . $mappings[0]->{name} . q{', 0) end}); >+ is( $result->[4], q{marc_map('} . $mappings[0]->{marc_field} . q{','} . $mappings[0]->{name} . q{__sort', -split => 1)}); >+ is( $result->[5], q{marc_map('} . $mappings[1]->{marc_field} . q{','} . $mappings[1]->{name} . q{.$append', -split => 1)}); >+ is( $result->[6], q{marc_map('} . $mappings[1]->{marc_field} . q{','} . $mappings[1]->{name} . q{__facet', -split => 1)}); >+ is( $result->[7], q{marc_map('} . $mappings[1]->{marc_field} . q{','} . $mappings[1]->{name} . q{__suggestion.input.$append')}); >+ is( $result->[8], q{unless exists('} . $mappings[1]->{name} . q{') add_field('} . $mappings[1]->{name} . q{', 0) end}); >+ is( $result->[9], q{marc_map('} . $mappings[1]->{marc_field} . q{','} . $mappings[1]->{name} . q{__sort', -split => 1)}); >+ is( $result->[10], q{move_field(_id,es_id)}); >+ >+ $mappings[0]->{type} = 'sum'; >+ $mappings[1]->{type} = 'sum'; >+ $result = $see->get_fixer_rules(); >+ is( $result->[0], q{marc_map('} . $mappings[0]->{marc_field} . q{','} . $mappings[0]->{name} . q{.$append', )}); >+ is( $result->[1], q{marc_map('} . $mappings[0]->{marc_field} . q{','} . $mappings[0]->{name} . q{__facet', )}); >+ is( $result->[2], q{marc_map('} . $mappings[0]->{marc_field} . q{','} . $mappings[0]->{name} . q{__suggestion.input.$append')}); >+ is( $result->[3], q{sum('} . $mappings[0]->{name} . q{')}); >+ is( $result->[4], q{marc_map('} . $mappings[0]->{marc_field} . q{','} . $mappings[0]->{name} . q{__sort', )}); >+ is( $result->[5], q{marc_map('} . $mappings[1]->{marc_field} . q{','} . $mappings[1]->{name} . q{.$append', )}); >+ is( $result->[6], q{marc_map('} . $mappings[1]->{marc_field} . q{','} . $mappings[1]->{name} . q{__facet', )}); >+ is( $result->[7], q{marc_map('} . $mappings[1]->{marc_field} . q{','} . $mappings[1]->{name} . q{__suggestion.input.$append')}); >+ is( $result->[8], q{sum('} . $mappings[1]->{name} . q{')}); >+ is( $result->[9], q{marc_map('} . $mappings[1]->{marc_field} . q{','} . $mappings[1]->{name} . q{__sort', )}); >+ is( $result->[10], q{move_field(_id,es_id)}); >+ >+ $mappings[0]->{type} = 'string'; >+ $mappings[0]->{facet} = 0; >+ $mappings[1]->{type} = 'string'; >+ $mappings[1]->{facet} = 0; >+ >+ $result = $see->get_fixer_rules(); >+ is( $result->[0], q{marc_map('} . $mappings[0]->{marc_field} . q{','} . $mappings[0]->{name} . q{.$append', -split => 1)}); >+ is( $result->[1], q{marc_map('} . $mappings[0]->{marc_field} . q{','} . $mappings[0]->{name} . q{__suggestion.input.$append')}); >+ is( $result->[2], q{marc_map('} . $mappings[0]->{marc_field} . q{','} . $mappings[0]->{name} . q{__sort', -split => 1)}); >+ is( $result->[3], q{marc_map('} . $mappings[1]->{marc_field} . q{','} . $mappings[1]->{name} . q{.$append', -split => 1)}); >+ is( $result->[4], q{marc_map('} . $mappings[1]->{marc_field} . q{','} . $mappings[1]->{name} . q{__suggestion.input.$append')}); >+ is( $result->[5], q{marc_map('} . $mappings[1]->{marc_field} . q{','} . $mappings[1]->{name} . q{__sort', -split => 1)}); >+ is( $result->[6], q{move_field(_id,es_id)}); >+ >+ $mappings[0]->{suggestible} = 0; >+ $mappings[1]->{suggestible} = 0; >+ >+ $result = $see->get_fixer_rules(); >+ is( $result->[0], q{marc_map('} . $mappings[0]->{marc_field} . q{','} . $mappings[0]->{name} . q{.$append', -split => 1)}); >+ is( $result->[1], q{marc_map('} . $mappings[0]->{marc_field} . q{','} . $mappings[0]->{name} . q{__sort', -split => 1)}); >+ is( $result->[2], q{marc_map('} . $mappings[1]->{marc_field} . q{','} . $mappings[1]->{name} . q{.$append', -split => 1)}); >+ is( $result->[3], q{marc_map('} . $mappings[1]->{marc_field} . q{','} . $mappings[1]->{name} . q{__sort', -split => 1)}); >+ is( $result->[4], q{move_field(_id,es_id)}); >+ >+ t::lib::Mocks::mock_preference( 'marcflavour', 'UNIMARC' ); >+ >+ $result = $see->get_fixer_rules(); >+ is( $result->[0], q{move_field(_id,es_id)}); >+ is( $result->[1], undef, q{No mapping when marc_type doesn't match marchflavour} ); >+ >+ $schema->storage->txn_rollback; >+ >+}; >+ >+1; >-- >2.7.4
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=64786">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 18434
:
62171
|
62702
|
63451
|
63452
|
63453
|
63473
|
63477
|
63478
|
63479
|
64386
|
64773
| 64786 |
64787
|
64788
|
64789
|
64790