Changeset 292


Ignore:
Timestamp:
Sep 24, 2009, 6:47:45 PM (11 years ago)
Author:
KOBAYASHI, Shinji
Message:

adjust some conflict

Location:
ruby
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • ruby/branches/0.5/lib/open_ehr/rm/common/archetyped.rb

    r216 r292  
    2222
    2323          def item_at_path(path)
    24             raise NotImplementError, "item_at_path must be implemented"
     24            raise NotImplementedError, "item_at_path must be implemented"
    2525          end
    2626
    2727          def items_at_path(path)
    28             raise NotImplementError, "items_at_path must be implemented"
     28            raise NotImplementedError, "items_at_path must be implemented"
    2929          end
    3030
    3131          def path_exists?(path)
    32             raise NotImplementError, "path_exists? must be implemented"
     32            raise NotImplementedError, "path_exists? must be implemented"
    3333          end
    3434
    3535          def path_of_item(item)
    36             raise NotImplementError, "path_of_item must be implemented"
     36            raise NotImplementedError, "path_of_item must be implemented"
    3737          end
    3838
    39           def path_unique(path)
    40             raise NotImplementError, "path_unique must be implemented"
     39          def path_unique?(path)
     40            raise NotImplementedError, "path_unique? must be implemented"
    4141          end
    4242        end
  • ruby/trunk/lib/models/tests/rm/test_common.rb

    r291 r292  
    8686class RM_Common_Archetyped_Test < Test::Unit::TestCase
    8787  def setup
    88 <<<<<<< .working
    89     @dv_text = OpenEHR::RM::Data_Types::Text::DV_Text.new('Test')
    90     @uid_based_id = OpenEHR::RM::Support::Identification::UID_Based_ID.new('rrip::0.0.5')
    91     @archetype_id = OpenEHR::RM::Support::Identification::Archetype_ID.new('openEHR-EHR-SECTION.physical_examination-prenatal.v2')
    92     @template_id = OpenEHR::RM::Support::Identification::Template_ID.new('1.0.1')
    93     assert_nothing_raised(Exception){@archetyped = OpenEHR::RM::Common::Archetyped::Archetyped.new(@archetype_id, '1.0.1')}
    94     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"))}
    95 =======
     88
    9689    @dv_text = OpenEhr::RM::DataTypes::Text::DvText.new('Test')
    9790    @uid_based_id = OpenEhr::RM::Support::Identification::UidBasedId.new('rrip::0.0.5')
     
    10093    assert_nothing_raised(Exception){@archetyped = OpenEhr::RM::Common::Archetyped::Archetyped.new(@archetype_id, '1.0.1')}
    10194    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"))}
    102 >>>>>>> .merge-right.r168
    10395    assert_nothing_raised(Exception){
    10496      @pathable = OpenEhr::RM::Common::Archetyped::Pathable.new }
     
    153145    assert_nothing_raised(Exception){@archetyped.template_id = @template_id}
    154146    assert_equal @template_id, @archetyped.template_id
    155 <<<<<<< .working
    156     archetype_id2 = OpenEHR::RM::Support::Identification::Archetype_ID.new('openEHR-EHR-SECTION.physical_examination-prenatal.v2')
    157 =======
    158147    archetype_id2 = OpenEhr::RM::Support::Identification::ArchetypeId.new("1.0.2", "biochemistry result_cholesterol", "entry", "ehr_rm", "openehr","cholesterol","0.0.3")
    159 >>>>>>> .merge-right.r168
    160148    assert_nothing_raised(ArgumentError){@archetyped.archetype_id = archetype_id2}
    161149    assert_equal archetype_id2, @archetyped.archetype_id
  • ruby/trunk/lib/models/tests/rm/test_data_structure.rb

    r291 r292  
    33require 'rm'
    44
    5 <<<<<<< .working
    6 include OpenEHR::RM::Data_Structures
    7 =======
    85include OpenEHR::RM::Data_Structures
    96include OpenEHR::RM::Data_Structures::Item_Structure
    10 >>>>>>> .merge-right.r168
     7
    118
    129class RmDataStructureTest < Test::Unit::TestCase
  • ruby/trunk/lib/models/tests/rm/test_support.rb

    r291 r292  
    1313class RM_Support_Identification_Test < Test::Unit::TestCase
    1414  def setup
    15 <<<<<<< .working
    16     assert_nothing_raised(Exception){@object_id = OpenEHR::RM::Support::Identification::Object_ID.new("0.0.3")}
    17     assert_nothing_raised(Exception){@object_ref = OpenEHR::RM::Support::Identification::Object_Ref.new('local', 'ANY', @object_id)}
    18     assert_nothing_raised(Exception){@archetype_id = OpenEHR::RM::Support::Identification::Archetype_ID.new('openEHR-EHR-SECTION.physical_examination-prenatal.v2')}
    19     assert_nothing_raised(Exception){@terminology_id = OpenEHR::RM::Support::Identification::Terminology_ID.new('ICD10(2003)')}
    20     assert_nothing_raised(Exception){@generic_id = OpenEHR::RM::Support::Identification::Generic_ID.new("0.0.3", "openehr")}
    21     assert_nothing_raised(Exception){@uid_based_id = OpenEHR::RM::Support::Identification::UID_Based_ID.new('rrip::0.0.3')}
    22     assert_nothing_raised(Exception){@hier_object_id = OpenEHR::RM::Support::Identification::Hier_Object_ID.new('0.0.4')}
    23     assert_nothing_raised(Exception){@locatable_ref = OpenEHR::RM::Support::Identification::Locatable_Ref.new('unknown', 'PERSON', @uid_based_id, 'data/event[at0001, standing]')}
    24     assert_nothing_raised(Exception){@party_ref = OpenEHR::RM::Support::Identification::Party_Ref.new('unknown', 'ORGANISATION', @object_id)}
    25     assert_nothing_raised(Exception){@access_group_ref = OpenEHR::RM::Support::Identification::Access_Group_Ref.new('unknown', 'ACCESS_GROUP', @object_id)}
    26     assert_nothing_raised(Exception){@version_tree_id = OpenEHR::RM::Support::Identification::Version_Tree_ID.new('1.2.3')}
    27     assert_nothing_raised(Exception){@object_version_id = OpenEHR::RM::Support::Identification::Object_Version_ID.new('ABC::DEF::1.2.3')}
    28 =======
    2915    assert_nothing_raised(Exception){@object_id = OpenEhr::RM::Support::Identification::ObjectId.new("0.0.3")}
    3016    assert_nothing_raised(Exception){@object_ref = OpenEhr::RM::Support::Identification::ObjectRef.new('local', 'ANY', @object_id)}
     
    3925    assert_nothing_raised(Exception){@version_tree_id = OpenEhr::RM::Support::Identification::VersionTreeId.new('1.2.3')}
    4026    assert_nothing_raised(Exception){@object_version_id = OpenEhr::RM::Support::Identification::ObjectVersionId.new('ABC::DEF::1.2.3')}
    41 >>>>>>> .merge-right.r168
    4227  end
    4328 
     
    10085
    10186  def test_archetype_id
    102 <<<<<<< .working
    103     assert_equal 'openEHR-EHR-SECTION.physical_examination-prenatal.v2', @archetype_id.value
    104     assert_equal 'openEHR-EHR-SECTION', @archetype_id.qualified_rm_entity
    105     assert_equal 'openEHR', @archetype_id.rm_originator
    106     assert_equal 'EHR', @archetype_id.rm_name
    107     assert_equal 'SECTION', @archetype_id.rm_entity
    108     assert_equal 'physical_examination', @archetype_id.concept_name
    109     assert_equal 'prenatal', @archetype_id.specialisation
    110     assert_equal 'v2', @archetype_id.version_id
    111 =======
    11287    assert_equal "0.0.5", @archetype_id.value
    11388    assert_nothing_raised(Exception){@archetype_id.value = "0.0.6"}
     
    166141    assert_raise(ArgumentError){@archetype_id.version_id = nil}
    167142    assert_raise(ArgumentError){@archetype_id.version_id = ""}
    168 >>>>>>> .merge-right.r168
    169143  end
    170144
Note: See TracChangeset for help on using the changeset viewer.