🎨 style: standardize parameter naming to camelCase
Refactor parameter and property names from PascalCase to camelCase for consistent naming conventions across VBA modules. Changes: - Conditions → conditions (property and parameters) - Update all references across 7 modules - Maintain functional behavior while improving code readability Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -116,21 +116,21 @@ Public Sub TestConditionEvaluator()
|
||||
Set evaluator = New ConditionEvaluator
|
||||
|
||||
' 创建测试条件字典
|
||||
Dim Conditions As Object
|
||||
Set Conditions = CreateObject("Scripting.Dictionary")
|
||||
Conditions.Add "azxs", "A0"
|
||||
Conditions.Add "bkxs", "531"
|
||||
Conditions.Add "gclj", "M20"
|
||||
Conditions.Add "jycz", "3"
|
||||
Conditions.Add "lcfw", "M06"
|
||||
Dim conditions As Object
|
||||
Set conditions = CreateObject("Scripting.Dictionary")
|
||||
conditions.Add "azxs", "A0"
|
||||
conditions.Add "bkxs", "531"
|
||||
conditions.Add "gclj", "M20"
|
||||
conditions.Add "jycz", "3"
|
||||
conditions.Add "lcfw", "M06"
|
||||
|
||||
' 测试用例1: 简单等式
|
||||
Debug.Print "测试用例1: 简单等式"
|
||||
Dim expr1 As String
|
||||
expr1 = "azxs=A0"
|
||||
Debug.Print " 表达式: " & expr1
|
||||
Debug.Print " 结果: " & evaluator.Evaluate(expr1, Conditions)
|
||||
AssertTrue "简单等式", evaluator.Evaluate(expr1, Conditions)
|
||||
Debug.Print " 结果: " & evaluator.Evaluate(expr1, conditions)
|
||||
AssertTrue "简单等式", evaluator.Evaluate(expr1, conditions)
|
||||
Debug.Print ""
|
||||
|
||||
' 测试用例2: AND运算
|
||||
@@ -138,8 +138,8 @@ Public Sub TestConditionEvaluator()
|
||||
Dim expr2 As String
|
||||
expr2 = "azxs=A0 AND bkxs=531"
|
||||
Debug.Print " 表达式: " & expr2
|
||||
Debug.Print " 结果: " & evaluator.Evaluate(expr2, Conditions)
|
||||
AssertTrue "AND运算", evaluator.Evaluate(expr2, Conditions)
|
||||
Debug.Print " 结果: " & evaluator.Evaluate(expr2, conditions)
|
||||
AssertTrue "AND运算", evaluator.Evaluate(expr2, conditions)
|
||||
Debug.Print ""
|
||||
|
||||
' 测试用例3: OR运算
|
||||
@@ -147,8 +147,8 @@ Public Sub TestConditionEvaluator()
|
||||
Dim expr3 As String
|
||||
expr3 = "azxs=AT OR azxs=A0"
|
||||
Debug.Print " 表达式: " & expr3
|
||||
Debug.Print " 结果: " & evaluator.Evaluate(expr3, Conditions)
|
||||
AssertTrue "OR运算", evaluator.Evaluate(expr3, Conditions)
|
||||
Debug.Print " 结果: " & evaluator.Evaluate(expr3, conditions)
|
||||
AssertTrue "OR运算", evaluator.Evaluate(expr3, conditions)
|
||||
Debug.Print ""
|
||||
|
||||
' 测试用例4: !=运算
|
||||
@@ -156,8 +156,8 @@ Public Sub TestConditionEvaluator()
|
||||
Dim expr4 As String
|
||||
expr4 = "azxs!=AH"
|
||||
Debug.Print " 表达式: " & expr4
|
||||
Debug.Print " 结果: " & evaluator.Evaluate(expr4, Conditions)
|
||||
AssertTrue "!=运算", evaluator.Evaluate(expr4, Conditions)
|
||||
Debug.Print " 结果: " & evaluator.Evaluate(expr4, conditions)
|
||||
AssertTrue "!=运算", evaluator.Evaluate(expr4, conditions)
|
||||
Debug.Print ""
|
||||
|
||||
' 测试用例5: 复杂嵌套
|
||||
@@ -165,8 +165,8 @@ Public Sub TestConditionEvaluator()
|
||||
Dim expr5 As String
|
||||
expr5 = "(azxs=A0 OR azxs=AT) AND (bkxs=531 OR bkxs=541)"
|
||||
Debug.Print " 表达式: " & expr5
|
||||
Debug.Print " 结果: " & evaluator.Evaluate(expr5, Conditions)
|
||||
AssertTrue "复杂嵌套", evaluator.Evaluate(expr5, Conditions)
|
||||
Debug.Print " 结果: " & evaluator.Evaluate(expr5, conditions)
|
||||
AssertTrue "复杂嵌套", evaluator.Evaluate(expr5, conditions)
|
||||
Debug.Print ""
|
||||
|
||||
' 测试用例6: 不存在的变量(!=情况)
|
||||
@@ -174,8 +174,8 @@ Public Sub TestConditionEvaluator()
|
||||
Dim expr6 As String
|
||||
expr6 = "tsyq!=SCRJ"
|
||||
Debug.Print " 表达式: " & expr6
|
||||
Debug.Print " 结果: " & evaluator.Evaluate(expr6, Conditions)
|
||||
AssertTrue "不存在的变量!=", evaluator.Evaluate(expr6, Conditions)
|
||||
Debug.Print " 结果: " & evaluator.Evaluate(expr6, conditions)
|
||||
AssertTrue "不存在的变量!=", evaluator.Evaluate(expr6, conditions)
|
||||
Debug.Print ""
|
||||
|
||||
' 测试用例7: 实际BOM条件
|
||||
@@ -183,9 +183,9 @@ Public Sub TestConditionEvaluator()
|
||||
Dim expr7 As String
|
||||
expr7 = "gclj=M20 AND jycz=1 AND lcfw=M01 AND (azxs=A0 OR azxs=AT OR azxs=AH)"
|
||||
Debug.Print " 表达式: " & expr7
|
||||
Debug.Print " 结果: " & evaluator.Evaluate(expr7, Conditions)
|
||||
Debug.Print " 结果: " & evaluator.Evaluate(expr7, conditions)
|
||||
' 这个应该是False,因为jycz=3,不是1
|
||||
AssertFalse "实际BOM条件(应该False)", evaluator.Evaluate(expr7, Conditions)
|
||||
AssertFalse "实际BOM条件(应该False)", evaluator.Evaluate(expr7, conditions)
|
||||
Debug.Print ""
|
||||
|
||||
Debug.Print "<<< ConditionEvaluator 测试完成"
|
||||
|
||||
Reference in New Issue
Block a user