Skip to content

Commit

Permalink
tests: replace deprecated given/when usage with if/elsif/else
Browse files Browse the repository at this point in the history
  • Loading branch information
radhermit committed Dec 15, 2023
1 parent aa8e118 commit a2bdefa
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 18 deletions.
16 changes: 7 additions & 9 deletions t/Pkgcraft/Dep.t
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,13 @@ foreach my $str (@{$DEP_DATA->{"compares"}}) {
my ($s1, $op, $s2) = split ' ', $str;
my $d1 = Pkgcraft::Dep->new($s1);
my $d2 = Pkgcraft::Dep->new($s2);
given ($op) {
when ("<") { ok($d1 < $d2, $str) }
when ("<=") { ok($d1 <= $d2, $str) }
when ("==") { ok($d1 == $d2, $str) }
when ("!=") { ok($d1 != $d2, $str) }
when (">=") { ok($d1 >= $d2, $str) }
when (">") { ok($d1 > $d2, $str) }
default { die "unknown operator: $op" }
}
if ($op eq "<") { ok($d1 < $d2, $str) }
elsif ($op eq "<=") { ok($d1 <= $d2, $str) }
elsif ($op eq "==") { ok($d1 == $d2, $str) }
elsif ($op eq "!=") { ok($d1 != $d2, $str) }
elsif ($op eq ">=") { ok($d1 >= $d2, $str) }
elsif ($op eq ">") { ok($d1 > $d2, $str) }
else { die "unknown operator: $op" }
}

# dep sorting
Expand Down
16 changes: 7 additions & 9 deletions t/Pkgcraft/Version.t
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,13 @@ foreach my $str (@{$VERSION_DATA->{"compares"}}) {
my ($s1, $op, $s2) = split ' ', $str;
my $v1 = Pkgcraft::Version->new($s1);
my $v2 = Pkgcraft::Version->new($s2);
given ($op) {
when ("<") { ok($v1 < $v2, $str) }
when ("<=") { ok($v1 <= $v2, $str) }
when ("==") { ok($v1 == $v2, $str) }
when ("!=") { ok($v1 != $v2, $str) }
when (">=") { ok($v1 >= $v2, $str) }
when (">") { ok($v1 > $v2, $str) }
default { die "unknown operator: $op" }
}
if ($op eq "<") { ok($v1 < $v2, $str) }
elsif ($op eq "<=") { ok($v1 <= $v2, $str) }
elsif ($op eq "==") { ok($v1 == $v2, $str) }
elsif ($op eq "!=") { ok($v1 != $v2, $str) }
elsif ($op eq ">=") { ok($v1 >= $v2, $str) }
elsif ($op eq ">") { ok($v1 > $v2, $str) }
else { die "unknown operator: $op" }
}

# version sorting
Expand Down

0 comments on commit a2bdefa

Please sign in to comment.