Changeset 311 for ruby/branches

Timestamp:

Sep 29, 2009, 11:12:37 AM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

DvDate completed

Location:

ruby/branches/0.5

Files:

• lib/open_ehr/rm/data_types/quantity/date_time.rb (modified) (2 diffs)
• spec/lib/open_ehr/rm/data_types/quantity/date_time/dv_date_spec.rb (modified) (1 diff)

ruby/branches/0.5/lib/open_ehr/rm/data_types/quantity/date_time.rb

@@ -60 +60 @@
                 day = future.day - past.day
               else
-                month -= 1
+                month = -1
                 previous_month = future.month - 1
-                if previous_month <= 0
+                if previous_month == 0
                   previous_month = 12
                 end
@@ -76 +76 @@
                 year -= 1
                 month += future.month + 12 - past.month
+              end
+              if month < 0
+                year -= 1
+                month += 12
               end
               year += future.year - past.year

ruby/branches/0.5/spec/lib/open_ehr/rm/data_types/quantity/date_time/dv_date_spec.rb

@@ -31 +31 @@
   end
 
-  it 'diff should P0Y0M1W10D' do
+  it 'diff should P0Y0M1W11D' do
     diff_date = DvDate.new(:value => '2009-10-09')
     @dv_date.diff(diff_date).value.should == 'P0Y0M1W11D'
   end
+
+  it 'should process leap year' do
+    @dv_date.value = '2004-02-28'
+    diff_date = DvDate.new(:value => '2004-03-01')
+    @dv_date.diff(diff_date).value.should == 'P0Y0M0W2D'
+  end
+
+  it 'should process year'do
+    diff_date = DvDate.new(:value => '2007-12-31')
+    @dv_date.diff(diff_date).value.should == 'P1Y8M4W28D'
+  end
+
+  it 'should be P0Y11M4W31D' do
+    diff_date = DvDate.new(:value => '2008-09-30')
+    @dv_date.diff(diff_date).value.should == 'P0Y11M4W29D'
+  end
+
+  it 'should be P1Y0M0W1D' do
+    diff_date = DvDate.new(:value => '2010-09-29')
+    @dv_date.diff(diff_date).value.should == 'P1Y0M0W1D'
+  end
+
+  it 'should be P0Y0M0W1D' do
+    past_date = DvDate.new(:value => '2009-12-31')
+    future_date=DvDate.new(:value => '2010-01-01')
+    past_date.diff(future_date).value.should == 'P0Y0M0W1D'
+  end
 end