Changeset 93

Timestamp:

Jul 29, 2008, 10:56:57 PM (16 years ago)

Author:

KOBAYASHI, Shinji

Message:

refs #39
fixed UID_Based_ID

Location:

ruby/trunk/lib/models

Files:

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

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

@@ -96 +96 @@
           end
         end # of Generic_ID
-
-      end # of Definition
+        class UID_Based_ID < Object_ID
+          def initialize(value)
+            super(value)
+          end
+          def extension
+            if self.has_extension?
+              @value[/::.*/][2..-1]
+            else
+              ''
+            end
+          end
+          def has_extension?
+            @value.include? '::'
+          end
+          def root
+            if self.has_extension?
+              @value[/.*::/][0..-3]
+            else
+              @value
+            end
+          end
+        end
+      end # of Identification
     end # of Support
   end # of RM

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

@@ -150 +150 @@
     assert_nothing_raised(Exception){@terminology_id = OpenEHR::RM::Support::Identification::Terminology_ID.new("0.0.7", 'terminology','0.0.3')}
     assert_nothing_raised(Exception){@generic_id = OpenEHR::RM::Support::Identification::Generic_ID.new("0.0.3", "openehr")}
-    assert_nothing_raised(Exception){@uid_based_id = OpenEHR::RM::Support::Identification::UID_Based_ID.new('rrip::0.0.3')
+    assert_nothing_raised(Exception){@uid_based_id = OpenEHR::RM::Support::Identification::UID_Based_ID.new('rrip::0.0.3')}
   end
   
@@ -158 +158 @@
     assert_instance_of OpenEHR::RM::Support::Identification::Terminology_ID, @terminology_id
     assert_instance_of OpenEHR::RM::Support::Identification::Object_ID, @object_id
-    assert_instance_of OpenEHR::RM::Support::Identification::UID
+    assert_instance_of OpenEHR::RM::Support::Identification::UID_Based_ID, @uid_based_id
   end
 
@@ -279 +279 @@
     assert_equal "cen", @generic_id.scheme
   end
+  def test_uid_based_id
+    assert_equal "rrip::0.0.3", @uid_based_id.value
+    assert_equal "rrip", @uid_based_id.root
+    assert_equal '0.0.3', @uid_based_id.extension
+    assert @uid_based_id.has_extension?
+
+    assert_raise(ArgumentError){@uid_based_id = OpenEHR::RM::Support::Identification::UID_Based_ID.new(nil)}
+    assert_raise(ArgumentError){@uid_based_id = OpenEHR::RM::Support::Identification::UID_Based_ID.new('')}
+    assert_raise(ArgumentError){@uid_based_id.value = nil}
+    assert_raise(ArgumentError){@uid_based_id.value = ''}
+
+    assert_nothing_raised(Exception){@uid_based_id.value = 'rrip'}
+    assert_equal 'rrip', @uid_based_id.value
+    assert_equal 'rrip', @uid_based_id.root
+    assert_equal '', @uid_based_id.extension
+  end
 end