From eb90241c7941760a79c48c745c8fd938780490a8 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 21 May 2013 17:13:35 +0200 Subject: [PATCH] Bug 10298: Mock C4::Context->preference t::lib::Mocks::Context tried to deal with preferences but did not manage to. This patch removes this module and add 2 routines in t::lib::Mocks in order to mock C4::context->preference and C4::Context->config. To test: ===START t/test.pl=== use Modern::Perl; use t::lib::Mocks; use C4::Context; say "initial value for version: " . C4::Context->preference('Version'); say "initial value for language: " . C4::Context->preference('language'); t::lib::Mocks::mock_preference('Version', "new version for testing"); say "version is mocked with: " . C4::Context->preference('Version'); say "language is not yet mocked: " . C4::Context->preference('language'); t::lib::Mocks::mock_preference('language', 'new langage for testing'); t::lib::Mocks::mock_preference('Version', 'another version for testing'); say "version is mocked with another value: " . C4::Context->preference('Version'); say "language is finally mocked: " . C4::Context->preference('language'); ===END=== Try to execute this file and check that the output is consistent. Signed-off-by: Julian Maurice Signed-off-by: Chris Cormack Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton --- t/lib/Mocks.pm | 46 ++++++++++++++++++++++++++++-------------- t/lib/Mocks/Context.pm | 13 ------------ 2 files changed, 31 insertions(+), 28 deletions(-) delete mode 100644 t/lib/Mocks/Context.pm diff --git a/t/lib/Mocks.pm b/t/lib/Mocks.pm index 9e2d831a70..3f834d27c9 100644 --- a/t/lib/Mocks.pm +++ b/t/lib/Mocks.pm @@ -1,23 +1,39 @@ package t::lib::Mocks; use Modern::Perl; +use C4::Context; use Test::MockModule; -use t::lib::Mocks::Context; -our (@ISA,@EXPORT,@EXPORT_OK); -BEGIN { - require Exporter; - @ISA = qw(Exporter); - push @EXPORT, qw( - &set_solr - &set_zebra - ); +my %configs; +sub mock_config { + my $context = new Test::MockModule('C4::Context'); + my ( $conf, $value ) = @_; + $configs{$conf} = $value; + $context->mock('config', sub { + my ( $self, $conf ) = @_; + if ( exists $configs{$conf} ) { + return $configs{$conf} + } else { + my $method = $context->original('config'); + return $method->($self, $conf); + } + }); } -my $context = new Test::MockModule('C4::Context'); -sub set_solr { - $context->mock('preference', sub { &t::lib::Mocks::Context::MockPreference( @_, "Solr", $context ) }); -} -sub set_zebra { - $context->mock('preference', sub { &t::lib::Mocks::Context::MockPreference( @_, "Zebra", $context ) }); +my %preferences; +sub mock_preference { + my $context = new Test::MockModule('C4::Context'); + my ( $pref, $value ) = @_; + $preferences{$pref} = $value; + $context->mock('preference', sub { + my ( $self, $pref ) = @_; + if ( exists $preferences{$pref} ) { + return $preferences{$pref} + } else { + my $method = $context->original('preference'); + return $method->($self, $pref); + } + }); } + +1; diff --git a/t/lib/Mocks/Context.pm b/t/lib/Mocks/Context.pm deleted file mode 100644 index 185209a549..0000000000 --- a/t/lib/Mocks/Context.pm +++ /dev/null @@ -1,13 +0,0 @@ -package t::lib::Mocks::Context; -use t::lib::Mocks::Context; -use C4::Context; - -sub MockPreference { - my ( $self, $syspref, $value, $mock_object ) = @_; - return $value if $syspref eq 'SearchEngine'; - $mock_object->unmock("preference"); - my $r = C4::Context->preference($syspref); - $mock_object->mock('preference', sub { &t::lib::Mocks::Context::MockPreference( @_, $value, $mock_object ) }); - return $r; -} -1; -- 2.39.5