[ruby/uri] Define test cases as qualified class names

https://github.com/ruby/uri/commit/aaa22a2443

6 files changed, 7 insertions, 43 deletions

diff --git a/test/uri/test_common.rb b/test/uri/test_common.rb
index 132770495b..1df19e6968 100644
--- a/test/uri/test_common.rb
+++ b/test/uri/test_common.rb
@@ -3,10 +3,7 @@ require 'test/unit'
 require 'envutil'
 require 'uri'
 
-module URI
-
-
-class TestCommon < Test::Unit::TestCase
+class URI::TestCommon < Test::Unit::TestCase
   def setup
   end
 
@@ -292,6 +289,3 @@ class TestCommon < Test::Unit::TestCase
   private
   def s(str) str.force_encoding(Encoding::Windows_31J); end
 end
-
-
-end
diff --git a/test/uri/test_ftp.rb b/test/uri/test_ftp.rb
index 0eec984db8..f45bb0667c 100644
--- a/test/uri/test_ftp.rb
+++ b/test/uri/test_ftp.rb
@@ -2,10 +2,7 @@
 require 'test/unit'
 require 'uri/ftp'
 
-module URI
-
-
-class TestFTP < Test::Unit::TestCase
+class URI::TestFTP < Test::Unit::TestCase
   def setup
   end
 
@@ -29,7 +26,7 @@ class TestFTP < Test::Unit::TestCase
   end
 
   def test_parse_invalid
-    assert_raise(InvalidURIError){URI.parse('ftp:example')}
+    assert_raise(URI::InvalidURIError) {URI.parse('ftp:example')}
   end
 
   def test_paths
@@ -62,6 +59,3 @@ class TestFTP < Test::Unit::TestCase
     end
   end
 end
-
-
-end
diff --git a/test/uri/test_http.rb b/test/uri/test_http.rb
index 748e90a322..e937b1a26b 100644
--- a/test/uri/test_http.rb
+++ b/test/uri/test_http.rb
@@ -3,10 +3,7 @@ require 'test/unit'
 require 'uri/http'
 require 'uri/https'
 
-module URI
-
-
-class TestHTTP < Test::Unit::TestCase
+class URI::TestHTTP < Test::Unit::TestCase
   def setup
   end
 
@@ -82,6 +79,3 @@ class TestHTTP < Test::Unit::TestCase
     assert_equal('https://a.b.c', URI.parse('https://a.b.c/').origin)
   end
 end
-
-
-end
diff --git a/test/uri/test_ldap.rb b/test/uri/test_ldap.rb
index 2625b24103..9c4506a357 100644
--- a/test/uri/test_ldap.rb
+++ b/test/uri/test_ldap.rb
@@ -2,10 +2,7 @@
 require 'test/unit'
 require 'uri/ldap'
 
-module URI
-
-
-class TestLDAP < Test::Unit::TestCase
+class URI::TestLDAP < Test::Unit::TestCase
   def setup
   end
 
@@ -100,6 +97,3 @@ class TestLDAP < Test::Unit::TestCase
     assert_raise(URI::InvalidURIError) {URI.parse("ldap:https://example.com")}
   end
 end
-
-
-end
diff --git a/test/uri/test_ws.rb b/test/uri/test_ws.rb
index 17acb0d9f2..f3918f617c 100644
--- a/test/uri/test_ws.rb
+++ b/test/uri/test_ws.rb
@@ -3,10 +3,7 @@ require 'test/unit'
 require 'uri/http'
 require 'uri/ws'
 
-module URI
-
-
-class TestWS < Test::Unit::TestCase
+class URI::TestWS < Test::Unit::TestCase
   def setup
   end
 
@@ -66,6 +63,3 @@ class TestWS < Test::Unit::TestCase
     end
   end
 end
-
-
-end
diff --git a/test/uri/test_wss.rb b/test/uri/test_wss.rb
index 2e8b9bc4b7..13a2583059 100644
--- a/test/uri/test_wss.rb
+++ b/test/uri/test_wss.rb
@@ -3,10 +3,7 @@ require 'test/unit'
 require 'uri/https'
 require 'uri/wss'
 
-module URI
-
-
-class TestWSS < Test::Unit::TestCase
+class URI::TestWSS < Test::Unit::TestCase
   def setup
   end
 
@@ -66,6 +63,3 @@ class TestWSS < Test::Unit::TestCase
     end
   end
 end
-
-
-end