From e8c817c496a913dd2c9bd73073620a91c62646b4 Mon Sep 17 00:00:00 2001 From: Steve Kemp Date: Sun, 25 Nov 2012 22:19:29 +0000 Subject: Parse the "otherwise 'xxxx'." part of the tests. --- lib/custodian/testfactory.rb | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/custodian/testfactory.rb b/lib/custodian/testfactory.rb index ccfc89e..603b69f 100644 --- a/lib/custodian/testfactory.rb +++ b/lib/custodian/testfactory.rb @@ -43,7 +43,19 @@ module Custodian test_type.chomp!( "." ) c = @@subclasses[test_type] if c - c.new( line ) + + obj = c.new( line ) + + # + # Get the notification text, which is not specific to the test-type + # + # We do this only after we've instantiated the test. + # + if ( line =~ /\s+otherwise\s+'([^']+)'/ ) + obj.set_notification_text( $1.dup ) + end + + return obj else raise ArgumentError, "Bad test type: '#{test_type}'" end @@ -94,6 +106,27 @@ module Custodian + + # + # Return the user-text which is returned on error + # + def get_notification_text + @notification_text + end + + + + + # + # Set the user-text which is returned on error. + # + def set_notification_text( str ) + @notification_text = str + end + + + + # # Is this test inverted? # @@ -102,6 +135,7 @@ module Custodian end + # # Return the port of this test. # -- cgit v1.2.1