From ce432003b9785ff3835719089c59dce06f8b8f85 Mon Sep 17 00:00:00 2001
From: zhaozg <zhaozg@gmail.com>
Date: Sat, 23 Dec 2023 15:18:28 +0800
Subject: [PATCH] fix pinyin_fluency test

---
 rime/init.lua                |  2 ++
 spec/double_pinyin_spec.lua  |  2 ++
 spec/pinyin_fluency_spec.lua | 38 +++++++++++++++++-------------------
 spec/pinyin_spec.lua         |  4 ++++
 4 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/rime/init.lua b/rime/init.lua
index 4b11933..6bf6cb3 100644
--- a/rime/init.lua
+++ b/rime/init.lua
@@ -247,6 +247,8 @@ local mtSession = {
         ret.ascii_mode = toBoolean(status.is_ascii_mode)
         ret.full_shape = toBoolean(status.is_full_shape)
         ret.simplified = toBoolean(status.is_simplified)
+        ret.traditional = toBoolean(status.is_traditional)
+        ret.ascii_punct = toBoolean(status.is_ascii_punct)
 
         return ret
       end
diff --git a/spec/double_pinyin_spec.lua b/spec/double_pinyin_spec.lua
index 75a90ea..6f524e0 100644
--- a/spec/double_pinyin_spec.lua
+++ b/spec/double_pinyin_spec.lua
@@ -45,6 +45,8 @@ describe("double_pinyin test", function()
       ascii_mode = true,
       full_shape = false,
       simplified = true,
+      traditional = false,
+      ascii_punct = false,
       id = schema,
       name = '自然码双拼'
     }, status)
diff --git a/spec/pinyin_fluency_spec.lua b/spec/pinyin_fluency_spec.lua
index a145020..dd7259f 100644
--- a/spec/pinyin_fluency_spec.lua
+++ b/spec/pinyin_fluency_spec.lua
@@ -4,10 +4,6 @@ describe("luna_pinyin test", function()
   local _ref = 0
   local schema = "luna_pinyin_fluency"
   -- 以空格分詞、標點或回車上屏。
-  -- FIXME: session:Commit fail
-  if true then
-    return
-  end
 
   setup(function()
     if not rime then
@@ -49,6 +45,8 @@ describe("luna_pinyin test", function()
       ascii_mode = true,
       full_shape = false,
       simplified = true,
+      traditional = false,
+      ascii_punct = false,
       id = schema,
       name = '朙月拼音·語句流'
     })
@@ -71,6 +69,8 @@ describe("luna_pinyin test", function()
       ascii_mode = false,
       full_shape = false,
       simplified = true,
+      traditional = false,
+      ascii_punct = false,
       id = schema,
       name = '朙月拼音·語句流'
     })
@@ -78,8 +78,8 @@ describe("luna_pinyin test", function()
     list = session:Candidates()
     assert(type(list)=='table')
     assert(#list > 0)
-    --rime.utils.print_r(list,'list of abcd')
-    print(session:Select(1))
+    assert(session:Select(1))
+    assert(session:commit())
     local commit = assert(session:Commit())
     assert.equal("啊不错的", commit)
   end)
@@ -90,37 +90,33 @@ describe("luna_pinyin test", function()
     session:Option('ascii_mode', false)
     local list
 
-    --rime.utils.printInfo(session)
     assert(session:simulate('xiguanjiuhaole')==true)
-    --rime.utils.printInfo(session)
     list = session:Candidates()
     assert(#list > 0)
-    --rime.utils.print_r(list, "习惯就好了")
     assert(session:Select(1))
-
+    assert(session:commit())
     local commit = session:Commit()
     assert.equal("习惯就好了", commit)
 
     assert(session:simulate('burejinsiji')==true)
-    --rime.utils.printInfo(session)
     list = session:Candidates()
     assert(#list > 0)
-    --rime.utils.print_r(list, "布热津斯基")
     assert(session:Select(1))
+    assert(session:commit())
     commit = session:Commit()
     assert.equal("布热津斯基", commit)
 
     assert(session:simulate('shurufangshizhuanhuanjian')==true)
-    --rime.utils.printInfo(session)
     list = session:Candidates()
     assert(session:Select(1))
+    assert(session:commit())
     commit = session:Commit()
     assert.equal("输入方式转换键", commit)
 
     assert(session:simulate('chujiangkongwan')==true)
-    --rime.utils.printInfo(session)
     list = session:Candidates()
     assert(session:Select(1))
+    assert(session:commit())
     commit = session:Commit()
     assert.equal("楚江空晚", commit)
 
@@ -130,13 +126,15 @@ describe("luna_pinyin test", function()
       session:process(keycode)
     end
 
-    local status = session:Status()
     local selected = {2, 2, 4, 2, 2, 1}
-    while(status.composing) do
-      local idx = assert(table.remove(selected, 1))
-      assert(session:Select(idx))
-      status = session:Status()
-    end
+    repeat
+      local idx = table.remove(selected, 1)
+      if idx then
+        --rime.utils.printInfo(session)
+        assert(session:Select(idx))
+      end
+    until not idx
+    assert(session:commit())
 
     assert.equal('一条大河波浪宽风吹稻花香两岸', session:Commit())
   end)
diff --git a/spec/pinyin_spec.lua b/spec/pinyin_spec.lua
index 878d365..61e65de 100644
--- a/spec/pinyin_spec.lua
+++ b/spec/pinyin_spec.lua
@@ -44,6 +44,8 @@ describe("luna_pinyin test", function()
       ascii_mode = true,
       full_shape = false,
       simplified = true,
+      traditional = false,
+      ascii_punct = false,
       id = schema,
       name = '朙月拼音'
     })
@@ -66,6 +68,8 @@ describe("luna_pinyin test", function()
       ascii_mode = false,
       full_shape = false,
       simplified = true,
+      traditional = false,
+      ascii_punct = false,
       id = schema,
       name = '朙月拼音'
     })