F2-3(规则族): 动态按钮族/comboBox深层访问族扩展,HARD 86→74,自动化率 81.1%→82.7%
规则族2(动态按钮): new Button + addClickListener + fieldVar.addButton(btnVar, N)
→ addFieldButton("FIELD", "文案", {闭包体}, N),命中 33 次,HARD→FULL_AUTO/PARTIAL -12
规则族3(深层访问): .comboBox.setValue → setFieldValue,.comboBox.removeItem → removeFieldItem
命中 6 次,5 个 PARTIAL 模板升为 FULL_AUTO
安全约束: 三元组不完整/来源不明/vl.addComponent 型一律保留 HARD,零误改
测试: 118 单测全绿(新增 13 条),output_staging 不入库
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
@@ -794,10 +794,12 @@ class TestOptionPopulation(unittest.TestCase):
|
||||
class TestHonestBoundary(unittest.TestCase):
|
||||
"""真实库迭代: 深层 Vaadin 组件访问保持 PARTIAL,不错改"""
|
||||
|
||||
def test_comboBox_widget_access_stays_partial(self):
|
||||
def test_comboBox_setValue_rewritten_to_full_auto(self):
|
||||
"""规则族3: .comboBox.setValue → setFieldValue,升为 FULL_AUTO"""
|
||||
src = 'group.getField("CHECKMONORQUA")?.comboBox.setValue(value);'
|
||||
result, _, label = rewrite_script(src)
|
||||
self.assertEqual(label, "PARTIAL")
|
||||
self.assertIn('setFieldValue("CHECKMONORQUA", value)', result)
|
||||
self.assertEqual(label, "FULL_AUTO")
|
||||
|
||||
def test_table_widget_access_stays_partial(self):
|
||||
src = 'def cols = group.getField("MATERIALDETAILS").table.getVisibleColumns();'
|
||||
@@ -819,5 +821,178 @@ class TestHonestBoundary(unittest.TestCase):
|
||||
self.assertIn(label, ("PARTIAL", "HARD"))
|
||||
|
||||
|
||||
class TestF23ComboBoxFamily(unittest.TestCase):
|
||||
"""F2-3 规则族3: 深层访问家族 - .comboBox 动词改写"""
|
||||
|
||||
def test_comboBox_setValue_safenav(self):
|
||||
"""?.comboBox.setValue(v) → setFieldValue("F", v),标准安全导航形态"""
|
||||
src = 'group.getField("CHECKMONORQUA")?.comboBox.setValue(value);'
|
||||
result, _, label = rewrite_script(src)
|
||||
self.assertIn('setFieldValue("CHECKMONORQUA", value)', result)
|
||||
self.assertNotIn('.comboBox', result)
|
||||
self.assertEqual(label, "FULL_AUTO")
|
||||
|
||||
def test_comboBox_setValue_safenav_both(self):
|
||||
"""?.comboBox?.setValue(v) — 双重安全导航"""
|
||||
src = 'group.getField("CHECKMONTHQUARTERLY")?.comboBox?.setValue(value);'
|
||||
result, _, label = rewrite_script(src)
|
||||
self.assertIn('setFieldValue("CHECKMONTHQUARTERLY", value)', result)
|
||||
self.assertEqual(label, "FULL_AUTO")
|
||||
|
||||
def test_comboBox_removeItem(self):
|
||||
"""?.comboBox?.removeItem(N) → removeFieldItem("F", N)"""
|
||||
src = 'group.getField("AUTHENTICATIONPART")?.comboBox?.removeItem(0);'
|
||||
result, _, label = rewrite_script(src)
|
||||
self.assertIn('removeFieldItem("AUTHENTICATIONPART", 0)', result)
|
||||
self.assertNotIn('.comboBox', result)
|
||||
self.assertEqual(label, "FULL_AUTO")
|
||||
|
||||
def test_comboBox_setValue_inline_handle(self):
|
||||
"""通过字段句柄变量内联后也能改写"""
|
||||
src = (
|
||||
'def f = group.getField("CHECKMONORQUA")\n'
|
||||
'f?.comboBox.setValue(val)\n'
|
||||
)
|
||||
result, _, label = rewrite_script(src)
|
||||
self.assertIn('setFieldValue("CHECKMONORQUA", val)', result)
|
||||
self.assertEqual(label, "FULL_AUTO")
|
||||
|
||||
def test_comboBox_other_verb_stays_partial(self):
|
||||
""".comboBox 后接未覆盖动词,保留 PARTIAL(负例)"""
|
||||
src = 'group.getField("X")?.comboBox.setItemCaption(1, "文案");'
|
||||
result, _, label = rewrite_script(src)
|
||||
self.assertEqual(label, "PARTIAL")
|
||||
self.assertIn('.comboBox', result)
|
||||
|
||||
def test_table_getVisibleColumns_stays_partial(self):
|
||||
""".table.getVisibleColumns() 无 facade 等价,保留 PARTIAL(负例)"""
|
||||
src = 'def cols = group.getField("MATERIALDETAILS").table.getVisibleColumns();'
|
||||
result, _, label = rewrite_script(src)
|
||||
self.assertEqual(label, "PARTIAL")
|
||||
|
||||
|
||||
class TestF23DynamicButtonFamily(unittest.TestCase):
|
||||
"""F2-3 规则族2: 动态按钮家族 - new Button + addClickListener + fieldVar.addButton"""
|
||||
|
||||
def test_basic_button_rewrite(self):
|
||||
"""标准三元组: Button声明 + addClickListener + field.addButton → addFieldButton"""
|
||||
src = (
|
||||
'def signDetails = group.getField("SIGNDETAILS");\n'
|
||||
'final Button cb = new Button("全选签到");\n'
|
||||
'cb?.addClickListener(new ClickListener() {\n'
|
||||
' public void buttonClick(ClickEvent event) {\n'
|
||||
' doSomething();\n'
|
||||
' }\n'
|
||||
'});\n'
|
||||
'signDetails?.addButton(cb, 1);\n'
|
||||
)
|
||||
result, _, label = rewrite_script(src)
|
||||
self.assertIn('addFieldButton("SIGNDETAILS", "全选签到"', result)
|
||||
self.assertIn('doSomething()', result)
|
||||
self.assertNotIn('new Button', result)
|
||||
self.assertNotIn('addClickListener', result)
|
||||
self.assertEqual(label, "FULL_AUTO")
|
||||
|
||||
def test_button_typed_decl(self):
|
||||
"""Button VAR = new Button 形态(有类型声明)"""
|
||||
src = (
|
||||
'def user = group.getField("PM_PROJECT_USERS");\n'
|
||||
'Button cb = new Button("删除");\n'
|
||||
'cb?.addClickListener(new ClickListener() {\n'
|
||||
' public void buttonClick(ClickEvent event) {\n'
|
||||
' removeUser();\n'
|
||||
' }\n'
|
||||
'});\n'
|
||||
'user?.addButton(cb, 1);\n'
|
||||
)
|
||||
result, _, label = rewrite_script(src)
|
||||
self.assertIn('addFieldButton("PM_PROJECT_USERS", "删除"', result)
|
||||
self.assertIn('removeUser()', result)
|
||||
self.assertNotIn('new Button', result)
|
||||
self.assertEqual(label, "FULL_AUTO")
|
||||
|
||||
def test_button_with_button_clicklistener(self):
|
||||
"""new Button.ClickListener() 形态"""
|
||||
src = (
|
||||
'def details = group.getField("DETAILS");\n'
|
||||
'Button search = new Button("查询");\n'
|
||||
'search?.addClickListener(new Button.ClickListener() {\n'
|
||||
' public void buttonClick(Button.ClickEvent event) {\n'
|
||||
' runSearch();\n'
|
||||
' }\n'
|
||||
'});\n'
|
||||
'details?.addButton(search, 0);\n'
|
||||
)
|
||||
result, _, label = rewrite_script(src)
|
||||
self.assertIn('addFieldButton("DETAILS", "查询"', result)
|
||||
self.assertIn('runSearch()', result)
|
||||
self.assertNotIn('new Button', result)
|
||||
self.assertEqual(label, "FULL_AUTO")
|
||||
|
||||
def test_vl_addComponent_stays_hard(self):
|
||||
"""vl = opertor?.parent + vl.addComponent(btn) 形态不在改写范围,保留 HARD(负例)"""
|
||||
src = (
|
||||
'def opertor = group.getField("BUTTON");\n'
|
||||
'def vl = opertor?.parent;\n'
|
||||
'Button button = new Button("计算");\n'
|
||||
'vl.addComponent(button, 0);\n'
|
||||
'button.addClickListener(new Button.ClickListener() {\n'
|
||||
' @Override\n'
|
||||
' public void buttonClick(Button.ClickEvent event) {\n'
|
||||
' calculate();\n'
|
||||
' }\n'
|
||||
'});\n'
|
||||
)
|
||||
result, _, label = rewrite_script(src)
|
||||
self.assertEqual(label, "HARD")
|
||||
|
||||
def test_button_without_click_listener_stays_hard(self):
|
||||
"""new Button 无 addClickListener,不改写,保留 HARD(负例)"""
|
||||
src = (
|
||||
'def f = group.getField("X");\n'
|
||||
'Button b = new Button("文案");\n'
|
||||
'f?.addButton(b, 0);\n'
|
||||
)
|
||||
result, _, label = rewrite_script(src)
|
||||
# 没有 addClickListener,不能确定行为,应保留 HARD
|
||||
self.assertEqual(label, "HARD")
|
||||
|
||||
def test_button_no_field_var_mapping_stays_hard(self):
|
||||
"""fieldVar 来源无法追溯到 group.getField,不改写(负例)"""
|
||||
src = (
|
||||
'Button cb = new Button("操作");\n'
|
||||
'cb?.addClickListener(new ClickListener() {\n'
|
||||
' public void buttonClick(ClickEvent event) { doIt(); }\n'
|
||||
'});\n'
|
||||
'unknownVar?.addButton(cb, 1);\n'
|
||||
)
|
||||
result, _, label = rewrite_script(src)
|
||||
# unknownVar 不能追溯到 getField,应保留 HARD
|
||||
self.assertEqual(label, "HARD")
|
||||
|
||||
def test_multiple_buttons_same_field(self):
|
||||
"""同一字段上挂多个按钮,各自独立改写"""
|
||||
src = (
|
||||
'def signDetails = group.getField("SIGNDETAILS");\n'
|
||||
'final Button cb = new Button("全选签到");\n'
|
||||
'cb?.addClickListener(new ClickListener() {\n'
|
||||
' public void buttonClick(ClickEvent event) { selectAll(); }\n'
|
||||
'});\n'
|
||||
'final Button cb2 = new Button("取消全选");\n'
|
||||
'cb2?.addClickListener(new ClickListener() {\n'
|
||||
' public void buttonClick(ClickEvent event) { deselectAll(); }\n'
|
||||
'});\n'
|
||||
'signDetails?.addButton(cb, 1);\n'
|
||||
'signDetails?.addButton(cb2, 2);\n'
|
||||
)
|
||||
result, _, label = rewrite_script(src)
|
||||
self.assertIn('addFieldButton("SIGNDETAILS", "全选签到"', result)
|
||||
self.assertIn('addFieldButton("SIGNDETAILS", "取消全选"', result)
|
||||
self.assertIn('selectAll()', result)
|
||||
self.assertIn('deselectAll()', result)
|
||||
self.assertNotIn('new Button', result)
|
||||
self.assertEqual(label, "FULL_AUTO")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main(verbosity=2)
|
||||
|
||||
Reference in New Issue
Block a user