Item13897: Fixed AccessControlTests

Added object attribute on Foswiki::Exception for future use.
foswiki · Jan 16, 2016 · 90965a8 · 90965a8
1 parent 35365e3
commit 90965a8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/UnitTestContrib/lib/Unit/TestRunner.pm b/UnitTestContrib/lib/Unit/TestRunner.pm
@@ -604,10 +604,6 @@ sub runOne {
                 $tester->set_up($test);
 
                 try {
-      # XXX vrurg Foswiki::Exception has to be replaced with more relevant class
-                    local $SIG{__DIE__} = sub {
-                        Foswiki::Exception->throw( text => $_[0] );
-                    };
                     $action .=
                       '$this->{tests_per_module}->{\'' . $suite . '\'}++;';
                     $tester->$test();
@@ -622,8 +618,9 @@ sub runOne {
                     }
                 }
                 catch {
-                    my $e                = $_;
-                    my $exceptionMessage = $e->stringify;
+# If for some reason any code within try just dies then why stringify what's not
+# an exception object?
+                    my $exceptionMessage = ref($_) ? $_->stringify : $_;
                     safe_print "*** ", $exceptionMessage, "\n";
                     if ( $tester->expecting_failure ) {
                         $action .=

diff --git a/core/lib/Foswiki/Exception.pm b/core/lib/Foswiki/Exception.pm
@@ -58,10 +58,11 @@ BEGIN {
     }
 }
 
-has line       => ( is => 'rwp' );
-has file       => ( is => 'rwp' );
+has line       => ( is => 'rwp', );
+has file       => ( is => 'rwp', );
 has text       => ( is => 'ro', );
-has stacktrace => ( is => 'rwp' );
+has object     => ( is => 'ro', );
+has stacktrace => ( is => 'rwp', );
 
 sub BUILD {
     my $this = shift;