Index: ruby/branches/0.0/adl_parser/tests/scanner_test.rb
===================================================================
--- ruby/branches/0.0/adl_parser/tests/scanner_test.rb	(revision 167)
+++ ruby/branches/0.0/adl_parser/tests/scanner_test.rb	(revision 168)
@@ -4,12 +4,12 @@
 class YaparcParserTest < Test::Unit::TestCase
   def test_RootScanner
-    parser = OpenEhr::ADL::Scanner::DADL::RootScanner.new
-    assert_instance_of OpenEhr::ADL::Scanner::DADL::RootScanner,parser
+    parser = OpenEHR::ADL::Scanner::DADL::RootScanner.new
+    assert_instance_of OpenEHR::ADL::Scanner::DADL::RootScanner,parser
     result = parser.parse('')
   end
 
   def test_V_LOCAL_TERM_CODE_REF
-    parser = OpenEhr::ADL::Scanner::Common::V_LOCAL_TERM_CODE_REF.new
-    assert_instance_of OpenEhr::ADL::Scanner::Common::V_LOCAL_TERM_CODE_REF,parser
+    parser = OpenEHR::ADL::Scanner::Common::V_LOCAL_TERM_CODE_REF.new
+    assert_instance_of OpenEHR::ADL::Scanner::Common::V_LOCAL_TERM_CODE_REF,parser
     result = parser.parse('[en-us]')
     assert_instance_of Yaparc::Result::OK, result
@@ -17,6 +17,6 @@
 
   def test_V_QUALIFIED_TERM_CODE_REF
-    parser = OpenEhr::ADL::Scanner::Common::V_QUALIFIED_TERM_CODE_REF.new
-    assert_instance_of OpenEhr::ADL::Scanner::Common::V_QUALIFIED_TERM_CODE_REF,parser
+    parser = OpenEHR::ADL::Scanner::Common::V_QUALIFIED_TERM_CODE_REF.new
+    assert_instance_of OpenEHR::ADL::Scanner::Common::V_QUALIFIED_TERM_CODE_REF,parser
     result = parser.parse('[ISO_639::en]')
     assert_instance_of Yaparc::Result::OK, result
@@ -26,6 +26,6 @@
 
   def test_V_STRING
-    parser = OpenEhr::ADL::Scanner::Common::V_STRING.new
-    assert_instance_of OpenEhr::ADL::Scanner::Common::V_STRING,parser
+    parser = OpenEHR::ADL::Scanner::Common::V_STRING.new
+    assert_instance_of OpenEHR::ADL::Scanner::Common::V_STRING,parser
     result = parser.parse('"this is a string"')
     assert_instance_of Yaparc::Result::OK, result
@@ -35,6 +35,6 @@
 
   def test_V_REAL
-    parser = OpenEhr::ADL::Scanner::Common::V_REAL.new
-    assert_instance_of OpenEhr::ADL::Scanner::Common::V_REAL,parser
+    parser = OpenEHR::ADL::Scanner::Common::V_REAL.new
+    assert_instance_of OpenEHR::ADL::Scanner::Common::V_REAL,parser
     result = parser.parse('0.1')
     assert_instance_of Yaparc::Result::OK, result
@@ -46,6 +46,6 @@
 
   def test_V_ISO8601_DURATION
-    parser = OpenEhr::ADL::Scanner::Common::V_ISO8601_DURATION.new
-    assert_instance_of OpenEhr::ADL::Scanner::Common::V_ISO8601_DURATION,parser
+    parser = OpenEHR::ADL::Scanner::Common::V_ISO8601_DURATION.new
+    assert_instance_of OpenEHR::ADL::Scanner::Common::V_ISO8601_DURATION,parser
     result = parser.parse('PT1M')
     assert_instance_of Yaparc::Result::OK, result
@@ -56,6 +56,6 @@
 
   def test_V_ISO8601_DATE_TIME_CONSTRAINT_PATTERN
-    parser = OpenEhr::ADL::Scanner::CADL::V_ISO8601_DATE_TIME_CONSTRAINT_PATTERN.new
-    assert_instance_of OpenEhr::ADL::Scanner::CADL::V_ISO8601_DATE_TIME_CONSTRAINT_PATTERN,parser
+    parser = OpenEHR::ADL::Scanner::CADL::V_ISO8601_DATE_TIME_CONSTRAINT_PATTERN.new
+    assert_instance_of OpenEHR::ADL::Scanner::CADL::V_ISO8601_DATE_TIME_CONSTRAINT_PATTERN,parser
     result = parser.parse('yyyy-??-??T??:??:??')
     assert_instance_of Yaparc::Result::OK, result
@@ -63,6 +63,6 @@
 
   def test_V_ISO8601_DATE_CONSTRAINT_PATTERN
-    parser = OpenEhr::ADL::Scanner::CADL::V_ISO8601_DATE_CONSTRAINT_PATTERN.new
-    assert_instance_of OpenEhr::ADL::Scanner::CADL::V_ISO8601_DATE_CONSTRAINT_PATTERN,parser
+    parser = OpenEHR::ADL::Scanner::CADL::V_ISO8601_DATE_CONSTRAINT_PATTERN.new
+    assert_instance_of OpenEHR::ADL::Scanner::CADL::V_ISO8601_DATE_CONSTRAINT_PATTERN,parser
     result = parser.parse('yyyy-mm-XX-dd')
     assert_instance_of Yaparc::Result::OK, result
@@ -70,6 +70,6 @@
 
   def test_V_ISO8601_TIME_CONSTRAINT_PATTERN
-    parser = OpenEhr::ADL::Scanner::CADL::V_ISO8601_TIME_CONSTRAINT_PATTERN.new
-    assert_instance_of OpenEhr::ADL::Scanner::CADL::V_ISO8601_TIME_CONSTRAINT_PATTERN,parser
+    parser = OpenEHR::ADL::Scanner::CADL::V_ISO8601_TIME_CONSTRAINT_PATTERN.new
+    assert_instance_of OpenEHR::ADL::Scanner::CADL::V_ISO8601_TIME_CONSTRAINT_PATTERN,parser
     result = parser.parse('hh:mm:ss:??')
     assert_instance_of Yaparc::Result::OK, result
@@ -77,5 +77,5 @@
 
   def test_dadl_reserved
-    parser = OpenEhr::ADL::Scanner::DADL::RootScanner.new
+    parser = OpenEHR::ADL::Scanner::DADL::RootScanner.new
     result = parser.parse('then')
     assert_instance_of Yaparc::Result::OK, result
@@ -86,6 +86,6 @@
 
   def test_cadl
-    parser = OpenEhr::ADL::Scanner::CADL::RootScanner.new
-    assert_instance_of OpenEhr::ADL::Scanner::CADL::RootScanner,parser
+    parser = OpenEHR::ADL::Scanner::CADL::RootScanner.new
+    assert_instance_of OpenEHR::ADL::Scanner::CADL::RootScanner,parser
     result = parser.parse('PT1M')
     assert_instance_of Yaparc::Result::OK, result
@@ -97,5 +97,5 @@
 
   def test_cadl_reserved
-    parser = OpenEhr::ADL::Scanner::CADL::RootScanner.new
+    parser = OpenEHR::ADL::Scanner::CADL::RootScanner.new
     result = parser.parse('then')
     assert_instance_of Yaparc::Result::OK, result
