ruby-changes:18346
From: nobu <ko1@a...>
Date: Sat, 25 Dec 2010 22:41:23 +0900 (JST)
Subject: [ruby-changes:18346] Ruby:r30369 (trunk): test/with_different_ofs.rb: fixed typos.
nobu 2010-12-25 22:41:11 +0900 (Sat, 25 Dec 2010) New Revision: 30369 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30369 Log: test/with_different_ofs.rb: fixed typos. Added files: trunk/test/with_different_ofs.rb Removed files: trunk/test/with_diffent_ofs.rb Modified files: trunk/ChangeLog trunk/test/csv/base.rb trunk/test/csv/test_csv_parsing.rb trunk/test/csv/test_csv_writing.rb trunk/test/csv/test_data_converters.rb trunk/test/csv/test_encodings.rb trunk/test/csv/test_features.rb trunk/test/csv/test_headers.rb trunk/test/csv/test_interface.rb trunk/test/csv/test_row.rb trunk/test/csv/test_serialization.rb trunk/test/csv/test_table.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 30368) +++ ChangeLog (revision 30369) @@ -3,10 +3,10 @@ * test/digest/test_digest_extend.rb (TestDigestExtend#setup): should not depend on the result of previous tests - * test/with_diffent_ofs.rb (DifferentOFS::WithDifferentOFS): give + * test/with_different_ofs.rb (DifferentOFS::WithDifferentOFS): give name. - * test/with_diffent_ofs.rb (DifferentOFS): test suite for test + * test/with_different_ofs.rb (DifferentOFS): test suite for test suites affected by $,. * test/digest/test_digest_extend.rb (TestDigestExtend): should not @@ -44,7 +44,7 @@ Sat Dec 25 17:33:55 2010 Nobuyoshi Nakada <nobu@r...> - * test/csv/base.rb (TestCSV.with_diffrent_ofs): give name to + * test/csv/base.rb (TestCSV.with_different_ofs): give name to anonymous classes. * lib/csv.rb (CSV#init_separators): use IO#gets with length Index: test/with_diffent_ofs.rb =================================================================== --- test/with_diffent_ofs.rb (revision 30368) +++ test/with_diffent_ofs.rb (revision 30369) @@ -1,19 +0,0 @@ -module DifferentOFS - def setup - super - @ofs, $, = $,, "-" - end - def teardown - $, = @ofs - super - end - - module WithDifferentOFS - def with_diffrent_ofs - end - end - def self.included(klass) - super(klass) - klass.const_set(:DifferentOFS, Class.new(klass).class_eval {include WithDifferentOFS}).name - end -end Index: test/with_different_ofs.rb =================================================================== --- test/with_different_ofs.rb (revision 0) +++ test/with_different_ofs.rb (revision 30369) @@ -0,0 +1,19 @@ +module DifferentOFS + def setup + super + @ofs, $, = $,, "-" + end + def teardown + $, = @ofs + super + end + + module WithDifferentOFS + def with_diffrent_ofs + end + end + def self.included(klass) + super(klass) + klass.const_set(:DifferentOFS, Class.new(klass).class_eval {include WithDifferentOFS}).name + end +end Property changes on: test/with_different_ofs.rb ___________________________________________________________________ Added: svn:eol-style + LF Index: test/csv/test_csv_parsing.rb =================================================================== --- test/csv/test_csv_parsing.rb (revision 30368) +++ test/csv/test_csv_parsing.rb (revision 30369) @@ -216,6 +216,4 @@ end end end - - with_diffrent_ofs end Index: test/csv/test_csv_writing.rb =================================================================== --- test/csv/test_csv_writing.rb (revision 30368) +++ test/csv/test_csv_writing.rb (revision 30369) @@ -92,6 +92,4 @@ CSV.generate_line( [1, "b", nil, %Q{already "quoted"}], force_quotes: true ) ) end - - with_diffrent_ofs end Index: test/csv/test_features.rb =================================================================== --- test/csv/test_features.rb (revision 30368) +++ test/csv/test_features.rb (revision 30369) @@ -31,6 +31,7 @@ [%Q{"\r\n,",}, ["\r\n,", nil]] ] def setup + super @sample_data = <<-END_DATA.gsub(/^ +/, "") line,1,abc line,2,"def\nghi" @@ -263,6 +264,4 @@ assert(CSV::VERSION.frozen?) assert_match(/\A\d\.\d\.\d\Z/, CSV::VERSION) end - - with_diffrent_ofs end Index: test/csv/test_interface.rb =================================================================== --- test/csv/test_interface.rb (revision 30368) +++ test/csv/test_interface.rb (revision 30369) @@ -11,6 +11,7 @@ class TestCSV::Interface < TestCSV def setup + super @path = File.join(File.dirname(__FILE__), "temp_test_data.csv") File.open(@path, "wb") do |file| @@ -23,6 +24,7 @@ def teardown File.unlink(@path) + super end ### Test Read Interface ### @@ -304,6 +306,4 @@ assert_equal(STDOUT, CSV.instance.instance_eval { @io }) assert_equal(STDOUT, CSV { |new_csv| new_csv.instance_eval { @io } }) end - - with_diffrent_ofs end Index: test/csv/test_data_converters.rb =================================================================== --- test/csv/test_data_converters.rb (revision 30368) +++ test/csv/test_data_converters.rb (revision 30369) @@ -11,6 +11,7 @@ class TestCSV::DataConverters < TestCSV def setup + super @data = "Numbers,:integer,1,:float,3.015" @parser = CSV.new(@data) @@ -257,6 +258,4 @@ assert_respond_to(row, :unconverted_fields) assert_equal(Array.new, row.unconverted_fields) end - - with_diffrent_ofs end Index: test/csv/test_row.rb =================================================================== --- test/csv/test_row.rb (revision 30368) +++ test/csv/test_row.rb (revision 30369) @@ -11,6 +11,7 @@ class TestCSV::Row < TestCSV def setup + super @row = CSV::Row.new(%w{A B C A A}, [1, 2, 3, 4]) end @@ -307,6 +308,4 @@ "Header field pair not found." ) end end - - with_diffrent_ofs end Index: test/csv/test_table.rb =================================================================== --- test/csv/test_table.rb (revision 30368) +++ test/csv/test_table.rb (revision 30369) @@ -11,6 +11,7 @@ class TestCSV::Table < TestCSV def setup + super @rows = [ CSV::Row.new(%w{A B C}, [1, 2, 3]), CSV::Row.new(%w{A B C}, [4, 5, 6]), CSV::Row.new(%w{A B C}, [7, 8, 9]) ] @@ -414,6 +415,4 @@ @table.inspect.encoding ), "inspect() was not ASCII compatible." ) end - - with_diffrent_ofs end Index: test/csv/test_encodings.rb =================================================================== --- test/csv/test_encodings.rb (revision 30368) +++ test/csv/test_encodings.rb (revision 30369) @@ -11,6 +11,7 @@ class TestCSV::Encodings < TestCSV def setup + super require 'tempfile' @temp_csv_file = Tempfile.new(%w"test_csv. .csv") @temp_csv_path = @temp_csv_file.path @@ -19,6 +20,7 @@ def teardown @temp_csv_file.close! + super end ######################################## @@ -306,6 +308,4 @@ yield encoding end end - - with_diffrent_ofs end Index: test/csv/base.rb =================================================================== --- test/csv/base.rb (revision 30368) +++ test/csv/base.rb (revision 30369) @@ -2,7 +2,7 @@ require "csv" -require_relative "../with_diffent_ofs.rb" +require_relative "../with_different_ofs.rb" class TestCSV < Test::Unit::TestCase include DifferentOFS Index: test/csv/test_headers.rb =================================================================== --- test/csv/test_headers.rb (revision 30368) +++ test/csv/test_headers.rb (revision 30369) @@ -11,6 +11,7 @@ class TestCSV::Headers < TestCSV def setup + super @data = <<-END_CSV.gsub(/^\s+/, "") first,second,third A,B,C @@ -283,6 +284,4 @@ assert_instance_of(CSV::Row, row) end end - - with_diffrent_ofs end Index: test/csv/test_serialization.rb =================================================================== --- test/csv/test_serialization.rb (revision 30368) +++ test/csv/test_serialization.rb (revision 30369) @@ -151,6 +151,4 @@ obj = {1 => "simple", test: Hash} assert_equal(obj, CSV.load(CSV.dump([obj])).first) end - - with_diffrent_ofs end -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/