[TWiki-Dev] CVS: twiki/tools/test TestUtil.pm,1.2,1.3

[John T. <ta...@us...>]

Update of /cvsroot/twiki/twiki/tools/test
In directory usw-pr-cvs1:/tmp/cvs-serv12014/tools/test

Modified Files:
	TestUtil.pm 
Log Message:
Now returns result of assert.


Index: TestUtil.pm
===================================================================
RCS file: /cvsroot/twiki/twiki/tools/test/TestUtil.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** TestUtil.pm	4 Jul 2001 13:20:01 -0000	1.2
--- TestUtil.pm	7 Apr 2002 21:03:34 -0000	1.3
***************
*** 23,26 ****
--- 23,28 ----
     my( $condition, $message, $extra ) = @_;
     
+    my $okay = 1;
+    
     if( $extra ) {
        $message .= "; $extra";
***************
*** 33,36 ****
--- 35,40 ----
        trace( "$message" );
     }
+    
+    return $okay;
  }
  
***************
*** 52,56 ****
  
     my $match = $text =~ /$pattern/;
!    check( $match, "$text match $pattern", $extra );
  }
  
--- 56,60 ----
  
     my $match = $text =~ /$pattern/;
!    return check( $match, "$text match $pattern", $extra );
  }
  
***************
*** 60,64 ****
  
     my $match = $text =~ /$pattern/s;
!    check( $match, "$text should match $pattern (s option)", $extra );
  }
  
--- 64,68 ----
  
     my $match = $text =~ /$pattern/s;
!    return check( $match, "$text should match $pattern (s option)", $extra );
  }
  
***************
*** 68,72 ****
     my( $result, $expected, $extra ) = @_;
  
!    check( $result eq $expected, "\"$result\" should be \"$expected\"", $extra );
  }
  
--- 72,76 ----
     my( $result, $expected, $extra ) = @_;
  
!    return check( $result eq $expected, "\"$result\" should be \"$expected\"", $extra );
  }