Changeset 249 for ruby/branches

Timestamp:

Sep 7, 2009, 1:38:31 PM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

move DvAbsoluteQuantity test to spec

Location:

ruby/branches/0.5

Files:

• lib/open_ehr/rm/data_types/quantity.rb (modified) (2 diffs)
• spec/lib/open_ehr/rm/data_types/quantity/dv_absolute_quantity_spec.rb (added)

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

@@ -129 +129 @@
           end
           def is_strictly_comparable_to?(others)
-            super
-            unless others.instance_of? self.class
+            unless super(others)
               return false
             end
@@ -145 +144 @@
           attr_accessor :accuracy
 
-          def initialize(magnitude, magnitude_status=nil, accuracy=nil,
-                         normal_range=nil, normal_status = nil,
-                         other_reference_ranges=nil)
-            super(magnitude, magnitude_status, normal_range,
-                   normal_status, other_reference_ranges)
+          def initialize(args = {})
+            super(args)
             self.accuracy = accuracy
           end
 
           def add(a_diff)
-            raise NotImplementedError, 'add must be implemented'
+            type_check(a_diff)
+            return result_builder(DvAbsoluteQuantity,
+                                  @magnitude+a_diff.magnitude)
           end
 
           def diff(other)
-            raise NotImplementedError, 'diff must be implemented'
+            type_check(other)
+            return result_builder(DvAmount,
+                                  (@magnitude-other.magnitude).abs)
           end
 
           def subtract(a_diff)
-            raise NotImplementedError, 'subtract must be implemented'
+            type_check(a_diff)
+            return result_builder(DvAbsoluteQuantity,
+                                  @magnitude-a_diff.magnitude)
+          end
+          private
+          def type_check(other)
+            unless self.is_strictly_comparable_to? other
+              raise ArgumentError, 'type mismatch'
+            end
+          end
+
+          def result_builder(klass, magnitude)
+            return klass.new(:magnitude => magnitude,
+                             :magnitude_status => @magnitude_status,
+                             :accuracy => @accuracy,
+                             :accuracy_percent => @accuracy_percent,
+                             :normal_range => @normal_range,
+                             :normal_status => @normal_status,
+                             :other_reference_ranges => @other_reference_ranges)
           end
         end