Changeset 250

Timestamp:

Sep 7, 2009, 3:59:20 PM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

move DvQuantity test to spec

Location:

ruby/branches/0.5

Files:

• lib/open_ehr/rm/data_types/quantity.rb (modified) (4 diffs)
• spec/lib/open_ehr/rm/data_types/quantity/dv_quantity_spec.rb (added)

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

@@ -146 +146 @@
           def initialize(args = {})
             super(args)
-            self.accuracy = accuracy
+            self.accuracy = args[:accuracy]
           end
 
@@ -226 +226 @@
         class DvQuantity < DvAmount
           attr_reader :units, :precision
-          def initialize(magnitude, units, magnitude_status=nil, precision=nil,
-                         accuracy=nil, accuracy_percent=nil, normal_range=nil,
-                         normal_status = nil, other_reference_ranges=nil)
-            super(magnitude, magnitude_status, accuracy, accuracy_percent,
-                  normal_range, normal_status, other_reference_ranges)
-            self.units = units
-            self.precision = precision
+
+          def initialize(args = {})
+            super(args)
+            self.units = args[:units]
+            self.precision = args[:precision]
           end
 
@@ -248 +246 @@
 
           def is_strictly_comparable_to?(others)
-            return false if others.nil?
-            if others.instance_of?(DvQuantity) && others.units == @units
+            unless super(others)
+              return false
+            end
+            if others.units == @units
               return true
             else
@@ -262 +262 @@
               return true
             end
-          end
-# accuracy???
-          def +(other)
-            dv_amount = super(other)
-            return DvQuantity.new(dv_amount.magnitude, @units,
-                                   @magnitude_status, @precision,
-                                   @accuracy, @accuracy_percent, @normal_range,
-                                   @normal_status, @other_reference_ranges)
           end
         end