Koha-community
/
Koha
13
5
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Bug 16289: Refactore code and add tests 

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
16.11.x
Jonathan Druart 8 years ago
committed by Kyle M Hall
parent
d753644c2f
commit
dde0e01503
2 changed files with 46 additions and 60 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 30
      C4/Serials.pm
  2. 76
      t/Serials/GetNextSeq.t

30
C4/Serials.pm
View File

@ -2498,7 +2498,7 @@ sub _numeration {
$num_type //= ''; $num_type //= '';
$locale ||= 'en'; $locale ||= 'en';
my $string; my $string;
if ( $num_type =~ /^dayname$/ ) { if ( $num_type =~ /^dayname$/ or $num_type =~ /^dayabrv$/ ) {
# 1970-11-01 was a Sunday # 1970-11-01 was a Sunday
$value = $value % 7; $value = $value % 7;
my $dt = DateTime->new( my $dt = DateTime->new(
@ -2507,33 +2507,19 @@ sub _numeration {
day => $value + 1, day => $value + 1,
locale => $locale, locale => $locale,
); );
$string = $dt->strftime("%A"); $string = $num_type =~ /^dayname$/
} elsif ( $num_type =~ /^dayabrv$/ ) { ? $dt->strftime("%A")
# 1970-11-01 was a Sunday : $dt->strftime("%a");
$value = $value % 7; } elsif ( $num_type =~ /^monthname$/ or $num_type =~ /^monthabrv$/ ) {
my $dt = DateTime->new(
year => 1970,
month => 11,
day => $value + 1,
locale => $locale,
);
$string = $dt->strftime("%a");
} elsif ( $num_type =~ /^monthname$/ ) {
$value = $value % 12;
my $dt = DateTime->new(
year => 1970,
month => $value + 1,
locale => $locale,
);
$string = $dt->strftime("%B");
} elsif ( $num_type =~ /^monthabrv$/ ) {
$value = $value % 12; $value = $value % 12;
my $dt = DateTime->new( my $dt = DateTime->new(
year => 1970, year => 1970,
month => $value + 1, month => $value + 1,
locale => $locale, locale => $locale,
); );
$string = $dt->strftime("%b"); $string = $num_type =~ /^monthname$/
? $dt->strftime("%B")
: $dt->strftime("%b");
} elsif ( $num_type =~ /^season$/ ) { } elsif ( $num_type =~ /^season$/ ) {
my @seasons= qw( Spring Summer Fall Winter ); my @seasons= qw( Spring Summer Fall Winter );
$value = $value % 4; $value = $value % 4;

76
t/Serials/GetNextSeq.t
View File

@ -43,96 +43,96 @@ $subscription = {
locale => 'C', locale => 'C',
}; };
$pattern = { $pattern = {
add1 => 1, add2 => 0, add3 => 0, add1 => 1, add2 => 1, add3 => 0,
every1 => 1, every2 => 0, every3 => 0, every1 => 1, every2 => 1, every3 => 0,
whenmorethan1 => 7, whenmorethan2 => 0, whenmorethan3 => 0, whenmorethan1 => 7, whenmorethan2 => 7, whenmorethan3 => 0,
setto1 => 1, setto2 => 0, setto3 => 0, setto1 => 1, setto2 => 1, setto3 => 0,
numberingmethod => 'X: {X}', numberingmethod => 'dayname: {X} | dayabrv: {Y}',
numbering1 => 'dayname', numbering1 => 'dayname',
numbering2 => '', numbering2 => 'dayabrv',
numbering3 => '', numbering3 => '',
}; };
$seq = _next_seq($subscription, $pattern); $seq = _next_seq($subscription, $pattern);
is($seq, 'X: Tuesday'); is($seq, 'dayname: Tuesday | dayabrv: Tue');
$seq = _next_seq($subscription, $pattern); $seq = _next_seq($subscription, $pattern);
is($seq, 'X: Wednesday'); is($seq, 'dayname: Wednesday | dayabrv: Wed');
$seq = _next_seq($subscription, $pattern); $seq = _next_seq($subscription, $pattern);
is($seq, 'X: Thursday'); is($seq, 'dayname: Thursday | dayabrv: Thu');
$seq = _next_seq($subscription, $pattern); $seq = _next_seq($subscription, $pattern);
is($seq, 'X: Friday'); is($seq, 'dayname: Friday | dayabrv: Fri');
$seq = _next_seq($subscription, $pattern); $seq = _next_seq($subscription, $pattern);
is($seq, 'X: Saturday'); is($seq, 'dayname: Saturday | dayabrv: Sat');
$seq = _next_seq($subscription, $pattern); $seq = _next_seq($subscription, $pattern);
is($seq, 'X: Sunday'); is($seq, 'dayname: Sunday | dayabrv: Sun');
$seq = _next_seq($subscription, $pattern); $seq = _next_seq($subscription, $pattern);
is($seq, 'X: Monday'); is($seq, 'dayname: Monday | dayabrv: Mon');
# TEST CASE 3 - 1 variable, use 'monthname' numbering, from 0 to 11 by step of 2 # TEST CASE 3 - 1 variable, use 'monthname' numbering, from 0 to 11 by step of 2
$subscription = { $subscription = {
lastvalue1 => 0, lastvalue2 => 1, lastvalue3 => 1, lastvalue1 => 0, lastvalue2 => 0, lastvalue3 => 0,
innerloop1 => 0, innerloop2 => 0, innerloop3 => 0, innerloop1 => 0, innerloop2 => 0, innerloop3 => 0,
skip_serialseq => 0, skip_serialseq => 0,
irregularity => '', irregularity => '',
locale => 'C', # locale set to 'C' to ensure we'll have english strings locale => 'C', # locale set to 'C' to ensure we'll have english strings
}; };
$pattern = { $pattern = {
add1 => 2, add2 => 0, add3 => 0, add1 => 2, add2 => 2, add3 => 0,
every1 => 1, every2 => 0, every3 => 0, every1 => 1, every2 => 1, every3 => 0,
whenmorethan1 => 11, whenmorethan2 => 0, whenmorethan3 => 0, whenmorethan1 => 11, whenmorethan2 => 11, whenmorethan3 => 0,
setto1 => 0, setto2 => 0, setto3 => 0, setto1 => 0, setto2 => 0, setto3 => 0,
numberingmethod => 'X: {X}', numberingmethod => 'monthname: {X} | monthabrv: {Y}',
numbering1 => 'monthname', numbering1 => 'monthname',
numbering2 => '', numbering2 => 'monthabrv',
numbering3 => '', numbering3 => '',
}; };
$seq = _next_seq($subscription, $pattern); $seq = _next_seq($subscription, $pattern);
is($seq, 'X: March'); is($seq, 'monthname: March | monthabrv: Mar');
$seq = _next_seq($subscription, $pattern); $seq = _next_seq($subscription, $pattern);
is($seq, 'X: May'); is($seq, 'monthname: May | monthabrv: May');
$seq = _next_seq($subscription, $pattern); $seq = _next_seq($subscription, $pattern);
is($seq, 'X: July'); is($seq, 'monthname: July | monthabrv: Jul');
$seq = _next_seq($subscription, $pattern); $seq = _next_seq($subscription, $pattern);
is($seq, 'X: September'); is($seq, 'monthname: September | monthabrv: Sep');
$seq = _next_seq($subscription, $pattern); $seq = _next_seq($subscription, $pattern);
is($seq, 'X: November'); is($seq, 'monthname: November | monthabrv: Nov');
$seq = _next_seq($subscription, $pattern); $seq = _next_seq($subscription, $pattern);
is($seq, 'X: January'); is($seq, 'monthname: January | monthabrv: Jan');
$seq = _next_seq($subscription, $pattern); $seq = _next_seq($subscription, $pattern);
is($seq, 'X: March'); is($seq, 'monthname: March | monthabrv: Mar');
# TEST CASE 4 - 1 variable, use 'season' numbering, from 0 to 3 # TEST CASE 4 - 1 variable, use 'season' numbering, from 0 to 3
# Months starts at 0, this implies subscription's lastvalue1 should be 0, # Months starts at 0, this implies subscription's lastvalue1 should be 0,
# together with setto1 and whenmorethan1 should be 11 # together with setto1 and whenmorethan1 should be 11
$subscription = { $subscription = {
lastvalue1 => 0, lastvalue2 => 1, lastvalue3 => 1, lastvalue1 => 0, lastvalue2 => 0, lastvalue3 => 0,
innerloop1 => 0, innerloop2 => 0, innerloop3 => 0, innerloop1 => 0, innerloop2 => 0, innerloop3 => 0,
skip_serialseq => 0, skip_serialseq => 0,
irregularity => '', irregularity => '',
locale => 'C', # locale set to 'C' to ensure we'll have english strings locale => 'C', # locale set to 'C' to ensure we'll have english strings
}; };
$pattern = { $pattern = {
add1 => 1, add2 => 0, add3 => 0, add1 => 1, add2 => 1, add3 => 0,
every1 => 1, every2 => 0, every3 => 0, every1 => 1, every2 => 1, every3 => 0,
whenmorethan1 => 3, whenmorethan2 => 0, whenmorethan3 => 0, whenmorethan1 => 3, whenmorethan2 => 3, whenmorethan3 => 0,
setto1 => 0, setto2 => 0, setto3 => 0, setto1 => 0, setto2 => 0, setto3 => 0,
numberingmethod => 'X: {X}', numberingmethod => 'season: {X} | seasonabrv: {Y}',
numbering1 => 'season', numbering1 => 'season',
numbering2 => '', numbering2 => 'seasonabrv',
numbering3 => '', numbering3 => '',
}; };
$seq = _next_seq($subscription, $pattern); $seq = _next_seq($subscription, $pattern);
is($seq, 'X: Summer'); is($seq, 'season: Summer | seasonabrv: Sum');
$seq = _next_seq($subscription, $pattern); $seq = _next_seq($subscription, $pattern);
is($seq, 'X: Fall'); is($seq, 'season: Fall | seasonabrv: Fal');
$seq = _next_seq($subscription, $pattern); $seq = _next_seq($subscription, $pattern);
is($seq, 'X: Winter'); is($seq, 'season: Winter | seasonabrv: Win');
$seq = _next_seq($subscription, $pattern); $seq = _next_seq($subscription, $pattern);
is($seq, 'X: Spring'); is($seq, 'season: Spring | seasonabrv: Spr');
$seq = _next_seq($subscription, $pattern); $seq = _next_seq($subscription, $pattern);
is($seq, 'X: Summer'); is($seq, 'season: Summer | seasonabrv: Sum');
# TEST CASE 5 - 2 variables, from 1 to 12, and from 1 to 4 # TEST CASE 5 - 2 variables, from 1 to 12, and from 1 to 4
$subscription = { $subscription = {

Write Preview
Loading…
Cancel
Save