From a2bdefaecc6b17113fab343f35ad8a7844c7d262 Mon Sep 17 00:00:00 2001 From: Tim Harder Date: Thu, 14 Dec 2023 20:31:53 -0700 Subject: [PATCH] tests: replace deprecated given/when usage with if/elsif/else --- t/Pkgcraft/Dep.t | 16 +++++++--------- t/Pkgcraft/Version.t | 16 +++++++--------- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/t/Pkgcraft/Dep.t b/t/Pkgcraft/Dep.t index 1df19c9..f05e491 100644 --- a/t/Pkgcraft/Dep.t +++ b/t/Pkgcraft/Dep.t @@ -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 diff --git a/t/Pkgcraft/Version.t b/t/Pkgcraft/Version.t index 0495757..12e1a11 100644 --- a/t/Pkgcraft/Version.t +++ b/t/Pkgcraft/Version.t @@ -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