tests: replace deprecated given/when usage with if/elsif/else

And fix invalid/valid Version tests.
pkgcraft · Dec 15, 2023 · 76182d3 · 76182d3
1 parent aa8e118
commit 76182d3
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 22 deletions.
diff --git a/lib/Pkgcraft/Version.pm b/lib/Pkgcraft/Version.pm
@@ -61,9 +61,9 @@ package Pkgcraft::Version {
   }
 
   sub parse {
+    my $class = shift;
     my $str = shift // die "missing version string";
-    my $ptr = C::pkgcraft_version_parse($str);
-    return (defined $ptr);
+    return (defined C::pkgcraft_version_parse($str));
   }
 
   sub revision {

diff --git 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
@@ -33,24 +33,28 @@ ok(dies { Pkgcraft::Version->new(">1-r2") == ">1-r2" });
 
 # valid
 foreach my $str (@{$VERSION_DATA->{"valid"}}) {
-  ok(Pkgcraft::Version->new($str));
-  ok(Pkgcraft::Version->parse($str));
+  ok(lives { Pkgcraft::Version->new($str) });
+  ok(Pkgcraft::Version->parse($str), "$str is not a valid version");
+}
+
+# invalid
+foreach my $str (@{$VERSION_DATA->{"invalid"}}) {
+  ok(dies { Pkgcraft::Version->new($str) });
+  ok(!Pkgcraft::Version->parse($str), "$str is a valid version");
 }
 
 # version comparisons
 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