Changeset 99

Timestamp:

Aug 17, 2008, 8:07:11 PM (16 years ago)

Author:

KOBAYASHI, Shinji

Message:

refs #39
fixed Access_Group_Ref

Location:

ruby/trunk/lib/models

Files:

• rm/support/identification.rb (modified) (2 diffs)
• tests/test_reference_model.rb (modified) (3 diffs)

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

@@ -170 +170 @@
 
         class Party_Ref < Object_Ref
-          TYPE = ['PERSON', 'ORGANISATION', 'GROUP', 'AGENT', 'ROLE',' PARTY', 'ACTOR']
+          TYPE = ['PERSON', 'ORGANISATION', 'GROUP', 'AGENT', 'ROLE','PARTY', 'ACTOR']
           def initialize(namespace, type, id)
             super(namespace, type, id)
@@ -176 +176 @@
 
           def type=(type)
-            raise ArgumentError, 'type mismatch' if !TYPE.include? type
+            raise ArgumentError, 'type invalid' if !TYPE.include? type
             @type = type
           end
         end
+
+        class Access_Group_Ref < Object_Ref
+          def type=(type)
+            raise ArgumentError, 'type invalid' if !(type == 'ACCESS_GROUP')
+            @type = type
+          end
+        end
+
         class Hier_Object_ID < UID_Based_ID
 

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

@@ -155 +155 @@
     assert_nothing_raised(Exception){@locatable_ref = OpenEHR::RM::Support::Identification::Locatable_Ref.new('unknown', 'PERSON', @uid_based_id, 'data/event[at0001, standing]')}
     assert_nothing_raised(Exception){@party_ref = OpenEHR::RM::Support::Identification::Party_Ref.new('unknown', 'ORGANISATION', @object_id)}
+    assert_nothing_raised(Exception){@access_group_ref = OpenEHR::RM::Support::Identification::Access_Group_Ref.new('unknown', 'ACCESS_GROUP', @object_id)}
   end
   
@@ -168 +169 @@
     assert_instance_of OpenEHR::RM::Support::Identification::Locatable_Ref, @locatable_ref
     assert_instance_of OpenEHR::RM::Support::Identification::Party_Ref, @party_ref
+    assert_instance_of OpenEHR::RM::Support::Identification::Access_Group_Ref, @access_group_ref
   end
 
@@ -376 +378 @@
     assert_nothing_raised(Exception){@party_ref.type = 'ACTOR'}
   end
+
+  def test_access_group_ref
+# test constructor
+    assert_equal 'unknown', @access_group_ref.namespace
+    assert_equal 'ACCESS_GROUP', @access_group_ref.type
+    assert_equal @object_id, @access_group_ref.id
+# test type validation
+    assert_raise(ArgumentError){@access_group_ref.type = 'PERSON'}
+    assert_nothing_raised(Exception){@access_group_ref.type = 'ACCESS_GROUP'}
+  end
 end