Changeset 133

Timestamp:

Jun 3, 2009, 9:24:53 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

@@ -58 +58 @@
         end
 
+# media type http://www.iana.org/assignments/media-types/text/
         class DV_Multimedia < DV_Encapsulated
+          def initialize(charset, language, size, media_type, uri=nil,
+                         data=nil, compression_algorithm=nil,
+                         integrity_check=nil, integrity_check_algorithm=nil,
+                         alternate_text=nil)
+
+          end
           
         end
@@ -64 +71 @@
         class DV_Parsable < DV_Encapsulated
           attr_reader :value, :formalism
-          def initialize(value, formalism, charset = nil, language = nil)
+          def initialize(charset, language, size, formalism, value)
+            super(charset, language, size)
+            self.formalism = formalism
+            self.value = value
+          end
+
+          def value=(value)
+            raise ArgumentError, 'value must not be nil' if value.nil?
             @value = value
-            size_positive
-            formalism_validity(formalism)
-            @formalism = formalism
-            @charset, @language = charset, language
           end
-          private
-          def formalism_validity(formalism)
-            if formalism.nil
+
+          def formalism=(formalism)
+            if formalism.nil?
               raise ArgumentError, "formalism must not be nil"
             elsif formalism.empty?
               raise ArgumentError, "formalism must nto be empty"
             end
+            @formalism = formalism
           end
         end

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

@@ -205 +205 @@
       @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){
-    }
+      @dv_parsable = OpenEHR::RM::Data_Types::Encapsulated::DV_Parsable.new(charset, language, 10, 'XML','<TEST>test</TEST>')}
+    media_type = OpenEHR::RM::Data_Types::Text::Code_Phrase.new('text/html', 'media-types')
+    uri = OpenEHR::RM::Data_Types::URI::DV_URI.new("http://www.openehr.jp/changeset/test?cmd=93#file0")
+    assert_nothing_raised(Exception){
+      @dv_multimedia = OpenEHR::RM::Data_Types::Encapsulated::DV_Multimedia.new(charset, language, 10, media_type, uri)}
   end
 
   def test_init
     assert_instance_of OpenEHR::RM::Data_Types::Encapsulated::DV_Encapsulated, @dv_encapsulated
+    assert_instance_of OpenEHR::RM::Data_Types::Encapsulated::DV_Parsable, @dv_parsable
+    assert_instance_of OpenEHR::RM::Data_Types::Encapsulated::DV_Multimedia, @dv_multimedia
   end
 
@@ -233 +237 @@
   end
 
-
-end
+  def test_dv_parsable
+    assert_equal 'UTF-8', @dv_parsable.charset.code_string
+    assert_equal 'ja', @dv_parsable.language.code_string
+    assert_equal 10, @dv_parsable.size
+    assert_equal 'XML', @dv_parsable.formalism
+    assert_equal '<TEST>test</TEST>', @dv_parsable.value
+    assert_raise(ArgumentError){
+      @dv_parsable.formalism = nil }
+    assert_nothing_raised(Exception){
+      @dv_parsable.formalism = 'HTML' }
+    assert_equal 'HTML', @dv_parsable.formalism
+    assert_raise(ArgumentError){
+      @dv_parsable.value = nil }
+    assert_nothing_raised(Exception){
+      @dv_parsable.value = '<H1>test</H1>' }
+    assert_equal '<H1>test</H1>', @dv_parsable.value
+  end
+end