Changeset 112

Timestamp:

Oct 26, 2008, 5:14:15 PM (16 years ago)

Author:

KOBAYASHI, Shinji

Message:

refs #63, #65

Location:

ruby/trunk/lib/models

Files:

• rm/common/archetyped.rb (modified) (1 diff)
• rm/common/directory.rb (modified) (1 diff)
• tests/test_reference_model.rb (modified) (2 diffs)

ruby/trunk/lib/models/rm/common/archetyped.rb

@@ -57 +57 @@
 
           def name=(name)
-            raise ArgumentError, 'name should not be empty' if name.nil? or name.empty?
+            raise ArgumentError, 'name should not be empty' if name.nil? or name.value.empty?
             @name = name
           end
           def links=(links)
-            raise ArgumentError, "links shoud not be nil" if links.nil?
+            raise ArgumentError, "links shoud not be empty" if !links.nil? and links.empty?
             @links = links
           end

ruby/trunk/lib/models/rm/common/directory.rb

@@ -6 +6 @@
     module Common
       module Directory
-        class Folder < OpenEHR::RM::Archetyped::Locatable
+        class Folder < OpenEHR::RM::Common::Archetyped::Locatable
           attr_accessor :items
-          attr_reader folders
+          attr_reader :folders
+
           def initialize(archetype_node_id, name, links, parent=nil, folders=nil, items=nil, uid = nil, archetype_details=nil, feeder_audit=nil)
             super(archetype_node_id, name, links, parent, uid, archetype_details, feeder_audit)
-            self.items = items
+            self.folders = folders
           end
+
           def folders=(folders)
-            raise ArgumentError, "empty subfolder" if !@folders.nil and @folders.empty?
+            raise ArgumentError, "empty subfolder" if !folders.nil? and folders.empty?
             @folders = folders
           end

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

@@ -513 +513 @@
   def setup
     dv_text = OpenEHR::RM::Data_Types::Text::DV_Text.new('root')
-    assert_nothing_raised(Exception){@folder = OpenEHR::RM::Common::Directory::Folder.new('at0000', dv_text)}
+    assert_nothing_raised(Exception){@folder = OpenEHR::RM::Common::Directory::Folder.new('at0000', dv_text, nil)}
   end
   
@@ -521 +521 @@
 
   def test_folder
-    assert_equal 'root', @folder.archetype_node_id
-    assert_equal 'name', @folder.name.value
+    assert_equal 'at0000', @folder.archetype_node_id
+    assert_equal 'root', @folder.name.value
   end
 end