nobu	2012-05-08 15:50:03 +0900 (Tue, 08 May 2012)

  New Revision: 35592

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=35592

  Log:
    test: fix test conditions
    
    * test/csv/test_features.rb (TestCSV#test_gzip_reader_bug_fix): test
      only if zlib is available.
    
    * test/csv/test_features.rb (TestCSV#test_gzip_writer_bug_fix): ditto.
    
    * test/open-uri/test_open-uri.rb (TestOpenURI#test_content_encoding):
      ditto.
    
    * test/rexml/test_order.rb (OrderTester#test_more_ordering): ditto.

  Modified files:
    trunk/test/csv/test_features.rb
    trunk/test/open-uri/test_open-uri.rb
    trunk/test/rexml/test_order.rb

Index: test/rexml/test_order.rb
===================================================================
--- test/rexml/test_order.rb	(revision 35591)
+++ test/rexml/test_order.rb	(revision 35592)
@@ -1,6 +1,9 @@
 require 'rexml_test_utils'
 require 'rexml/document'
-require 'zlib'
+begin
+  require 'zlib'
+rescue LoadError
+end
 
 class OrderTester < Test::Unit::TestCase
   include REXMLTestUtils
@@ -98,5 +101,5 @@
        assert_equal( actual[count], n ) unless n =~ /Arrive at/
        count += 1
      }
-   end
+   end if defined?(Zlib::GzipReader)
 end
Index: test/open-uri/test_open-uri.rb
===================================================================
--- test/open-uri/test_open-uri.rb	(revision 35591)
+++ test/open-uri/test_open-uri.rb	(revision 35592)
@@ -2,7 +2,10 @@
 require 'open-uri'
 require 'webrick'
 require 'webrick/httpproxy'
-require 'zlib'
+begin
+  require 'zlib'
+rescue LoadError
+end
 
 class TestOpenURI < Test::Unit::TestCase
 
@@ -497,7 +500,7 @@
         assert_equal(content_gz, f.read.force_encoding("ascii-8bit"))
       }
     }
-  end
+  end if defined?(Zlib::GzipWriter)
 
   # 192.0.2.0/24 is TEST-NET.  [RFC3330]
 
Index: test/csv/test_features.rb
===================================================================
--- test/csv/test_features.rb	(revision 35591)
+++ test/csv/test_features.rb	(revision 35592)
@@ -7,7 +7,10 @@
 #  Copyright 2005 James Edward Gray II. You can redistribute or modify this code
 #  under the terms of Ruby's license.
 
-require "zlib"
+begin
+  require "zlib"
+rescue LoadError
+end
 
 require_relative "base"
 
@@ -205,7 +208,7 @@
                )
     end
     assert_equal("\r\n", zipped.row_sep)
-  end
+  end if defined?(Zlib::GzipReader)
 
   def test_gzip_writer_bug_fix
     tempfile = Tempfile.new(%w"temp .gz")
@@ -223,7 +226,7 @@
                              include?($INPUT_RECORD_SEPARATOR),
             "@row_sep did not default" )
     tempfile.close(true)
-  end
+  end if defined?(Zlib::GzipWriter)
 
   def test_inspect_is_smart_about_io_types
     str = CSV.new("string,data").inspect

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/