open_ehr 0.9.4 → 0.9.5

data/spec/lib/open_ehr/am/archetype/constraint_model/primitive/c_date_time_spec.rb

@@ -1,18 +1,17 @@
 require File.dirname(__FILE__) + '/../../../../../../spec_helper'
-include OpenEHR::AssumedLibraryTypes
 include OpenEHR::AM::Archetype
 include OpenEHR::AM::Archetype::ConstraintModel::Primitive
+include OpenEHR::RM::DataTypes::Quantity::DateTime
 
 describe CDateTime do
   before(:each) do
-    default_value = ISO8601DateTime.new('2010-01-25T01:23:45.1')
-    assumed_value = ISO8601DateTime.new('2001-12-23T22:02:33.2')
-    range = Interval.new(:lower => ISO8601DateTime.new('1995-04-19T01:01:22'),
-                         :upper => ISO8601DateTime.new('2022-12-31T23:55:59'))
+    default_value = DvDateTime.new(:value => '2010-01-25T01:23:45.1')
+    assumed_value = DvDateTime.new(:value => '2001-12-23T22:02:33.2')
+    range = Interval.new(:lower => DvDateTime.new(:value =>'1995-04-19T01:01:22'),
+                         :upper => DvDateTime.new(:value => '2022-12-31T23:55:59'))
     @c_date_time =
       CDateTime.new(:default_value => default_value,
                     :assumed_value => assumed_value,
-                    :type => 'Boolean',
                     :range => range,
                     :month_validity => ValidityKind::MANDATORY,
                     :day_validity => ValidityKind::MANDATORY,
@@ -27,8 +26,8 @@ describe CDateTime do
     @c_date_time.should be_an_instance_of CDateTime
   end
 
-  it 'type is DvDateTime' do
-    @c_date_time.type.should == 'Boolean'
+  it 'type is ISO8601_DATE_TIME' do
+    @c_date_time.type.should == 'ISO8601_DATE_TIME'
   end
 
   it 'hour_validity should be assigned properly' do
@@ -41,6 +40,11 @@ describe CDateTime do
     }.should raise_error ArgumentError
   end
 
+  it 'range is properly assigned, lower value is 1995-04-19T01:01:22' do
+    @c_date_time.range.lower.value.should == '1995-04-19T01:01:22'
+  end
+
+
   it 'should not raise ArgumentError if hour_validity is DISALLOWED and minute_validity is DISALLOWED' do
     @c_date_time.second_validity = ValidityKind::DISALLOWED
     @c_date_time.minute_validity = ValidityKind::DISALLOWED
@@ -108,4 +112,25 @@ describe CDateTime do
       @c_date_time.day_validity = ValidityKind::OPTIONAL
     }.should_not raise_error ArgumentError
   end
+
+  describe 'pattern constraint' do
+    before(:all) do
+      @c_date_timep = CDateTime.new(:pattern => 'yyyy-mm-dd hh:mm:ss')
+    end
+
+    it 'pattern is yyyy-mm-dd hh:mm:ss' do
+      @c_date_timep.pattern.should == 'yyyy-mm-dd hh:mm:ss'
+    end
+  end
+
+  describe 'list constraint' do
+    before(:all) do
+      @c_date_timel = CDateTime.new(:list =>
+                [DvDateTime.new(:value => '2010-01-25T01:23:45.1')])
+    end
+
+    it 'first item of list is 2010-01-25T01:23:45.1' do
+      @c_date_timel.list[0].value.should == '2010-01-25T01:23:45.1'
+    end
+  end
 end

data/spec/lib/open_ehr/am/archetype/constraint_model/primitive/c_duration_spec.rb

@@ -1,74 +1,41 @@
 require File.dirname(__FILE__) + '/../../../../../../spec_helper'
+include OpenEHR::RM::DataTypes::Quantity::DateTime
 include OpenEHR::AssumedLibraryTypes
-include OpenEHR::AM::Archetype
 include OpenEHR::AM::Archetype::ConstraintModel::Primitive
 
 describe CDuration do
-  before(:each) do
-    assumed_value = stub(ISO8601Duration, :year => 2)
-    default_value = stub(ISO8601Duration, :month => 3)
-    range = stub(Interval, :upper => assumed_value, :lower => default_value)
+  before(:all) do
+    assumed_value = DvDuration.new(:value => 'P2Y')
+    default_value = DvDuration.new(:value => 'P3M')
+    range = Interval.new(:upper => assumed_value, :lower => default_value)
     @c_duration = CDuration.new(:assumed_value => assumed_value,
                                 :default_value => default_value,
-                                :type => 'Boolean',
-                                :range => range,
-                                :years_allowed => true,
-                                :months_allowed => false,
-                                :weeks_allowed => true,
-                                :days_allowed => false,
-                                :hours_allowed => true,
-                                :minutes_allowed => false,
-                                :seconds_allowed => true,
-                                :fractional_seconds_allowed => false)
+                                :range => range)
   end
 
   it 'should be an instance of CDuration' do
     @c_duration.should be_an_instance_of CDuration
   end
 
-  it 'type is DvDuration' do
-    @c_duration.type.should == 'Boolean'
+  it 'type is ISO8601_DURATION' do
+    @c_duration.type.should == 'ISO8601_DURATION'
   end
 
-  it 'years_allowed should be assigned properly' do
-    @c_duration.years_allowed.should be_true
+  it 'upper range is 2 years' do
+    @c_duration.range.upper.value.should == 'P2Y'
   end
 
-  it 'months_allowed should be assigned properly' do
-    @c_duration.months_allowed.should be_false
+  it 'lower range is 3 months year' do
+    @c_duration.range.lower.value.should == 'P3M'
   end
 
-  it 'weeks_allowed should be assigned properly' do
-    @c_duration.weeks_allowed.should be_true
-  end
-
-  it 'days_allowed should be assigned properly' do
-    @c_duration.days_allowed.should be_false
-  end
-
-  it 'hours_allowed should be assigned properly' do
-    @c_duration.hours_allowed.should be_true
-  end
-
-  it 'minutes_allowed should be assigned properly' do
-    @c_duration.minutes_allowed.should be_false
-  end
-
-  it 'seconds_allowed should be assigned properly' do
-    @c_duration.seconds_allowed.should be_true
-  end
-
-  it 'fractional_seconds_allowed should be assigned properly' do
-    @c_duration.fractional_seconds_allowed.should be_false
-  end
+  context 'list constraint' do
+    before(:all) do
+      @c_duration = CDuration.new(:list => [DvDuration.new(:value => 'PT0s')])
+    end
 
-  it 'should raise ArgumentError if range is nil and all parameters are not allowed' do
-    @c_duration.years_allowed = false
-    @c_duration.weeks_allowed = false
-    @c_duration.hours_allowed = false
-    @c_duration.seconds_allowed = false
-    lambda {
-      @c_duration.range = nil
-    }.should raise_error ArgumentError
+    it '1st item of the list value is PT0s' do
+      @c_duration.list[0].value.should == 'PT0s'
+    end
   end
 end

data/spec/lib/open_ehr/am/archetype/constraint_model/primitive/c_string_spec.rb

@@ -6,7 +6,6 @@ describe CString do
   before(:each) do
     @default_value = DvText.new(:value => 'default')
     @c_string = CString.new(:default_value => @default_value,
-                            :type => 'Boolean',
                             :assumed_value => 'assumed',
                             :pattern => 't[a-z]st')
   end
@@ -15,8 +14,8 @@ describe CString do
     @c_string.should be_an_instance_of CString
   end
 
-  it 'type is DvText' do
-    @c_string.type.should == 'Boolean'
+  it 'type is always String' do
+    @c_string.type.should == 'String'
   end
 
   it 'default should be assigned properly' do

data/spec/lib/open_ehr/am/archetype/constraint_model/primitive/c_time_spec.rb

@@ -1,17 +1,16 @@
 require File.dirname(__FILE__) + '/../../../../../../spec_helper'
-include OpenEHR::AssumedLibraryTypes
+include OpenEHR::RM::DataTypes::Quantity::DateTime
 include OpenEHR::AM::Archetype
 include OpenEHR::AM::Archetype::ConstraintModel::Primitive
 
 describe CTime do
   before(:each) do
-    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'))
+    default_value = DvTime.new(:value => '01:23:45')
+    assumed_value = DvTime.new(:value => '22:02:33')
+    range = Interval.new(:lower => DvTime.new(:value => '01:01:22'),
+                         :upper => DvTime.new(:value => '23:55:59'))
     @c_time = CTime.new(:default_value => default_value,
                         :assumed_value => assumed_value,
-                        :type => 'Boolean',
                         :range => range,
                         :minute_validity => ValidityKind::MANDATORY,
                         :second_validity => ValidityKind::OPTIONAL,
@@ -23,7 +22,7 @@ describe CTime do
   end
 
   it 'type is DvTime' do
-    @c_time.type.should == 'Boolean'
+    @c_time.type.should == 'ISO8601_TIME'
   end
 
   it 'minute_validity should be assigned' do
@@ -81,4 +80,25 @@ describe CTime do
       @c_time.second_validity = ValidityKind::DISALLOWED
     }.should raise_error ArgumentError
   end
+
+  describe 'pattern constraint' do
+    before(:all) do
+      @c_timep = CTime.new(:pattern => 'hh:mm:ss')
+    end
+
+    it 'pattern is hh:mm:ss' do
+      @c_timep.pattern.should == 'hh:mm:ss'
+    end
+  end
+
+  describe 'list constraint' do
+    before(:all) do
+      time = DvTime.new(:value => '09:51:17')
+      @c_timel = CTime.new(:list => [time])
+    end
+
+    it 'first item value is 09:51:17' do
+      @c_timel.list[0].value.should == '09:51:17'
+    end
+  end
 end

data/spec/lib/open_ehr/am/archetype/ontology/archetype_ontology_spec.rb

@@ -42,7 +42,6 @@ describe ArchetypeOntology do
     @archetype_ontology.languages_available.should == ['ja', 'en']
   end
 
-
   it 'term_definition should be assigned properly' do
     @archetype_ontology.term_definition(:lang => 'ja', :code => 'at0000').items['text'].should == 'Archetype Concept'
   end

data/spec/lib/open_ehr/am/openehr_profile/data_types/text/c_code_phrase_spec.rb

@@ -0,0 +1,35 @@
+require File.dirname(__FILE__) + '/../../../../../../spec_helper'
+
+include ::OpenEHR::RM::DataTypes::Text
+include ::OpenEHR::AssumedLibraryTypes
+include ::OpenEHR::RM::Support::Identification
+require 'open_ehr/am/openehr_profile/data_types/text'
+include ::OpenEHR::AM::OpenEHRProfile::DataTypes::Text
+
+describe CCodePhrase do
+  before(:all) do
+    term_id = TerminologyID.new(:value => 'ICD10')
+    occurrences = Interval.new(:upper => 1)
+    @c_code_phrase  = CCodePhrase.new(:terminology_id => term_id,
+                                      :code_list => ['C92', 'C93'],
+                                      :path => 'value/text',
+                                      :occurrences => occurrences,
+                                      :rm_type_name => 'CodePhrase')
+  end
+
+  it 'is an instance of CCodePhrase' do
+    @c_code_phrase.should be_an_instance_of CCodePhrase
+  end
+
+  it 'terminology_id is ICD10' do
+    @c_code_phrase.terminology_id.value.should == 'ICD10'
+  end
+
+  it 'code_list is C92, C93' do
+    @c_code_phrase.code_list.should == ['C92', 'C93']
+  end
+
+  it 'occurrences upper is 1' do
+    @c_code_phrase.occurrences.upper.should be 1
+  end
+end

data/spec/lib/open_ehr/parser/adl14/adl-test-SOME_TYPE.generic_type_basic.draft.adl

@@ -1,5 +1,5 @@
 archetype (adl_version=1.4)
-	adl-test-SOME_TYPE.generic_type_basic.draft
+	adl-test-SOME_TYPE.generic_type_basic.v1
 
 concept
 	[at0000]	-- root item

data/spec/lib/open_ehr/parser/adl14/adl-test-entry.archetype_slot.test.adl

@@ -1,5 +1,5 @@
 archetype
-	adl-test-entry.archetype_slot.test
+	adl-test-entry.archetype_slot.v1
 
 concept
 	[at0000]

data/spec/lib/open_ehr/parser/adl14/adl-test-entry.archetype_slot.test2.adl

@@ -1,5 +1,5 @@
 archetype
-	adl-test-entry.archetype_slot.test
+	adl-test-entry.archetype_slot.v1
 
 concept
 	[at0000]

data/spec/lib/open_ehr/parser/adl14/adl-test-entry.basic_types.test.adl

@@ -1,5 +1,5 @@
-archetype 	
-	adl-test-ENTRY.test.draft
+archetype 
+	adl-test-ENTRY.basic_types.v1
 
 concept 
 	[at0000]	--  basic data types test 1
@@ -115,7 +115,7 @@ definition
                 date_attr10 matches {|> 2004-09-20|}
                 date_attr11 matches {|>= 2004-09-20|}
 
-                -- date_attr12 matches {2001-12-25, ...} -- Not currently in ADL syntax
+                date_attr12 matches {2001-12-25, ...} -- Not currently in ADL syntax
                 
                 -- with assumed values
                 date_attr13 matches {yyyy-mm-dd; 2000-01-01}

data/spec/lib/open_ehr/parser/adl14/adl-test-entry.c_code_phrase.test.adl

@@ -1,5 +1,5 @@
 archetype
-	adl-test-ENTRY.c_code_phrase.test
+	adl-test-ENTRY.c_code_phrase.v1
 
 concept
 	[at0000]

data/spec/lib/open_ehr/parser/adl14/adl-test-entry.datetime.test.adl

@@ -1,5 +1,5 @@
 archetype 	
-	adl-test-ENTRY.test.draft
+	adl-test-ENTRY.test.v1
 
 concept 
 	[at0000]	--  basic data types test 1

data/spec/lib/open_ehr/parser/adl14/adl-test-entry.durations.test.adl

@@ -1,5 +1,5 @@
 archetype 	
-	adl-test-ENTRY.test.draft
+	adl-test-ENTRY.test.v1
 
 concept 
 	[at0000]	--  basic data types test 1
@@ -54,9 +54,6 @@ definition
 					ELEMENT[at1013] matches {	-- duration with fractional seconds
                 		value matches {|PT1.1s|}
                 	}
-                	ELEMENT[at1014] matches {	-- duration with mixed Pattern and Interval 
-						value matches {PTS/|PT0S..PT120S|}
-					}				
                 	-- matches {PT30s, PT45s, PT1m0s, PT2m0s} -- Not currently in ADL syntax
                 	-- matches {|P1d +/PT4h|}
                 }           	
@@ -80,6 +77,7 @@ definition
                 		value matches {|<=PT1h|; P1d}
                 	}
                 	ELEMENT[at1006] matches {	-- duration
+
                 		value matches {PDTH; P1d}
                 	}
                 	

data/spec/lib/open_ehr/parser/adl_archetype_internal_ref_with_generics_spec.rb

@@ -97,15 +97,15 @@ describe ADLParser do
                 end
 
                 it 's lower is 37.0' do
-                  @magnitude.children[0].lower.should == 37.0
+                  @magnitude.children[0].range.lower.should == 37.0
                 end
 
                 it 'is lower included' do
-                  @magnitude.children[0].should be_lower_included
+                  @magnitude.children[0].range.should be_lower_included
                 end
 
                 it 'is upper unbounded' do
-                  @magnitude.children[0].should be_upper_unbounded
+                  @magnitude.children[0].range.should be_upper_unbounded
                 end
               end
             end
@@ -177,15 +177,15 @@ describe ADLParser do
                 end
 
                 it 's magnitude lower is 39.0' do
-                  @magnitude.children[0].lower.should == 39.0
+                  @magnitude.children[0].range.lower.should == 39.0
                 end
 
                 it 's magnitude lower included' do
-                  @magnitude.children[0].should be_lower_included
+                  @magnitude.children[0].range.should be_lower_included
                 end
 
                 it 's upper unbounded' do
-                  @magnitude.children[0].should be_upper_unbounded
+                  @magnitude.children[0].range.should be_upper_unbounded
                 end
               end
             end

data/spec/lib/open_ehr/parser/adl_archetype_slot_cluster_spec.rb

@@ -0,0 +1,101 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.dirname(__FILE__) + '/parser_spec_helper'
+include OpenEHR::AM::Archetype::ConstraintModel
+include OpenEHR::AM::Archetype::ConstraintModel::Primitive
+include OpenEHR::AM::Archetype::Assertion
+
+# ticket 166
+
+describe ADLParser do
+  context ArchetypeSlot do
+    before(:all) do
+      archetype = adl14_archetype('adl-test-entry.archetype_slot.test2.adl')
+      @slot = archetype.definition.attributes[0].children[0]
+    end
+
+    it 'is an instance of ArchetypeSlot' do
+      @slot.should be_an_instance_of ArchetypeSlot
+    end
+
+    it 's node id is at0001' do
+      @slot.node_id.should == 'at0001'
+    end
+
+    it 's occurrences upper is 1' do
+      @slot.occurrences.upper.should be 1
+    end
+
+    it 's occurrences lower is 0' do
+      @slot.occurrences.lower.should be 0
+    end
+
+    it 's rm type name is SECTION' do
+      @slot.rm_type_name.should == 'SECTION'
+    end
+
+    it 's path is /content[at0001]' do
+      @slot.path.should == '/content[at0001]'
+    end
+
+    context 'includes' do
+      before(:all) do
+        @includes = @slot.includes
+      end
+
+      it 's size is 1' do
+        @includes.size.should be 1
+      end
+
+      it 's string_expression is archetype_id/value matches {/openEHR-EHR-CLUSTER\.device\.v1/}' do
+        @includes[0].string_expression.should ==
+          'archetype_id/value matches {/openEHR-EHR-CLUSTER\.device\.v1/}'
+      end
+
+      context 'item' do
+        before(:all) do
+          @item = @includes[0].expression
+        end
+
+        it 'is an instance of ExprBooleanExpression' do
+          @item.should be_an_instance_of ExprBinaryOperator
+        end
+
+        it 's operator is OP_MATCHES' do
+          @item.operator.should == OperatorKind::OP_MATCHES
+        end
+
+        context 'left operand' do
+          before(:all) do
+            @left_operand = @item.left_operand
+          end
+
+          it 'is an instance of ExprLeaf' do
+            @left_operand.should be_an_instance_of ExprLeaf
+          end
+
+          it 's item is archetype_id/value' do
+            @left_operand.item.should == 'archetype_id/value'
+          end
+        end
+
+        context 'right operand' do
+          before(:all) do
+            @right_operand = @item.right_operand
+          end
+
+          it 'is an intance of ExprLeaf' do
+            @right_operand.should be_an_instance_of ExprLeaf
+          end
+
+          it 's item type is CString' do
+            @right_operand.item.should be_an_instance_of CString
+          end
+
+          it 's item pattern is /openEHR-EHR-CLUSTER\.device\.v1/' do
+            @right_operand.item.pattern.should == '/openEHR-EHR-CLUSTER\.device\.v1/'
+          end
+        end
+      end
+    end
+  end
+end