Changeset 399 for ruby

Timestamp:

Jan 25, 2010, 12:03:38 PM (14 years ago)

Author:

KOBAYASHI, Shinji

Message:

refs #71

Location:

ruby/trunk

Files:

• lib/open_ehr/am/archetype/constraint_model/primitive.rb (modified) (1 diff)
• spec/lib/open_ehr/am/archetype/constraint_model/primitive/c_date_spec.rb (modified) (1 diff)
• spec/lib/open_ehr/am/archetype/constraint_model/primitive/c_time_spec.rb (modified) (2 diffs)

ruby/trunk/lib/open_ehr/am/archetype/constraint_model/primitive.rb

@@ -175 +175 @@
 
           class CTime < CPrimitive
-
+            attr_accessor :range
+            attr_reader :minute_validity, :second_validity,
+                        :millisecond_validity
+
+            def initialize(args = { })
+              super
+              self.range = args[:range]
+              self.millisecond_validity = args[:millisecond_validity]
+              self.second_validity = args[:second_validity]
+              self.minute_validity = args[:minute_validity]
+            end
+
+            def minute_validity=(minute_validity)
+              if (minute_validity == ValidityKind::OPTIONAL &&
+                  @second_validity == ValidityKind::MANDATORY) ||
+                  (minute_validity == ValidityKind::DISALLOWED &&
+                   @second_validity != ValidityKind::DISALLOWED)
+                raise ArgumentError, 'minute_validity is invalid'
+              end
+              @minute_validity = minute_validity
+            end
+
+            def second_validity=(second_validity)
+              if (second_validity == ValidityKind::OPTIONAL &&
+                  @millisecond_validity == ValidityKind::MANDATORY) ||
+                  (second_validity == ValidityKind::DISALLOWED &&
+                   @millisecond_validity != ValidityKind::DISALLOWED)
+                raise ArgumentError, 'second_validity is invalid'
+              end
+              @second_validity = second_validity
+            end
+
+            def millisecond_validity=(millisecond_validity)
+              @millisecond_validity = millisecond_validity
+            end
+
+            def validity_is_range?
+              return !@range.nil?
+            end
           end
         end # of Primitive

ruby/trunk/spec/lib/open_ehr/am/archetype/constraint_model/primitive/c_date_spec.rb

@@ -8 +8 @@
     default_value = ISO8601Date.new('2010-01-18')
     assumed_value = ISO8601Date.new('2007-02-19')
-    
     range = Interval.new(:lower => ISO8601Date.new('2001-01-01'),
                          :upper => ISO8601Date.new('2010-12-31'))

ruby/trunk/spec/lib/open_ehr/am/archetype/constraint_model/primitive/c_time_spec.rb

@@ -1 +1 @@
 require File.dirname(__FILE__) + '/../../../../../../spec_helper'
+include OpenEHR::AssumedLibraryTypes
+include OpenEHR::AM::Archetype
 include OpenEHR::AM::Archetype::ConstraintModel::Primitive
-include OpenEHR::AssumedLibraryTypes
+
 
 describe CTime do
   before(:each) do
-    default_value = ISO8601Time.new('01:23:45.1')
-    assumed_value = ISO8601Time.new('22:02:33.2')
-    range = Interval.new(:lower => ISO8601Time.new('01:01:22.3'),
-                         :upper => ISO8601Time.new('23:55:59.4'))
+    default_value = ISO8601Time.new('01:23:45')
+    assumed_value = ISO8601Time.new('22:02:33')
+    range = Interval.new(:lower => ISO8601Time.new('01:01:22'),
+                         :upper => ISO8601Time.new('23:55:59'))
     @c_time = CTime.new(:default_value => default_value,
                         :assumed_value => assumed_value,
-                        :range => range)
+                        :range => range,
+                        :minute_validity => ValidityKind::MANDATORY,
+                        :second_validity => ValidityKind::OPTIONAL,
+                        :millisecond_validity => ValidityKind::DISALLOWED)
   end
 
@@ -17 +22 @@
     @c_time.should be_an_instance_of CTime
   end
+
+  it 'minute_validity should be assigned' do
+    @c_time.minute_validity.should be_equal ValidityKind::MANDATORY
+  end
+
+  it 'seconds_validity should be assigned properly' do
+    @c_time.second_validity.should be_equal ValidityKind::OPTIONAL
+  end
+
+  it 'millisecond_validity should be assigned properly' do
+    @c_time.millisecond_validity.should be_equal ValidityKind::DISALLOWED
+  end
+
+  it 'should be true if range is not nil' do
+    @c_time.should be_validity_is_range
+  end
+
+  it 'second_validity should not be MANDATORY if minute_validity is optional' do
+    @c_time.second_validity = ValidityKind::MANDATORY
+    lambda {
+      @c_time.minute_validity = ValidityKind::OPTIONAL
+    }.should raise_error ArgumentError
+  end
+
+  it 'second_validity should be DISALLOWED if minute_validity is DISALLOWED' do
+    lambda {
+      @c_time.minute_validity = ValidityKind::DISALLOWED
+    }.should raise_error ArgumentError
+  end
+
+  it 'should not raise ArgumentError if minute_validity and second_validity are DISALLOWED' do
+    @c_time.second_validity = ValidityKind::DISALLOWED
+    lambda {
+      @c_time.minute_validity = ValidityKind::DISALLOWED
+    }.should_not raise_error ArgumentError
+  end
+
+  it 'millisecond_validity should not be MANDATORY if second_validity is optional' do
+    @c_time.millisecond_validity = ValidityKind::MANDATORY
+    lambda {
+      @c_time.second_validity = ValidityKind::OPTIONAL
+    }.should raise_error ArgumentError
+  end
+
+  it 'millisecond_validity should be DISALLOWED if second_validity is DISALLOWED' do
+    lambda {
+      @c_time.second_validity = ValidityKind::DISALLOWED
+    }.should_not raise_error ArgumentError
+  end
+
+  it 'should raise ArgumentError if second_validity is DISALLOWED and millisecond_validity is OPTIONAL' do
+    @c_time.millisecond_validity = ValidityKind::OPTIONAL
+    lambda {
+      @c_time.second_validity = ValidityKind::DISALLOWED
+    }.should raise_error ArgumentError
+  end
 end