Changeset 69

Timestamp:

Jun 11, 2008, 11:24:44 PM (16 years ago)

Author:

KOBAYASHI, Shinji

Message:

worked on #36

Location:

ruby/trunk/lib/models

Files:

• assumed_library_types.rb (modified) (2 diffs)
• tests/test_assumed_library_types.rb (modified) (2 diffs)

ruby/trunk/lib/models/assumed_library_types.rb

@@ -1 +1 @@
 module OpenEHR
   module Assumed_Library_Types
-    class Interval
+    class Any < Object
+      
+    end # of Any
+    class Interval < Any
       attr_reader :lower, :lower_included, :lower_unbounded
       attr_reader :upper, :upper_included, :upper_unbounded
@@ -58 +61 @@
         @lower = lower
         @upper = upper
-      end
-    end
-  end
-end
+      end      
+    end # end of Interval
+
+    class TIME_DEFINITIONS < Any
+      DAYS_IN_LEAP_YEAR = 366
+      DAYS_IN_WEEK = 7
+      DAYS_IN_YEAR = 365
+      HOURS_IN_DAY = 24
+      MAX_DAYS_IN_MONTH = 31
+      MAX_DAYS_IN_YEAR = 366
+      MINUTES_IN_HOUR = 60
+      MONTH_IN_YEAR = 12
+      NOMINAL_DAYS_IN_MONTH = 30.42
+      NOMINAL_DAYS_IN_YEAR = 365.24
+      SECONDS_IN_MINUTE = 60
+    end # end of TIME_DEFINITIONS
+
+    class ISO_8601_DATE < TIME_DEFINITIONS
+      
+    end # end of ISO_8601_DATE
+  end # end of Assumed_Types
+end # end of OpenEHR

ruby/trunk/lib/models/tests/test_assumed_library_types.rb

@@ -5 +5 @@
   def setup
     @interval = OpenEHR::Assumed_Library_Types::Interval.new(1,2)
+    @time_definition = OpenEHR::Assumed_Library_Types::TIME_DEFINITIONS.new
   end
   def test_initialize
     assert_instance_of OpenEHR::Assumed_Library_Types::Interval, @interval
+    assert_instance_of OpenEHR::Assumed_Library_Types::TIME_DEFINITIONS, @time_definition
   end
   def test_limits_comparable
@@ -39 +41 @@
     assert !@interval.upper_included
   end
+  def test_definitions
+    assert_equal OpenEHR::Assumed_Library_Types::TIME_DEFINITIONS::DAYS_IN_LEAP_YEAR, 366
+    assert_equal OpenEHR::Assumed_Library_Types::TIME_DEFINITIONS::DAYS_IN_WEEK, 7
+    assert_equal OpenEHR::Assumed_Library_Types::TIME_DEFINITIONS::DAYS_IN_YEAR, 365
+    assert_equal OpenEHR::Assumed_Library_Types::TIME_DEFINITIONS::HOURS_IN_DAY, 24
+    assert_equal OpenEHR::Assumed_Library_Types::TIME_DEFINITIONS::MAX_DAYS_IN_MONTH, 31
+    assert_equal OpenEHR::Assumed_Library_Types::TIME_DEFINITIONS::MAX_DAYS_IN_YEAR, 366
+    assert_equal OpenEHR::Assumed_Library_Types::TIME_DEFINITIONS::MINUTES_IN_HOUR, 60
+    assert_equal OpenEHR::Assumed_Library_Types::TIME_DEFINITIONS::MONTH_IN_YEAR, 12
+    assert_equal OpenEHR::Assumed_Library_Types::TIME_DEFINITIONS::NOMINAL_DAYS_IN_MONTH, 30.42
+    assert_equal OpenEHR::Assumed_Library_Types::TIME_DEFINITIONS::NOMINAL_DAYS_IN_YEAR, 365.24
+    assert_equal OpenEHR::Assumed_Library_Types::TIME_DEFINITIONS::SECONDS_IN_MINUTE, 60
+  end
 end