You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2006/07/30 23:15:45 UTC

svn commit: r426944 - /directory/branches/shared/optimization/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifReaderTest.java

Author: elecharny
Date: Sun Jul 30 14:15:45 2006
New Revision: 426944

URL: http://svn.apache.org/viewvc?rev=426944&view=rev
Log:
Changed the UTF-8 chars to Unicode escaped chars. That will fix the
issue DIRSERVER_686

Modified:
    directory/branches/shared/optimization/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifReaderTest.java

Modified: directory/branches/shared/optimization/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifReaderTest.java
URL: http://svn.apache.org/viewvc/directory/branches/shared/optimization/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifReaderTest.java?rev=426944&r1=426943&r2=426944&view=diff
==============================================================================
--- directory/branches/shared/optimization/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifReaderTest.java (original)
+++ directory/branches/shared/optimization/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifReaderTest.java Sun Jul 30 14:15:45 2006
@@ -483,7 +483,7 @@
         assertEquals( "cn=app1,ou=applications,ou=conf,dc=apache,dc=org", entry.getDn() );
 
         Attribute attr = entry.get( "cn" );
-        assertTrue( attr.contains( "Emmanuel Lécharny".getBytes( "UTF-8" ) ) );
+        assertTrue( attr.contains( "Emmanuel L\u00e9charny".getBytes( "UTF-8" ) ) );
 
         attr = entry.get( "objectclass" );
         assertTrue( attr.contains( "top" ) );
@@ -526,7 +526,7 @@
         assertEquals( "cn=app1,ou=applications,ou=conf,dc=apache,dc=org", entry.getDn() );
 
         Attribute attr = entry.get( "cn" );
-        assertTrue( attr.contains( "Emmanuel Lécharny  ".getBytes( "UTF-8" ) ) );
+        assertTrue( attr.contains( "Emmanuel L\u00e9charny  ".getBytes( "UTF-8" ) ) );
 
         attr = entry.get( "objectclass" );
         assertTrue( attr.contains( "top" ) );
@@ -792,7 +792,8 @@
             "# dn:: ou=営業部,o=Airius\n" + 
             "objectclass: top\n" + 
             "objectclass: organizationalUnit\n" + 
-            "ou:: 5Za25qWt6YOo\n" + "# ou:: 営業部\n" + 
+            "ou:: 5Za25qWt6YOo\n" + 
+            "# ou:: 営業部\n" + 
             "ou;lang-ja:: 5Za25qWt6YOo\n" + 
             "# ou;lang-ja:: 営業部\n" + 
             "ou;lang-ja;phonetic:: 44GI44GE44GO44KH44GG44G2\n" + 
@@ -827,12 +828,11 @@
             "title:: 5Za25qWt6YOoIOmDqOmVtw==\n" + 
             "# title:: 営業部 部長\n" + 
             "givenname;lang-ja;phonetic:: 44KN44Gp44Gr44O8\n" + 
-            "# givenname;lang-ja;phonetic::\n" + 
-              " ろどにー\n" + 
+            "# givenname;lang-ja;phonetic:: ろどにー\n" + 
             "sn;lang-ja;phonetic:: 44GK44GM44GV44KP44KJ\n" + 
             "# sn;lang-ja;phonetic:: おがさわら\n" + 
             "cn;lang-ja;phonetic:: 44GK44GM44GV44KP44KJIOOCjeOBqeOBq+ODvA==\n" + 
-            "# cn;lang-ja;phonetic:: おがさわら ろどにー\n" + 
+            "# cn;lang-ja;phonetic:: おがぎわら ろどにー\n" +
             "title;lang-ja;phonetic:: 44GI44GE44GO44KH44GG44G2IOOBtuOBoeOCh+OBhg==\n" + 
             "# title;lang-ja;phonetic::\n" + 
               "# えいぎょうぶ ぶちょう\n" + 
@@ -847,16 +847,17 @@
         String[][][] values =
             {
                 {
-                    { "dn", "ou=営業部,o=Airius" },
+                    { "dn", "ou=\u55b6\u696d\u90e8,o=Airius" }, // 55b6 = 営, 696d = 業, 90e8 = 部 
                     { "objectclass", "top" },
                     { "objectclass", "organizationalUnit" },
-                    { "ou", "営業部" },
-                    { "ou;lang-ja", "営業部" },
-                    { "ou;lang-ja;phonetic", "えいぎょうぶ" },
+                    { "ou", "\u55b6\u696d\u90e8" },
+                    { "ou;lang-ja", "\u55b6\u696d\u90e8" },
+                    { "ou;lang-ja;phonetic", "\u3048\u3044\u304e\u3087\u3046\u3076" }, // 3048 = え, 3044 = い, 304e = ぎ
+                                                                                    // 3087 = ょ, 3046 = う, 3076 = ぶ
                     { "ou;lang-en", "Sales" },
                     { "description", "Japanese office" } },
                     {
-                    { "dn", "uid=rogasawara,ou=営業部,o=Airius" },
+                    { "dn", "uid=rogasawara,ou=\u55b6\u696d\u90e8,o=Airius" },
                     { "userpassword", "{SHA}O3HSv1MusyL4kTjP+HKI5uxuNoM=" },
                     { "objectclass", "top" },
                     { "objectclass", "person" },
@@ -864,19 +865,19 @@
                     { "objectclass", "inetOrgPerson" },
                     { "uid", "rogasawara" },
                     { "mail", "rogasawara@airius.co.jp" },
-                    { "givenname;lang-ja", "ロドニー" },
-                    { "sn;lang-ja", "小笠原" },
-                    { "cn;lang-ja", "小笠原 ロドニー" },
-                    { "title;lang-ja", "営業部 部長" },
+                    { "givenname;lang-ja", "\u30ed\u30c9\u30cb\u30fc" },    // 30ed = ロ, 30c9 = ド, 30cb = ニ, 30fc = ー   
+                    { "sn;lang-ja", "\u5c0f\u7b20\u539f" },    // 5c0f = 小, 7b20 = 笠, 539f = 原  
+                    { "cn;lang-ja", "\u5c0f\u7b20\u539f \u30ed\u30c9\u30cb\u30fc" },
+                    { "title;lang-ja", "\u55b6\u696d\u90e8 \u90e8\u9577" },   // 9577 = 長
                     { "preferredlanguage", "ja" },
-                    { "givenname", "ロドニー" },
-                    { "sn", "小笠原" },
-                    { "cn", "小笠原 ロドニー" },
-                    { "title", "営業部 部長" },
-                    { "givenname;lang-ja;phonetic", "ろどにー" },
-                    { "sn;lang-ja;phonetic", "おがさわら" },
-                    { "cn;lang-ja;phonetic", "おがさわら ろどにー" },
-                    { "title;lang-ja;phonetic", "えいぎょうぶ ぶちょう" },
+                    { "givenname", "\u30ed\u30c9\u30cb\u30fc" },
+                    { "sn", "\u5c0f\u7b20\u539f" },
+                    { "cn", "\u5c0f\u7b20\u539f \u30ed\u30c9\u30cb\u30fc" },
+                    { "title", "\u55b6\u696d\u90e8 \u90e8\u9577" },
+                    { "givenname;lang-ja;phonetic", "\u308d\u3069\u306b\u30fc" },  // 308d = ろ,3069 = ど, 306b = に
+                    { "sn;lang-ja;phonetic", "\u304a\u304c\u3055\u308f\u3089" }, // 304a = お, 304c = が,3055 = さ,308f = わ, 3089 = ら    
+                    { "cn;lang-ja;phonetic", "\u304a\u304c\u3055\u308f\u3089 \u308d\u3069\u306b\u30fc" },
+                    { "title;lang-ja;phonetic", "\u3048\u3044\u304e\u3087\u3046\u3076 \u3076\u3061\u3087\u3046" }, // 304E = ぎ, 3061 = ち
                     { "givenname;lang-en", "Rodney" },
                     { "sn;lang-en", "Ogasawara" },
                     { "cn;lang-en", "Rodney Ogasawara" },