Item13897: Changed AddressTests to work with static _parse() method.

- Experiment: throw Foswiki::Exception::ASSERT exception instead of Carp::confess upon failed ASSERT().
foswiki · Jan 16, 2016 · 7d66fb5 · 7d66fb5
1 parent 90965a8
commit 7d66fb5
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 deletions.
diff --git a/UnitTestContrib/test/unit/AddressTests.pm b/UnitTestContrib/test/unit/AddressTests.pm
@@ -740,12 +740,10 @@ sub test_timing_hashref_creation {
 
 sub test_timing_reparse_default {
     my ($this) = @_;
-    my $addr =
-      Foswiki::Address->new( topic => 'Topic', webpath => [qw(Web SubWeb)] );
     my $benchmark = timeit(
         15000,
         sub {
-            $addr->_parse(
+            Foswiki::Address::_parse(
                 'AnotherTopic',
                 {
                     isA     => 'topic',
@@ -762,12 +760,10 @@ sub test_timing_reparse_default {
 
 sub test_timing_reparse {
     my ($this) = @_;
-    my $addr =
-      Foswiki::Address->new( topic => 'Topic', webpath => [qw(Web SubWeb)] );
     my $benchmark = timeit(
         15000,
         sub {
-            $addr->_parse( 'AnotherWeb/AnotherSubWeb.AnotherTopic',
+            Foswiki::Address::_parse( 'AnotherWeb/AnotherSubWeb.AnotherTopic',
                 { isA => 'topic', } );
         }
     );

diff --git a/core/lib/AssertOn.pm b/core/lib/AssertOn.pm
@@ -5,6 +5,7 @@
 
 use strict;
 use locale;    # so result of lc() is tainted
+use Foswiki::Exception;
 
 our $DIRTY = lc('x');    # Used in TAINT
 our $soft  = 0;
@@ -27,7 +28,15 @@ sub ASSERT($;$) {
             Carp::cluck($msg);
         }
         else {
-            Carp::confess($msg);
+            # SMELL Experimental: generate exception instead of just die.
+            my ( $pkg, $file, $line ) = caller;
+            Foswiki::Exception::ASSERT->throw(
+                text => $msg,
+                file => $file,
+                line => $line,
+            );
+
+            #Carp::confess($msg);
         }
     }
     return;

diff --git a/core/lib/Foswiki/Address.pm b/core/lib/Foswiki/Address.pm
@@ -649,6 +649,8 @@ sub _parse {
             existAs     => { attachment => 1, topic => 1 }
         };
     }
+    ASSERT( defined $opts, "\$opts is not defined" );
+    ASSERT( ref($opts) eq 'HASH', "\$opts isn't a hashref but '$opts'" );
     ASSERT(
         ( !defined $opts->{rev} || $opts->{rev} =~ m/^[-\+]?\d+$/ ),
         "rev: '"

diff --git a/core/lib/Foswiki/Exception.pm b/core/lib/Foswiki/Exception.pm
@@ -85,6 +85,12 @@ sub stringify {
       );
 }
 
+package Foswiki::Exception::ASSERT;
+use Moo;
+extends qw(Foswiki::Exception);
+
+# This class is to distinguish ASSERT-generated exceptions only.
+
 package Foswiki::Exception::Engine;
 use Moo;
 use namespace::clean;