Changeset 132

Timestamp:

Jun 3, 2009, 8:04:40 PM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

refs #51

Location:

ruby/trunk/lib/models

Files:

• rm/data_types/encapsulated.rb (modified) (2 diffs)
• tests/rm/test_data_types.rb (modified) (2 diffs)

ruby/trunk/lib/models/rm/data_types/encapsulated.rb

@@ -10 +10 @@
       module Encapsulated
         class DV_Encapsulated  < OpenEHR::RM::Data_Types::Basic::Data_Value
-          attr_reader :language, :charset
-          def initialize(charset, language)
+          attr_reader :language, :charset, :size
+          def initialize(charset, language, size)
             self.charset = charset
             self.language = language
+            self.size = size
           end
 
-          def size
-            raise NotImplementedError, "size method not implemented"
+          def size=(size)
+            if size < 0
+              raise ArgumentError, "negative size"
+            end
+            @size = size
           end
 
@@ -67 +71 @@
             @charset, @language = charset, language
           end
-          def size
-            value.size
-          end
           private
           def formalism_validity(formalism)

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

@@ -203 +203 @@
     language = OpenEHR::RM::Data_Types::Text::Code_Phrase.new('ja', 'languages')
     assert_nothing_raised(Exception){
-      @dv_encapsulated = OpenEHR::RM::Data_Types::Encapsulated::DV_Encapsulated.new(charset, language)}
+      @dv_encapsulated = OpenEHR::RM::Data_Types::Encapsulated::DV_Encapsulated.new(charset, language, 10)}
+    assert_nothing_raised(Exception){
+      @dv_parsable = OpenEHR::RM::Data_Types::Encapsulated::Dv_Parsable.new(charset, language, 10, '','')}
+    assert_nothing_raised(Exception){
+    }
   end
 
@@ -209 +213 @@
     assert_instance_of OpenEHR::RM::Data_Types::Encapsulated::DV_Encapsulated, @dv_encapsulated
   end
-end
+
+  def test_dv_encapsulated
+    assert_equal 'UTF-8', @dv_encapsulated.charset.code_string
+    assert_equal 'ja', @dv_encapsulated.language.code_string
+    assert_equal 10, @dv_encapsulated.size
+    wrong_charset = OpenEHR::RM::Data_Types::Text::Code_Phrase.new('USO8000', 'character-sets')
+    assert_raise(ArgumentError){@dv_encapsulated.charset = wrong_charset}
+    charset = OpenEHR::RM::Data_Types::Text::Code_Phrase.new('EUC-JP', 'character-sets')
+    assert_nothing_raised(Exception){@dv_encapsulated.charset = charset}
+    assert_equal 'EUC-JP', @dv_encapsulated.charset.code_string
+    wrong_language = OpenEHR::RM::Data_Types::Text::Code_Phrase.new('jpg', 'language')
+    assert_raise(ArgumentError){@dv_encapsulated.language = wrong_language}
+    language = OpenEHR::RM::Data_Types::Text::Code_Phrase.new('eng', 'language')
+    assert_nothing_raised(Exception){@dv_encapsulated.language = language}
+    assert_equal 'eng', @dv_encapsulated.language.code_string
+    assert_raise(ArgumentError){@dv_encapsulated.size = -1}
+    assert_nothing_raised(Exception){@dv_encapsulated.size = 0}
+    assert_equal 0, @dv_encapsulated.size
+  end
+
+
+end