Changeset 138 for ruby

Timestamp:

Jun 12, 2009, 11:15:14 PM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

refs #50
Quantity package is difficult to solve.

Location:

ruby/trunk/lib/models

Files:

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

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

@@ -11 +11 @@
         class DV_Ordered < OpenEHR::RM::Data_Types::Basic::Data_Value
           include Comparable
-          attr_reader :other_refference_ranges, :normal_range, :normal_status
+          attr_accessor :normal_range, :other_refference_ranges, :normal_status
 
           def initialize(normal_range=nil, normal_status = nil,
@@ -61 +61 @@
         class DV_Quantified < DV_Ordered
 
-          def initialize
+          def initialize(normal_range=nil, normal_status = nil,
+                         other_reference_ranges=nil)
+            
             
           end

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

@@ -165 +165 @@
       @dv_ordered = OpenEHR::RM::Data_Types::Quantity::DV_Ordered.new }
     assert_nothing_raised(Exception){
-      @dv_quantified = OpenEHR::RM::Data_Types::Quantity::Dv_Quantified.new }
-  end
-  def test_init
-    assert_instance_of OpenEHR::RM::Data_Types::Quantity::DV_Ordered, @dv_ordered
+      @dv_interval = OpenEHR::RM::Data_Types::Quantity::DV_Interval.new}
+    assert_nothing_raised(Exception){
+      @reference_range = OpenEHR::RM::Data_Types::Quantity::Reference_Range.new}
+    assert_nothing_raised(Exception){
+      @dv_ordinal = OpenEHR::RM::Data_Types::Quantity::DV_Ordinal.new}
+    assert_nothing_raised(Exception){
+      @dv_quantified = OpenEHR::RM::Data_Types::Quantity::DV_Quantified.new }
+    assert_nothing_raised(Exception){
+      @dv_amount = OpenEHR::RM::Data_Types::Quantity::DV_Amount.new}
+    assert_nothing_raised(Exception){
+      @dv_quantity = OpenEHR::RM::Data_Types::Quantity::DV_Quantity.new}
+   end
+
+   def test_init
+     assert_instance_of OpenEHR::RM::Data_Types::Quantity::DV_Ordered, @dv_ordered
+     assert_instance_of OpenEHR::RM::Data_Types::Quantity::DV_Quantified, @dv_quantified
+     assert_instance_of OpenEHR::RM::Data_Types::Quantity::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
+     assert_instance_of OpenEHR::RM::Data_Types::Quantity::DV_Amount, @dv_amount
+     assert_instance_of OpenEHR::RM::Data_Types::Quantity:DV_Quantity, @dv_quantity
   end
 
@@ -176 +194 @@
     assert_nil @dv_ordered.normal_range
     assert_nil @dv_ordered.other_refference_ranges
+    assert @dv_orderd.is_simple?
     assert_raise(NotImplementedError){@dv_ordered<=>1}
     openehr_terminology_id = OpenEHR::RM::Support::Identification::Terminology_ID.new('openEHR','')
@@ -185 +204 @@
     assert_raise(NotImplementedError){
       @dv_ordered.is_strictry_comparable_to? }
+  end
+
+  def test_dv_quantifie
+
   end
 end