Changeset 168


Ignore:
Timestamp:
Aug 6, 2009, 9:06:59 AM (15 years ago)
Author:
KOBAYASHI, Shinji
Message:

roll back branch 0.0

Location:
ruby/branches/0.0
Files:
1 deleted
38 edited

Legend:

Unmodified
Added
Removed

  • ruby/branches/0.0/adl_parser/bin/adl_validator.rb

    r167 r168  
    77require 'net/http'
    88
    9 module OpenEhr
     9module OpenEHR
    1010  module CommandLine
    1111    class Arguments < Hash
    … …  
    4040            when /\A(http:\/\/.*)/
    4141              name = $1
    42               input = case response = Net::HTTP.get_response(Uri.parse($1))
     42              input = case response = Net::HTTP.get_response(URI.parse($1))
    4343                      when Net::HTTPSuccess   
    4444                        response.body
    … …  
    7474if __FILE__ == $0
    7575  begin
    76     arguments = OpenEhr::CommandLine::Arguments.new(ARGV)
    77     validator = OpenEhr::CommandLine::ADLValidator.new(arguments)
     76    arguments = OpenEHR::CommandLine::Arguments.new(ARGV)
     77    validator = OpenEHR::CommandLine::ADLValidator.new(arguments)
    7878    validator.run
    7979  end

  • ruby/branches/0.0/adl_parser/lib/model.rb

    r167 r168  
    22
    33
    4 module OpenEhr
     4module OpenEHR
    55  module ADL
    66    module Model

  • ruby/branches/0.0/adl_parser/lib/parser.rb

    r167 r168  
    2020
    2121
    22 module OpenEhr
     22module OpenEHR
    2323
    2424  module ADL

  • ruby/branches/0.0/adl_parser/lib/scanner.rb

    r167 r168  
    55
    66
    7 module OpenEhr
     7module OpenEHR
    88  module ADL
    99    module Scanner
    … …  
    138138            @parser = lambda do |input|
    139139              Yaparc::Alt.new(Reserved.new,
    140                               OpenEhr::ADL::Scanner::Common::V_QUALIFIED_TERM_CODE_REF.new,
    141                               OpenEhr::ADL::Scanner::Common::V_LOCAL_TERM_CODE_REF.new,
    142                               OpenEhr::ADL::Scanner::Common::ERR_V_QUALIFIED_TERM_CODE_REF.new,
    143                               OpenEhr::ADL::Scanner::Common::V_TYPE_IDENTIFIER.new,
    144                               OpenEhr::ADL::Scanner::Common::V_GENERIC_TYPE_IDENTIFIER.new,
    145                               OpenEhr::ADL::Scanner::Common::V_STRING.new,
    146                               OpenEhr::ADL::Scanner::Common::V_LOCAL_CODE.new,
    147                               OpenEhr::ADL::Scanner::Common::V_REAL.new,
    148                               OpenEhr::ADL::Scanner::Common::V_ISO8601_DURATION.new
     140                              OpenEHR::ADL::Scanner::Common::V_QUALIFIED_TERM_CODE_REF.new,
     141                              OpenEHR::ADL::Scanner::Common::V_LOCAL_TERM_CODE_REF.new,
     142                              OpenEHR::ADL::Scanner::Common::ERR_V_QUALIFIED_TERM_CODE_REF.new,
     143                              OpenEHR::ADL::Scanner::Common::V_TYPE_IDENTIFIER.new,
     144                              OpenEHR::ADL::Scanner::Common::V_GENERIC_TYPE_IDENTIFIER.new,
     145                              OpenEHR::ADL::Scanner::Common::V_STRING.new,
     146                              OpenEHR::ADL::Scanner::Common::V_LOCAL_CODE.new,
     147                              OpenEHR::ADL::Scanner::Common::V_REAL.new,
     148                              OpenEHR::ADL::Scanner::Common::V_ISO8601_DURATION.new
    149149                              )
    150150            end
    … …  
    157157          def initialize
    158158            @parser = lambda do |input|
    159               reserved_parsers = OpenEhr::ADL::Scanner::DADL::RESERVED.map do |keyword|
     159              reserved_parsers = OpenEHR::ADL::Scanner::DADL::RESERVED.map do |keyword|
    160160                Yaparc::Tokenize.new(
    161161                                     Yaparc::Literal.new(keyword[0])
    … …  
    163163              end
    164164              Yaparc::Alt.new(Yaparc::Apply.new(Yaparc::Alt.new(*reserved_parsers)) do |match|
    165                                 OpenEhr::ADL::Scanner::Common::LOG.info("Reserved: #{match}")
    166                                 [OpenEhr::ADL::Scanner::DADL::RESERVED[match], OpenEhr::ADL::Scanner::DADL::RESERVED[match]]
     165                                OpenEHR::ADL::Scanner::Common::LOG.info("Reserved: #{match}")
     166                                [OpenEHR::ADL::Scanner::DADL::RESERVED[match], OpenEHR::ADL::Scanner::DADL::RESERVED[match]]
    167167                              end,
    168168                              Yaparc::Apply.new(Yaparc::Regex.new(/\A[a-z][a-zA-Z0-9_]*/)) do |match|
    169                                 OpenEhr::ADL::Scanner::Common::LOG.info("V_ATTRIBUTE_IDENTIFIER: #{match}")
     169                                OpenEHR::ADL::Scanner::Common::LOG.info("V_ATTRIBUTE_IDENTIFIER: #{match}")
    170170                                [:V_ATTRIBUTE_IDENTIFIER, match]
    171171                              end)
    … …  
    215215            @parser = lambda do |input|
    216216              Yaparc::Apply.new(Yaparc::Regex.new(/\A[yY][yY][yY][yY]-[mM?X][mM?X]-[dD?X][dD?X][T\t][hH?X][hH?X]:[mM?X][mM?X]:[sS?X][sS?X]/)) do |match|
    217                 OpenEhr::ADL::Scanner::Common::LOG.info("V_ISO8601_DATE_TIME_CONSTRAINT_PATTERN: #{match}")
     217                OpenEHR::ADL::Scanner::Common::LOG.info("V_ISO8601_DATE_TIME_CONSTRAINT_PATTERN: #{match}")
    218218                [:V_ISO8601_DATE_TIME_CONSTRAINT_PATTERN, match]
    219219              end
    … …  
    228228            @parser = lambda do |input|
    229229              Yaparc::Apply.new(Yaparc::Regex.new(/\A[yY][yY][yY][yY]-[mM?X][mM?X]-[dD?X][dD?X]/)) do |match|
    230                 OpenEhr::ADL::Scanner::Common::LOG.info("V_ISO8601_DATE_CONSTRAINT_PATTERN: #{match}")
     230                OpenEHR::ADL::Scanner::Common::LOG.info("V_ISO8601_DATE_CONSTRAINT_PATTERN: #{match}")
    231231                [:V_ISO8601_DATE_CONSTRAINT_PATTERN, match]
    232232              end
    … …  
    241241            @parser = lambda do |input|
    242242              Yaparc::Apply.new(Yaparc::Regex.new(/\A[hH][hH]:[mM?X][mM?X]:[sS?X][sS?X]/)) do |match|
    243                 OpenEhr::ADL::Scanner::Common::LOG.info("V_ISO8601_TIME_CONSTRAINT_PATTERN: #{match}")
     243                OpenEHR::ADL::Scanner::Common::LOG.info("V_ISO8601_TIME_CONSTRAINT_PATTERN: #{match}")
    244244                [:V_ISO8601_TIME_CONSTRAINT_PATTERN, match]
    245245              end
    … …  
    255255              Yaparc::Apply.new(Yaparc::Alt.new(Yaparc::Regex.new(/\AP[yY]?[mM]?[wW]?[dD]?T[hH]?[mM]?[sS]?/),
    256256                                                Yaparc::Regex.new(/\AP[yY]?[mM]?[wW]?[dD]?/))) do |match|
    257                 OpenEhr::ADL::Scanner::Common::LOG.info("V_ISO8601_DURATION_CONSTRAINT_PATTERN: #{match}")
     257                OpenEHR::ADL::Scanner::Common::LOG.info("V_ISO8601_DURATION_CONSTRAINT_PATTERN: #{match}")
    258258                [:V_ISO8601_DURATION_CONSTRAINT_PATTERN, match]
    259259              end
    … …  
    268268            @parser = lambda do |input|
    269269              Yaparc::Apply.new(Yaparc::Regex.new(/\A[A-Z][a-zA-Z0-9_]*[ \n]*\</)) do |match|
    270                 OpenEhr::ADL::Scanner::Common::LOG.info("V_C_DOMAIN_TYPE: #{match}")
     270                OpenEHR::ADL::Scanner::Common::LOG.info("V_C_DOMAIN_TYPE: #{match}")
    271271                [:START_V_C_DOMAIN_TYPE_BLOCK, match]
    272272              end
    … …  
    282282                              V_ISO8601_DATE_CONSTRAINT_PATTERN.new,
    283283                              V_ISO8601_TIME_CONSTRAINT_PATTERN.new,
    284                               OpenEhr::ADL::Scanner::Common::V_ISO8601_DURATION.new,
     284                              OpenEHR::ADL::Scanner::Common::V_ISO8601_DURATION.new,
    285285                              V_C_DOMAIN_TYPE.new,
    286286                              V_ISO8601_DURATION_CONSTRAINT_PATTERN.new,
    287287                              Reserved.new,
    288                               OpenEhr::ADL::Scanner::Common::V_QUALIFIED_TERM_CODE_REF.new,
    289                               OpenEhr::ADL::Scanner::Common::V_LOCAL_TERM_CODE_REF.new,
    290                               OpenEhr::ADL::Scanner::Common::ERR_V_QUALIFIED_TERM_CODE_REF.new,
    291                               OpenEhr::ADL::Scanner::Common::V_TYPE_IDENTIFIER.new,
    292                               OpenEhr::ADL::Scanner::Common::V_GENERIC_TYPE_IDENTIFIER.new,
    293                               OpenEhr::ADL::Scanner::Common::V_STRING.new,
    294                               OpenEhr::ADL::Scanner::Common::V_LOCAL_CODE.new,
    295                               OpenEhr::ADL::Scanner::Common::V_REAL.new,
    296                               OpenEhr::ADL::Scanner::Common::V_ISO8601_DURATION.new
     288                              OpenEHR::ADL::Scanner::Common::V_QUALIFIED_TERM_CODE_REF.new,
     289                              OpenEHR::ADL::Scanner::Common::V_LOCAL_TERM_CODE_REF.new,
     290                              OpenEHR::ADL::Scanner::Common::ERR_V_QUALIFIED_TERM_CODE_REF.new,
     291                              OpenEHR::ADL::Scanner::Common::V_TYPE_IDENTIFIER.new,
     292                              OpenEHR::ADL::Scanner::Common::V_GENERIC_TYPE_IDENTIFIER.new,
     293                              OpenEHR::ADL::Scanner::Common::V_STRING.new,
     294                              OpenEHR::ADL::Scanner::Common::V_LOCAL_CODE.new,
     295                              OpenEHR::ADL::Scanner::Common::V_REAL.new,
     296                              OpenEHR::ADL::Scanner::Common::V_ISO8601_DURATION.new
    297297                              )
    298298            end
    … …  
    310310              end
    311311              Yaparc::Alt.new(Yaparc::Apply.new(Yaparc::Alt.new(*reserved_parsers)) do |match|
    312                                 OpenEhr::ADL::Scanner::Common::LOG.info("Reserved: #{match}")
    313                                 [OpenEhr::ADL::Scanner::CADL::RESERVED[match], OpenEhr::ADL::Scanner::CADL::RESERVED[match]]
     312                                OpenEHR::ADL::Scanner::Common::LOG.info("Reserved: #{match}")
     313                                [OpenEHR::ADL::Scanner::CADL::RESERVED[match], OpenEHR::ADL::Scanner::CADL::RESERVED[match]]
    314314                              end,
    315315                              Yaparc::Apply.new(Yaparc::Regex.new(/\A[a-z][a-zA-Z0-9_]*/)) do |match|
    316                                 OpenEhr::ADL::Scanner::Common::LOG.info("V_ATTRIBUTE_IDENTIFIER: #{match}")
     316                                OpenEHR::ADL::Scanner::Common::LOG.info("V_ATTRIBUTE_IDENTIFIER: #{match}")
    317317                                [:V_ATTRIBUTE_IDENTIFIER, match]
    318318                              end)

  • ruby/branches/0.0/adl_parser/lib/shell.rb

    r167 r168  
    33require 'stringio'
    44
    5 module OpenEhr
     5module OpenEHR
    66  module Application
    77    class Shell

  • ruby/branches/0.0/adl_parser/lib/validator.rb

    r167 r168  
    33
    44
    5 module OpenEhr
     5module OpenEHR
    66  module ADL
    77

  • ruby/branches/0.0/adl_parser/tests/parser_test.rb

    r167 r168  
    1515    assert_nothing_raised do
    1616      result = @parser.parse(laboratory_request, 'openEHR-EHR-ITEM_TREE.Laboratory_request.v1.adl')
    17       assert_instance_of OpenEhr::AM::Archetype::ARCHETYPE, result
    18       assert_instance_of OpenEhr::AM::Archetype::Archetype_Description::ARCHETYPE_DESCRIPTION, result.description
    19       assert_instance_of OpenEhr::AM::Archetype::Constraint_Model::C_COMPLEX_OBJECT, result.definition
     17      assert_instance_of OpenEHR::AM::Archetype::ARCHETYPE, result
     18      assert_instance_of OpenEHR::AM::Archetype::Archetype_Description::ARCHETYPE_DESCRIPTION, result.description
     19      assert_instance_of OpenEHR::AM::Archetype::Constraint_Model::C_COMPLEX_OBJECT, result.definition
    2020#      assert_equal '', result.definition
    2121    end
    … …  
    2424    assert_nothing_raised do
    2525      result = @parser.parse(apgar, 'openEHR-EHR-OBSERVATION.apgar.v1.adl')
    26       assert_instance_of OpenEhr::AM::Archetype::ARCHETYPE, result
    27       assert_instance_of OpenEhr::AM::Archetype::Archetype_Description::ARCHETYPE_DESCRIPTION, result.description
    28       assert_instance_of OpenEhr::AM::Archetype::Constraint_Model::C_COMPLEX_OBJECT, result.definition
     26      assert_instance_of OpenEHR::AM::Archetype::ARCHETYPE, result
     27      assert_instance_of OpenEHR::AM::Archetype::Archetype_Description::ARCHETYPE_DESCRIPTION, result.description
     28      assert_instance_of OpenEHR::AM::Archetype::Constraint_Model::C_COMPLEX_OBJECT, result.definition
    2929    end
    3030

  • ruby/branches/0.0/adl_parser/tests/scanner_test.rb

    r167 r168  
    44class YaparcParserTest < Test::Unit::TestCase
    55  def test_RootScanner
    6     parser = OpenEhr::ADL::Scanner::DADL::RootScanner.new
    7     assert_instance_of OpenEhr::ADL::Scanner::DADL::RootScanner,parser
     6    parser = OpenEHR::ADL::Scanner::DADL::RootScanner.new
     7    assert_instance_of OpenEHR::ADL::Scanner::DADL::RootScanner,parser
    88    result = parser.parse('')
    99  end
    1010
    1111  def test_V_LOCAL_TERM_CODE_REF
    12     parser = OpenEhr::ADL::Scanner::Common::V_LOCAL_TERM_CODE_REF.new
    13     assert_instance_of OpenEhr::ADL::Scanner::Common::V_LOCAL_TERM_CODE_REF,parser
     12    parser = OpenEHR::ADL::Scanner::Common::V_LOCAL_TERM_CODE_REF.new
     13    assert_instance_of OpenEHR::ADL::Scanner::Common::V_LOCAL_TERM_CODE_REF,parser
    1414    result = parser.parse('[en-us]')
    1515    assert_instance_of Yaparc::Result::OK, result
    … …  
    1717
    1818  def test_V_QUALIFIED_TERM_CODE_REF
    19     parser = OpenEhr::ADL::Scanner::Common::V_QUALIFIED_TERM_CODE_REF.new
    20     assert_instance_of OpenEhr::ADL::Scanner::Common::V_QUALIFIED_TERM_CODE_REF,parser
     19    parser = OpenEHR::ADL::Scanner::Common::V_QUALIFIED_TERM_CODE_REF.new
     20    assert_instance_of OpenEHR::ADL::Scanner::Common::V_QUALIFIED_TERM_CODE_REF,parser
    2121    result = parser.parse('[ISO_639::en]')
    2222    assert_instance_of Yaparc::Result::OK, result
    … …  
    2626
    2727  def test_V_STRING
    28     parser = OpenEhr::ADL::Scanner::Common::V_STRING.new
    29     assert_instance_of OpenEhr::ADL::Scanner::Common::V_STRING,parser
     28    parser = OpenEHR::ADL::Scanner::Common::V_STRING.new
     29    assert_instance_of OpenEHR::ADL::Scanner::Common::V_STRING,parser
    3030    result = parser.parse('"this is a string"')
    3131    assert_instance_of Yaparc::Result::OK, result
    … …  
    3535
    3636  def test_V_REAL
    37     parser = OpenEhr::ADL::Scanner::Common::V_REAL.new
    38     assert_instance_of OpenEhr::ADL::Scanner::Common::V_REAL,parser
     37    parser = OpenEHR::ADL::Scanner::Common::V_REAL.new
     38    assert_instance_of OpenEHR::ADL::Scanner::Common::V_REAL,parser
    3939    result = parser.parse('0.1')
    4040    assert_instance_of Yaparc::Result::OK, result
    … …  
    4646
    4747  def test_V_ISO8601_DURATION
    48     parser = OpenEhr::ADL::Scanner::Common::V_ISO8601_DURATION.new
    49     assert_instance_of OpenEhr::ADL::Scanner::Common::V_ISO8601_DURATION,parser
     48    parser = OpenEHR::ADL::Scanner::Common::V_ISO8601_DURATION.new
     49    assert_instance_of OpenEHR::ADL::Scanner::Common::V_ISO8601_DURATION,parser
    5050    result = parser.parse('PT1M')
    5151    assert_instance_of Yaparc::Result::OK, result
    … …  
    5656
    5757  def test_V_ISO8601_DATE_TIME_CONSTRAINT_PATTERN
    58     parser = OpenEhr::ADL::Scanner::CADL::V_ISO8601_DATE_TIME_CONSTRAINT_PATTERN.new
    59     assert_instance_of OpenEhr::ADL::Scanner::CADL::V_ISO8601_DATE_TIME_CONSTRAINT_PATTERN,parser
     58    parser = OpenEHR::ADL::Scanner::CADL::V_ISO8601_DATE_TIME_CONSTRAINT_PATTERN.new
     59    assert_instance_of OpenEHR::ADL::Scanner::CADL::V_ISO8601_DATE_TIME_CONSTRAINT_PATTERN,parser
    6060    result = parser.parse('yyyy-??-??T??:??:??')
    6161    assert_instance_of Yaparc::Result::OK, result
    … …  
    6363
    6464  def test_V_ISO8601_DATE_CONSTRAINT_PATTERN
    65     parser = OpenEhr::ADL::Scanner::CADL::V_ISO8601_DATE_CONSTRAINT_PATTERN.new
    66     assert_instance_of OpenEhr::ADL::Scanner::CADL::V_ISO8601_DATE_CONSTRAINT_PATTERN,parser
     65    parser = OpenEHR::ADL::Scanner::CADL::V_ISO8601_DATE_CONSTRAINT_PATTERN.new
     66    assert_instance_of OpenEHR::ADL::Scanner::CADL::V_ISO8601_DATE_CONSTRAINT_PATTERN,parser
    6767    result = parser.parse('yyyy-mm-XX-dd')
    6868    assert_instance_of Yaparc::Result::OK, result
    … …  
    7070
    7171  def test_V_ISO8601_TIME_CONSTRAINT_PATTERN
    72     parser = OpenEhr::ADL::Scanner::CADL::V_ISO8601_TIME_CONSTRAINT_PATTERN.new
    73     assert_instance_of OpenEhr::ADL::Scanner::CADL::V_ISO8601_TIME_CONSTRAINT_PATTERN,parser
     72    parser = OpenEHR::ADL::Scanner::CADL::V_ISO8601_TIME_CONSTRAINT_PATTERN.new
     73    assert_instance_of OpenEHR::ADL::Scanner::CADL::V_ISO8601_TIME_CONSTRAINT_PATTERN,parser
    7474    result = parser.parse('hh:mm:ss:??')
    7575    assert_instance_of Yaparc::Result::OK, result
    … …  
    7777
    7878  def test_dadl_reserved
    79     parser = OpenEhr::ADL::Scanner::DADL::RootScanner.new
     79    parser = OpenEHR::ADL::Scanner::DADL::RootScanner.new
    8080    result = parser.parse('then')
    8181    assert_instance_of Yaparc::Result::OK, result
    … …  
    8686
    8787  def test_cadl
    88     parser = OpenEhr::ADL::Scanner::CADL::RootScanner.new
    89     assert_instance_of OpenEhr::ADL::Scanner::CADL::RootScanner,parser
     88    parser = OpenEHR::ADL::Scanner::CADL::RootScanner.new
     89    assert_instance_of OpenEHR::ADL::Scanner::CADL::RootScanner,parser
    9090    result = parser.parse('PT1M')
    9191    assert_instance_of Yaparc::Result::OK, result
    … …  
    9797
    9898  def test_cadl_reserved
    99     parser = OpenEhr::ADL::Scanner::CADL::RootScanner.new
     99    parser = OpenEHR::ADL::Scanner::CADL::RootScanner.new
    100100    result = parser.parse('then')
    101101    assert_instance_of Yaparc::Result::OK, result

  • ruby/branches/0.0/models/am.rb

    r167 r168  
    1414require 'rm/common/resource.rb'
    1515#require 'rm/support/terminology/openehr_code_set_identifier.rb'
    16 module OpenEhr
     16module OpenEHR
    1717  module AM
    1818    module Archetype
    … …  
    3737
    3838    module OpenEHR_Profile
    39       module DataTypes
     39      module Data_Types
    4040        module Basic
    4141          autoload :C_DV_STATE, "am/openehr_profile/data_types/basic.rb"

  • ruby/branches/0.0/models/am/archetype/archetype.rb

    r167 r168  
    11require 'rm/support/terminology.rb'
    22
    3 module OpenEhr
     3module OpenEHR
    44  module AM
    55    module Archetype
    66      module ADL_Definition
    77#        include OpenEHR::RM::Support::Terminology::OpenEHR_Code_Set_Identifier
    8         include OpenEhr::RM::Support::Terminology
     8        include OpenEHR::RM::Support::Terminology
    99        CURRENT_ADL_VERSION = "1.4"
    1010      end
    1111
    12       class ARCHETYPE < OpenEhr::RM::Common::Resource::AUTHORED_RESOURCE
     12      class ARCHETYPE < OpenEHR::RM::Common::Resource::AUTHORED_RESOURCE
    1313        include ADL_Definition
    1414        attr_accessor :archetype_id, :concept_code, :is_controlled, :original_language, :parent_archtype_id, :uid

  • ruby/branches/0.0/models/am/archetype/archetype_description/archetype_description.rb

    r167 r168  
    11
    2 module OpenEhr
     2module OpenEHR
    33  module AM
    44    module Archetype

  • ruby/branches/0.0/models/am/archetype/constraint_model/archetype_constraint.rb

    r167 r168  
    11
    2 module OpenEhr
     2module OpenEHR
    33  module AM
    44    module Archetype

  • ruby/branches/0.0/models/am/archetype/constraint_model/assertion.rb

    r167 r168  
    1 module OpenEhr
     1module OpenEHR
    22  module AM
    33    module Archetype

  • ruby/branches/0.0/models/am/archetype/constraint_model/primitive.rb

    r167 r168  
    1 module OpenEhr
     1module OpenEHR
    22  module AM
    33    module Archetype

  • ruby/branches/0.0/models/am/archetype/ontology.rb

    r167 r168  
    1 module OpenEhr
     1module OpenEHR
    22  module AM
    33    module Archetype

  • ruby/branches/0.0/models/am/openehr_profile/data_types/basic.rb

    r167 r168  
    1 module OpenEhr
     1module OpenEHR
    22  module AM
    33    module OpenEHR_Profile
    4       module DataTypes
     4      module Data_Types
    55        module Basic
    66          class C_DV_STATE

  • ruby/branches/0.0/models/am/openehr_profile/data_types/quantity.rb

    r167 r168  
    1 module OpenEhr
     1module OpenEHR
    22  module AM
    33    module OpenEHR_Profile
    4       module DataTypes
     4      module Data_Types
    55
    66        module Quantity
    7           class C_DV_QUANTITY < OpenEhr::AM::Archetype::Constraint_Model::C_DOMAIN_TYPE
     7          class C_DV_QUANTITY < OpenEHR::AM::Archetype::Constraint_Model::C_DOMAIN_TYPE
    88          end
    99         
    10           class C_DV_ORDINAL < OpenEhr::AM::Archetype::Constraint_Model::C_DOMAIN_TYPE
     10          class C_DV_ORDINAL < OpenEHR::AM::Archetype::Constraint_Model::C_DOMAIN_TYPE
    1111          end
    1212

  • ruby/branches/0.0/models/am/openehr_profile/data_types/text.rb

    r167 r168  
    1 module OpenEhr
     1module OpenEHR
    22  module AM
    33    module OpenEHR_Profile
    4       module DataTypes
     4      module Data_Types
    55        module Text
    6           class C_CODE_PHASE < OpenEhr::AM::Archetype::Constraint_Model::C_DOMAIN_TYPE
     6          class C_CODE_PHASE < OpenEHR::AM::Archetype::Constraint_Model::C_DOMAIN_TYPE
    77          end
    88        end

  • ruby/branches/0.0/models/assumed_library_types.rb

    r167 r168  
    1 module OpenEhr
    2   module AssumedLibraryTypes
     1module OpenEHR
     2  module Assumed_Library_Types
    33    class Interval
    44      attr_reader :lower, :lower_included, :lower_unbounded

  • ruby/branches/0.0/models/rm.rb

    r167 r168  
    1010
    1111# OpenEHR::RM
    12 module OpenEhr
     12module OpenEHR
    1313  module RM
    1414    autoload :Demographic, "rm/demographic.rb"
    … …  
    3030    end
    3131
    32     module DataTypes
     32    module Data_Types
    3333      autoload :Basic, "rm/data_types/basic.rb"
    3434      autoload :Text, "rm/data_types/text.rb"

  • ruby/branches/0.0/models/rm/common/archetyped.rb

    r167 r168  
    1 module OpenEhr
     1module OpenEHR
    22  module RM
    33    module Common
    44      module Archetyped
    5         module LocaterConstants
     5        module Locater_Constants
    66          CURRENT_TRANSACTION_ID = "current"
    77          FRAGMENT_SEPARATOR = "#"
    … …  
    3232        end
    3333        class Locatable < Pathable
    34           include LocaterConstants
     34          include Locater_Constants
    3535          attr_accessor :uid, :archetype_node_id, :archetype_details
    3636          attr_accessor :feeder_audit, :links, :parent

  • ruby/branches/0.0/models/rm/common/generic.rb

    r167 r168  
    1 module OpenEhr
     1module OpenEHR
    22  module RM
    33    module Common
    44      module Generic
    5         class RevisionHistory
    6         end # of RevisionHistory
     5        class Revision_History
     6        end # of Revision_History
    77      end # of Generic
    88    end # of Common

  • ruby/branches/0.0/models/rm/common/resource.rb

    r167 r168  
    11require 'set'
    2 module OpenEhr
     2module OpenEHR
    33  module RM
    44    module Common

  • ruby/branches/0.0/models/rm/composition/content/entry.rb

    r167 r168  
    1 module OpenEhr
     1module OpenEHR
    22  module RM
    33    module Content
    … …  
    55        class Entry < Content_Item
    66        end
    7         class CareEntry < Entry
     7        class Care_Entry < Entry
    88        end
    9         class Action < CareEntry
     9        class Action < Care_Entry
    1010          attr_accessor :description, :time
    1111          attr_accessor :ism_transition, :instruction_details

  • ruby/branches/0.0/models/rm/data_types/basic.rb

    r167 r168  
    1 module OpenEhr
     1module OpenEHR
    22  module RM
    3     module DataTypes
     3    module Data_Types
    44      module Basic
    5         module CanonicalFragment
     5        module Canonical_Fragment
    66        end
    77
    8         class DataValue
    9           include OpenEhr::RM::Support::Definition::BasicDefinition
     8        class Data_Value
     9          include OpenEHR::RM::Support::Definition::Basic_Definition
    1010        end
    1111
    12         class DvBoolean < DataValue
     12        class DV_Boolean < Data_Value
    1313          def initialize(value)
    1414            check_not_nil(value)
    … …  
    3232            end
    3333          end
    34         end  # end of DvBoolean
     34        end  # end of DV_Boolean
    3535
    36         class DvState < DataValue
     36        class DV_State < Data_Value
    3737          attr_accessor :value
    3838          attr_writer :terminal
    … …  
    4747            @terminal == true
    4848          end
    49         end # end of DvState
     49        end # end of DV_State
    5050
    51         class DvIdentifier
     51        class DV_Identifier
    5252          attr_accessor :issuer, :assigner, :id, :type
    5353          def initialize(assigner, id, issuer, type)
    … …  
    6060            @type = type
    6161          end
    62         end #end of DvIdentifier
     62        end #end of DV_Identifier
    6363      end # end of Basic
    6464    end # end of Data_types

  • ruby/branches/0.0/models/rm/data_types/encapslated.rb

    r167 r168  
    1 module OpenEhr
     1module OpenEHR
    22  module RM
    3     module DataTypes
     3    module Data_Types
    44      module Encapsulated
    5         class DvEncapsulated  < OpenEhr::RM::DataTypes::Basic::DataValue
     5        class DV_Encapsulated  < OpenEHR::RM::Data_Types::Basic::Data_Value
    66          attr_accessor :charset, :language
    77          def size
    … …  
    1313          end
    1414        end
    15         class DvMultimedia < DvEncapsulated
     15        class DV_Multimedia < DV_Encapsulated
    1616         
    1717        end
    18         class DvParsable < DvEncapsulated
     18        class DV_Parsable < DV_Encapsulated
    1919          attr_reader :value, :formalism
    2020          def initialize(value, formalism, charset = nil, language = nil)

  • ruby/branches/0.0/models/rm/data_types/quantity/data_time.rb

    r167 r168  
    1 module OpenEhr
     1module OpenEHR
    22  module RM
    3     module DataTypes
     3    module Data_Types
    44      module Quantity
    55        module Date_

  • ruby/branches/0.0/models/rm/data_types/text.rb

    r167 r168  
    1 module OpenEhr
     1module OpenEHR
    22  module RM
    3     module DataTypes
     3    module Data_Types
    44      module Text
    5         class TermMapping
     5        class Term_Mapping
    66          attr_reader :match, :purpose, :target
    77          def initialize(match, purpose, target)
    … …  
    2323            match == '?'
    2424          end
    25           def TermMapping.is_valid_mach_code?(c)
     25          def Term_Mapping.is_valid_mach_code?(c)
    2626            c == '>' or c == '=' or c == '<' or c == '?'
    2727          end
    … …  
    3131          end
    3232          def purpose_valid(purpose)
    33             if !purpose.nil? and !purpose.instance_of? DvCodedText
     33            if !purpose.nil? and !purpose.instance_of? DV_Coded_Text
    3434              raise ArgumentError, "purpose is not valid"
    3535            end
    … …  
    4141        end
    4242
    43         class CodePhrase
     43        class Code_Phrase
    4444          attr_reader :terminology_id, :code_string
    4545          def initialize(terminology_id, code_string)
    … …  
    5050              raise Exception.new("empty codeString")
    5151            end
    52             if terminology_id.instance_of?(TerminologyId)
     52            if terminology_id.instance_of?(Terminology_ID)
    5353              @terminology_id = terminology_id
    5454            else
    55               @terminologyID = TerminologyId.new(terminology_id)
     55              @terminologyID = Terminology_ID.new(terminology_id)
    5656            end
    5757            @code_string = code_string
    5858          end
    59         end # of CodePhrase
     59        end # of Code_Phrase
    6060
    61         class DvText < OpenEhr::RM::DataTypes::Basic::DataValue
     61        class DV_Text < OpenEHR::RM::Data_Types::Basic::Data_Value
    6262          attr_reader :value, :formatting, :hyperlink, :mappings
    6363          attr_reader :language, :encoding
    … …  
    6565                         mappings = nil, language = nil, encoding = nil)
    6666            value_valid(value)
    67             DvText.formatting_valid(formatting)
    68             DvText.encoding_valid(encoding)
    69             DvText.mapping_valid(mappings)
    70             DvText.language_valid(language)
     67            DV_Text.formatting_valid(formatting)
     68            DV_Text.encoding_valid(encoding)
     69            DV_Text.mapping_valid(mappings)
     70            DV_Text.language_valid(language)
    7171            @value, @formatting, @encoding = value, formatting, encoding
    7272            @mappings, @language = mappings, language
    … …  
    7777          end
    7878          def formatting=(formatting)
    79             DvText.formatting_valid(formatting)
     79            DV_Text.formatting_valid(formatting)
    8080            @formatting = formatting
    8181          end
    8282          def encoding=(encoding)
    83             DvText.encoding_valid(encoding)
     83            DV_Text.encoding_valid(encoding)
    8484            @encoding = encoding
    8585          end
    8686          def mappings=(mappings)
    87             DvText.mapping_valid(mappings)
     87            DV_Text.mapping_valid(mappings)
    8888            @mappings = mappings
    8989          end
    9090          def language=(language)
    91             DvText.language_valid(language)
     91            DV_Text.language_valid(language)
    9292            @language = language
    9393          end
    … …  
    9696            if value.nil? or value.empty? or value.include? CR or value.include? LF
    9797              raise ArgumentError, "value is not valid"
    98               # CR and LF are defined in Basic_Definition inherited DataValue.
     98              # CR and LF are defined in Basic_Definition inherited Data_Value.
    9999            end
    100100          end
    … …  
    125125        end
    126126
    127         class DvCodedText < DvText
     127        class DV_Coded_Text < DV_Text
    128128          attr_reader :defining_code
    129129          def initialize(value, defining_code, formatting = nil,
    … …  
    144144        end
    145145
    146         class DvParagraph < OpenEhr::RM::DataTypes::Basic::DataValue
     146        class DV_Paragraph < OpenEHR::RM::Data_Types::Basic::Data_Value
    147147          attr_reader :items
    148148          def initialize(items)

  • ruby/branches/0.0/models/rm/data_types/time_specification.rb

    r167 r168  
    1 module OpenEhr
     1module OpenEHR
    22  module RM
    3     module DataTypes
    4       module TimeSpecification
    5         class DvTimeSpecification < OpenEhr::RM::DataTypes::Basic::DataValue
     3    module Data_Types
     4      module Time_Specification
     5        class DV_Time_Specification < OpenEHR::RM::Data_Types::Basic::Data_Value
    66          def initialize(value)
    77            @value = value
    … …  
    1818        end
    1919       
    20         class DvGeneralTimeSpecification < DvTimeSpecification
     20        class DV_General_Time_Specification < DV_Time_Specification
    2121          attr_reader :value
    2222          def initialize(value)
    … …  
    3434        end
    3535
    36         class DvPeriodicTimeSpecification < DvTimeSpecification
     36        class DV_Periodic_Time_Specification < DV_Time_Specification
    3737          attr_reader :value
    3838          def initialize(value)

  • ruby/branches/0.0/models/rm/data_types/uri.rb

    r167 r168  
    11require 'uri'
    22#require 'uri/generic'
    3 module Uri
    4   class Ehr < ::URI::Generic
     3module URI
     4  class EHR < ::URI::Generic
    55    COMPONENT = [
    66      :scheme, :path, :fragment, :query
    … …  
    1717    end
    1818  end
    19   @@schemes['EHR'] = Ehr
     19  @@schemes['EHR'] = EHR
    2020end
    21 module OpenEhr
     21module OpenEHR
    2222  module RM
    23     module DataTypes
    24       module Uri
    25         class DvUri < OpenEhr::RM::DataTypes::Basic::DataValue
     23    module Data_Types
     24      module URI
     25        class DV_URI < OpenEHR::RM::Data_Types::Basic::Data_Value
    2626          def initialize(value)
    2727            raise ArgumentError, "value is empty" if value.nil?
    … …  
    5151          end
    5252        end
    53         class DvEhrUri < DvUri
     53        class DV_EHR_URI < DV_URI
    5454          def initialize(value)
    5555            check_value(value)

  • ruby/branches/0.0/models/rm/demographic.rb

    r167 r168  
    1 module OpenEhr
     1module OpenEHR
    22  module RM
    33    module Demogrphic
    4       class Party < OpenEhr::RM::Common::Archetyped::Locatable
     4      class Party < OpenEHR::RM::Common::Archetyped::Locatable
    55        attr_reader :details, :reverse_relationships, :uid
    66        attr_reader :idetities, :contacts, :relationships

  • ruby/branches/0.0/models/rm/support/assumed_types.rb

    r167 r168  
    1 module OpenEhr
     1module OpenEHR
    22  module RM
    33    module Support
    4       module AssumedTypes
     4      module Assumed_Types
    55        class Interval
    66          attr_accessor :lower, :upper

  • ruby/branches/0.0/models/rm/support/definition.rb

    r167 r168  
    1 module OpenEhr
     1module OpenEHR
    22  module RM
    33    module Support
    44      module Definition
    5         module BasicDefinition
     5        module Basic_Definition
    66          CR = "\015"
    77          LF = "\012"
    88        end
    9         class OpenEHRDefinitions
    10           include BasicDefinition
     9        class OpenEHR_Definitions
     10          include Basic_Definition         
    1111        end
    1212      end

  • ruby/branches/0.0/models/rm/support/identification.rb

    r167 r168  
    1 module OpenEhr
     1module OpenEHR
    22  module RM
    33    module Support

  • ruby/branches/0.0/models/rm/support/terminology.rb

    r167 r168  
    11
    2 module OpenEhr
     2module OpenEHR
    33  module RM
    44    module Support
    55      module Terminology
    6         class CodeSetAccess
     6        class Code_Set_Access
    77          def all_codes
    88            raise NotImplementedError, "all_codes must be implemented"
    … …  
    1818          end
    1919        end
    20         module OpenEhrCodeSetIdentifier
     20        module OpenEHR_Code_Set_Identifier
    2121          CODE_SET_ID_CHARACER_SETS = "character sets".freeze
    2222          CODE_SET_ID_COMPRESSION_ALGORITHMS = "compression algorithms".freeze
    … …  
    2929          end
    3030        end
    31         module OpenEhrTerminologyGroupIdentifiers
     31        module OpenEHR_Terminology_Group_Identifiers
    3232          GROUP_ID_ATTESTATION_REASON = "attestation reason".freeze
    3333          GROUP_ID_AUDIT_CHANGE_TYPE = "audit change type".freeze
    … …  
    4646          TERMINOLOGY_ID = "openehr".freeze
    4747        end
    48         class TerminologyAccess
     48        class Terminology_Access
    4949          def all_codes
    5050            raise NotImplementedError, "all_codes is not implemented"
    … …  
    7474          end
    7575        end
    76         class TerminologyService
    77           include OpenEhrCodeSetIdentifier, OpenEhrTerminologyGroupIdentifiers
     76        class Terminology_Service
     77          include OpenEHR_Code_Set_Identifier, OpenEHR_Terminology_Group_Identifiers
    7878          def code_set(name)
    7979            raise NotImplementedError, "code_set is not implemented"

  • ruby/branches/0.0/models/tests/test_archetype_model.rb

    r167 r168  
    55class ArchetypeModelTest < Test::Unit::TestCase
    66  def setup
    7     @archetype = OpenEhr::AM::Archetype::ARCHETYPE.new
    8     @validity_kind = OpenEhr::AM::Archetype::VALIDITY_KIND.new
     7    @archetype = OpenEHR::AM::Archetype::ARCHETYPE.new
     8    @validity_kind = OpenEHR::AM::Archetype::VALIDITY_KIND.new
    99
    10     @archetype_description = OpenEhr::AM::Archetype::Archetype_Description::ARCHETYPE_DESCRIPTION.new
    11     @archetype_description_item = OpenEhr::AM::Archetype::Archetype_Description::ARCHETYPE_DESCRIPTION_ITEM.new
     10    @archetype_description = OpenEHR::AM::Archetype::Archetype_Description::ARCHETYPE_DESCRIPTION.new
     11    @archetype_description_item = OpenEHR::AM::Archetype::Archetype_Description::ARCHETYPE_DESCRIPTION_ITEM.new
    1212  end
    1313 
    1414  def test_init
    15     assert_instance_of OpenEhr::AM::Archetype::ARCHETYPE, @archetype
    16     assert_instance_of OpenEhr::AM::Archetype::VALIDITY_KIND, @validity_kind
    17     assert_instance_of OpenEhr::AM::Archetype::Archetype_Description::ARCHETYPE_DESCRIPTION, @archetype_description
    18     assert_instance_of OpenEhr::AM::Archetype::Archetype_Description::ARCHETYPE_DESCRIPTION_ITEM, @archetype_description_item
    19     assert_instance_of OpenEhr::AM::Archetype::ARCHETYPE, @archetype
     15    assert_instance_of OpenEHR::AM::Archetype::ARCHETYPE, @archetype
     16    assert_instance_of OpenEHR::AM::Archetype::VALIDITY_KIND, @validity_kind
     17    assert_instance_of OpenEHR::AM::Archetype::Archetype_Description::ARCHETYPE_DESCRIPTION, @archetype_description
     18    assert_instance_of OpenEHR::AM::Archetype::Archetype_Description::ARCHETYPE_DESCRIPTION_ITEM, @archetype_description_item
     19    assert_instance_of OpenEHR::AM::Archetype::ARCHETYPE, @archetype
    2020  end
    2121
    2222  def test_create
    23     archetype_instance = OpenEhr::AM::Archetype::ARCHETYPE.create() do |archetype|
     23    archetype_instance = OpenEHR::AM::Archetype::ARCHETYPE.create() do |archetype|
    2424      archetype.adl_version = '1.4'
    2525    end
    2626
    27     assert_instance_of OpenEhr::AM::Archetype::ARCHETYPE, archetype_instance
     27    assert_instance_of OpenEHR::AM::Archetype::ARCHETYPE, archetype_instance
    2828  end
    2929end
    … …  
    3131class ArchetypeModelConstraintTest < Test::Unit::TestCase
    3232  def setup
    33     @archetype_constraint = OpenEhr::AM::Archetype::Constraint_Model::ARCHETYPE_CONSTRAINT.new
    34     @cardinality = OpenEhr::AM::Archetype::Constraint_Model::CARDINALITY.new
     33    @archetype_constraint = OpenEHR::AM::Archetype::Constraint_Model::ARCHETYPE_CONSTRAINT.new
     34    @cardinality = OpenEHR::AM::Archetype::Constraint_Model::CARDINALITY.new   
    3535   
    36     @archetype_constraint = OpenEhr::AM::Archetype::Constraint_Model::ARCHETYPE_CONSTRAINT.new
    37     @c_object = OpenEhr::AM::Archetype::Constraint_Model::C_OBJECT.new
    38     @c_defined_object = OpenEhr::AM::Archetype::Constraint_Model::C_DEFINED_OBJECT.new
    39     @c_attribute = OpenEhr::AM::Archetype::Constraint_Model::C_ATTRIBUTE.new
    40     @c_single_attribute = OpenEhr::AM::Archetype::Constraint_Model::C_SINGLE_ATTRIBUTE.new
    41     @c_multiple_attribute = OpenEhr::AM::Archetype::Constraint_Model::C_MULTIPLE_ATTRIBUTE.new(:rm_attribute_name => 'attribute_name', :cardinality => @cardinality)
    42     @c_primitive_object = OpenEhr::AM::Archetype::Constraint_Model::C_PRIMITIVE_OBJECT.new
    43     @c_reference_object =  OpenEhr::AM::Archetype::Constraint_Model::C_REFERENCE_OBJECT.new
    44     @archetype_internal_ref =  OpenEhr::AM::Archetype::Constraint_Model::ARCHETYPE_INTERNAL_REF.new
    45     @archetype_slot = OpenEhr::AM::Archetype::Constraint_Model::ARCHETYPE_SLOT.new
    46     @constraint_ref = OpenEhr::AM::Archetype::Constraint_Model::CONSTRAINT_REF.new
    47     @c_domain_type = OpenEhr::AM::Archetype::Constraint_Model::C_DOMAIN_TYPE.new
    48     @c_complex_object = OpenEhr::AM::Archetype::Constraint_Model::C_COMPLEX_OBJECT.new(:attributes => [@c_single_attribute])
     36    @archetype_constraint = OpenEHR::AM::Archetype::Constraint_Model::ARCHETYPE_CONSTRAINT.new
     37    @c_object = OpenEHR::AM::Archetype::Constraint_Model::C_OBJECT.new
     38    @c_defined_object = OpenEHR::AM::Archetype::Constraint_Model::C_DEFINED_OBJECT.new
     39    @c_attribute = OpenEHR::AM::Archetype::Constraint_Model::C_ATTRIBUTE.new
     40    @c_single_attribute = OpenEHR::AM::Archetype::Constraint_Model::C_SINGLE_ATTRIBUTE.new
     41    @c_multiple_attribute = OpenEHR::AM::Archetype::Constraint_Model::C_MULTIPLE_ATTRIBUTE.new(:rm_attribute_name => 'attribute_name', :cardinality => @cardinality)
     42    @c_primitive_object = OpenEHR::AM::Archetype::Constraint_Model::C_PRIMITIVE_OBJECT.new
     43    @c_reference_object =  OpenEHR::AM::Archetype::Constraint_Model::C_REFERENCE_OBJECT.new
     44    @archetype_internal_ref =  OpenEHR::AM::Archetype::Constraint_Model::ARCHETYPE_INTERNAL_REF.new
     45    @archetype_slot = OpenEHR::AM::Archetype::Constraint_Model::ARCHETYPE_SLOT.new
     46    @constraint_ref = OpenEHR::AM::Archetype::Constraint_Model::CONSTRAINT_REF.new
     47    @c_domain_type = OpenEHR::AM::Archetype::Constraint_Model::C_DOMAIN_TYPE.new
     48    @c_complex_object = OpenEHR::AM::Archetype::Constraint_Model::C_COMPLEX_OBJECT.new(:attributes => [@c_single_attribute])
    4949  end
    5050
    5151  def test_init
    52     assert_instance_of OpenEhr::AM::Archetype::Constraint_Model::ARCHETYPE_CONSTRAINT, @archetype_constraint
    53     assert_instance_of OpenEhr::AM::Archetype::Constraint_Model::C_OBJECT, @c_object
    54     assert_instance_of OpenEhr::AM::Archetype::Constraint_Model::C_DEFINED_OBJECT, @c_defined_object
    55     assert_instance_of OpenEhr::AM::Archetype::Constraint_Model::C_ATTRIBUTE, @c_attribute
    56     assert_instance_of OpenEhr::AM::Archetype::Constraint_Model::C_SINGLE_ATTRIBUTE, @c_single_attribute
    57     assert_instance_of OpenEhr::AM::Archetype::Constraint_Model::C_MULTIPLE_ATTRIBUTE, @c_multiple_attribute
     52    assert_instance_of OpenEHR::AM::Archetype::Constraint_Model::ARCHETYPE_CONSTRAINT, @archetype_constraint
     53    assert_instance_of OpenEHR::AM::Archetype::Constraint_Model::C_OBJECT, @c_object
     54    assert_instance_of OpenEHR::AM::Archetype::Constraint_Model::C_DEFINED_OBJECT, @c_defined_object
     55    assert_instance_of OpenEHR::AM::Archetype::Constraint_Model::C_ATTRIBUTE, @c_attribute
     56    assert_instance_of OpenEHR::AM::Archetype::Constraint_Model::C_SINGLE_ATTRIBUTE, @c_single_attribute
     57    assert_instance_of OpenEHR::AM::Archetype::Constraint_Model::C_MULTIPLE_ATTRIBUTE, @c_multiple_attribute
    5858    assert_equal 'attribute_name', @c_multiple_attribute.rm_attribute_name
    59     assert_instance_of OpenEhr::AM::Archetype::Constraint_Model::CARDINALITY, @c_multiple_attribute.cardinality
    60     assert_instance_of OpenEhr::AM::Archetype::Constraint_Model::C_PRIMITIVE_OBJECT, @c_primitive_object
    61     assert_instance_of OpenEhr::AM::Archetype::Constraint_Model::C_REFERENCE_OBJECT, @c_reference_object
    62     assert_instance_of OpenEhr::AM::Archetype::Constraint_Model::ARCHETYPE_INTERNAL_REF, @archetype_internal_ref
    63     assert_instance_of OpenEhr::AM::Archetype::Constraint_Model::ARCHETYPE_SLOT, @archetype_slot
    64     assert_instance_of OpenEhr::AM::Archetype::Constraint_Model::CONSTRAINT_REF, @constraint_ref
    65     assert_instance_of OpenEhr::AM::Archetype::Constraint_Model::C_DOMAIN_TYPE, @c_domain_type
    66     assert_instance_of OpenEhr::AM::Archetype::Constraint_Model::C_COMPLEX_OBJECT, @c_complex_object
     59    assert_instance_of OpenEHR::AM::Archetype::Constraint_Model::CARDINALITY, @c_multiple_attribute.cardinality
     60    assert_instance_of OpenEHR::AM::Archetype::Constraint_Model::C_PRIMITIVE_OBJECT, @c_primitive_object
     61    assert_instance_of OpenEHR::AM::Archetype::Constraint_Model::C_REFERENCE_OBJECT, @c_reference_object
     62    assert_instance_of OpenEHR::AM::Archetype::Constraint_Model::ARCHETYPE_INTERNAL_REF, @archetype_internal_ref
     63    assert_instance_of OpenEHR::AM::Archetype::Constraint_Model::ARCHETYPE_SLOT, @archetype_slot
     64    assert_instance_of OpenEHR::AM::Archetype::Constraint_Model::CONSTRAINT_REF, @constraint_ref
     65    assert_instance_of OpenEHR::AM::Archetype::Constraint_Model::C_DOMAIN_TYPE, @c_domain_type
     66    assert_instance_of OpenEHR::AM::Archetype::Constraint_Model::C_COMPLEX_OBJECT, @c_complex_object
    6767    assert_instance_of Array, @c_complex_object.attributes
    68     assert_instance_of OpenEhr::AM::Archetype::Constraint_Model::ARCHETYPE_CONSTRAINT, @archetype_constraint
    69     assert_instance_of OpenEhr::AM::Archetype::Constraint_Model::CARDINALITY, @cardinality
     68    assert_instance_of OpenEHR::AM::Archetype::Constraint_Model::ARCHETYPE_CONSTRAINT, @archetype_constraint
     69    assert_instance_of OpenEHR::AM::Archetype::Constraint_Model::CARDINALITY, @cardinality
    7070  end
    7171
    7272  def test_create
    73     c_complex_object = OpenEhr::AM::Archetype::Constraint_Model::C_COMPLEX_OBJECT.create(:node_id => 'test_node',
     73    c_complex_object = OpenEHR::AM::Archetype::Constraint_Model::C_COMPLEX_OBJECT.create(:node_id => 'test_node',
    7474                                                                                         :attributes => [1,2],
    7575                                                                                         :assumed_value => Array
    7676                                                                                         )
    77     assert_instance_of OpenEhr::AM::Archetype::Constraint_Model::C_COMPLEX_OBJECT, c_complex_object
     77    assert_instance_of OpenEHR::AM::Archetype::Constraint_Model::C_COMPLEX_OBJECT, c_complex_object
    7878    assert_equal 'test_node', c_complex_object.node_id
    7979  end
    … …  
    8282class ArchetypeModelPrimitiveTest < Test::Unit::TestCase
    8383  def setup
    84     @c_primitive = OpenEhr::AM::Archetype::Constraint_Model::Primitive::C_PRIMITIVE.new
    85     @c_boolean = OpenEhr::AM::Archetype::Constraint_Model::Primitive::C_BOOLEAN.new(:true_valid => true,
     84    @c_primitive = OpenEHR::AM::Archetype::Constraint_Model::Primitive::C_PRIMITIVE.new
     85    @c_boolean = OpenEHR::AM::Archetype::Constraint_Model::Primitive::C_BOOLEAN.new(:true_valid => true,
    8686                                                                                    :false_valid => true,
    8787                                                                                    :assumed_value => true)
    88     @c_string = OpenEhr::AM::Archetype::Constraint_Model::Primitive::C_STRING.new
    89     @c_integer = OpenEhr::AM::Archetype::Constraint_Model::Primitive::C_INTEGER.new
    90     @c_real = OpenEhr::AM::Archetype::Constraint_Model::Primitive::C_REAL.new
    91     @c_time = OpenEhr::AM::Archetype::Constraint_Model::Primitive::C_TIME.new
    92     @c_date = OpenEhr::AM::Archetype::Constraint_Model::Primitive::C_DATE.new
    93     @c_date_time = OpenEhr::AM::Archetype::Constraint_Model::Primitive::C_DATE_TIME.new
    94     @c_duration = OpenEhr::AM::Archetype::Constraint_Model::Primitive::C_DURATION.new
     88    @c_string = OpenEHR::AM::Archetype::Constraint_Model::Primitive::C_STRING.new
     89    @c_integer = OpenEHR::AM::Archetype::Constraint_Model::Primitive::C_INTEGER.new
     90    @c_real = OpenEHR::AM::Archetype::Constraint_Model::Primitive::C_REAL.new
     91    @c_time = OpenEHR::AM::Archetype::Constraint_Model::Primitive::C_TIME.new
     92    @c_date = OpenEHR::AM::Archetype::Constraint_Model::Primitive::C_DATE.new
     93    @c_date_time = OpenEHR::AM::Archetype::Constraint_Model::Primitive::C_DATE_TIME.new
     94    @c_duration = OpenEHR::AM::Archetype::Constraint_Model::Primitive::C_DURATION.new
    9595  end
    9696
    9797  def test_init
    98     assert_instance_of OpenEhr::AM::Archetype::Constraint_Model::Primitive::C_PRIMITIVE, @c_primitive
    99     assert_instance_of OpenEhr::AM::Archetype::Constraint_Model::Primitive::C_BOOLEAN, @c_boolean
    100     assert_instance_of OpenEhr::AM::Archetype::Constraint_Model::Primitive::C_STRING, @c_string
    101     assert_instance_of OpenEhr::AM::Archetype::Constraint_Model::Primitive::C_INTEGER, @c_integer
    102     assert_instance_of OpenEhr::AM::Archetype::Constraint_Model::Primitive::C_REAL, @c_real
    103     assert_instance_of OpenEhr::AM::Archetype::Constraint_Model::Primitive::C_TIME, @c_time
    104     assert_instance_of OpenEhr::AM::Archetype::Constraint_Model::Primitive::C_DATE, @c_date
    105     assert_instance_of OpenEhr::AM::Archetype::Constraint_Model::Primitive::C_DATE_TIME, @c_date_time
    106     assert_instance_of OpenEhr::AM::Archetype::Constraint_Model::Primitive::C_DURATION, @c_duration
     98    assert_instance_of OpenEHR::AM::Archetype::Constraint_Model::Primitive::C_PRIMITIVE, @c_primitive
     99    assert_instance_of OpenEHR::AM::Archetype::Constraint_Model::Primitive::C_BOOLEAN, @c_boolean
     100    assert_instance_of OpenEHR::AM::Archetype::Constraint_Model::Primitive::C_STRING, @c_string
     101    assert_instance_of OpenEHR::AM::Archetype::Constraint_Model::Primitive::C_INTEGER, @c_integer
     102    assert_instance_of OpenEHR::AM::Archetype::Constraint_Model::Primitive::C_REAL, @c_real
     103    assert_instance_of OpenEHR::AM::Archetype::Constraint_Model::Primitive::C_TIME, @c_time
     104    assert_instance_of OpenEHR::AM::Archetype::Constraint_Model::Primitive::C_DATE, @c_date
     105    assert_instance_of OpenEHR::AM::Archetype::Constraint_Model::Primitive::C_DATE_TIME, @c_date_time
     106    assert_instance_of OpenEHR::AM::Archetype::Constraint_Model::Primitive::C_DURATION, @c_duration
    107107  end
    108108
    … …  
    119119    end
    120120    assert_raise(ArgumentError) do
    121       OpenEhr::AM::Archetype::Constraint_Model::Primitive::C_BOOLEAN.new(:true_valid =>false,
     121      OpenEHR::AM::Archetype::Constraint_Model::Primitive::C_BOOLEAN.new(:true_valid =>false,
    122122                                                                         :false_valid => false,
    123123                                                                         :assumed_value => false)
    … …  
    129129class ArchetypeModelOntologyTest < Test::Unit::TestCase
    130130  def setup
    131     @archetype_ontology = OpenEhr::AM::Archetype::Ontology::ARCHETYPE_ONTOLOGY.new
    132     @archetype_term = OpenEhr::AM::Archetype::Ontology::ARCHETYPE_TERM.new(:code => '', :items => '')
     131    @archetype_ontology = OpenEHR::AM::Archetype::Ontology::ARCHETYPE_ONTOLOGY.new
     132    @archetype_term = OpenEHR::AM::Archetype::Ontology::ARCHETYPE_TERM.new(:code => '', :items => '')
    133133  end
    134134
    135135  def test_init
    136     assert_instance_of OpenEhr::AM::Archetype::Ontology::ARCHETYPE_ONTOLOGY, @archetype_ontology
    137     assert_instance_of OpenEhr::AM::Archetype::Ontology::ARCHETYPE_TERM, @archetype_term
     136    assert_instance_of OpenEHR::AM::Archetype::Ontology::ARCHETYPE_ONTOLOGY, @archetype_ontology
     137    assert_instance_of OpenEHR::AM::Archetype::Ontology::ARCHETYPE_TERM, @archetype_term
    138138  end
    139139end
    … …  
    141141class ArchetypeModelAssertionTest < Test::Unit::TestCase
    142142  def setup
    143     @assertion = OpenEhr::AM::Archetype::Assertion::ASSERTION.new
    144     @assertion_variable = OpenEhr::AM::Archetype::Assertion::ASSERTION_VARIABLE.new
    145     @operator_kind = OpenEhr::AM::Archetype::Assertion::OPERATOR_KIND.new
    146     @expr_item = OpenEhr::AM::Archetype::Assertion::EXPR_ITEM.new
    147     @expr_leaf = OpenEhr::AM::Archetype::Assertion::EXPR_LEAF.new
    148     @expr_operator = OpenEhr::AM::Archetype::Assertion::EXPR_OPERATOR.new
    149     @expr_unary_operator = OpenEhr::AM::Archetype::Assertion::EXPR_UNARY_OPERATOR.new
    150     @expr_binary_operator = OpenEhr::AM::Archetype::Assertion::EXPR_BINARY_OPERATOR.new
     143    @assertion = OpenEHR::AM::Archetype::Assertion::ASSERTION.new
     144    @assertion_variable = OpenEHR::AM::Archetype::Assertion::ASSERTION_VARIABLE.new
     145    @operator_kind = OpenEHR::AM::Archetype::Assertion::OPERATOR_KIND.new
     146    @expr_item = OpenEHR::AM::Archetype::Assertion::EXPR_ITEM.new
     147    @expr_leaf = OpenEHR::AM::Archetype::Assertion::EXPR_LEAF.new
     148    @expr_operator = OpenEHR::AM::Archetype::Assertion::EXPR_OPERATOR.new
     149    @expr_unary_operator = OpenEHR::AM::Archetype::Assertion::EXPR_UNARY_OPERATOR.new
     150    @expr_binary_operator = OpenEHR::AM::Archetype::Assertion::EXPR_BINARY_OPERATOR.new
    151151  end
    152152
    153153  def test_init
    154     assert_instance_of OpenEhr::AM::Archetype::Assertion::ASSERTION, @assertion
    155     assert_instance_of OpenEhr::AM::Archetype::Assertion::ASSERTION_VARIABLE, @assertion_variable
    156     assert_instance_of OpenEhr::AM::Archetype::Assertion::OPERATOR_KIND, @operator_kind
    157     assert_instance_of OpenEhr::AM::Archetype::Assertion::EXPR_ITEM, @expr_item
    158     assert_instance_of OpenEhr::AM::Archetype::Assertion::EXPR_LEAF, @expr_leaf
    159     assert_instance_of OpenEhr::AM::Archetype::Assertion::EXPR_OPERATOR, @expr_operator
    160     assert_instance_of OpenEhr::AM::Archetype::Assertion::EXPR_UNARY_OPERATOR, @expr_unary_operator
    161     assert_instance_of OpenEhr::AM::Archetype::Assertion::EXPR_BINARY_OPERATOR, @expr_binary_operator
     154    assert_instance_of OpenEHR::AM::Archetype::Assertion::ASSERTION, @assertion
     155    assert_instance_of OpenEHR::AM::Archetype::Assertion::ASSERTION_VARIABLE, @assertion_variable
     156    assert_instance_of OpenEHR::AM::Archetype::Assertion::OPERATOR_KIND, @operator_kind
     157    assert_instance_of OpenEHR::AM::Archetype::Assertion::EXPR_ITEM, @expr_item
     158    assert_instance_of OpenEHR::AM::Archetype::Assertion::EXPR_LEAF, @expr_leaf
     159    assert_instance_of OpenEHR::AM::Archetype::Assertion::EXPR_OPERATOR, @expr_operator
     160    assert_instance_of OpenEHR::AM::Archetype::Assertion::EXPR_UNARY_OPERATOR, @expr_unary_operator
     161    assert_instance_of OpenEHR::AM::Archetype::Assertion::EXPR_BINARY_OPERATOR, @expr_binary_operator
    162162  end
    163163end
    … …  
    165165class ArchetypeModelProfileTest < Test::Unit::TestCase
    166166  def setup
    167     @c_dv_state = OpenEhr::AM::OpenEHR_Profile::DataTypes::Basic::C_DV_STATE.new
    168     @state_machine = OpenEhr::AM::OpenEHR_Profile::DataTypes::Basic::STATE_MACHINE.new
    169     @state = OpenEhr::AM::OpenEHR_Profile::DataTypes::Basic::STATE.new
    170     @terminal_state = OpenEhr::AM::OpenEHR_Profile::DataTypes::Basic::TERMINAL_STATE.new
    171     @non_terminal_state = OpenEhr::AM::OpenEHR_Profile::DataTypes::Basic::NON_TERMINAL_STATE.new
    172     @transition = OpenEhr::AM::OpenEHR_Profile::DataTypes::Basic::TRANSITION.new
     167    @c_dv_state = OpenEHR::AM::OpenEHR_Profile::Data_Types::Basic::C_DV_STATE.new
     168    @state_machine = OpenEHR::AM::OpenEHR_Profile::Data_Types::Basic::STATE_MACHINE.new
     169    @state = OpenEHR::AM::OpenEHR_Profile::Data_Types::Basic::STATE.new
     170    @terminal_state = OpenEHR::AM::OpenEHR_Profile::Data_Types::Basic::TERMINAL_STATE.new
     171    @non_terminal_state = OpenEHR::AM::OpenEHR_Profile::Data_Types::Basic::NON_TERMINAL_STATE.new
     172    @transition = OpenEHR::AM::OpenEHR_Profile::Data_Types::Basic::TRANSITION.new
    173173
    174     @c_code_phase = OpenEhr::AM::OpenEHR_Profile::DataTypes::Text::C_CODE_PHASE.new
     174    @c_code_phase = OpenEHR::AM::OpenEHR_Profile::Data_Types::Text::C_CODE_PHASE.new
    175175
    176     @c_dv_quantity = OpenEhr::AM::OpenEHR_Profile::DataTypes::Quantity::C_DV_QUANTITY.new
    177     @c_dv_ordinal = OpenEhr::AM::OpenEHR_Profile::DataTypes::Quantity::C_DV_ORDINAL.new
    178     @c_quantity_item = OpenEhr::AM::OpenEHR_Profile::DataTypes::Quantity::C_QUANTITY_ITEM.new
     176    @c_dv_quantity = OpenEHR::AM::OpenEHR_Profile::Data_Types::Quantity::C_DV_QUANTITY.new
     177    @c_dv_ordinal = OpenEHR::AM::OpenEHR_Profile::Data_Types::Quantity::C_DV_ORDINAL.new
     178    @c_quantity_item = OpenEHR::AM::OpenEHR_Profile::Data_Types::Quantity::C_QUANTITY_ITEM.new
    179179  end
    180180
    181181  def test_init
    182     assert_instance_of OpenEhr::AM::OpenEHR_Profile::DataTypes::Basic::C_DV_STATE, @c_dv_state
    183     assert_instance_of OpenEhr::AM::OpenEHR_Profile::DataTypes::Basic::STATE_MACHINE, @state_machine
    184     assert_instance_of OpenEhr::AM::OpenEHR_Profile::DataTypes::Basic::STATE, @state
    185     assert_instance_of OpenEhr::AM::OpenEHR_Profile::DataTypes::Basic::TERMINAL_STATE, @terminal_state
    186     assert_instance_of OpenEhr::AM::OpenEHR_Profile::DataTypes::Basic::NON_TERMINAL_STATE, @non_terminal_state
    187     assert_instance_of OpenEhr::AM::OpenEHR_Profile::DataTypes::Basic::TRANSITION, @transition
    188     assert_instance_of OpenEhr::AM::OpenEHR_Profile::DataTypes::Text::C_CODE_PHASE, @c_code_phase
    189     assert_instance_of OpenEhr::AM::OpenEHR_Profile::DataTypes::Quantity::C_DV_QUANTITY, @c_dv_quantity
    190     assert_instance_of OpenEhr::AM::OpenEHR_Profile::DataTypes::Quantity::C_DV_ORDINAL, @c_dv_ordinal
    191     assert_instance_of OpenEhr::AM::OpenEHR_Profile::DataTypes::Quantity::C_QUANTITY_ITEM, @c_quantity_item
     182    assert_instance_of OpenEHR::AM::OpenEHR_Profile::Data_Types::Basic::C_DV_STATE, @c_dv_state
     183    assert_instance_of OpenEHR::AM::OpenEHR_Profile::Data_Types::Basic::STATE_MACHINE, @state_machine
     184    assert_instance_of OpenEHR::AM::OpenEHR_Profile::Data_Types::Basic::STATE, @state
     185    assert_instance_of OpenEHR::AM::OpenEHR_Profile::Data_Types::Basic::TERMINAL_STATE, @terminal_state
     186    assert_instance_of OpenEHR::AM::OpenEHR_Profile::Data_Types::Basic::NON_TERMINAL_STATE, @non_terminal_state
     187    assert_instance_of OpenEHR::AM::OpenEHR_Profile::Data_Types::Basic::TRANSITION, @transition
     188    assert_instance_of OpenEHR::AM::OpenEHR_Profile::Data_Types::Text::C_CODE_PHASE, @c_code_phase
     189    assert_instance_of OpenEHR::AM::OpenEHR_Profile::Data_Types::Quantity::C_DV_QUANTITY, @c_dv_quantity
     190    assert_instance_of OpenEHR::AM::OpenEHR_Profile::Data_Types::Quantity::C_DV_ORDINAL, @c_dv_ordinal
     191    assert_instance_of OpenEHR::AM::OpenEHR_Profile::Data_Types::Quantity::C_QUANTITY_ITEM, @c_quantity_item
    192192  end
    193193end

  • ruby/branches/0.0/models/tests/test_assumed_library_types.rb

    r167 r168  
    44class Assumed_Library_Test < Test::Unit::TestCase
    55  def setup
    6     @interval = OpenEhr::AssumedLibraryTypes::Interval.new(1,2)
     6    @interval = OpenEHR::Assumed_Library_Types::Interval.new(1,2)
    77  end
    88  def test_initialize
    9     assert_instance_of OpenEhr::AssumedLibraryTypes::Interval, @interval
     9    assert_instance_of OpenEHR::Assumed_Library_Types::Interval, @interval
    1010  end
    1111  def test_limits_comparable

  • ruby/branches/0.0/models/tests/test_reference_model.rb

    r167 r168  
    55class ReferenceModelTest < Test::Unit::TestCase
    66  def setup
    7     @authored_resource = OpenEhr::RM::Common::Resource::AUTHORED_RESOURCE.new(:original_language => "ja",
     7    @authored_resource = OpenEHR::RM::Common::Resource::AUTHORED_RESOURCE.new(:original_language => "ja",
    88                                                                              :translations => "en",
    99                                                                              :description => "test")
    10     @translation_details = OpenEhr::RM::Common::Resource::TRANSLATION_DETAILS.new(nil,nil,nil,nil,nil)
     10    @translation_details = OpenEHR::RM::Common::Resource::TRANSLATION_DETAILS.new(nil,nil,nil,nil,nil)
    1111#    @openehr_definitions = OpenEHR::RM::Support::Definition::OpenEHR_Definitions.new
    12     @dv_boolean = OpenEhr::RM::DataTypes::Basic::DvBoolean.new("TRUE")
    13     @dv_state = OpenEhr::RM::DataTypes::Basic::DvState.new("code1",true)
    14     @dv_identifier = OpenEhr::RM::DataTypes::Basic::DvIdentifier.new("Ruby Hospital","0123456-0", "Information office", "personal id")
    15     @dv_uri = OpenEhr::RM::DataTypes::Uri::DvUri.new("http://www.openehr.jp/changeset/test?cmd=93#file0")
    16     @dv_ehr_uri = OpenEhr::RM::DataTypes::Uri::DvEhrUri.new("ehr://1234567/87284370-2D4B-4e3d-A3F3-F303D2F4F34B@2005-08-02T04:30:00")
    17     @dv_text = OpenEhr::RM::DataTypes::Text::DvText.new("valid value")
    18     @dv_coded_text = OpenEhr::RM::DataTypes::Text::DvCodedText.new("valid value", "AT1000")
    19     @dv_paragraph = OpenEhr::RM::DataTypes::Text::DvParagraph.new(Set.new(["test1", "test2"]))
     12    @dv_boolean = OpenEHR::RM::Data_Types::Basic::DV_Boolean.new("TRUE")
     13    @dv_state = OpenEHR::RM::Data_Types::Basic::DV_State.new("code1",true)
     14    @dv_identifier = OpenEHR::RM::Data_Types::Basic::DV_Identifier.new("Ruby Hospital","0123456-0", "Information office", "personal id")
     15    @dv_uri = OpenEHR::RM::Data_Types::URI::DV_URI.new("http://www.openehr.jp/changeset/test?cmd=93#file0")
     16    @dv_ehr_uri = OpenEHR::RM::Data_Types::URI::DV_EHR_URI.new("ehr://1234567/87284370-2D4B-4e3d-A3F3-F303D2F4F34B@2005-08-02T04:30:00")
     17    @dv_text = OpenEHR::RM::Data_Types::Text::DV_Text.new("valid value")
     18    @dv_coded_text = OpenEHR::RM::Data_Types::Text::DV_Coded_Text.new("valid value", "AT1000")
     19    @dv_paragraph = OpenEHR::RM::Data_Types::Text::DV_Paragraph.new(Set.new(["test1", "test2"]))
    2020  end
    2121 
    2222  def test_init
    23     assert_instance_of OpenEhr::RM::Common::Resource::AUTHORED_RESOURCE, @authored_resource
    24     assert_instance_of OpenEhr::RM::Common::Resource::TRANSLATION_DETAILS, @translation_details
    25     assert_instance_of OpenEhr::RM::DataTypes::Basic::DvBoolean, @dv_boolean
    26     assert_instance_of OpenEhr::RM::DataTypes::Basic::DvState, @dv_state
    27     assert_instance_of OpenEhr::RM::DataTypes::Basic::DvIdentifier, @dv_identifier
    28     assert_instance_of OpenEhr::RM::DataTypes::Uri::DvUri, @dv_uri
    29     assert_instance_of OpenEhr::RM::DataTypes::Uri::DvEhrUri, @dv_ehr_uri
    30     assert_instance_of OpenEhr::RM::DataTypes::Text::DvText, @dv_text
    31     assert_instance_of OpenEhr::RM::DataTypes::Text::DvCodedText, @dv_coded_text
     23    assert_instance_of OpenEHR::RM::Common::Resource::AUTHORED_RESOURCE, @authored_resource
     24    assert_instance_of OpenEHR::RM::Common::Resource::TRANSLATION_DETAILS, @translation_details
     25    assert_instance_of OpenEHR::RM::Data_Types::Basic::DV_Boolean, @dv_boolean
     26    assert_instance_of OpenEHR::RM::Data_Types::Basic::DV_State, @dv_state
     27    assert_instance_of OpenEHR::RM::Data_Types::Basic::DV_Identifier, @dv_identifier
     28    assert_instance_of OpenEHR::RM::Data_Types::URI::DV_URI, @dv_uri
     29    assert_instance_of OpenEHR::RM::Data_Types::URI::DV_EHR_URI, @dv_ehr_uri
     30    assert_instance_of OpenEHR::RM::Data_Types::Text::DV_Text, @dv_text
     31    assert_instance_of OpenEHR::RM::Data_Types::Text::DV_Coded_Text, @dv_coded_text
    3232  end
    3333
    3434  def test_constant
    35     assert_equal("\r", OpenEhr::RM::Support::Definition::OpenEHRDefinitions::CR)
    36     assert_equal("\n", OpenEhr::RM::Support::Definition::OpenEHRDefinitions::LF)
    37     assert_equal("\r", OpenEhr::RM::DataTypes::Basic::DataValue::CR)
    38     assert_equal("\n", OpenEhr::RM::DataTypes::Basic::DataValue::LF)
     35    assert_equal("\r", OpenEHR::RM::Support::Definition::OpenEHR_Definitions::CR)
     36    assert_equal("\n", OpenEHR::RM::Support::Definition::OpenEHR_Definitions::LF)
     37    assert_equal("\r", OpenEHR::RM::Data_Types::Basic::Data_Value::CR)
     38    assert_equal("\n", OpenEHR::RM::Data_Types::Basic::Data_Value::LF)
    3939  end
    4040
    … …  
    4545    # Constraints Value_exists
    4646    assert_raise(ArgumentError){@dv_boolean.value=nil}
    47     assert_raise(ArgumentError){OpenEhr::RM::DataTypes::Basic::DvBoolean.new(nil)}
     47    assert_raise(ArgumentError){OpenEHR::RM::Data_Types::Basic::DV_Boolean.new(nil)}
    4848  end
    4949
    … …  
    5555    @dv_state.terminal = false
    5656    assert !@dv_state.is_terminal?
    57     assert_raise(ArgumentError) {OpenEhr::RM::DataTypes::Basic::DvState.new(nil,nil)}
     57    assert_raise(ArgumentError) {OpenEHR::RM::Data_Types::Basic::DV_State.new(nil,nil)}
    5858  end
    5959
    … …  
    7171    @dv_identifier.type = "test id"
    7272    assert_equal("test id", @dv_identifier.type)
    73     assert_raise(ArgumentError) {OpenEhr::RM::DataTypes::Basic::DvIdentifier.new(nil, nil, nil, nil)}
     73    assert_raise(ArgumentError) {OpenEHR::RM::Data_Types::Basic::DV_Identifier.new(nil, nil, nil, nil)}
    7474  end
    7575
    … …  
    123123class ReferenceModelSupportIdentificationTest < Test::Unit::TestCase
    124124  def setup
    125     @object_id = OpenEhr::RM::Support::Identification::OBJECT_ID.new
    126     @terminology_id = OpenEhr::RM::Support::Identification::TERMINOLOGY_ID.new('terminology','version')
    127     @archetype_id = OpenEhr::RM::Support::Identification::ARCHETYPE_ID.new
     125    @object_id = OpenEHR::RM::Support::Identification::OBJECT_ID.new
     126    @terminology_id = OpenEHR::RM::Support::Identification::TERMINOLOGY_ID.new('terminology','version')
     127    @archetype_id = OpenEHR::RM::Support::Identification::ARCHETYPE_ID.new
    128128  end
    129129 
    130130  def test_init
    131     assert_instance_of OpenEhr::RM::Support::Identification::OBJECT_ID, @object_id
    132     assert_instance_of OpenEhr::RM::Support::Identification::TERMINOLOGY_ID, @terminology_id
    133     assert_instance_of OpenEhr::RM::Support::Identification::ARCHETYPE_ID, @archetype_id
     131    assert_instance_of OpenEHR::RM::Support::Identification::OBJECT_ID, @object_id
     132    assert_instance_of OpenEHR::RM::Support::Identification::TERMINOLOGY_ID, @terminology_id
     133    assert_instance_of OpenEHR::RM::Support::Identification::ARCHETYPE_ID, @archetype_id
    134134
    135135  end
Note: See TracChangeset for help on using the changeset viewer.