From 50a9df1bcd316296b95faec49ed53e86d51ceccf Mon Sep 17 00:00:00 2001
From: Jason Edward Stewart <jasons@apache.org>
Date: Mon, 28 Aug 2006 11:14:36 +0000
Subject: [PATCH] using pass() and fail() for first test

git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@437658 13f79535-47bb-0310-9956-ffa450edef68
---
 swig/perl/t/AttributeList.t        |  4 +-
 swig/perl/t/Attributes.t           |  4 +-
 swig/perl/t/DOMAttr.t              |  4 +-
 swig/perl/t/DOMCount.t             |  4 +-
 swig/perl/t/DOMCreate.t            | 11 ++--
 swig/perl/t/DOMDocument.t          |  4 +-
 swig/perl/t/DOMEntity.t            |  4 +-
 swig/perl/t/DOMException.t         |  4 +-
 swig/perl/t/DOMNamedNodeMap.t      |  4 +-
 swig/perl/t/DOMNode.t              |  4 +-
 swig/perl/t/DOMNodeIterator.t      |  4 +-
 swig/perl/t/DOMNodeList.t          |  4 +-
 swig/perl/t/DOMParser.t            |  4 +-
 swig/perl/t/DOMPrint.t             |  4 +-
 swig/perl/t/DOMTreeWalker.t        |  4 +-
 swig/perl/t/EntityResolver.t       |  2 +-
 swig/perl/t/Grammar.t              |  4 +-
 swig/perl/t/InputSource.t          |  4 +-
 swig/perl/t/LocalFileInputSource.t |  4 +-
 swig/perl/t/MemBufInputSource.t    |  4 +-
 swig/perl/t/PerlErrorHandler.t     |  4 +-
 swig/perl/t/SAX2Count.t            |  4 +-
 swig/perl/t/SAX2XMLReader.t        |  4 +-
 swig/perl/t/SAXCount.t             |  4 +-
 swig/perl/t/SAXException.t         | 88 ++++++++++++------------------
 swig/perl/t/SAXParser.t            |  4 +-
 swig/perl/t/Schema.t               |  4 +-
 swig/perl/t/StdInInputSource.t     |  4 +-
 swig/perl/t/URLInputSource.t       |  4 +-
 swig/perl/t/UTF8.t                 |  4 +-
 swig/perl/t/XMLException.t         |  4 +-
 swig/perl/t/XMLURL.t               |  4 +-
 swig/perl/t/XMLUri.t               |  4 +-
 swig/perl/t/XercesDOMParser.t      |  4 +-
 34 files changed, 102 insertions(+), 123 deletions(-)

diff --git a/swig/perl/t/AttributeList.t b/swig/perl/t/AttributeList.t
index ae247f206..75d7ca9ab 100644
--- a/swig/perl/t/AttributeList.t
+++ b/swig/perl/t/AttributeList.t
@@ -4,7 +4,7 @@
 
 ######################### We start with some black magic to print on failure.
 
-END {ok(0) unless $loaded;}
+END {fail() unless $loaded;}
 
 use Carp;
 use blib;
@@ -18,7 +18,7 @@ use vars qw($loaded);
 use strict;
 
 $loaded = 1;
-ok($loaded, "module loaded");
+pass("module loaded");
 
 ######################### End of black magic.
 
diff --git a/swig/perl/t/Attributes.t b/swig/perl/t/Attributes.t
index 45f9be479..b07912309 100644
--- a/swig/perl/t/Attributes.t
+++ b/swig/perl/t/Attributes.t
@@ -7,7 +7,7 @@
 # Change 1..1 below to 1..last_test_to_print .
 # (It may become useful if the test is moved to ./t subdirectory.)
 
-END {ok(0) unless $loaded;}
+END {fail() unless $loaded;}
 
 use Carp;
 use blib;
@@ -22,7 +22,7 @@ use strict;
 
 $loaded = 1;
 $i = 1;
-ok($loaded, "module loaded");
+pass("module loaded");
 
 ######################### End of black magic.
 
diff --git a/swig/perl/t/DOMAttr.t b/swig/perl/t/DOMAttr.t
index 6eaf7e87b..48755b20f 100644
--- a/swig/perl/t/DOMAttr.t
+++ b/swig/perl/t/DOMAttr.t
@@ -4,7 +4,7 @@
 
 ######################### We start with some black magic to print on failure.
 
-END {ok(0) unless $loaded;}
+END {fail() unless $loaded;}
 
 use Carp;
 # use blib;
@@ -18,7 +18,7 @@ use vars qw($loaded);
 use strict;
 
 $loaded = 1;
-ok($loaded, "module loaded");
+pass("module loaded");
 
 ######################### End of black magic.
 
diff --git a/swig/perl/t/DOMCount.t b/swig/perl/t/DOMCount.t
index 2ede37e1c..655f483c5 100644
--- a/swig/perl/t/DOMCount.t
+++ b/swig/perl/t/DOMCount.t
@@ -7,7 +7,7 @@
 # Change 1..1 below to 1..last_test_to_print .
 # (It may become useful if the test is moved to ./t subdirectory.)
 
-END {ok(0) unless $loaded;}
+END {fail() unless $loaded;}
 
 use Carp;
 # use blib;
@@ -21,7 +21,7 @@ use vars qw($loaded $file);
 use strict;
 
 $loaded = 1;
-ok($loaded, "module loaded");
+pass("module loaded");
 
 ######################### End of black magic.
 
diff --git a/swig/perl/t/DOMCreate.t b/swig/perl/t/DOMCreate.t
index 0ccdf1b56..ae58693cd 100644
--- a/swig/perl/t/DOMCreate.t
+++ b/swig/perl/t/DOMCreate.t
@@ -4,7 +4,7 @@
 
 ######################### We start with some black magic to print on failure.
 
-END {ok(0) unless $loaded;}
+END {fail() unless $loaded;}
 
 use Carp;
 # use blib;
@@ -18,7 +18,7 @@ use vars qw($loaded);
 use strict;
 
 $loaded = 1;
-ok($loaded, "module loaded");
+pass("module loaded");
 
 ######################### End of black magic.
 
@@ -48,9 +48,8 @@ my $document = q[<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 my $perl = $Config{startperl};
 $perl =~ s/^\#!//;
 my $cmd = "$perl -Mblib $SAMPLE_DIR/DOMCreate.pl 2>/dev/null";
-# print STDERR "Running: $cmd\n";
+print STDERR "Running: $cmd\n";
 my $output = `$cmd`;
 
-ok($document eq $output, 'document eq output');
-diag("Found output\n[$output]")
-  if $document ne $output;
+is($document, $output,
+   'document eq output') or diag("Found output\n[$output]");
diff --git a/swig/perl/t/DOMDocument.t b/swig/perl/t/DOMDocument.t
index 134dc7765..316f826a9 100644
--- a/swig/perl/t/DOMDocument.t
+++ b/swig/perl/t/DOMDocument.t
@@ -7,7 +7,7 @@
 # Change 1..1 below to 1..last_test_to_print .
 # (It may become useful if the test is moved to ./t subdirectory.)
 
-END {ok(0) unless $loaded;}
+END {fail() unless $loaded;}
 
 use Carp;
 
@@ -22,7 +22,7 @@ use vars qw($loaded);
 use strict;
 
 $loaded = 1;
-ok($loaded, "module loaded");
+pass("module loaded");
 
 ######################### End of black magic.
 
diff --git a/swig/perl/t/DOMEntity.t b/swig/perl/t/DOMEntity.t
index b1796e1f9..868aee4fa 100644
--- a/swig/perl/t/DOMEntity.t
+++ b/swig/perl/t/DOMEntity.t
@@ -4,7 +4,7 @@
 
 ######################### We start with some black magic to print on failure.
 
-END {ok(0) unless $loaded;}
+END {fail() unless $loaded;}
 
 use Carp;
 # use blib;
@@ -17,7 +17,7 @@ use vars qw($loaded);
 use strict;
 
 $loaded = 1;
-ok($loaded, "module loaded");
+pass("module loaded");
 
 ######################### End of black magic.
 
diff --git a/swig/perl/t/DOMException.t b/swig/perl/t/DOMException.t
index 465cacd6c..acd7ab843 100644
--- a/swig/perl/t/DOMException.t
+++ b/swig/perl/t/DOMException.t
@@ -7,7 +7,7 @@
 # Change 1..1 below to 1..last_test_to_print .
 # (It may become useful if the test is moved to ./t subdirectory.)
 
-END {ok(0) unless $loaded;}
+END {fail() unless $loaded;}
 
 use Carp;
 # use blib;
@@ -20,7 +20,7 @@ use vars qw($loaded);
 use strict;
 
 $loaded = 1;
-ok($loaded, "module loaded");
+pass("module loaded");
 
 ######################### End of black magic.
 
diff --git a/swig/perl/t/DOMNamedNodeMap.t b/swig/perl/t/DOMNamedNodeMap.t
index fcb7ef912..da4a898b2 100644
--- a/swig/perl/t/DOMNamedNodeMap.t
+++ b/swig/perl/t/DOMNamedNodeMap.t
@@ -7,7 +7,7 @@
 # Change 1..1 below to 1..last_test_to_print .
 # (It may become useful if the test is moved to ./t subdirectory.)
 
-END {ok(0) unless $loaded;}
+END {fail() unless $loaded;}
 
 use Carp;
 use XML::Xerces;
@@ -19,7 +19,7 @@ use vars qw($loaded);
 use strict;
 
 $loaded = 1;
-ok($loaded, "module loaded");
+pass("module loaded");
 
 ######################### End of black magic.
 
diff --git a/swig/perl/t/DOMNode.t b/swig/perl/t/DOMNode.t
index 3f6e7a6ec..5b042dd54 100644
--- a/swig/perl/t/DOMNode.t
+++ b/swig/perl/t/DOMNode.t
@@ -4,7 +4,7 @@
 
 ######################### We start with some black magic to print on failure.
 
-END {ok(0) unless $loaded;}
+END {fail() unless $loaded;}
 
 use Carp;
 
@@ -17,7 +17,7 @@ use vars qw($loaded);
 use strict;
 
 $loaded = 1;
-ok($loaded, "module loaded");
+pass("module loaded");
 
 ######################### End of black magic.
 
diff --git a/swig/perl/t/DOMNodeIterator.t b/swig/perl/t/DOMNodeIterator.t
index bf84711ac..b071c6122 100644
--- a/swig/perl/t/DOMNodeIterator.t
+++ b/swig/perl/t/DOMNodeIterator.t
@@ -4,7 +4,7 @@
 
 ######################### We start with some black magic to print on failure.
 
-END {ok(0) unless $loaded;}
+END {fail() unless $loaded;}
 
 use Carp;
 
@@ -17,7 +17,7 @@ use vars qw($loaded);
 use strict;
 
 $loaded = 1;
-ok($loaded, "module loaded");
+pass("module loaded");
 
 package MyNodeFilter;
 use strict;
diff --git a/swig/perl/t/DOMNodeList.t b/swig/perl/t/DOMNodeList.t
index 1eb5cf319..476ec7151 100644
--- a/swig/perl/t/DOMNodeList.t
+++ b/swig/perl/t/DOMNodeList.t
@@ -3,7 +3,7 @@
 
 ######################### We start with some black magic to print on failure.
 
-END {ok(0) unless $loaded;}
+END {fail() unless $loaded;}
 
 use Carp;
 use Cwd;
@@ -17,7 +17,7 @@ use vars qw($loaded);
 use strict;
 
 $loaded = 1;
-ok($loaded, "module loaded");
+pass("module loaded");
 
 ######################### End of black magic.
 
diff --git a/swig/perl/t/DOMParser.t b/swig/perl/t/DOMParser.t
index 560ad9bd9..1514807fa 100644
--- a/swig/perl/t/DOMParser.t
+++ b/swig/perl/t/DOMParser.t
@@ -4,7 +4,7 @@
 
 ######################### We start with some black magic to print on failure.
 
-END {ok(0) unless $loaded;}
+END {fail() unless $loaded;}
 
 use Carp;
 # use blib;
@@ -18,7 +18,7 @@ use vars qw($loaded $error);
 use strict;
 
 $loaded = 1;
-ok($loaded, "module loaded");
+pass("module loaded");
 
 ######################### End of black magic.
 
diff --git a/swig/perl/t/DOMPrint.t b/swig/perl/t/DOMPrint.t
index eb28c3fdd..4de12b6db 100644
--- a/swig/perl/t/DOMPrint.t
+++ b/swig/perl/t/DOMPrint.t
@@ -7,7 +7,7 @@
 # Change 1..1 below to 1..last_test_to_print .
 # (It may become useful if the test is moved to ./t subdirectory.)
 
-END {ok(0) unless $loaded;}
+END {fail() unless $loaded;}
 
 use Carp;
 # use blib;
@@ -21,7 +21,7 @@ use vars qw($loaded $file);
 use strict;
 
 $loaded = 1;
-ok($loaded, "module loaded");
+pass("module loaded");
 
 ######################### End of black magic.
 
diff --git a/swig/perl/t/DOMTreeWalker.t b/swig/perl/t/DOMTreeWalker.t
index 0880eb5f8..f9b926663 100644
--- a/swig/perl/t/DOMTreeWalker.t
+++ b/swig/perl/t/DOMTreeWalker.t
@@ -7,7 +7,7 @@
 # Change 1..1 below to 1..last_test_to_print .
 # (It may become useful if the test is moved to ./t subdirectory.)
 
-END {ok(0) unless $loaded;}
+END {fail() unless $loaded;}
 
 use Carp;
 # use blib;
@@ -20,7 +20,7 @@ use vars qw($loaded);
 use strict;
 
 $loaded = 1;
-ok($loaded, "module loaded");
+pass("module loaded");
 
 package MyNodeFilter;
 use strict;
diff --git a/swig/perl/t/EntityResolver.t b/swig/perl/t/EntityResolver.t
index 99ec998fa..2d836d550 100644
--- a/swig/perl/t/EntityResolver.t
+++ b/swig/perl/t/EntityResolver.t
@@ -4,7 +4,7 @@
 
 ######################### We start with some black magic to print on failure.
 
-END {ok(0) unless $loaded;}
+END {fail() unless $loaded;}
 
 use Carp;
 # use blib;
diff --git a/swig/perl/t/Grammar.t b/swig/perl/t/Grammar.t
index 33b10d205..37446441a 100644
--- a/swig/perl/t/Grammar.t
+++ b/swig/perl/t/Grammar.t
@@ -4,7 +4,7 @@
 
 ######################### We start with some black magic to print on failure.
 
-END {ok(0) unless $loaded;}
+END {fail() unless $loaded;}
 
 use Carp;
 # use blib;
@@ -17,7 +17,7 @@ use vars qw($loaded);
 use strict;
 
 $loaded = 1;
-ok($loaded, "module loaded");
+pass("module loaded");
 
 ######################### End of black magic.
 
diff --git a/swig/perl/t/InputSource.t b/swig/perl/t/InputSource.t
index b4fcf0de3..48fe53554 100644
--- a/swig/perl/t/InputSource.t
+++ b/swig/perl/t/InputSource.t
@@ -4,7 +4,7 @@
 
 ######################### We start with some black magic to print on failure.
 
-END {ok(0) unless $loaded;}
+END {fail() unless $loaded;}
 
 use Carp;
 # use blib;
@@ -17,7 +17,7 @@ use vars qw($loaded);
 use strict;
 
 $loaded = 1;
-ok($loaded, "module loaded");
+pass("module loaded");
 
 ######################### End of black magic.
 
diff --git a/swig/perl/t/LocalFileInputSource.t b/swig/perl/t/LocalFileInputSource.t
index dde214f40..4f05cfce1 100644
--- a/swig/perl/t/LocalFileInputSource.t
+++ b/swig/perl/t/LocalFileInputSource.t
@@ -5,7 +5,7 @@
 ######################### We start with some black magic to print on failure.
 
 
-END {ok(0) unless $loaded;}
+END {fail() unless $loaded;}
 
 use Carp;
 # use blib;
@@ -19,7 +19,7 @@ use vars qw($loaded $error);
 use strict;
 
 $loaded = 1;
-ok($loaded, "module loaded");
+pass("module loaded");
 
 ######################### End of black magic.
 
diff --git a/swig/perl/t/MemBufInputSource.t b/swig/perl/t/MemBufInputSource.t
index 977ce0895..d569b7eda 100644
--- a/swig/perl/t/MemBufInputSource.t
+++ b/swig/perl/t/MemBufInputSource.t
@@ -4,7 +4,7 @@
 
 ######################### We start with some black magic to print on failure.
 
-END {ok(0) unless $loaded;}
+END {fail() unless $loaded;}
 
 use Carp;
 # use blib;
@@ -17,7 +17,7 @@ use vars qw($loaded);
 use strict;
 
 $loaded = 1;
-ok($loaded, "module loaded");
+pass("module loaded");
 
 ######################### End of black magic.
 
diff --git a/swig/perl/t/PerlErrorHandler.t b/swig/perl/t/PerlErrorHandler.t
index 3c9e5840c..e5065d869 100644
--- a/swig/perl/t/PerlErrorHandler.t
+++ b/swig/perl/t/PerlErrorHandler.t
@@ -4,7 +4,7 @@
 
 ######################### We start with some black magic to print on failure.
 
-END {ok(0) unless $loaded;}
+END {fail() unless $loaded;}
 
 use Carp;
 
@@ -18,7 +18,7 @@ use subs qw(warning error fatal_error);
 use vars qw($error $loaded);
 
 $loaded = 1;
-ok($loaded, "module loaded");
+pass("module loaded");
 
 ######################### End of black magic.
 
diff --git a/swig/perl/t/SAX2Count.t b/swig/perl/t/SAX2Count.t
index 56a08a946..b5f448ec1 100644
--- a/swig/perl/t/SAX2Count.t
+++ b/swig/perl/t/SAX2Count.t
@@ -4,7 +4,7 @@
 
 ######################### We start with some black magic to print on failure.
 
-END {ok(0) unless $loaded;}
+END {fail() unless $loaded;}
 
 use Carp;
 # use blib;
@@ -18,7 +18,7 @@ use vars qw($loaded $file);
 use strict;
 
 $loaded = 1;
-ok($loaded, "module loaded");
+pass("module loaded");
 
 ######################### End of black magic.
 
diff --git a/swig/perl/t/SAX2XMLReader.t b/swig/perl/t/SAX2XMLReader.t
index 002d83816..113eb6764 100644
--- a/swig/perl/t/SAX2XMLReader.t
+++ b/swig/perl/t/SAX2XMLReader.t
@@ -4,7 +4,7 @@
 
 ######################### We start with some black magic to print on failure.
 
-END {ok(0) unless $loaded;}
+END {fail() unless $loaded;}
 
 use Carp;
 # use blib;
@@ -18,7 +18,7 @@ use vars qw($loaded $error);
 use strict;
 
 $loaded = 1;
-ok($loaded, "module loaded");
+pass("module loaded");
 
 ######################### End of black magic.
 
diff --git a/swig/perl/t/SAXCount.t b/swig/perl/t/SAXCount.t
index fc9a96546..7af97a6be 100644
--- a/swig/perl/t/SAXCount.t
+++ b/swig/perl/t/SAXCount.t
@@ -4,7 +4,7 @@
 
 ######################### We start with some black magic to print on failure.
 
-END {ok(0) unless $loaded;}
+END {fail() unless $loaded;}
 
 use Carp;
 # use blib;
@@ -18,7 +18,7 @@ use vars qw($loaded $file);
 use strict;
 
 $loaded = 1;
-ok($loaded, "module loaded");
+pass("module loaded");
 
 ######################### End of black magic.
 
diff --git a/swig/perl/t/SAXException.t b/swig/perl/t/SAXException.t
index a7e1fe967..43137a11d 100644
--- a/swig/perl/t/SAXException.t
+++ b/swig/perl/t/SAXException.t
@@ -4,7 +4,7 @@
 
 ######################### We start with some black magic to print on failure.
 
-END {ok(0) unless $loaded;}
+END {fail() unless $loaded;}
 
 use Carp;
 
@@ -19,7 +19,7 @@ use vars qw($loaded);
 use strict;
 
 $loaded = 1;
-ok($loaded, "module loaded");
+pass("module loaded");
 
 ######################### End of black magic.
 
@@ -28,68 +28,47 @@ my $parser = XML::Xerces::XMLReaderFactory::createXMLReader();
 isa_ok($parser,"XML::Xerces::SAX2XMLReader");
 
 my $feature = "http://xml.org/sax/features/foospaces";
-eval {
-  $parser->setFeature($feature, 0);
-};
-my $error = $@;
-my $skip = 0;
-unless (ok($error,"setFeature: $feature")) {
-  $skip = 1;
-}
+my $error;
+
+SKIP: {
+  eval {$parser->setFeature($feature, 0)};
+  $error = $@;
+  ok($error,"setFeature: $feature");
 
-TODO: {
-  todo_skip "setFeature didn't raise an exception", 2, if $skip;
+  skip "setFeature didn't raise an exception", 2, if not $error;
 
   isa_ok($error,'XML::Xerces::SAXNotRecognizedException');
   ok($error->getMessage(),"message");
 }
 
-$skip = 0;
-
-eval {
-  $parser->getFeature($feature);
-};
-$error = $@;
-unless (ok($error,"getFeature: $feature")){
-  $skip = 1;
-}
+SKSIP: {
+  eval {$parser->getFeature($feature)};
+  $error = $@;
+  ok($error,"getFeature: $feature");
 
-TODO: {
-  todo_skip "setFeature didn't raise an exception", 2, if $skip;
+  skip "setFeature didn't raise an exception", 2, if not $error;
 
   isa_ok($error,'XML::Xerces::SAXNotRecognizedException');
   ok($error->getMessage(),"message");
 }
 
-$skip = 0;
-
-eval {
-  $parser->getProperty($feature);
-};
-$error = $@;
-unless (ok($error,"getProperty: $feature")) {
-  $skip = 1;
-}
+SKIP: {
+  eval {$parser->getProperty($feature)};
+  $error = $@;
+  ok($error,"getProperty: $feature");
 
-TODO: {
-  todo_skip "setFeature didn't raise an exception", 2, if $skip;
+  skip "setFeature didn't raise an exception", 2, if not $@;
 
   isa_ok($error,'XML::Xerces::SAXNotRecognizedException');
   ok($error->getMessage(),"message");
 }
 
-$skip = 0;
+SKIP: {
+  eval {$parser->setProperty($feature, $parser)};
+  $error = $@;
+  ok($@,"setProperty: $feature");
 
-eval {
-  $parser->setProperty($feature, $parser);
-};
-$error = $@;
-unless (ok($error,"setProperty: $feature")){
-  $skip = 1;
-}
-
-TODO: {
-  todo_skip "setFeature didn't raise an exception", 2, if $skip;
+  skip "setFeature didn't raise an exception", 2, if not $error;
 
   isa_ok($error,'XML::Xerces::SAXNotRecognizedException');
   ok($error->getMessage(),"message");
@@ -114,17 +93,18 @@ sub ignorable_whitespace {
 
 package main;
 my $handler = MyHandler->new();
+
+# we must reset this - because $parser has been stringified by an earlier test
+$parser = XML::Xerces::XMLReaderFactory::createXMLReader();
 $parser->setContentHandler($handler);
-eval {
-  $parser->parse(XML::Xerces::LocalFileInputSource->new($PERSONAL_FILE_NAME));
-};
-$error = $@;
-unless (ok($error,"setting a feature during parse")) {
-  $skip = 1;
-}
 
-TODO: {
-  todo_skip "modifying a feature during a parse didn't raise a not supported exception", 2, if $skip;
+SKIP: {
+  eval {$parser->parse(XML::Xerces::LocalFileInputSource->new($PERSONAL_FILE_NAME))};
+  $error = $@;
+  ok($error,"setting a feature during parse");
+
+  skip "modifying a feature during a parse didn't raise a not supported exception", 2,
+    if not $error;
 
   isa_ok($error,'XML::Xerces::SAXNotSupportedException');
   ok($error->getMessage(),"message");
diff --git a/swig/perl/t/SAXParser.t b/swig/perl/t/SAXParser.t
index f3a86e0c8..594c5dbaf 100644
--- a/swig/perl/t/SAXParser.t
+++ b/swig/perl/t/SAXParser.t
@@ -4,7 +4,7 @@
 
 ######################### We start with some black magic to print on failure.
 
-END {ok(0) unless $loaded;}
+END {fail() unless $loaded;}
 
 use Carp;
 use blib;
@@ -18,7 +18,7 @@ use vars qw($loaded $error);
 use strict;
 
 $loaded = 1;
-ok($loaded, "module loaded");
+pass("module loaded");
 
 ######################### End of black magic.
 
diff --git a/swig/perl/t/Schema.t b/swig/perl/t/Schema.t
index 6a192aceb..a5f6ace3a 100644
--- a/swig/perl/t/Schema.t
+++ b/swig/perl/t/Schema.t
@@ -4,7 +4,7 @@
 
 ######################### We start with some black magic to print on failure.
 
-END {ok(0) unless $loaded;}
+END {fail() unless $loaded;}
 
 use Carp;
 # use blib;
@@ -17,7 +17,7 @@ use vars qw($loaded $file);
 use strict;
 
 $loaded = 1;
-ok($loaded, "module loaded");
+pass("module loaded");
 
 ######################### End of black magic.
 
diff --git a/swig/perl/t/StdInInputSource.t b/swig/perl/t/StdInInputSource.t
index d0b0ce3db..3957b90e0 100644
--- a/swig/perl/t/StdInInputSource.t
+++ b/swig/perl/t/StdInInputSource.t
@@ -4,7 +4,7 @@
 
 ######################### We start with some black magic to print on failure.
 
-END {ok(0) unless $loaded;}
+END {fail() unless $loaded;}
 
 use Carp;
 # use blib;
@@ -19,7 +19,7 @@ use vars qw($loaded);
 use strict;
 
 $loaded = 1;
-ok($loaded, "module loaded");
+pass("module loaded");
 
 ######################### End of black magic.
 
diff --git a/swig/perl/t/URLInputSource.t b/swig/perl/t/URLInputSource.t
index 815c417da..8de5ac55d 100644
--- a/swig/perl/t/URLInputSource.t
+++ b/swig/perl/t/URLInputSource.t
@@ -4,7 +4,7 @@
 
 ######################### We start with some black magic to print on failure.
 
-END {ok(0) unless $loaded;}
+END {fail() unless $loaded;}
 
 use Carp;
 # use blib;
@@ -15,7 +15,7 @@ use vars qw($loaded $error);
 use strict;
 
 $loaded = 1;
-ok($loaded, "module loaded");
+pass("module loaded");
 
 ######################### End of black magic.
 
diff --git a/swig/perl/t/UTF8.t b/swig/perl/t/UTF8.t
index d0bdc10c0..451444bf5 100644
--- a/swig/perl/t/UTF8.t
+++ b/swig/perl/t/UTF8.t
@@ -4,7 +4,7 @@
 
 ######################### We start with some black magic to print on failure.
 
-END {ok(0) unless $loaded;}
+END {fail() unless $loaded;}
 
 use Carp;
 
@@ -19,7 +19,7 @@ use vars qw($loaded);
 use strict;
 
 $loaded = 1;
-ok($loaded, "module loaded");
+pass("module loaded");
 
 ######################### End of black magic.
 
diff --git a/swig/perl/t/XMLException.t b/swig/perl/t/XMLException.t
index 8ce543028..4ab80cb77 100644
--- a/swig/perl/t/XMLException.t
+++ b/swig/perl/t/XMLException.t
@@ -4,7 +4,7 @@
 
 ######################### We start with some black magic to print on failure.
 
-END {ok(0) unless $loaded;}
+END {fail() unless $loaded;}
 
 use Carp;
 
@@ -19,7 +19,7 @@ use vars qw($loaded $error);
 use strict;
 
 $loaded = 1;
-ok($loaded, "module loaded");
+pass("module loaded");
 
 ######################### End of black magic.
 
diff --git a/swig/perl/t/XMLURL.t b/swig/perl/t/XMLURL.t
index 653cd7627..e4184abdf 100644
--- a/swig/perl/t/XMLURL.t
+++ b/swig/perl/t/XMLURL.t
@@ -4,7 +4,7 @@
 
 ######################### We start with some black magic to print on failure.
 
-END {ok(0) unless $loaded;}
+END {fail() unless $loaded;}
 
 use Carp;
 # use blib;
@@ -18,7 +18,7 @@ use vars qw($loaded $error);
 use strict;
 
 $loaded = 1;
-ok($loaded, "module loaded");
+pass("module loaded");
 
 ######################### End of black magic.
 
diff --git a/swig/perl/t/XMLUri.t b/swig/perl/t/XMLUri.t
index 8560aee12..60b2ab6d7 100644
--- a/swig/perl/t/XMLUri.t
+++ b/swig/perl/t/XMLUri.t
@@ -4,7 +4,7 @@
 
 ######################### We start with some black magic to print on failure.
 
-END {ok(0) unless $loaded;}
+END {fail() unless $loaded;}
 
 use Carp;
 # use blib;
@@ -17,7 +17,7 @@ use vars qw($loaded);
 use strict;
 
 $loaded = 1;
-ok($loaded, "module loaded");
+pass("module loaded");
 
 ######################### End of black magic.
 
diff --git a/swig/perl/t/XercesDOMParser.t b/swig/perl/t/XercesDOMParser.t
index 1cbb8aeda..c4f38e6ca 100644
--- a/swig/perl/t/XercesDOMParser.t
+++ b/swig/perl/t/XercesDOMParser.t
@@ -4,7 +4,7 @@
 
 ######################### We start with some black magic to print on failure.
 
-END {ok(0) unless $loaded;}
+END {fail() unless $loaded;}
 
 use Carp;
 # use blib;
@@ -17,7 +17,7 @@ use vars qw($loaded);
 use strict;
 
 $loaded = 1;
-ok($loaded, "module loaded");
+pass("module loaded");
 
   # NOTICE: We must now explicitly call XMLPlatformUtils::Initialize()
   #   when the module is loaded. Xerces.pm no longer does this.
-- 
GitLab