Changeset 162 for ruby/trunk/lib/models/tests

Timestamp:

Jul 8, 2009, 8:15:17 PM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

fixed 63

Location:

ruby/trunk/lib/models/tests/rm

Files:

• test_common.rb (modified) (4 diffs)
• test_data_structure.rb (modified) (1 diff)

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

@@ -8 +8 @@
 include OpenEHR::RM::Common::Generic
 include OpenEHR::RM::Common::Change_Control
+include OpenEHR::RM::Common::Directory
 include OpenEHR::RM::Support::Identification
 include OpenEHR::RM::Data_Types::Basic
@@ -44 +45 @@
     links = Set.new([@uid_based_id])
     assert_nothing_raised(Exception){
-      @locatable = OpenEHR::RM::Common::Archetyped::Locatable.new('at0001',name,links)}
+      @locatable = Locatable.new(:archetype_node_id => 'at0001',
+                                 :name => name,
+                                 :links => links)}
     provider = Party_Identified.new(:name => 'NERV')
     location = Party_Identified.new(:name => 'GEOFRONT')
@@ -291 +294 @@
 class RM_Common_Directory_Test < Test::Unit::TestCase
   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, nil)}
+    archetype_node_id = 'at0001'
+    name = DV_Text.new('folder_test')
+    object_id = Object_ID.new('1.1.1')
+    object_ref = Object_Ref.new('local', 'PARTY', object_id)
+    assert_nothing_raised(Exception){
+      @folder = Folder.new(:archetype_node_id => archetype_node_id,
+                           :name => name,
+                           :items => [object_ref])}
+    
+
   end
   
@@ -300 +311 @@
 
   def test_folder
-    assert_equal 'at0000', @folder.archetype_node_id
-    assert_equal 'root', @folder.name.value
+    assert_equal 'at0001', @folder.archetype_node_id
+    assert_equal 'local', @folder.items[0].namespace
   end
 end

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

@@ -13 +13 @@
     links = Set.new([uid])
     assert_nothing_raised(Exception){
-      @data_structure = OpenEHR::RM::Data_Structures::Data_Structure.new('test',name,links) }
+      @data_structure = OpenEHR::RM::Data_Structures::Data_Structure.new(:archetype_node_id => 'test',
+                                                                         :name => name,
+                                                                         :links => links) }
   end