A terser way to display versions for modules used in tests

diff --git a/t/16-huf.t b/t/16-huf.t
index da2e674eb8e90fc8a91d85744d65b7bb26ae7080..0934219579ca9613d9955ceda412f0967ace69c0 100644 (file)
--- a/t/16-huf.t
+++ b/t/16-huf.t
@@ -16,8 +16,8 @@ if ($@) {
  plan skip_all => 'Hash::Util::FieldHash required for testing uvar interaction';
 } else {
  plan tests => 2 * 5 + 7 + 1;
- my $v = $Hash::Util::FieldHash::VERSION;
- diag "Using Hash::Util::FieldHash $v" if defined $v;
+ defined and diag "Using Hash::Util::FieldHash $_"
+                                            for $Hash::Util::FieldHash::VERSION;
 }
 
 use lib 't/lib';

diff --git a/t/25-copy.t b/t/25-copy.t
index 98fbf22d3fcdf378e417ee675e031393dd9b0a1c..0630ae33502d7c659616d1df4de0b9bebb809d9f 100644 (file)
--- a/t/25-copy.t
+++ b/t/25-copy.t
@@ -23,7 +23,7 @@ SKIP: {
  eval "use Tie::Array";
  skip 'Tie::Array required to test copy magic on arrays'
                                              => (2 * 5 + 3) + (2 * 2 + 1) if $@;
- diag "Using Tie::Array $Tie::Array::VERSION" if defined $Tie::Array::VERSION;
+ defined and diag "Using Tie::Array $_" for $Tie::Array::VERSION;
 
  tie my @a, 'Tie::StdArray';
  @a = (1 .. 10);
@@ -57,7 +57,7 @@ SKIP: {
 SKIP: {
  eval "use Tie::Hash";
  skip 'Tie::Hash required to test copy magic on hashes' => 2 * 9 + 6 if $@;
- diag "Using Tie::Hash $Tie::Hash::VERSION" if defined $Tie::Hash::VERSION;
+ defined and diag "Using Tie::Hash $_" for $Tie::Hash::VERSION;
 
  tie my %h, 'Tie::StdHash';
  %h = (a => 1, b => 2, c => 3);

diff --git a/t/28-uvar.t b/t/28-uvar.t
index b0114ad67f5234b3d960f3f785c5eb609923dc10..acc761f24f795fa0880585fe15a05ce9e452d1a2 100644 (file)
--- a/t/28-uvar.t
+++ b/t/28-uvar.t
@@ -53,7 +53,7 @@ is $x, 1, 'uvar: fetch directly with also non uvar magic correctly';
 SKIP: {
  eval "use Tie::Hash";
  skip 'Tie::Hash required to test uvar magic on tied hashes' => 2 * 5 + 4 if $@;
- diag "Using Tie::Hash $Tie::Hash::VERSION" if defined $Tie::Hash::VERSION;
+ defined and diag "Using Tie::Hash $_" for $Tie::Hash::VERSION;
 
  tie my %h, 'Tie::StdHash';
  %h = (x => 7, y => 8);

diff --git a/t/30-scalar.t b/t/30-scalar.t
index f6faea4ea1eaf27f79b839ec542f4b4f18a2e7eb..ab20ed6450dc5f3e2406232011fe47a1d6837d12 100644 (file)
--- a/t/30-scalar.t
+++ b/t/30-scalar.t
@@ -112,7 +112,7 @@ SKIP: {
  }
 
  skip $SKIP => 3 if $SKIP;
- diag "Using Tie::Array $Tie::Array::VERSION" if defined $Tie::Array::VERSION;
+ defined and diag "Using Tie::Array $_" for $Tie::Array::VERSION;
 
  tie my @a, 'Tie::StdArray';
  $a[0] = $$;

diff --git a/t/34-glob.t b/t/34-glob.t
index b5c8394fd86d3e43b483c5631a0fd45d08faf718..bbfbeeedff7ffb4de870d1910e7006857a4b6598 100644 (file)
--- a/t/34-glob.t
+++ b/t/34-glob.t
@@ -10,7 +10,7 @@ if ($@) {
  plan skip_all => "Symbol::gensym required for testing magic for globs";
 } else {
  plan tests => 2 * 12 + 1;
- diag "Using Symbol $Symbol::VERSION" if defined $Symbol::VERSION;
+ defined and diag "Using Symbol $_" for $Symbol::VERSION;
 }
 
 use Variable::Magic qw/cast dispell VMG_COMPAT_GLOB_GET/;

diff --git a/t/40-threads.t b/t/40-threads.t
index e483b7f24f76405cd36b03359ffce4fe3d49320f..b86a4b46ec89fd4201d45163ad857995a92088c1 100644 (file)
--- a/t/40-threads.t
+++ b/t/40-threads.t
@@ -32,10 +32,8 @@ use Variable::Magic qw/wizard cast dispell getdata VMG_THREADSAFE VMG_OP_INFO_NA
 BEGIN {
  skipall 'This Variable::Magic isn\'t thread safe' unless VMG_THREADSAFE;
  plan tests => (4 * 18 + 1) + (4 * 13 + 1);
- my $v = $threads::VERSION;
- diag "Using threads $v" if defined $v;
- $v = $threads::shared::VERSION;
- diag "Using threads::shared $v" if defined $v;
+ defined and diag "Using threads $_"         for $threads::VERSION;
+ defined and diag "Using threads::shared $_" for $threads::shared::VERSION;
 }
 
 my $destroyed : shared = 0;

diff --git a/t/41-clone.t b/t/41-clone.t
index eb1e8c23196e7ca243ac5637ed10b9c6b9b1b301..d66d098465245d13105f17fe85f3fedbf5fc5dda 100644 (file)
--- a/t/41-clone.t
+++ b/t/41-clone.t
@@ -32,10 +32,8 @@ use Variable::Magic qw/wizard cast dispell getdata VMG_THREADSAFE VMG_OP_INFO_NA
 BEGIN {
  skipall 'This Variable::Magic isn\'t thread safe' unless VMG_THREADSAFE;
  plan tests => 2 * 3 + 2 * (2 * 10 + 2) + 2 * (2 * 7 + 2);
- my $v = $threads::VERSION;
- diag "Using threads $v" if defined $v;
- $v = $threads::shared::VERSION;
- diag "Using threads::shared $v" if defined $v;
+ defined and diag "Using threads $_"         for $threads::VERSION;
+ defined and diag "Using threads::shared $_" for $threads::shared::VERSION;
 }
 
 my $destroyed : shared = 0;