1 files changed, 34 insertions, 6 deletions
diff --git a/basic/qa/vba_tests/vartype.vb b/basic/qa/vba_tests/vartype.vb
index c392772ec27d..066255b2b7e3 100644
--- a/basic/qa/vba_tests/vartype.vb
+++ b/basic/qa/vba_tests/vartype.vb
@@ -22,14 +22,42 @@ Sub verify_testVarType()
     Dim TestLong As Long
     Dim TestDouble As Double
     Dim TestBoo As Boolean
+    Dim TestSingle As Single
+    Dim TestCurr As Currency
+
+    Dim TestIntSign%
+    Dim TestLongSign&
+    Dim TestSingleSign!
+    Dim TestDoubleSign#
+    Dim TestCurrSign@
+    Dim TestStrSign$
     On Error GoTo errorHandler
 
-    TestUtil.AssertEqual(VarType(TestStr),      8, "VarType(TestStr)")
-    TestUtil.AssertEqual(VarType(TestBoo),     11, "VarType(TestBoo)")
-    TestUtil.AssertEqual(VarType(TestDouble),   5, "VarType(TestDouble)")
-    TestUtil.AssertEqual(VarType(TestLong),     3, "VarType(TestLong)")
-    TestUtil.AssertEqual(VarType(TestInt),      2, "VarType(TestInt)")
-    TestUtil.AssertEqual(VarType(TestDateTime), 7, "VarType(TestDateTime)")
+    TestUtil.AssertEqual(vbInteger,  2,  "vbInteger")
+    TestUtil.AssertEqual(vbLong,     3,  "vbLong")
+    TestUtil.AssertEqual(vbSingle,   4,  "vbSingle")
+    TestUtil.AssertEqual(vbDouble,   5,  "vbDouble")
+    TestUtil.AssertEqual(vbCurrency, 6,  "vbCurrency")
+    TestUtil.AssertEqual(vbDate,     7,  "vbDate")
+    TestUtil.AssertEqual(vbString,   8,  "vbString")
+    TestUtil.AssertEqual(vbBoolean,  11, "vbBoolean")
+
+    TestUtil.AssertEqual(VarType(varname:=TestStr), vbString, "VarType(varname:=TestStr)")
+
+    TestUtil.AssertEqual(VarType(TestStr),        vbString,   "VarType(TestStr)")
+    TestUtil.AssertEqual(VarType(TestBoo),        vbBoolean,  "VarType(TestBoo)")
+    TestUtil.AssertEqual(VarType(TestDouble),     vbDouble,   "VarType(TestDouble)")
+    TestUtil.AssertEqual(VarType(TestLong),       vbLong,     "VarType(TestLong)")
+    TestUtil.AssertEqual(VarType(TestInt),        vbInteger,  "VarType(TestInt)")
+    TestUtil.AssertEqual(VarType(TestDateTime),   vbDate,     "VarType(TestDateTime)")
+    TestUtil.AssertEqual(VarType(TestSingle),     vbSingle,   "VarType(TestSingle)")
+    TestUtil.AssertEqual(VarType(TestCurr),       vbCurrency, "VarType(TestCurr)")
+
+    TestUtil.AssertEqual(VarType(TestIntSign),    vbInteger,  "VarType(TestIntSign)")
+    TestUtil.AssertEqual(VarType(TestLongSign),   vbLong,     "VarType(TestLongSign)")
+    TestUtil.AssertEqual(VarType(TestSingleSign), vbSingle,   "VarType(TestSingleSign)")
+    TestUtil.AssertEqual(VarType(TestDoubleSign), vbDouble,   "VarType(TestDoubleSign)")
+    TestUtil.AssertEqual(VarType(TestCurrSign),   vbCurrency, "VarType(TestCurrSign)")
 
     Exit Sub
 errorHandler: