Changeset 100 for ruby/trunk

Timestamp:

Aug 17, 2008, 10:51:53 PM (16 years ago)

Author:

KOBAYASHI, Shinji

Message:

refs #39
fixing Version_Tree_ID

Location:

ruby/trunk/lib/models

Files:

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

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

@@ -125 +125 @@
         end # of Generic_ID
 
+        class Template_ID < Object_ID
+
+        end
+
         class UID_Based_ID < Object_ID
           def initialize(value)
@@ -170 +174 @@
 
         class Party_Ref < Object_Ref
-          TYPE = ['PERSON', 'ORGANISATION', 'GROUP', 'AGENT', 'ROLE','PARTY', 'ACTOR']
-          def initialize(namespace, type, id)
-            super(namespace, type, id)
-          end
 
           def type=(type)
-            raise ArgumentError, 'type invalid' if !TYPE.include? type
+            parties = ['PERSON', 'ORGANISATION', 'GROUP', 'AGENT', 'ROLE','PARTY', 'ACTOR']
+            raise ArgumentError, 'type invalid' if !parties.include? type
             @type = type
           end
@@ -203 +204 @@
             @value = value
             (trunk_version, branch_number, branch_version) = value.split '.'
-            self.trunk_version =trunk_version
+            self.trunk_version = trunk_version
+            self.branch_number = branch_number
+            self.branch_version = branch_version
           end
 
           def trunk_version=(trunk_version)
-            Raise ArgumentError, 'trunk_version invalid' if trunk_version.nil? and trunk_version.to_i >= 0
+            raise ArgumentError, 'trunk_version invalid' if trunk_version.nil? and trunk_version.to_i >= 0
             @trunk_version = trunk_version
           end
 
           def branch_number=(branch_number)
-            Raise ArgumentError, 'branch number invalid' if branch_nmuber.nil?
-          end
-
+            raise ArgumentError, 'branch number invalid' if branch_number.nil?
+            @branch_number = branch_number
+          end
+
+          def branch_version=(branch_version)
+            raise ArgumentError, 'branch version invalid' if branch_version.nil?
+            @branch_version = branch_version
+          end
           def is_branch?
             !@branch_version.nil?

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

@@ -156 +156 @@
     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)}
+    assert_nothing_raised(Exception){@version_tree_id = OpenEHR::RM::Support::Identification::Version_Tree_ID.new('1.2.3')}
   end
   
@@ -170 +171 @@
     assert_instance_of OpenEHR::RM::Support::Identification::Party_Ref, @party_ref
     assert_instance_of OpenEHR::RM::Support::Identification::Access_Group_Ref, @access_group_ref
+    assert_instance_of OpenEHR::RM::Support::Identification::Version_Tree_ID, @version_tree_id
   end
 
@@ -388 +390 @@
     assert_nothing_raised(Exception){@access_group_ref.type = 'ACCESS_GROUP'}
   end
+
+  def test_version_tree_id
+    assert_equal '1.2.3', @version_tree_id.value
+    assert_equal '1', @version_tree_id.trunk_version
+    assert_equal '2', @version_tree_id.branch_number
+    assert_equal '3', @version_tree_id.branch_version
+  end
 end