* test/date/*.rb: imported additional tests and some adjustments.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19622 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 153 insertions, 4 deletions

diff --git a/test/date/test_date_compat.rb b/test/date/test_date_compat.rb
new file mode 100644
index 0000000000..8284007407
--- /dev/null
+++ b/test/date/test_date_compat.rb
@@ -0,0 +1,21 @@
+require 'test/unit'
+require 'date'
+
+class TestDateCompat < Test::Unit::TestCase
+
+  def test_compat
+    assert_equal(DateTime.new, Date.new)
+    assert_equal(DateTime.new(2002,3,19), Date.new(2002,3,19))
+    assert_equal(DateTime.new(2002,3,19, 0,0,0), Date.new(2002,3,19))
+    assert_equal(DateTime.new(2002,3,19, 0,0,0, 0), Date.new(2002,3,19))
+    assert_equal(DateTime.new(2002,3,19, 0,0,0, 0.to_r), Date.new(2002,3,19))
+    assert_equal(DateTime.new(2002,3,19, 0,0,0, 0, Date::GREGORIAN), Date.new(2002,3,19, Date::GREGORIAN))
+    assert_equal(DateTime.new(2002,3,19, 0,0,0, 0, Date::JULIAN), Date.new(2002,3,19, Date::JULIAN))
+
+    assert(Date.new(2002,3,19) != DateTime.new(2002,3,19, 12,0,0))
+    assert(Date.new(2002,3,19) != DateTime.new(2002,3,19, 0,0,1))
+    assert(Date.new(2002,3,19) === DateTime.new(2002,3,19, 12,0,0))
+    assert(Date.new(2002,3,19) === DateTime.new(2002,3,19, 0,0,1))
+  end
+
+end
diff --git a/test/date/test_date_conv.rb b/test/date/test_date_conv.rb
new file mode 100644
index 0000000000..5565ca8e5e
--- /dev/null
+++ b/test/date/test_date_conv.rb
@@ -0,0 +1,130 @@
+require 'test/unit'
+require 'date'
+
+class TestDateConv < Test::Unit::TestCase
+
+  def test_to_class
+    [Time.now, Date.today, DateTime.now].each do |o|
+      assert_instance_of(Time, o.to_time)
+      assert_instance_of(Date, o.to_date)
+      assert_instance_of(DateTime, o.to_datetime)
+    end
+  end
+
+  def test_to_time__from_time
+    t = Time.mktime(2004, 9, 19, 1, 2, 3, 456789)
+    t2 = t.to_time
+    assert_equal([2004, 9, 19, 1, 2, 3, 456789],
+		 [t2.year, t2.mon, t2.mday, t2.hour, t2.min, t2.sec, t2.usec])
+
+    t = Time.utc(2004, 9, 19, 1, 2, 3, 456789)
+    t2 = t.to_time.utc
+    assert_equal([2004, 9, 19, 1, 2, 3, 456789],
+		 [t2.year, t2.mon, t2.mday, t2.hour, t2.min, t2.sec, t2.usec])
+  end
+
+  def test_to_time__from_date
+    d = Date.new(2004, 9, 19)
+    t = d.to_time
+    assert_equal([2004, 9, 19, 0, 0, 0, 0],
+		 [t.year, t.mon, t.mday, t.hour, t.min, t.sec, t.usec])
+  end
+
+  def test_to_time__from_datetime
+    d = DateTime.new(2004, 9, 19, 1, 2, 3, 9.to_r/24) + 456789.to_r/86400000000
+    t = d.to_time
+    if t.utc_offset == 9*60*60
+      assert_equal([2004, 9, 19, 1, 2, 3, 456789],
+		   [t.year, t.mon, t.mday, t.hour, t.min, t.sec, t.usec])
+    end
+
+    d = DateTime.new(2004, 9, 19, 1, 2, 3, 0) + 456789.to_r/86400000000
+    t = d.to_time.utc
+    assert_equal([2004, 9, 19, 1, 2, 3, 456789],
+		 [t.year, t.mon, t.mday, t.hour, t.min, t.sec, t.usec])
+
+    if Time.allocate.respond_to?(:nsec)
+      d = DateTime.new(2004, 9, 19, 1, 2, 3, 0) + 456789123.to_r/86400000000000
+      t = d.to_time.utc
+      assert_equal([2004, 9, 19, 1, 2, 3, 456789123],
+		   [t.year, t.mon, t.mday, t.hour, t.min, t.sec, t.nsec])
+    end
+  end
+
+  def test_to_date__from_time
+    t = Time.mktime(2004, 9, 19, 1, 2, 3, 456789)
+    d = t.to_date
+    assert_equal([2004, 9, 19, 0], [d.year, d.mon, d.mday, d.day_fraction])
+
+    t = Time.utc(2004, 9, 19, 1, 2, 3, 456789)
+    d = t.to_date
+    assert_equal([2004, 9, 19, 0], [d.year, d.mon, d.mday, d.day_fraction])
+  end
+
+  def test_to_date__from_date
+    d = Date.new(2004, 9, 19) + 1.to_r/2
+    d2 = d.to_date
+    assert_equal([2004, 9, 19, 1.to_r/2],
+		 [d2.year, d2.mon, d2.mday, d2.day_fraction])
+  end
+
+  def test_to_date__from_datetime
+    d = DateTime.new(2004, 9, 19, 1, 2, 3, 9.to_r/24) + 456789.to_r/86400000000
+    d2 = d.to_date
+    assert_equal([2004, 9, 19, 0], [d2.year, d2.mon, d2.mday, d2.day_fraction])
+
+    d = DateTime.new(2004, 9, 19, 1, 2, 3, 0) + 456789.to_r/86400000000
+    d2 = d.to_date
+    assert_equal([2004, 9, 19, 0], [d2.year, d2.mon, d2.mday, d2.day_fraction])
+  end
+
+  def test_to_datetime__from_time
+    t = Time.mktime(2004, 9, 19, 1, 2, 3, 456789)
+    d = t.to_datetime
+    assert_equal([2004, 9, 19, 1, 2, 3,
+		  456789.to_r/1000000,
+		  t.utc_offset.to_r/86400],
+		 [d.year, d.mon, d.mday, d.hour, d.min, d.sec,
+		  d.sec_fraction, d.offset])
+
+    t = Time.utc(2004, 9, 19, 1, 2, 3, 456789)
+    d = t.to_datetime
+    assert_equal([2004, 9, 19, 1, 2, 3,
+		  456789.to_r/1000000,
+		  0],
+		 [d.year, d.mon, d.mday, d.hour, d.min, d.sec,
+		  d.sec_fraction, d.offset])
+
+    t = Time.now
+    d = t.to_datetime
+    require 'time'
+    assert_equal(t.iso8601(10), d.iso8601(10))
+  end
+
+  def test_to_datetime__from_date
+    d = Date.new(2004, 9, 19) + 1.to_r/2
+    d2 = d.to_datetime
+    assert_equal([2004, 9, 19, 0, 0, 0, 0, 0],
+		 [d2.year, d2.mon, d2.mday, d2.hour, d2.min, d2.sec,
+		  d2.sec_fraction, d2.offset])
+  end
+
+  def test_to_datetime__from_datetime
+    d = DateTime.new(2004, 9, 19, 1, 2, 3, 9.to_r/24) + 456789.to_r/86400000000
+    d2 = d.to_datetime
+    assert_equal([2004, 9, 19, 1, 2, 3,
+		  456789.to_r/1000000,
+		  9.to_r/24],
+		 [d2.year, d2.mon, d2.mday, d2.hour, d2.min, d2.sec,
+		  d2.sec_fraction, d2.offset])
+
+    d = DateTime.new(2004, 9, 19, 1, 2, 3, 0) + 456789.to_r/86400000000
+    d2 = d.to_datetime
+    assert_equal([2004, 9, 19, 1, 2, 3,
+		  456789.to_r/1000000,
+		  0],
+		 [d2.year, d2.mon, d2.mday, d2.hour, d2.min, d2.sec,
+		  d2.sec_fraction, d2.offset])
+  end
+
+end
diff --git a/test/date/test_date_parse.rb b/test/date/test_date_parse.rb
index a89dc9406e..c44523fd98 100644
--- a/test/date/test_date_parse.rb
+++ b/test/date/test_date_parse.rb
@@ -435,6 +435,7 @@ class TestDateParse < Test::Unit::TestCase
 
   def test__parse_slash_exp
     [
+     # little
      [['2/5/1999',false],[1999,5,2,nil,nil,nil,nil,nil,nil]],
      [['02/05/1999',false],[1999,5,2,nil,nil,nil,nil,nil,nil]],
      [['02/05/-1999',false],[-1999,5,2,nil,nil,nil,nil,nil,nil]],
diff --git a/test/date/test_date_strftime.rb b/test/date/test_date_strftime.rb
index 42b9734785..cc386e02ca 100644
--- a/test/date/test_date_strftime.rb
+++ b/test/date/test_date_strftime.rb
@@ -350,7 +350,7 @@ class TestDateStrftime < Test::Unit::TestCase
     assert_equal('M45.07.29', Date.parse('1912-07-29').jisx0301)
     assert_equal('T01.07.30', Date.parse('1912-07-30').jisx0301)
     assert_equal('T15.12.24', Date.parse('1926-12-24').jisx0301)
-      assert_equal('S01.12.25', Date.parse('1926-12-25').jisx0301)
+    assert_equal('S01.12.25', Date.parse('1926-12-25').jisx0301)
     assert_equal('S64.01.07', Date.parse('1989-01-07').jisx0301)
     assert_equal('H01.01.08', Date.parse('1989-01-08').jisx0301)
     assert_equal('H18.09.01', Date.parse('2006-09-01').jisx0301)
@@ -366,9 +366,6 @@ class TestDateStrftime < Test::Unit::TestCase
       assert_equal(s, Date.parse(s).jisx0301)
     end
   
-    d = Date.new(2001,2,3)
-    d2 = DateTime.new(2001,2,3,2)
-
   end
 
 end