Changeset 292 for ruby/trunk/lib/models/tests/rm/test_common.rb

Timestamp:

Sep 24, 2009, 6:47:45 PM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

adjust some conflict

File:

• ruby/trunk/lib/models/tests/rm/test_common.rb (modified) (3 diffs)

ruby/trunk/lib/models/tests/rm/test_common.rb

@@ -86 +86 @@
 class RM_Common_Archetyped_Test < Test::Unit::TestCase
   def setup
-<<<<<<< .working
-    @dv_text = OpenEHR::RM::Data_Types::Text::DV_Text.new('Test')
-    @uid_based_id = OpenEHR::RM::Support::Identification::UID_Based_ID.new('rrip::0.0.5')
-    @archetype_id = OpenEHR::RM::Support::Identification::Archetype_ID.new('openEHR-EHR-SECTION.physical_examination-prenatal.v2')
-    @template_id = OpenEHR::RM::Support::Identification::Template_ID.new('1.0.1')
-    assert_nothing_raised(Exception){@archetyped = OpenEHR::RM::Common::Archetyped::Archetyped.new(@archetype_id, '1.0.1')}
-    assert_nothing_raised(Exception){@link = OpenEHR::RM::Common::Archetyped::Link.new(OpenEHR::RM::Data_Types::Text::DV_Text.new("generic"), OpenEHR::RM::Data_Types::URI::DV_EHR_URI.new("ehr://test/"),OpenEHR::RM::Data_Types::Text::DV_Text.new("problem"))}
-=======
+
     @dv_text = OpenEhr::RM::DataTypes::Text::DvText.new('Test')
     @uid_based_id = OpenEhr::RM::Support::Identification::UidBasedId.new('rrip::0.0.5')
@@ -100 +93 @@
     assert_nothing_raised(Exception){@archetyped = OpenEhr::RM::Common::Archetyped::Archetyped.new(@archetype_id, '1.0.1')}
     assert_nothing_raised(Exception){@link = OpenEhr::RM::Common::Archetyped::Link.new(OpenEhr::RM::DataTypes::Text::DvText.new("generic"), OpenEhr::RM::DataTypes::Uri::DvEhrUri.new("ehr://test/"),OpenEhr::RM::DataTypes::Text::DvText.new("problem"))}
->>>>>>> .merge-right.r168
     assert_nothing_raised(Exception){
       @pathable = OpenEhr::RM::Common::Archetyped::Pathable.new }
@@ -153 +145 @@
     assert_nothing_raised(Exception){@archetyped.template_id = @template_id}
     assert_equal @template_id, @archetyped.template_id
-<<<<<<< .working
-    archetype_id2 = OpenEHR::RM::Support::Identification::Archetype_ID.new('openEHR-EHR-SECTION.physical_examination-prenatal.v2')
-=======
     archetype_id2 = OpenEhr::RM::Support::Identification::ArchetypeId.new("1.0.2", "biochemistry result_cholesterol", "entry", "ehr_rm", "openehr","cholesterol","0.0.3")
->>>>>>> .merge-right.r168
     assert_nothing_raised(ArgumentError){@archetyped.archetype_id = archetype_id2}
     assert_equal archetype_id2, @archetyped.archetype_id