From: Steve F. <sm...@us...> - 2002-09-02 20:15:37
|
Update of /cvsroot/mockobjects/no-stone-unturned/src/ruby In directory usw-pr-cvs1:/tmp/cvs-serv28807/src/ruby Modified Files: addrservlet.rb test_addrservlet.rb Log Message: *** keyword substitution change *** Index: addrservlet.rb =================================================================== RCS file: /cvsroot/mockobjects/no-stone-unturned/src/ruby/addrservlet.rb,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 Index: test_addrservlet.rb =================================================================== RCS file: /cvsroot/mockobjects/no-stone-unturned/src/ruby/test_addrservlet.rb,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- test_addrservlet.rb 31 Aug 2002 10:55:21 -0000 1.1 +++ test_addrservlet.rb 2 Sep 2002 20:15:33 -0000 1.2 @@ -1,81 +1,81 @@ - - -require 'test/unit' -require 'webrick' -require 'addrservlet' - - -class MockRequest - def _setup_query_string( query ) - @query_string = WEBrick::HTTPUtils::escape_form(query) - end - attr_reader :query_string -end - -class MockResponse - include Test::Unit::Assertions - - def initialize - @content_type_set = false - @body_set = false - @body_expectation = nil - end - - def []=( header, value ) - assert_equal( "content-type", header ) - assert_match( /^text\/.*/, value ) - @content_type_set = true - end - - def _expect_body( &proc ) - @body_expectation = proc - end - - def body=( value ) - @body_expectation.call(value) if @body_expectation - @body_set = true - end - - def _verify - assert( "content-type", @content_type_set ) - assert( "body", @body_expectation && @body_set ) - end -end - - -class AddressBookServletTest < Test::Unit::TestCase - NAME1 = "First Last" - ADDR1 = "ADDRESS" - - def set_up - @request = MockRequest.new - @response = MockResponse.new - @servlet = AddressBookServlet.new( {}, NAME1 => ADDR1 ) - end - - def test_no_address_found - @request._setup_query_string( "UNKNOWN NAME" ) - @response._expect_body { |text| assert_match( /no address found/, text ) } - - @servlet.do_GET( @request, @response ) - - @response._verify - end - - def test_no_address_found_when_no_name - @response._expect_body { |text| assert_match( /no address found/, text ) } - - @servlet.do_GET( @request, @response ) - - @response._verify - end - - def test_address_found - @request._setup_query_string( NAME1 ) - @response._expect_body { |text| assert_match( /#{ADDR1}/, text ) } - - @servlet.do_GET( @request, @response ) - - @response._verify - end -end + + +require 'test/unit' +require 'webrick' +require 'addrservlet' + + +class MockRequest + def _setup_query_string( query ) + @query_string = WEBrick::HTTPUtils::escape_form(query) + end + attr_reader :query_string +end + +class MockResponse + include Test::Unit::Assertions + + def initialize + @content_type_set = false + @body_set = false + @body_expectation = nil + end + + def []=( header, value ) + assert_equal( "content-type", header ) + assert_match( /^text\/.*/, value ) + @content_type_set = true + end + + def _expect_body( &proc ) + @body_expectation = proc + end + + def body=( value ) + @body_expectation.call(value) if @body_expectation + @body_set = true + end + + def _verify + assert( "content-type", @content_type_set ) + assert( "body", @body_expectation && @body_set ) + end +end + + +class AddressBookServletTest < Test::Unit::TestCase + NAME1 = "First Last" + ADDR1 = "ADDRESS" + + def set_up + @request = MockRequest.new + @response = MockResponse.new + @servlet = AddressBookServlet.new( {}, NAME1 => ADDR1 ) + end + + def test_no_address_found + @request._setup_query_string( "UNKNOWN NAME" ) + @response._expect_body { |text| assert_match( /no address found/, text ) } + + @servlet.do_GET( @request, @response ) + + @response._verify + end + + def test_no_address_found_when_no_name + @response._expect_body { |text| assert_match( /no address found/, text ) } + + @servlet.do_GET( @request, @response ) + + @response._verify + end + + def test_address_found + @request._setup_query_string( NAME1 ) + @response._expect_body { |text| assert_match( /#{ADDR1}/, text ) } + + @servlet.do_GET( @request, @response ) + + @response._verify + end +end |