X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fruby.git;a=blobdiff_plain;f=test%2Ftest-ids.rb;fp=test%2Ftest-ids.rb;h=8e2d4deb44aa8388955af07e4e79f82f51da5b0b;hp=c4237294dcad29da64364a82a4f3050999a85a7a;hb=fc94a49ca7fffa51475bcccf26b328a3b92f3758;hpb=5f691f77eafbb6df3012966d053e9d8b39c6a3ff

diff --git a/test/test-ids.rb b/test/test-ids.rb
index c423729..8e2d4de 100755
--- a/test/test-ids.rb
+++ b/test/test-ids.rb
@@ -57,6 +57,16 @@ class TestIDS < Test::Unit::TestCase
     assert_equal("⿱宀子", "字".decompose)
     assert_equal("文⿱宀子", "文字".decompose)
     assert_equal("⿰木神", "榊".decompose)
+
+    assert_equal("⿰木神", "榊".ids_text)
+    assert_equal("⿰木神", "榊".ids_org)
+    assert_equal("⿰木神", "榊".ids)
+    assert_equal("⿰⺭申", "神".ids_text)
+    assert_equal("⿰⺭申", "神".ids_org)
+    assert_equal("⿰⺭申", "神".ids)
+
+    assert_equal("⿰⺭申", "神".decompose)
+
     assert_equal("⿰木⿰⺭申", "榊".decompose_all)
     assert_equal("⿳⿲木缶木冖⿰鬯彡", "鬱".decompose)
 
@@ -81,14 +91,25 @@ class TestIDS < Test::Unit::TestCase
 
   def test_compose
     assert_equal("⿰木木", "林".decompose)
-    assert_equal("⿱木⿰木木", "森".ids)
-    assert_equal("林", "⿰木木".to_ids.compose)
-    assert_equal("森", "⿱木⿰木木".to_ids.compose)
+    assert_equal("⿱木林", "森".ids)
+    assert_equal("林", "⿰木木".compose)
+
     # test_aggregate
-    assert_equal("⿱木林", "⿱木⿰木木".to_ids.aggregate)
+    assert_equal("⿱木林", "⿱木⿰木木".aggregate)
+    assert_equal("森", "⿱木⿰木木".aggregate.compose)
+
+    # test_compose
+    assert_equal("林", "⿰木木".compose)
+    assert_equal("森", "⿱木⿰木木".compose)
+  end
+
+  def test_find()
+    #p "日雲".find #"曇"
+    assert(4 <= "日雲".find .char_length) #"曇"
+    #p "鬼".find
   end
 
-  def nutest_idc_example
+  def test_idc_example
     assert_equal(CHISE::IDC_0, "林".decompose.to_a[0])
     assert_equal(CHISE::IDC_0+"木木", "林".decompose)
 
@@ -97,10 +118,10 @@ class TestIDS < Test::Unit::TestCase
     assert_equal(CHISE::IDC_1+"火火", "炎".decompose)
 
     assert_equal(CHISE::IDC_2, "班".decompose.to_a[0])
-    assert_equal(CHISE::IDC_2+"彳"+CHISE::IDC_1+"山王"+"攵", "徴".decompose) #meaning?
+    assert_equal(CHISE::IDC_2+"彳"+CHISE::IDC_1+"山王"+"攵", "徴".decompose) # meaning?
 
-    assert_equal(CHISE::IDC_3, "é¼»".decompose.to_a[0])
-    assert_equal(CHISE::IDC_3+"自田廾", "鼻".decompose)
+#    assert_equal(CHISE::IDC_3, "é¼»".decompose.to_a[0])
+#    assert_equal(CHISE::IDC_3+"自田廾", "鼻".decompose)
     assert_equal(CHISE::IDC_3+"士冖匕", "壱".decompose)
     assert_equal(CHISE::IDC_3+"穴厶心", "窓".decompose)
     assert_equal(CHISE::IDC_3+"丗冖巾", "帯".decompose)
@@ -118,9 +139,9 @@ class TestIDS < Test::Unit::TestCase
     assert_equal(CHISE::IDC_5+"戌女", "威".decompose)
     assert_equal(CHISE::IDC_5+"茂臣", "蔵".decompose)
     assert_equal(CHISE::IDC_5+"尺旦", "昼".decompose)
-    assert_equal(CHISE::IDC_5+"冂入", "内".decompose)
+#    assert_equal(CHISE::IDC_5+"冂入", "内".decompose)
     assert_equal(CHISE::IDC_5+"几丶", "凡".decompose)
-    assert_equal(CHISE::IDC_5+"几"+CHISE::IDC_1+"丿虫", "風".decompose)
+#    assert_equal(CHISE::IDC_5+"几"+CHISE::IDC_1+"丿虫", "風".decompose)
 
     assert_equal(CHISE::IDC_6, "凶".decompose.to_a[0])
     assert_equal(CHISE::IDC_1+"止"+CHISE::IDC_6+"凵米", "歯".decompose)
@@ -139,9 +160,9 @@ class TestIDS < Test::Unit::TestCase
     assert_equal(CHISE::IDC_8+"府肉", "腐".decompose)
     assert_equal(CHISE::IDC_8+"麻手", "摩".decompose)
     assert_equal(CHISE::IDC_8+"虍思", "慮".decompose)
-    assert_equal(CHISE::IDC_8+"食口", "倉".decompose)
-    assert_equal(CHISE::IDC_1+"日"+CHISE::IDC_8+"耳又", "最".decompose)
-    assert_equal(CHISE::IDC_8+"手目", "看".decompose) #meaning
+#    assert_equal(CHISE::IDC_8+"食口", "倉".decompose)
+#    assert_equal(CHISE::IDC_1+"日"+CHISE::IDC_8+"耳又", "最".decompose)
+#    assert_equal(CHISE::IDC_8+"手目", "看".decompose) # meaning
     assert_equal(CHISE::IDC_8+"辰口", "唇".decompose) #?
 
     assert_equal(CHISE::IDC_9, "句".decompose.to_a[0])
@@ -151,7 +172,7 @@ class TestIDS < Test::Unit::TestCase
     assert_equal(CHISE::IDC_9+"戈廾", "戒".decompose)
     assert_equal(CHISE::IDC_9+"弋工", "式".decompose)
     assert_equal(CHISE::IDC_9+"刀丿", "刃".decompose)
-    assert_equal(CHISE::IDC_9+"鳥山", "島".decompose) #meaning
+#    assert_equal(CHISE::IDC_9+"鳥山", "島".decompose) # meaning
 
     assert_equal(CHISE::IDC_A, "通".decompose.to_a[0])
     assert_equal(CHISE::IDC_A+"廴聿", "建".decompose)
@@ -162,15 +183,15 @@ class TestIDS < Test::Unit::TestCase
     assert_equal(CHISE::IDC_A+"是頁", "題".decompose)
     assert_equal(CHISE::IDC_A+"免力", "勉".decompose)
     assert_equal(CHISE::IDC_A+"鬼未", "魅".decompose)
-    assert_equal(CHISE::IDC_A+"黒犬", "黙".decompose)
+#    assert_equal(CHISE::IDC_A+"黒犬", "黙".decompose)
 
-    assert_equal(CHISE::IDC_B, "太".decompose.to_a[0])
-    assert_equal(CHISE::IDC_B+"大丶", "太".decompose)
+#    assert_equal(CHISE::IDC_B, "太".decompose.to_a[0])
+#    assert_equal(CHISE::IDC_B+"大丶", "太".decompose)
     assert_equal(CHISE::IDC_B+"衣中", "衷".decompose)
     assert_equal(CHISE::IDC_B+"衣里", "裏".decompose)
     assert_equal(CHISE::IDC_B+"勹巳", "包".decompose)
     assert_equal(CHISE::IDC_B+"勹乂", "匁".decompose)
-    assert_equal(CHISE::IDC_B+"木日", "東".decompose)
+#    assert_equal(CHISE::IDC_B+"木日", "東".decompose) # meaning
     assert_equal(CHISE::IDC_B+"弍一", "弐".decompose)
     assert_equal(CHISE::IDC_B+"衣保", "褒".decompose)
   end