From ef63734effc6aaf9b14c6dda69ef309e0f332fa7 Mon Sep 17 00:00:00 2001 From: PaulHarvey Date: Sat, 16 Jun 2012 05:50:50 +0000 Subject: [PATCH] Item11945: missing form types are now logged git-svn-id: http://svn.foswiki.org/branches/Release01x01@14995 0b4bb1d4-4e5a-0410-9cc4-b2b747904278 --- UnitTestContrib/test/unit/HTMLValidationTests.pm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/UnitTestContrib/test/unit/HTMLValidationTests.pm b/UnitTestContrib/test/unit/HTMLValidationTests.pm index cfd8be9b28..b92796f5d7 100644 --- a/UnitTestContrib/test/unit/HTMLValidationTests.pm +++ b/UnitTestContrib/test/unit/HTMLValidationTests.pm @@ -203,8 +203,16 @@ sub call_UI_FN { $this->assert_matches( qr/^1?$/, $result, "$SCRIPT_NAME returned '$result'" ) if defined $result; - $this->assert_equals( '', $stderr, "$SCRIPT_NAME errored: '$stderr'" ) - if defined $stderr; + + # Item11945: Foswiki now logs when bad or missing form types are used, so + # check STDERR is only a single line & that it contains that warning + $this->assert( + ( + !$stderr || ( scalar( $stderr =~ /([\r\n]+)/g ) == 1 + && $stderr =~ /error compiling class Foswiki::Form::Nuffin/ ) + ), + "$SCRIPT_NAME errored: '$stderr'" + ) if defined $stderr; # Remove CGI header my $CRLF = "\015\012"; # "\r\n" is not portable