Last and final attempt at improving the Ruby only speed of the IO processing. Future releases will replace Ruby code with C.

git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@15 19e92222-5c0b-0410-8929-a290d50e31e9

1 files changed, 29 insertions, 22 deletions

diff --git a/test/test_http11.rb b/test/test_http11.rb
index 8f07900..60d020b 100644
--- a/test/test_http11.rb
+++ b/test/test_http11.rb
@@ -4,28 +4,35 @@ require 'http11'
 
 class HttpParserTest < Test::Unit::TestCase
     
-    def test_parse_simple
-            parser = HttpParser.new
-            req = {}
-            http = "GET / HTTP/1.1\r\n\r\n"
-            nread = parser.execute(req, http);
-            assert nread == http.length, "Failed to parse the full HTTP request"
-            assert parser.finished?, "Parser didn't finish"
-            assert !parser.error?, "Parser had error"
-            assert nread == parser.nread, "Number read returned from execute does not match"
-            parser.reset
-            assert parser.nread == 0, "Number read after reset should be 0"
-    end
-    
-    
-    def test_parse_error
-        parser = HttpParser.new
-        req = {}
-        bad_http = "GET / SsUTF/1.1"
-        nread = parser.execute(req, bad_http)
-        assert nread < bad_http.length, "Number read should be less than total on error"
-        assert !parser.finished?, "Parser shouldn't be finished"
-        assert parser.error?, "Parser SHOULD have error"
+  def test_parse_simple
+    parser = HttpParser.new
+    req = {}
+    http = "GET / HTTP/1.1\r\n\r\n"
+    nread = parser.execute(req, http);
+    assert nread == http.length, "Failed to parse the full HTTP request"
+    assert parser.finished?, "Parser didn't finish"
+    assert !parser.error?, "Parser had error"
+    assert nread == parser.nread, "Number read returned from execute does not match"
+    parser.reset
+    assert parser.nread == 0, "Number read after reset should be 0"
+  end
+  
+  
+  def test_parse_error
+    parser = HttpParser.new
+    req = {}
+    bad_http = "GET / SsUTF/1.1"
+
+    error = false
+    begin
+      nread = parser.execute(req, bad_http)
+    rescue => details
+      error = true
     end
+
+    assert error, "failed to throw exception"
+    assert !parser.finished?, "Parser shouldn't be finished"
+    assert parser.error?, "Parser SHOULD have error"
+  end
 end