Changeset 141 for ruby/trunk

Timestamp:

Jun 20, 2009, 10:10:26 AM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

refs #50

Location:

ruby/trunk/lib/models

Files:

• rm/data_types/quantity.rb (modified) (3 diffs)
• tests/rm/test_data_types.rb (modified) (3 diffs)

ruby/trunk/lib/models/rm/data_types/quantity.rb

@@ -2 +2 @@
 # http://www.openehr.org/uml/release-1.0.1/Browsable/_9_0_76d0249_1109599337877_94556_1510Report.html
 # Ticket refs #50
+require 'assumed_library_types'
 module OpenEHR
   module RM
@@ -50 +51 @@
         end
 
+        class DV_Interval < OpenEHR::Assumed_Library_Types::Interval
+
+        end
+        
         class DV_Quantified < DV_Ordered
 
@@ -122 +127 @@
 
         class Reference_Range
-          
+          attr_reader :meaning
+
+          def initialize(meaning)
+            self.meaning = meaning
+          end
+
+          def meaning=(meaning)
+            if meaning.nil?
+              raise ArgumentError, 'meaning should not be nil'
+            end
+            @meaning = meaning
+          end
         end
 

ruby/trunk/lib/models/tests/rm/test_data_types.rb

@@ -166 +166 @@
     assert_nothing_raised(Exception){
       @dv_interval = OpenEHR::RM::Data_Types::Quantity::Date_Time::DV_Interval.new}
-    assert_nothing_raised(Exception){
-      @reference_range = OpenEHR::RM::Data_Types::Quantity::Reference_Range.new}
+    meaning = OpenEHR::RM::Data_Types::Text::DV_Text.new('normal')
+    assert_nothing_raised(Exception){
+      @reference_range = OpenEHR::RM::Data_Types::Quantity::Reference_Range.new(meaning)}
     assert_nothing_raised(Exception){
       @dv_ordinal = OpenEHR::RM::Data_Types::Quantity::DV_Ordinal.new(1,'+')}
@@ -183 +184 @@
      assert_instance_of OpenEHR::RM::Data_Types::Quantity::Date_Time::DV_Interval, @dv_interval
      assert_instance_of OpenEHR::RM::Data_Types::Quantity::Reference_Range, @reference_range
+     
      assert_instance_of OpenEHR::RM::Data_Types::Quantity::DV_Ordinal, @dv_ordinal
      assert_instance_of OpenEHR::RM::Data_Types::Quantity::DV_Quantified, @dv_quantified
@@ -207 +209 @@
   end
 
+  def test_reference_range
+    assert_equal 'normal', @reference_range.meaning.value
+  end
+
   def test_dv_quantified
-
+    
+  end
+
+  def test_dv_amount
+
+  end
+
+  def test_dv_interval
+    
+  end
+
+  def test_dv_ordinal
+    
   end