From 16658578a55558271c76f305e62f526e6296c8e3 Mon Sep 17 00:00:00 2001 From: nahi Date: Sun, 5 Oct 2003 05:42:04 +0000 Subject: [PATCH] * lib/xsd/datatypes.rb: Rational -> Decimal string bug fix. * test/soap/marshal/test_marshal.rb: ditto. * test/soap/calc/test_calc_cgi.rb: add Config::CONFIG["EXEECT"] to RUBYBIN. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4693 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 9 +++++++++ lib/xsd/datatypes.rb | 2 +- test/soap/calc/test_calc_cgi.rb | 6 +++++- test/soap/marshal/test_marshal.rb | 5 ++++- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 49f5fc95c9..003f8a3a06 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Sun Oct 5 14:37:39 2003 NAKAMURA, Hiroshi + + * lib/xsd/datatypes.rb: Rational -> Decimal string bug fix. + + * test/soap/marshal/test_marshal.rb: ditto. + + * test/soap/calc/test_calc_cgi.rb: add Config::CONFIG["EXEECT"] to + RUBYBIN. + Sun Oct 5 13:47:22 2003 NAKAMURA, Hiroshi * test/ruby/test_beginendblock.rb, test/ruby/beginmainend.rb: add tests diff --git a/lib/xsd/datatypes.rb b/lib/xsd/datatypes.rb index 0be64fe635..a1e3e55624 100644 --- a/lib/xsd/datatypes.rb +++ b/lib/xsd/datatypes.rb @@ -600,7 +600,7 @@ private year, @data.mon, @data.mday, @data.hour, @data.min, @data.sec) if @data.sec_fraction.nonzero? fr = @data.sec_fraction * SecInDay - shiftsize = fr.denominator.to_s.size + shiftsize = fr.denominator.to_s.size + 1 fr_s = (fr * (10 ** shiftsize)).to_i.to_s s << '.' << '0' * (shiftsize - fr_s.size) << fr_s.sub(/0+$/, '') end diff --git a/test/soap/calc/test_calc_cgi.rb b/test/soap/calc/test_calc_cgi.rb index 14b0097bb6..6e7bae8d20 100644 --- a/test/soap/calc/test_calc_cgi.rb +++ b/test/soap/calc/test_calc_cgi.rb @@ -11,7 +11,11 @@ module Calc class TestCalcCGI < Test::Unit::TestCase # This test shuld be run after installing ruby. - RUBYBIN = File.join(Config::CONFIG["bindir"], Config::CONFIG["ruby_install_name"]) + RUBYBIN = File.join( + Config::CONFIG["bindir"], + Config::CONFIG["ruby_install_name"] + Config::CONFIG["EXEEXT"] + ) + def setup logger = Logger.new(STDERR) logger.level = Logger::Severity::FATAL diff --git a/test/soap/marshal/test_marshal.rb b/test/soap/marshal/test_marshal.rb index 87e364e2aa..21776c5fd1 100644 --- a/test/soap/marshal/test_marshal.rb +++ b/test/soap/marshal/test_marshal.rb @@ -199,7 +199,10 @@ module MarshalTestLib class MyTime < Time; def initialize(v, *args) super(*args); @v = v; end end def test_time - marshal_equal(Time.now) + # once there was a bug caused by usec overflow. try a little harder. + 10.times do + marshal_equal(Time.now) + end end def test_time_subclass