Author: akhaldi
Date: Thu Nov 17 23:16:08 2016
New Revision: 73299
URL:
http://svn.reactos.org/svn/reactos?rev=73299&view=rev
Log:
[VBSCRIPT_WINETEST] Sync with Wine Staging 1.9.23. CORE-12409
Modified:
trunk/rostests/winetests/vbscript/api.vbs
trunk/rostests/winetests/vbscript/run.c
Modified: trunk/rostests/winetests/vbscript/api.vbs
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/vbscript/api.vb…
==============================================================================
--- trunk/rostests/winetests/vbscript/api.vbs [iso-8859-1] (original)
+++ trunk/rostests/winetests/vbscript/api.vbs [iso-8859-1] Thu Nov 17 23:16:08 2016
@@ -440,6 +440,35 @@
TestLCase Empty, ""
Call ok(getVT(LCase(Null)) = "VT_NULL", "getVT(LCase(Null)) = " &
getVT(LCase(Null)))
+Sub TestStrComp(str_left, str_right, mode, ex)
+ x = StrComp(str_left, str_right, mode)
+ Call ok(x = ex, "StrComp(" & str_left & ", " &
str_right & ", " & mode & ") = " & x & "
expected " & ex)
+End Sub
+
+TestStrComp "ABC", "abc", 0, -1
+TestStrComp "abc", "ABC", 0, 1
+TestStrComp "ABC", "ABC", 0, 0
+TestStrComp "ABC", "abc", 0, -1
+TestStrComp "abc", "ABC", 0, 1
+TestStrComp "ABC", "ABC", 0, 0
+TestStrComp "ABCD", "ABC", 0, 1
+TestStrComp "ABC", "ABCD", 0, -1
+TestStrComp "ABC", "abc", 1, 0
+TestStrComp "ABC", "ABC", 1, 0
+TestStrComp "ABCD", "ABC", 1, 1
+TestStrComp "ABC", "ABCD", 1, -1
+TestStrComp "ABC", "ABCD", "0", -1
+TestStrComp "ABC", "ABCD", "1", -1
+TestStrComp 1, 1, 1, 0
+TestStrComp "1", 1, 1, 0
+TestStrComp "1", 1.0, 1, 0
+TestStrComp Empty, Empty, 1, 0
+TestStrComp Empty, "", 1, 0
+TestStrComp Empty, "ABC", 1, -1
+TestStrComp "ABC", Empty, 1, 1
+TestStrComp vbNull, vbNull, 1, 0
+TestStrComp "", vbNull, 1, -1
+
Call ok(Len("abc") = 3, "Len(abc) = " & Len("abc"))
Call ok(Len("") = 0, "Len() = " & Len(""))
Call ok(Len(1) = 1, "Len(1) = " & Len(1))
Modified: trunk/rostests/winetests/vbscript/run.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/vbscript/run.c?…
==============================================================================
--- trunk/rostests/winetests/vbscript/run.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/vbscript/run.c [iso-8859-1] Thu Nov 17 23:16:08 2016
@@ -2133,6 +2133,12 @@
CHECK_CALLED(global_success_d);
CHECK_CALLED(global_success_i);
+ SET_EXPECT(global_success_d);
+ SET_EXPECT(global_success_i);
+ parse_script_af(0, "TEST.reportSuccess()");
+ CHECK_CALLED(global_success_d);
+ CHECK_CALLED(global_success_i);
+
SET_EXPECT(global_vbvar_d);
SET_EXPECT(global_vbvar_i);
parse_script_a("Option Explicit\nvbvar = 3");