Ignore:
Timestamp:
Sep 24, 2009, 10:37:13 AM (15 years ago)
Author:
KOBAYASHI, Shinji
Message:

merged branches/0.5 to trunk

Location:
ruby/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • ruby/trunk

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

    r268 r291  
    33require 'rm'
    44
    5 include OpenEHR::RM::Data_Types::Text
    6 include OpenEHR::RM::Common::Resource
    7 include OpenEHR::RM::Common::Archetyped
    8 include OpenEHR::RM::Common::Generic
    9 include OpenEHR::RM::Common::Change_Control
    10 include OpenEHR::RM::Common::Directory
    11 include OpenEHR::RM::Support::Identification
    12 include OpenEHR::RM::Data_Types::Basic
    13 include OpenEHR::RM::Data_Types::Quantity
    14 include OpenEHR::RM::Data_Types::URI
     5include OpenEhr::RM::DataTypes::Text
     6include OpenEhr::RM::Common::Resource
     7include OpenEhr::RM::Common::Archetyped
     8include OpenEhr::RM::Common::Generic
     9include OpenEhr::RM::Common::ChangeControl
     10include OpenEhr::RM::Common::Directory
     11include OpenEhr::RM::Support::Identification
     12include OpenEhr::RM::DataTypes::Basic
     13include OpenEhr::RM::DataTypes::Quantity
     14include OpenEhr::RM::DataTypes::Uri
    1515
    1616class RM_Common_Resource_Test < Test::Unit::TestCase
    1717  def setup
    18     terminology_id = Terminology_ID.new('openehr')
    19     code_phrase = Code_Phrase.new('ja', terminology_id)   
    20     @translation_details = OpenEHR::RM::Common::Resource::Translation_Details.new(:language => code_phrase, :author => {'KOBAYASHI, Shinji', 'Ehime Univ'},
     18    terminology_id = TerminologyId.new('openehr')
     19    code_phrase = CodePhrase.new('ja', terminology_id)
     20    @translation_details = OpenEhr::RM::Common::Resource::TranslationDetails.new(:language => code_phrase, :author => {'KOBAYASHI, Shinji', 'Ehime Univ'},
    2121  :accreditation => 'jp', :other_details => {'ruby', 'test'})
    22     @authored_resource = OpenEHR::RM::Common::Resource::Authored_Resource.new(:original_language => code_phrase, :translations => {'ja', @translation_details}, :description => "test")
    23     @resource_description_item = OpenEHR::RM::Common::Resource::Resource_Description_Item.new(:language => code_phrase,
     22    @authored_resource = OpenEhr::RM::Common::Resource::AuthoredResource.new(:original_language => code_phrase, :translations => {'ja', @translation_details}, :description => "test")
     23    @resource_description_item = OpenEhr::RM::Common::Resource::ResourceDescriptionItem.new(:language => code_phrase,
    2424              :purpose => 'test',
    2525              :keywords => %w[test ruby],
    … …  
    2929              :original_resource_uri => {'issuer', 'http://openehr.jp/'},
    3030              :other_details => {'samos', 'icicth7'})
    31     @resource_description = OpenEHR::RM::Common::Resource::Resource_Description.new(:original_author => {'KOBAYASHI, Shinji' => 'Ehime University'},
     31    @resource_description = OpenEhr::RM::Common::Resource::ResourceDescription.new(:original_author => {'KOBAYASHI, Shinji' => 'Ehime University'},
    3232    :lifecycle_state => 'experimental',
    3333    :details => {'ja', @resource_description_item},
    … …  
    3636    :other_details => {'ja', 'shikoku'},
    3737    :parent_resource => @authored_resource)
    38     @authored_resource = OpenEHR::RM::Common::Resource::Authored_Resource.new(:original_language => code_phrase, :translations => {'ja', @translation_details}, :description => @resource_description)
     38    @authored_resource = OpenEhr::RM::Common::Resource::AuthoredResource.new(:original_language => code_phrase, :translations => {'ja', @translation_details}, :description => @resource_description)
    3939  end
    4040
    4141  def test_init
    42     assert_instance_of OpenEHR::RM::Common::Resource::Authored_Resource, @authored_resource
    43     assert_instance_of OpenEHR::RM::Common::Resource::Translation_Details, @translation_details
    44     assert_instance_of OpenEHR::RM::Common::Resource::Resource_Description_Item, @resource_description_item
    45     assert_instance_of OpenEHR::RM::Common::Resource::Resource_Description, @resource_description
     42    assert_instance_of OpenEhr::RM::Common::Resource::AuthoredResource, @authored_resource
     43    assert_instance_of OpenEhr::RM::Common::Resource::TranslationDetails, @translation_details
     44    assert_instance_of OpenEhr::RM::Common::Resource::ResourceDescriptionItem, @resource_description_item
     45    assert_instance_of OpenEhr::RM::Common::Resource::ResourceDescription, @resource_description
    4646  end
    4747
    … …  
    8686class RM_Common_Archetyped_Test < Test::Unit::TestCase
    8787  def setup
     88<<<<<<< .working
    8889    @dv_text = OpenEHR::RM::Data_Types::Text::DV_Text.new('Test')
    8990    @uid_based_id = OpenEHR::RM::Support::Identification::UID_Based_ID.new('rrip::0.0.5')
    … …  
    9293    assert_nothing_raised(Exception){@archetyped = OpenEHR::RM::Common::Archetyped::Archetyped.new(@archetype_id, '1.0.1')}
    9394    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"))}
    94     assert_nothing_raised(Exception){
    95       @pathable = OpenEHR::RM::Common::Archetyped::Pathable.new }
    96     name = OpenEHR::RM::Data_Types::Text::DV_Text.new('blood')
     95=======
     96    @dv_text = OpenEhr::RM::DataTypes::Text::DvText.new('Test')
     97    @uid_based_id = OpenEhr::RM::Support::Identification::UidBasedId.new('rrip::0.0.5')
     98    @archetype_id = OpenEhr::RM::Support::Identification::ArchetypeId.new("0.0.5", "biochemistry result_cholesterol", "entry", "ehr_rm", "openehr","cholesterol","0.0.3")
     99    @template_id = OpenEhr::RM::Support::Identification::TemplateId.new('1.0.1')
     100    assert_nothing_raised(Exception){@archetyped = OpenEhr::RM::Common::Archetyped::Archetyped.new(@archetype_id, '1.0.1')}
     101    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
     103    assert_nothing_raised(Exception){
     104      @pathable = OpenEhr::RM::Common::Archetyped::Pathable.new }
     105    name = OpenEhr::RM::DataTypes::Text::DvText.new('blood')
    97106    links = Set.new([@uid_based_id])
    98107    assert_nothing_raised(Exception){
    … …  
    100109                                 :name => name,
    101110                                 :links => links)}
    102     provider = Party_Identified.new(:name => 'NERV')
    103     location = Party_Identified.new(:name => 'GEOFRONT')
    104     object_version_id = Object_Version_ID.new('ABC::DEF::1.3.4')
    105     party_ref = Party_Ref.new('local', 'ORGANISATION', object_id)
    106     assert_nothing_raised(Exception){
    107       @feeder_audit_details = Feeder_Audit_Details.new(:system_id => 'MAGI',
     111    provider = PartyIdentified.new(:name => 'NERV')
     112    location = PartyIdentified.new(:name => 'GEOFRONT')
     113    object_version_id = ObjectVersionId.new('ABC::DEF::1.3.4')
     114    party_ref = PartyRef.new('local', 'ORGANISATION', object_id)
     115    assert_nothing_raised(Exception){
     116      @feeder_audit_details = FeederAuditDetails.new(:system_id => 'MAGI',
    108117                                                       :provider => provider,
    109118                                                       :location => location,
    110                                                        :time => DV_Date_Time.new('2009-07-03T12:16:31'),
    111                                                        :subject => Party_Proxy.new(:external_ref => party_ref),
     119                                                       :time => DvDateTime.new('2009-07-03T12:16:31'),
     120                                                       :subject => PartyProxy.new(:external_ref => party_ref),
    112121                                                       :version_id => '0.0.4')}
    113     feeder_audit_details = Feeder_Audit_Details.new(:system_id => 'AKAGI')
    114     dv_identifier = DV_Identifier.new('NERV', 'MELCHIOR', 'RITSUKO', 'COMPUTER')
    115     feeder_audit_details2 = Feeder_Audit_Details.new(:system_id => 'KATSURAGI')
    116     dv_identifier2 = DV_Identifier.new('NERV', 'SHOGOUKI', 'MISATO', 'EVANGELION')
    117     charset = OpenEHR::RM::Data_Types::Text::Code_Phrase.new('UTF-8','character-sets')
    118     language = OpenEHR::RM::Data_Types::Text::Code_Phrase.new('ja', 'languages')
    119 
    120     dv_encapsulated = OpenEHR::RM::Data_Types::Encapsulated::DV_Encapsulated.new(charset, language, 10)
    121     assert_nothing_raised(Exception){
    122       @feeder_audit = Feeder_Audit.new(:originating_system_audit => feeder_audit_details,
     122    feeder_audit_details = FeederAuditDetails.new(:system_id => 'AKAGI')
     123    dv_identifier = DvIdentifier.new('NERV', 'MELCHIOR', 'RITSUKO', 'COMPUTER')
     124    feeder_audit_details2 = FeederAuditDetails.new(:system_id => 'KATSURAGI')
     125    dv_identifier2 = DvIdentifier.new('NERV', 'SHOGOUKI', 'MISATO', 'EVANGELION')
     126    charset = OpenEhr::RM::DataTypes::Text::CodePhrase.new('UTF-8','character-sets')
     127    language = OpenEhr::RM::DataTypes::Text::CodePhrase.new('ja', 'languages')
     128
     129    dv_encapsulated = OpenEhr::RM::DataTypes::Encapsulated::DvEncapsulated.new(charset, language, 10)
     130    assert_nothing_raised(Exception){
     131      @feeder_audit = FeederAudit.new(:originating_system_audit => feeder_audit_details,
    123132                                       :originating_system_item_ids => [dv_identifier],
    124133                                       :feeder_system_audit => feeder_audit_details2,
    … …  
    128137
    129138  def test_init
    130     assert_instance_of OpenEHR::RM::Common::Archetyped::Archetyped, @archetyped
    131     assert_instance_of OpenEHR::RM::Common::Archetyped::Link, @link
    132     assert_instance_of OpenEHR::RM::Common::Archetyped::Pathable, @pathable
    133     assert_instance_of OpenEHR::RM::Common::Archetyped::Locatable, @locatable
    134     assert_instance_of Feeder_Audit_Details, @feeder_audit_details
    135     assert_instance_of Feeder_Audit, @feeder_audit
     139    assert_instance_of OpenEhr::RM::Common::Archetyped::Archetyped, @archetyped
     140    assert_instance_of OpenEhr::RM::Common::Archetyped::Link, @link
     141    assert_instance_of OpenEhr::RM::Common::Archetyped::Pathable, @pathable
     142    assert_instance_of OpenEhr::RM::Common::Archetyped::Locatable, @locatable
     143    assert_instance_of FeederAuditDetails, @feeder_audit_details
     144    assert_instance_of FeederAudit, @feeder_audit
    136145  end
    137146
    … …  
    144153    assert_nothing_raised(Exception){@archetyped.template_id = @template_id}
    145154    assert_equal @template_id, @archetyped.template_id
     155<<<<<<< .working
    146156    archetype_id2 = OpenEHR::RM::Support::Identification::Archetype_ID.new('openEHR-EHR-SECTION.physical_examination-prenatal.v2')
     157=======
     158    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
    147160    assert_nothing_raised(ArgumentError){@archetyped.archetype_id = archetype_id2}
    148161    assert_equal archetype_id2, @archetyped.archetype_id
    … …  
    157170    assert_equal 'problem', @link.type.value
    158171    # test meaning
    159     assert_nothing_raised(Exception){@link.meaning = OpenEHR::RM::Data_Types::Text::DV_Text.new('clinical')}
     172    assert_nothing_raised(Exception){@link.meaning = OpenEhr::RM::DataTypes::Text::DvText.new('clinical')}
    160173    assert_equal 'clinical', @link.meaning.value
    161174    assert_raise(ArgumentError){@link.meaning = nil}
    162175    # test target
    163     assert_nothing_raised(Exception){@link.target = OpenEHR::RM::Data_Types::URI::DV_EHR_URI.new("ehr://try/")}
     176    assert_nothing_raised(Exception){@link.target = OpenEhr::RM::DataTypes::Uri::DvEhrUri.new("ehr://try/")}
    164177    assert_equal 'ehr://try/', @link.target.value
    165178    assert_raise(ArgumentError){@link.target = nil}
    166179    # test type
    167     assert_nothing_raised(Exception){@link.type = OpenEHR::RM::Data_Types::Text::DV_Text.new("issue")}
     180    assert_nothing_raised(Exception){@link.type = OpenEhr::RM::DataTypes::Text::DvText.new("issue")}
    168181    assert_equal 'issue', @link.type.value
    169182    assert_raise(ArgumentError){@link.type = nil}
    … …  
    190203class RM_Common_Generic_Test < Test::Unit::TestCase
    191204  def setup
    192     assert_nothing_raised(Exception){party_proxy = Party_Proxy.new}
    193     object_id = Object_ID.new('0.0.4')
    194     party_ref = Party_Ref.new('unknown', 'ORGANISATION', object_id)
    195     assert_nothing_raised(Exception){
    196       @party_proxy = Party_Proxy.new(:external_ref => party_ref)}
    197     assert_nothing_raised(Exception){party_self = Party_Self.new}
    198     assert_nothing_raised(Exception){
    199       @party_self = Party_Self.new(:external_ref => party_ref)}
     205    assert_nothing_raised(Exception){party_proxy = PartyProxy.new}
     206    object_id = ObjectId.new('0.0.4')
     207    party_ref = PartyRef.new('unknown', 'ORGANISATION', object_id)
     208    assert_nothing_raised(Exception){
     209      @party_proxy = PartyProxy.new(:external_ref => party_ref)}
     210    assert_nothing_raised(Exception){party_self = PartySelf.new}
     211    assert_nothing_raised(Exception){
     212      @party_self = PartySelf.new(:external_ref => party_ref)}
    200213    assert_raise(ArgumentError){
    201       party_identified = Party_Identified.new}
     214      party_identified = PartyIdentified.new}
    202215
    203216    identifiers = []
    204     identifiers << DV_Identifier.new('NERV', 'MELCHIOR', 'GENDO', 'COMPUTER')
    205     identifiers << DV_Identifier.new('NERV', 'CASPER', 'GENDO', 'COMPUTER')
    206     identifiers << DV_Identifier.new('NERV', 'BALTHAZAR', 'GENDO', 'COMPUTER')
    207     assert_nothing_raised(Exception){
    208       @party_identified = Party_Identified.new(:name => 'NERV',
     217    identifiers << DvIdentifier.new('NERV', 'MELCHIOR', 'GENDO', 'COMPUTER')
     218    identifiers << DvIdentifier.new('NERV', 'CASPER', 'GENDO', 'COMPUTER')
     219    identifiers << DvIdentifier.new('NERV', 'BALTHAZAR', 'GENDO', 'COMPUTER')
     220    assert_nothing_raised(Exception){
     221      @party_identified = PartyIdentified.new(:name => 'NERV',
    209222                                               :external_ref => party_ref,
    210223                                               :identifier => identifiers)}
    211224
    212     terminology_id = Terminology_ID.new('test(0.04)')
    213     code_phrase = Code_Phrase.new('self', terminology_id)
    214     dv_coded_text = DV_Coded_Text.new('Seele',code_phrase)
    215     assert_nothing_raised(Exception){
    216       @party_related = Party_Related.new(:name => 'GEHIRN',
     225    terminology_id = TerminologyId.new('test(0.04)')
     226    code_phrase = CodePhrase.new('self', terminology_id)
     227    dv_coded_text = DvCodedText.new('Seele',code_phrase)
     228    assert_nothing_raised(Exception){
     229      @party_related = PartyRelated.new(:name => 'GEHIRN',
    217230                                         :relationship => dv_coded_text)}
    218     dv_text = DV_Text.new('commiter')
    219     dv_coded_text = DV_Coded_Text.new('present',terminology_id)
    220     dv_date_time1 = DV_Date_Time.new('2009-07-04T16:30:00')
    221     dv_date_time2 = DV_Date_Time.new('2009-07-14T00:00:00')
    222     dv_interval = DV_Interval.new(dv_date_time1, dv_date_time2)
     231    dv_text = DvText.new('commiter')
     232    dv_coded_text = DvCodedText.new('present',terminology_id)
     233    dv_date_time1 = DvDateTime.new('2009-07-04T16:30:00')
     234    dv_date_time2 = DvDateTime.new('2009-07-14T00:00:00')
     235    dv_interval = DvInterval.new(dv_date_time1, dv_date_time2)
    223236    assert_nothing_raised(Exception){
    224237      @participation = Participation.new(:performer => @party_proxy,
    … …  
    226239                                         :mode => dv_coded_text,
    227240                                         :time => dv_interval)}
    228     dv_date_time = DV_Date_Time.new('2009-07-04T18:56:00')
    229     terminology_id = Terminology_ID.new('openehr(1.0.2)')
    230     code_phrase = Code_Phrase.new('249', terminology_id)
    231     dv_coded_text = DV_Coded_Text.new('creation', code_phrase)
    232     dv_text = DV_Text.new('test environment')
    233     assert_nothing_raised(Exception){
    234       @audit_details = Audit_Details.new(:system_id => 'MAGI',
     241    dv_date_time = DvDateTime.new('2009-07-04T18:56:00')
     242    terminology_id = TerminologyId.new('openehr(1.0.2)')
     243    code_phrase = CodePhrase.new('249', terminology_id)
     244    dv_coded_text = DvCodedText.new('creation', code_phrase)
     245    dv_text = DvText.new('test environment')
     246    assert_nothing_raised(Exception){
     247      @audit_details = AuditDetails.new(:system_id => 'MAGI',
    235248                                         :committer => @party_proxy,
    236249                                         :time_committed => dv_date_time,
    237250                                         :change_type => dv_coded_text,
    238251                                         :description => dv_text)}
    239     dv_text = DV_Text.new('authorisation')
    240     dv_ehr_uri = DV_EHR_URI.new('ehr://test/')
     252    dv_text = DvText.new('authorisation')
     253    dv_ehr_uri = DvEhrUri.new('ehr://test/')
    241254    assert_nothing_raised(Exception){
    242255      @attestation = Attestation.new(:system_id => 'NERV',
    … …  
    248261                                     :proof => 'hashedstring',
    249262                                     :items => Set[dv_ehr_uri])}
    250     object_version_id = Object_Version_ID.new('SHOGOUKI::NERV::1.1.1')
    251     audit_details2 = Audit_Details.new(:system_id => 'MAGI',
     263    object_version_id = ObjectVersionId.new('SHOGOUKI::NERV::1.1.1')
     264    audit_details2 = AuditDetails.new(:system_id => 'MAGI',
    252265                                       :committer => @party_proxy,
    253266                                       :time_committed => dv_date_time2,
    254267                                       :change_type => dv_coded_text)
    255268    assert_nothing_raised(Exception){
    256       @revision_history_item = Revision_History_Item.new(:audits => [@audit_details, audit_details2],
     269      @revision_history_item = RevisionHistoryItem.new(:audits => [@audit_details, audit_details2],
    257270                                                         :version_id => object_version_id)}
    258     dv_date_time3 = DV_Date_Time.new('2009-07-14T12:00:00')
    259     dv_date_time4 = DV_Date_Time.new('2009-07-15T00:00:00')
    260     audit_details3 = Audit_Details.new(:system_id => 'MAGI',
     271    dv_date_time3 = DvDateTime.new('2009-07-14T12:00:00')
     272    dv_date_time4 = DvDateTime.new('2009-07-15T00:00:00')
     273    audit_details3 = AuditDetails.new(:system_id => 'MAGI',
    261274                                     :committer => @party_proxy,
    262275                                     :time_committed => dv_date_time3,
    263276                                     :change_type => dv_coded_text)
    264     audit_details4 = Audit_Details.new(:system_id => 'MAGI',
     277    audit_details4 = AuditDetails.new(:system_id => 'MAGI',
    265278                                     :committer => @party_proxy,
    266279                                     :time_committed => dv_date_time4,
    267280                                     :change_type => dv_coded_text)
    268     object_version_id = Object_Version_ID.new('NIGOUKI::NERV::2.2.2')
    269     revision_history_item2 = Revision_History_Item.new(:audits => [audit_details3, audit_details4],
     281    object_version_id = ObjectVersionId.new('NIGOUKI::NERV::2.2.2')
     282    revision_history_item2 = RevisionHistoryItem.new(:audits => [audit_details3, audit_details4],
    270283                                                      :version_id => object_version_id)
    271284    assert_nothing_raised(Exception){
    272       @revision_history = Revision_History.new([@revision_history_item, revision_history_item2])}
     285      @revision_history = RevisionHistory.new([@revision_history_item, revision_history_item2])}
    273286  end
    274287
    275288  def test_init
    276     assert_instance_of Party_Proxy, @party_proxy
    277     assert_instance_of Party_Self, @party_self
    278     assert_instance_of Party_Identified, @party_identified
     289    assert_instance_of PartyProxy, @party_proxy
     290    assert_instance_of PartySelf, @party_self
     291    assert_instance_of PartyIdentified, @party_identified
    279292    assert_instance_of Participation, @participation
    280     assert_instance_of Audit_Details, @audit_details
     293    assert_instance_of AuditDetails, @audit_details
    281294    assert_instance_of Attestation, @attestation
    282     assert_instance_of Revision_History_Item, @revision_history_item
    283     assert_instance_of Revision_History, @revision_history
     295    assert_instance_of RevisionHistoryItem, @revision_history_item
     296    assert_instance_of RevisionHistory, @revision_history
    284297  end
    285298
    … …  
    347360  def setup
    348361    archetype_node_id = 'at0001'
    349     name = DV_Text.new('folder_test')
    350     object_id = Object_ID.new('1.1.1')
    351     object_ref = Object_Ref.new('local', 'PARTY', object_id)
     362    name = DvText.new('folder_test')
     363    object_id = ObjectId.new('1.1.1')
     364    object_ref = ObjectRef.new('local', 'PARTY', object_id)
    352365    assert_nothing_raised(Exception){
    353366      @folder = Folder.new(:archetype_node_id => archetype_node_id,
    … …  
    359372 
    360373  def test_init
    361     assert_instance_of OpenEHR::RM::Common::Directory::Folder, @folder
     374    assert_instance_of OpenEhr::RM::Common::Directory::Folder, @folder
    362375  end
    363376
    … …  
    370383class RM_Common_Change_Control_Test < Test::Unit::TestCase
    371384  def setup
    372     object_version_id1 = Object_Version_ID.new('ABC::DEF::2.2.3')
    373     object_version_id2 = Object_Version_ID.new('GHI::JKL::4.5.6')
    374     object_id = Object_ID.new('ehr://uniqueid1020')
    375     dv_date_time = DV_Date_Time.new('2009-07-06T21:10:12')
    376     party_ref = Party_Ref.new('unknown', 'ORGANISATION', object_id)
    377     party_proxy = Party_Proxy.new(:external_ref => party_ref)
    378     terminology_id = Terminology_ID.new('openehr(1.0.2)')
    379     code_phrase = Code_Phrase.new('249', terminology_id)
    380     dv_coded_text = DV_Coded_Text.new('creation', code_phrase)
    381     audit_details = Audit_Details.new(:system_id => 'MAGI',
     385    object_version_id1 = ObjectVersionId.new('ABC::DEF::2.2.3')
     386    object_version_id2 = ObjectVersionId.new('GHI::JKL::4.5.6')
     387    object_id = ObjectId.new('ehr://uniqueid1020')
     388    dv_date_time = DvDateTime.new('2009-07-06T21:10:12')
     389    party_ref = PartyRef.new('unknown', 'ORGANISATION', object_id)
     390    party_proxy = PartyProxy.new(:external_ref => party_ref)
     391    terminology_id = TerminologyId.new('openehr(1.0.2)')
     392    code_phrase = CodePhrase.new('249', terminology_id)
     393    dv_coded_text = DvCodedText.new('creation', code_phrase)
     394    audit_details = AuditDetails.new(:system_id => 'MAGI',
    382395                                      :committer => party_proxy,
    383396                                      :time_committed => dv_date_time,
    384397                                      :change_type => dv_coded_text)
    385     code_phrase = Code_Phrase.new('532', terminology_id)
    386     dv_coded_text = DV_Coded_Text.new('complete', code_phrase)
    387     object_id = Object_ID.new('ehr://test_location')
    388     object_ref = Object_Ref.new('local', 'PARTY', object_id)
    389     hier_object_id = Hier_Object_ID.new('ABC')
     398    code_phrase = CodePhrase.new('532', terminology_id)
     399    dv_coded_text = DvCodedText.new('complete', code_phrase)
     400    object_id = ObjectId.new('ehr://test_location')
     401    object_ref = ObjectRef.new('local', 'PARTY', object_id)
     402    hier_object_id = HierObjectId.new('ABC')
    390403    assert_nothing_raised(Exception){
    391404      @version = Version.new(:uid => object_version_id1,
    … …  
    396409                             :signature => 'test_version',
    397410                             :data => 'data')}
    398     object_version_id3 = Object_Version_ID.new('MNO::PQR::7.8.9')
    399     object_version_id4 = Object_Version_ID.new('STU::VWX::1.2.3')
    400     code_phrase = Code_Phrase.new('240', terminology_id)
    401     dv_coded_text2 = DV_Coded_Text.new('signed', code_phrase)
     411    object_version_id3 = ObjectVersionId.new('MNO::PQR::7.8.9')
     412    object_version_id4 = ObjectVersionId.new('STU::VWX::1.2.3')
     413    code_phrase = CodePhrase.new('240', terminology_id)
     414    dv_coded_text2 = DvCodedText.new('signed', code_phrase)
    402415    attestation = Attestation.new(:system_id => 'NERV',
    403416                                  :committer => party_proxy,
    404417                                  :time_committed => dv_date_time,
    405418                                  :change_type => dv_coded_text,
    406                                   :reason => DV_Text.new('signed'))
    407     dv_date_time = DV_Date_Time.new('2009-07-07T21:10:12')
    408     audit_details = Audit_Details.new(:system_id => 'MAGI',
     419                                  :reason => DvText.new('signed'))
     420    dv_date_time = DvDateTime.new('2009-07-07T21:10:12')
     421    audit_details = AuditDetails.new(:system_id => 'MAGI',
    409422                                      :committer => party_proxy,
    410423                                      :time_committed => dv_date_time,
    411424                                      :change_type => dv_coded_text)
    412425    assert_nothing_raised(Exception){
    413       @original_version = Original_Version.new(:uid => object_version_id3,
     426      @original_version = OriginalVersion.new(:uid => object_version_id3,
    414427                                               :preceding_version_uid => object_version_id4,
    415428                                               :other_input_version_uids => Set[object_version_id1, object_version_id2],
    … …  
    419432                                               :data => 'data',
    420433                                               :lifecycle_state => dv_coded_text)}
    421     dv_date_time = DV_Date_Time.new('2009-07-08T21:10:12')
    422     audit_details = Audit_Details.new(:system_id => 'CASPER',
     434    dv_date_time = DvDateTime.new('2009-07-08T21:10:12')
     435    audit_details = AuditDetails.new(:system_id => 'CASPER',
    423436                                      :committer => party_proxy,
    424437                                      :time_committed => dv_date_time,
    425438                                      :change_type => dv_coded_text,
    426439                                      :description => 'for contribution')
    427     object_ref = Object_Ref.new('unknown', 'PARTY', object_id)
    428     assert_nothing_raised(Exception){
    429       @imported_version = Imported_Version.new(:item => @original_version,
     440    object_ref = ObjectRef.new('unknown', 'PARTY', object_id)
     441    assert_nothing_raised(Exception){
     442      @imported_version = ImportedVersion.new(:item => @original_version,
    430443                                               :commit_audit => audit_details,
    431444                                               :contribution => object_ref,
    … …  
    435448                                       :versions => Set[object_ref],
    436449                                       :audit => audit_details)}
    437     dv_date_time = DV_Date_Time.new('2009-07-08T18:10:12')
    438     audit_details = Audit_Details.new(:system_id => 'MAGI',
     450    dv_date_time = DvDateTime.new('2009-07-08T18:10:12')
     451    audit_details = AuditDetails.new(:system_id => 'MAGI',
    439452                                      :committer => party_proxy,
    440453                                      :time_committed => dv_date_time,
    … …  
    446459                                :change_type => dv_coded_text)
    447460    assert_nothing_raised(Exception){
    448       @versioned_object = Versioned_Object.new(:uid => hier_object_id,
     461      @versioned_object = VersionedObject.new(:uid => hier_object_id,
    449462                                               :owner_id => object_ref,
    450463                                               :time_created => dv_date_time,
    … …  
    453466
    454467  def test_init
    455     assert_instance_of OpenEHR::RM::Common::Change_Control::Version, @version
    456     assert_instance_of Original_Version, @original_version
    457     assert_instance_of Imported_Version, @imported_version
    458     assert_instance_of OpenEHR::RM::Common::Change_Control::Contribution, @contribution
    459     assert_instance_of Versioned_Object, @versioned_object
     468    assert_instance_of OpenEhr::RM::Common::ChangeControl::Version, @version
     469    assert_instance_of OriginalVersion, @original_version
     470    assert_instance_of ImportedVersion, @imported_version
     471    assert_instance_of OpenEhr::RM::Common::ChangeControl::Contribution, @contribution
     472    assert_instance_of VersionedObject, @versioned_object
    460473  end
    461474
    … …  
    505518    assert !@versioned_object.is_original_version?(@version.uid)
    506519    assert @versioned_object.is_original_version?(@original_version.uid)
    507     assert @versioned_object.has_version_at_time?(DV_Date_Time.new('2009-07-06T21:10:12'))
     520    assert @versioned_object.has_version_at_time?(DvDateTime.new('2009-07-06T21:10:12'))
    508521    assert_equal @version, @versioned_object.version_with_id(@version.uid)
    509522    assert_equal @version, @versioned_object.version_at_time(@version.commit_audit.time_committed)
    … …  
    538551                                                :item => @imported_version.item)}
    539552    assert_equal 7, @versioned_object.version_count
    540     dv_date_time = DV_Date_Time.new('2009-07-07T22:11:31')
     553    dv_date_time = DvDateTime.new('2009-07-07T22:11:31')
    541554    attestation = Attestation.new(:system_id => 'NERV2',
    542555                                  :committer => @version.contribution,
    543556                                  :time_committed => dv_date_time,
    544557                                  :change_type => @original_version.commit_audit.change_type,
    545                                   :reason => DV_Text.new('signed'))
     558                                  :reason => DvText.new('signed'))
    546559    assert_nothing_raised(Exception){
    547560      @versioned_object.commit_attestation(:attestation => attestation,
Note: See TracChangeset for help on using the changeset viewer.