1 files changed, 46 insertions, 5 deletions
diff --git a/test/uri/test_parser.rb b/test/uri/test_parser.rb
index f8e9299d09..f455a5cc9b 100644
--- a/test/uri/test_parser.rb
+++ b/test/uri/test_parser.rb
@@ -8,8 +8,8 @@ class URI::TestParser < Test::Unit::TestCase
   end
 
   def test_inspect
-    assert_match(/URI::RFC2396_Parser/, URI::Parser.new.inspect)
-    assert_match(/URI::RFC3986_Parser/, URI::RFC3986_Parser.new.inspect)
+    assert_match(/URI::RFC2396_Parser/, URI::RFC2396_Parser.new.inspect)
+    assert_match(/URI::RFC3986_Parser/, URI::Parser.new.inspect)
   end
 
   def test_compare
@@ -33,7 +33,9 @@ class URI::TestParser < Test::Unit::TestCase
     assert(!u2.equal?(u3))
   end
 
-  def test_parse
+  def test_parse_rfc2396_parser
+    URI.parser = URI::RFC2396_PARSER
+
     escaped = URI::REGEXP::PATTERN::ESCAPED
     hex = URI::REGEXP::PATTERN::HEX
     p1 = URI::Parser.new(:ESCAPED => "(?:#{escaped}|%u[#{hex}]{4})")
@@ -43,6 +45,8 @@ class URI::TestParser < Test::Unit::TestCase
     u1.path = '/%uDCBA'
     assert_equal(['http', nil, 'a', URI::HTTP.default_port, '/%uDCBA', nil, nil],
 		 uri_to_ary(u1))
+  ensure
+    URI.parser = URI::DEFAULT_PARSER
   end
 
   def test_parse_query_pct_encoded
@@ -65,11 +69,48 @@ class URI::TestParser < Test::Unit::TestCase
     end
   end
 
-  def test_unescape
-    p1 = URI::Parser.new
+  def test_rfc2822_unescape
+    p1 = URI::RFC2396_Parser.new
     assert_equal("\xe3\x83\x90", p1.unescape("\xe3\x83\x90"))
     assert_equal("\xe3\x83\x90", p1.unescape('%e3%83%90'))
     assert_equal("\u3042", p1.unescape('%e3%81%82'.force_encoding(Encoding::US_ASCII)))
     assert_equal("\xe3\x83\x90\xe3\x83\x90", p1.unescape("\xe3\x83\x90%e3%83%90"))
   end
+
+  def test_split
+    assert_equal(["http", nil, "example.com", nil, nil, "", nil, nil, nil], URI.split("http://example.com"))
+    assert_equal(["http", nil, "[0::0]", nil, nil, "", nil, nil, nil], URI.split("http://[0::0]"))
+    assert_equal([nil, nil, "example.com", nil, nil, "", nil, nil, nil], URI.split("//example.com"))
+    assert_equal([nil, nil, "[0::0]", nil, nil, "", nil, nil, nil], URI.split("//[0::0]"))
+
+    assert_equal(["a", nil, nil, nil, nil, "", nil, nil, nil], URI.split("a:"))
+    assert_raise(URI::InvalidURIError) do
+      URI.parse("::")
+    end
+    assert_raise(URI::InvalidURIError) do
+      URI.parse("foo@example:foo")
+    end
+  end
+
+  def test_rfc2822_parse_relative_uri
+    pre = ->(length) {
+      " " * length + "\0"
+    }
+    parser = URI::RFC2396_Parser.new
+    assert_linear_performance((1..5).map {|i| 10**i}, pre: pre) do |uri|
+      assert_raise(URI::InvalidURIError) do
+        parser.split(uri)
+      end
+    end
+  end
+
+  def test_rfc3986_port_check
+    pre = ->(length) {"\t" * length + "a"}
+    uri = URI.parse("http://my.example.com")
+    assert_linear_performance((1..5).map {|i| 10**i}, pre: pre) do |port|
+      assert_raise(URI::InvalidComponentError) do
+        uri.port = port
+      end
+    end
+  end
 end