Skip to content

Commit b8ea6d3

Browse files
committed
Added test for implied multiplication
1 parent d435a21 commit b8ea6d3

File tree

1 file changed

+36
-17
lines changed

1 file changed

+36
-17
lines changed

src/Tests/TestRunner.bas

Lines changed: 36 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ Private actual As String
1111
Private Assert As Object
1212
Private Fakes As Object
1313

14+
Public Sub ShowEvalForm(control As IRibbonControl)
15+
EvalForm_frm.Show False
16+
End Sub
17+
1418
'@ModuleInitialize
1519
Private Sub ModuleInitialize()
1620
'this method runs once per module.
@@ -35,18 +39,18 @@ Private Sub TestCleanup()
3539
'this method runs after every test in the module.
3640
End Sub
3741

38-
Private Function GetResult(Expression As String _
42+
Private Function GetResult(expression As String _
3943
, Optional VariablesValues As String = vbNullString) As String
4044
On Error Resume Next
4145
Set Evaluator = New VBAexpressions
4246

4347
With Evaluator
44-
.Create Expression
48+
.Create expression
4549
GetResult = .Eval(VariablesValues)
4650
End With
4751
End Function
4852

49-
'@TestMethod("General")
53+
'@TestMethod("VBA Expressions")
5054
Private Sub Parentheses()
5155
On Error GoTo TestFail
5256

@@ -62,7 +66,7 @@ TestFail:
6266
Assert.Fail "Test raised an error: #" & err.Number & " - " & err.Description
6367
Resume TestExit
6468
End Sub
65-
'@TestMethod("General")
69+
'@TestMethod("VBA Expressions")
6670
Private Sub ParenthesesAndSingleFunction()
6771
On Error GoTo TestFail
6872

@@ -78,7 +82,7 @@ TestFail:
7882
Assert.Fail "Test raised an error: #" & err.Number & " - " & err.Description
7983
Resume TestExit
8084
End Sub
81-
'@TestMethod("General")
85+
'@TestMethod("VBA Expressions")
8286
Private Sub FunctionsWithMoreThanOneArgument()
8387
On Error GoTo TestFail
8488

@@ -94,7 +98,7 @@ TestFail:
9498
Assert.Fail "Test raised an error: #" & err.Number & " - " & err.Description
9599
Resume TestExit
96100
End Sub
97-
'@TestMethod("General")
101+
'@TestMethod("VBA Expressions")
98102
Private Sub NestedFunctions()
99103
On Error GoTo TestFail
100104

@@ -111,7 +115,7 @@ TestFail:
111115
Assert.Fail "Test raised an error: #" & err.Number & " - " & err.Description
112116
Resume TestExit
113117
End Sub
114-
'@TestMethod("General")
118+
'@TestMethod("VBA Expressions")
115119
Private Sub FloatingPointArithmetic()
116120
On Error GoTo TestFail
117121

@@ -127,7 +131,7 @@ TestFail:
127131
Assert.Fail "Test raised an error: #" & err.Number & " - " & err.Description
128132
Resume TestExit
129133
End Sub
130-
'@TestMethod("General")
134+
'@TestMethod("VBA Expressions")
131135
Private Sub ExponentiationPrecedence()
132136
On Error GoTo TestFail
133137

@@ -143,7 +147,7 @@ TestFail:
143147
Assert.Fail "Test raised an error: #" & err.Number & " - " & err.Description
144148
Resume TestExit
145149
End Sub
146-
'@TestMethod("General")
150+
'@TestMethod("VBA Expressions")
147151
Private Sub Factorials()
148152
On Error GoTo TestFail
149153

@@ -159,7 +163,7 @@ TestFail:
159163
Assert.Fail "Test raised an error: #" & err.Number & " - " & err.Description
160164
Resume TestExit
161165
End Sub
162-
'@TestMethod("General")
166+
'@TestMethod("VBA Expressions")
163167
Private Sub Precedence()
164168
On Error GoTo TestFail
165169

@@ -175,7 +179,7 @@ TestFail:
175179
Assert.Fail "Test raised an error: #" & err.Number & " - " & err.Description
176180
Resume TestExit
177181
End Sub
178-
'@TestMethod("General")
182+
'@TestMethod("VBA Expressions")
179183
Private Sub Variables()
180184
On Error GoTo TestFail
181185

@@ -192,7 +196,7 @@ TestFail:
192196
Assert.Fail "Test raised an error: #" & err.Number & " - " & err.Description
193197
Resume TestExit
194198
End Sub
195-
'@TestMethod("General")
199+
'@TestMethod("VBA Expressions")
196200
Private Sub UDFsAndArrays()
197201
On Error GoTo TestFail
198202
'///////////////////////////////////////////////////////////////////////////////////
@@ -218,7 +222,7 @@ TestFail:
218222
Assert.Fail "Test raised an error: #" & err.Number & " - " & err.Description
219223
Resume TestExit
220224
End Sub
221-
'@TestMethod("General")
225+
'@TestMethod("VBA Expressions")
222226
Private Sub LogicalOperatorsNumericOutput()
223227
On Error GoTo TestFail
224228

@@ -235,7 +239,7 @@ TestFail:
235239
Assert.Fail "Test raised an error: #" & err.Number & " - " & err.Description
236240
Resume TestExit
237241
End Sub
238-
'@TestMethod("General")
242+
'@TestMethod("VBA Expressions")
239243
Private Sub TestLogicalOperatorsBooleanOutput()
240244
On Error GoTo TestFail
241245

@@ -252,7 +256,7 @@ TestFail:
252256
Assert.Fail "Test raised an error: #" & err.Number & " - " & err.Description
253257
Resume TestExit
254258
End Sub
255-
'@TestMethod("General")
259+
'@TestMethod("VBA Expressions")
256260
Private Sub TestTrigFunctions()
257261
On Error GoTo TestFail
258262

@@ -268,7 +272,7 @@ TestFail:
268272
Assert.Fail "Test raised an error: #" & err.Number & " - " & err.Description
269273
Resume TestExit
270274
End Sub
271-
'@TestMethod("General")
275+
'@TestMethod("VBA Expressions")
272276
Private Sub TestModFunction()
273277
On Error GoTo TestFail
274278

@@ -284,7 +288,7 @@ TestFail:
284288
Assert.Fail "Test raised an error: #" & err.Number & " - " & err.Description
285289
Resume TestExit
286290
End Sub
287-
'@TestMethod("General")
291+
'@TestMethod("VBA Expressions")
288292
Private Sub testStringComp()
289293
On Error GoTo TestFail
290294

@@ -301,4 +305,19 @@ TestFail:
301305
Assert.Fail "Test raised an error: #" & err.Number & " - " & err.Description
302306
Resume TestExit
303307
End Sub
308+
'@TestMethod("VBA Expressions")
309+
Private Sub ImpliedMultiplication()
310+
On Error GoTo TestFail
311+
312+
actual = GetResult( _
313+
"5(2)(3)(4)" _
314+
)
315+
expected = "120"
316+
Assert.AreEqual expected, actual
304317

318+
TestExit:
319+
Exit Sub
320+
TestFail:
321+
Assert.Fail "Test raised an error: #" & err.Number & " - " & err.Description
322+
Resume TestExit
323+
End Sub

0 commit comments

Comments
 (0)