Changeset 108 for ruby/trunk

Timestamp:

Oct 12, 2008, 5:56:41 PM (16 years ago)

Author:

KOBAYASHI, Shinji

Message:

refs #48

Location:

ruby/trunk/lib/models

Files:

• rm/data_types/text.rb (modified) (1 diff)
• tests/test_reference_model.rb (modified) (2 diffs)

ruby/trunk/lib/models/rm/data_types/text.rb

@@ -134 +134 @@
                          encoding = nil)
             super(value, formatting, hyperlink, mappings, language, encoding)
-            definition_exists(defining_code)
-            @defining_code = defining_code
+            self.defining_code = defining_code
           end
           def defining_code=(defining_code)

ruby/trunk/lib/models/tests/test_reference_model.rb

@@ -352 +352 @@
   def setup
     assert_nothing_raised(Exception){@dv_boolean = OpenEHR::RM::Data_Types::Basic::DV_Boolean.new("TRUE")}
-    @terminology_id = OpenEHR::RM::Support::Identification::Terminology_ID.new('ICD10')
-    @code_phrase = OpenEHR::RM::Data_Types::Text::Code_Phrase.new('C92.0', @terminology_id)
-    @dv_coded_text = OpenEHR::RM::Data_Types::Text::DV_Coded_Text.new("Acute Myeloyd Leukemia", @code_phrase)
-    @dv_state = OpenEHR::RM::Data_Types::Basic::DV_State.new(@dv_coded_text, true)
-    @dv_identifier = OpenEHR::RM::Data_Types::Basic::DV_Identifier.new("Ruby Hospital","0123456-0", "Information office", "personal id")
+    @terminology_id = OpenEHR::RM::Support::Identification::Terminology_ID.new('openEHR','1.0.2')
+    @code_phrase = OpenEHR::RM::Data_Types::Text::Code_Phrase.new('PROPOSED', @terminology_id)
+    @dv_coded_text = OpenEHR::RM::Data_Types::Text::DV_Coded_Text.new("Blood examination", @code_phrase)
+    assert_nothing_raised(Exception){@dv_state = OpenEHR::RM::Data_Types::Basic::DV_State.new(@dv_coded_text, false)}
+    assert_nothing_raised(Exception){@dv_identifier = OpenEHR::RM::Data_Types::Basic::DV_Identifier.new("Ruby Hospital","0123456-0", "Information office", "personal id")}
   end
 
@@ -375 +375 @@
 
   def test_dv_state
-    assert_equal(@dv_coded_text, @dv_state.value)
-    assert_nothing_raised(Exception){@dv_state.value = "code2"}
-    assert_equal("code2", @dv_state.value)
+    assert_equal 'Blood examination', @dv_state.value.value
+    assert_equal 'PROPOSED', @dv_state.value.defining_code.code_string
+    assert_equal 'openEHR', @dv_state.value.defining_code.terminology_id.name
+    assert_equal '1.0.2', @dv_state.value.defining_code.terminology_id.version_id
+    assert !@dv_state.is_terminal?
+    assert_nothing_raised(Exception){@dv_state.value.defining_code.code_string = "COMPLETED"}
+    assert_nothing_raised(Exception){@dv_state.is_terminal = true}
+    assert_equal 'COMPLETED', @dv_state.value.defining_code.code_string
     assert @dv_state.is_terminal?
-    assert_nothing_raised(Exception){@dv_state.is_terminal = false}
-    assert !@dv_state.is_terminal?
     assert_raise(ArgumentError) {OpenEHR::RM::Data_Types::Basic::DV_State.new(nil,nil)}
     assert_raise(ArgumentError) {@dv_state.value=nil}