Changeset 248

Timestamp:

Sep 7, 2009, 12:07:59 PM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

move DvAmount, DvCount test to spec

Location:

ruby/branches/0.5

Files:

• lib/open_ehr/rm/data_types/quantity.rb (modified) (6 diffs)
• spec/lib/open_ehr/rm/data_types/quantity/dv_amount_spec.rb (added)
• spec/lib/open_ehr/rm/data_types/quantity/dv_count_spec.rb (added)
• spec/lib/open_ehr/rm/data_types/quantity/dv_ordered_spec.rb (modified) (1 diff)
• spec/lib/open_ehr/rm/data_types/quantity/dv_ordinal_spec.rb (modified) (1 diff)

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

@@ -43 +43 @@
           end
 
-          def is_strictly_comparable_to?(other)
-            raise NotImplementedError, 'this method should be implemented'
+          def is_strictly_comparable_to?(others)
+            if others.instance_of? self.class
+              return true
+            else
+              return false
+            end
           end
         end
@@ -113 +117 @@
           end
 
-          def is_strictly_comparable_to?(others)
-            unless others.instance_of? OpenEHR::RM::DataTypes::Quantity::DvOrdinal
-              return false
-            end
-            unless others.symbol.defining_code.terminology_id.value ==
-                @symbol.defining_code.terminology_id.value
-              return false
-            end
-            return true
-          end
-
           def <=>(other)
             @value <=> other.value
@@ -133 +126 @@
             else
               @limits = limits
+            end
+          end
+          def is_strictly_comparable_to?(others)
+            super
+            unless others.instance_of? self.class
+              return false
+            end
+            unless others.symbol.defining_code.terminology_id.value ==
+                @symbol.defining_code.terminology_id.value
+              return false
+            else
+              return true
             end
           end
@@ -163 +168 @@
         class DvAmount < DvQuantified
           attr_reader :accuracy, :accuracy_percent
-          def initialize(magnitude, magnitude_status=nil, accuracy=nil,
-                         accuracy_percent=nil, normal_range=nil,
-                         normal_status = nil, other_reference_ranges=nil)
-            super(magnitude, magnitude_status, normal_range,
-                  normal_status, other_reference_ranges)
-            unless accuracy.nil?
-              set_accuracy(accuracy, accuracy_percent)
+
+          def initialize(args = {})
+            super(args)
+            unless args[:accuracy].nil?
+              set_accuracy(args[:accuracy], args[:accuracy_percent])
             else
               @accuracy, @accuracy_percent = nil, nil
@@ -176 +179 @@
 
           def +(other)
-            unless self.is_strictly_comparable_to?(other)
+            unless self.is_strictly_comparable_to? other
               raise ArgumentError, 'type mismatch'
             end
-            return DvAmount.new(@magnitude+other.magnitude, @magnitude_status,
-                                 @accuracy, @accuracy_percent, @normal_range,
-                                 @normal_status, @other_reference_ranges)
-          end
-
-          def -(other)
+            result = self.dup
+            result.magnitude = @magnitude + other.magnitude
+            return result
+          end
+
+          def -(other)            
             other.magnitude = - other.magnitude
             self+(other)
@@ -253 +256 @@
 
         class DvCount < DvAmount
-          def is_strictly_comparable_to?(others)
-            return false if others.nil?
-            if others.instance_of?(DvCount)
-              return true
-            else
-              return false
-            end
-          end
+
         end
 

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

@@ -49 +49 @@
   end
 
-  it 'is_strictly_comparable_to should raise ArgumentError' do
-    lambda{
-      @dv_ordered.is_strictly_comparable_to? 'test'
-    }.should raise_error(NotImplementedError)
+  it 'is_strictly_comparable_to should be true for DvOrdered' do
+    @dv_ordered.is_strictly_comparable_to?(DvOrdered.new).should be_true
   end
 

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

@@ -61 +61 @@
 
   it 'is_strictly comparable should be false with other instance' do
-    @dv_ordinal.is_strictly_comparable_to?(stub).should be_false
+    @dv_ordinal.is_strictly_comparable_to?('dummy').should be_false
   end