Changeset 26 for ruby/trunk/models


Ignore:
Timestamp:
May 2, 2008, 1:47:51 AM (16 years ago)
Author:
Tatsukawa, Akimichi
Message:

fixed parser.y

Location:
ruby/trunk/models
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • ruby/trunk/models/am/archetype/archetype.rb

    r24 r26  
    1414        attr_accessor :archetype_id, :concept_code, :is_controlled, :original_language, :parent_archtype_id, :uid
    1515
    16         attr_reader :id, :parent_id,:concept, :definition, :ontology
     16        attr_reader :parent_id,:concept, :definition, :ontology
    1717        attr_accessor :adl_version,:description,:original_language
    1818        attr_accessor :revision_history, :translation
    … …  
    2020        def initialize(args = {})
    2121          @adl_version = args[:adl_version] if args[:adl_version]
    22           @id = args[:id] ? args[:id] : nil
     22          @archetype_id = args[:archetype_id] ? args[:archetype_id] : nil
    2323          @parent_id = args[:parent_id] if args[:parent_id]
    2424          @concept = args[:concept] if args[:concept]
    25 #          @original_language = args[:original_language] ? args[:original_language] : nil
    26 #          @translation = args[:translation] ? args[:translation] : nil
    27 #          @description = args[:description] if args[:description]
    28 #          @revision_history = args[:revision_history] if args[:revision_history]
    2925          @is_controled = args[:is_controled] if args[:is_controled]
    30           @definition = args[:definition] if args[:definition] 
     26          @definition = args[:definition] if args[:definition]
    3127          @ontology = args[:ontology] if args[:ontology]
    3228 #         loadMaps(definition)

  • ruby/trunk/models/am/archetype/constraint_model/primitive.rb

    r23 r26  
    8787
    8888          class C_DURATION < C_PRIMITIVE
    89            
     89            attr_accessor :years_allowed, :months_allowed, :weeks_allowed, :days_allowed, :hours_allowed, :minutes_allowed, :seconds_allowed, :fractional_seconds_allowed, :range, :assumed_value
    9090          end
    9191

  • ruby/trunk/models/rm.rb

    r7 r26  
    1313  module RM
    1414    autoload :Demographic, "rm/demographic.rb"
     15
    1516    module Common
    1617      autoload :Resource, "rm/common/resource.rb"
    1718    end
     19
    1820    module Support
    1921      autoload :Definition, "rm/support/definition.rb"
     22
     23      module Identification
     24        autoload :OBJECT_ID, "rm/support/identification.rb"
     25      end
     26
    2027      module Terminology
    2128        autoload :Terminology, "rm/support/terminology.rb"
    2229      end
    2330    end
     31
    2432    module Data_Types
    2533      autoload :Basic, "rm/data_types/basic.rb"

  • ruby/trunk/models/rm/support/identification.rb

    r4 r26  
    22  module RM
    33    module Support
    4       module Definition
    5         class Object_ID
     4      module Identification
     5
     6        class OBJECT_ID
    67          attr_accessor :value
     8
    79          def initiallize(value)
    8             if value == nil
    9               raise Exception.new("empty value")
    10             end
     10            raise "empty value" unless value
    1111            @value = value
    1212          end
    1313        end # of ObjectID
    14         class Terminology_ID < Object_ID
     14
     15        class ARCHETYPE_ID < OBJECT_ID
     16        end
     17
     18        class TERMINOLOGY_ID < OBJECT_ID
    1519          attr_reader :name
    16           def initialize(arg0, arg1=nil)
    17             if arg1 == nil
    18               super(arg0)
    19             else
    20               super(toValue(arg0, arg1))
    21               @name = arg0
    22               @version = arg1     
    23             end
     20
     21          def initialize(name , version_id)
     22            @name , @version_id = name , version_id
     23#             if arg1 == nil
     24#               super(arg0)
     25#             else
     26#               super(toValue(arg0, arg1))
     27#               @name = arg0
     28#               @version = arg1     
     29#             end
    2430          end
     31
    2532          def setValue(value)
    2633            loadValue(value)
    2734            super.value = value
    2835          end
     36
    2937          def version_id
    3038            @version
    3139          end
     40
    3241          private
     42
    3343          def loadValue(value)
    3444            if /\(.*\)$/ =~ value
    35               @name, @version = value.split(\())
     45#              @name, @version = value.split(\())
    3646              @version.chop!
    3747            else
    … …  
    4050            end
    4151          end
     52
    4253          def toValue(name, version)
    4354            if name == ""

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

    r24 r26  
    3131    assert_instance_of OpenEHR::RM::Data_Types::Text::DV_Coded_Text, @dv_coded_text
    3232  end
     33
    3334  def test_constant
    3435    assert_equal("\r", OpenEHR::RM::Support::Definition::OpenEHR_Definitions::CR)
    … …  
    3738    assert_equal("\n", OpenEHR::RM::Data_Types::Basic::Data_Value::LF)
    3839  end
     40
    3941  def test_dv_boolean
    4042    assert @dv_boolean.value?
    … …  
    4547    assert_raise(ArgumentError){OpenEHR::RM::Data_Types::Basic::DV_Boolean.new(nil)}
    4648  end
     49
    4750  def test_dv_state
    4851    assert_equal("code1", @dv_state.value)
    … …  
    5457    assert_raise(ArgumentError) {OpenEHR::RM::Data_Types::Basic::DV_State.new(nil,nil)}
    5558  end
     59
    5660  def test_dv_identifier
    5761    assert_equal("Ruby Hospital", @dv_identifier.assigner)
    … …  
    6973    assert_raise(ArgumentError) {OpenEHR::RM::Data_Types::Basic::DV_Identifier.new(nil, nil, nil, nil)}
    7074  end
     75
    7176  def test_dv_uri
    7277    assert_equal("file0", @dv_uri.fragment_id)
    … …  
    7984    assert_equal("/openehr-jp/", @dv_uri.path)
    8085  end
     86
    8187  def test_dv_ehr_uri
    8288    assert_equal("ehr", @dv_ehr_uri.scheme)
    … …  
    8490      @dv_ehr_uri.value="svn://www.openehr.jp/openehr-jp/" }
    8591  end
     92
    8693  def test_dv_text
    8794    assert_equal("valid value", @dv_text.value)
    88     assert_raise(ArgumentError){
    89       @dv_text.value = "not valid value\n"}
    90     assert_raise(ArgumentError){
    91       @dv_text.value = nil }
    92     assert_raise(ArgumentError){
    93       @dv_text.value = "" }
    94     assert_raise(ArgumentError){
    95       @dv_text.formatting = "" }
    96     assert_raise(ArgumentError){
    97       @dv_text.encoding = ""}
    98     assert_raise(ArgumentError){
    99       @dv_text.language = ""}
    100     assert_raise(ArgumentError){
    101       @dv_text.mappings = Set.new}
    102     assert_raise(ArgumentError){
    103       @dv_text.mappings = ""}
    104     assert_raise(ArgumentError){
    105       @dv_text.language = ""}
     95    assert_raise(ArgumentError){@dv_text.value = "not valid value\n"}
     96    assert_raise(ArgumentError){@dv_text.value = nil }
     97    assert_raise(ArgumentError){@dv_text.value = "" }
     98    assert_raise(ArgumentError){@dv_text.formatting = "" }
     99    assert_raise(ArgumentError){@dv_text.encoding = ""}
     100    assert_raise(ArgumentError){@dv_text.language = ""}
     101    assert_raise(ArgumentError){@dv_text.mappings = Set.new}
     102    assert_raise(ArgumentError){@dv_text.mappings = ""}
     103    assert_raise(ArgumentError){@dv_text.language = ""}
    106104  end
     105
    107106  def test_dv_coded_text
    108107    assert_equal("valid value", @dv_coded_text.value)
    109108    assert_equal("AT1000", @dv_coded_text.defining_code)
    110     assert_raise(ArgumentError){
    111       @dv_coded_text.defining_code=nil}
     109    assert_raise(ArgumentError){@dv_coded_text.defining_code=nil}
    112110  end
     111
    113112  def test_dv_paragraph
    114113    assert_equal((Set.new ["test1", "test2"]), @dv_paragraph.items)
    115     assert_raise(ArgumentError){
    116       @dv_paragraph.items=Set.new}
     114    assert_raise(ArgumentError){@dv_paragraph.items=Set.new}
    117115  end
     116
    118117  def test_terminology_mapping
    119118   
    … …  
    121120end
    122121
     122
     123class ReferenceModelSupportIdentificationTest < Test::Unit::TestCase
     124  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
     128  end
     129 
     130  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
     134
     135  end
     136end
Note: See TracChangeset for help on using the changeset viewer.