Kaydet (Commit) d4b4a6a8 authored tarafından Noel Power's avatar Noel Power Kaydeden (comit) Fridrich Strba

unittest and test data for bnc#809017

Change-Id: I3ccae692db44bb3ce41b371f0b511a9db7181bf4
Reviewed-on: https://gerrit.libreoffice.org/2759Reviewed-by: 's avatarFridrich Strba <fridrich@documentfoundation.org>
Tested-by: 's avatarFridrich Strba <fridrich@documentfoundation.org>
üst dd59a0a0
...@@ -22,7 +22,7 @@ namespace ...@@ -22,7 +22,7 @@ namespace
VBATest() : BootstrapFixture(true, false) {} VBATest() : BootstrapFixture(true, false) {}
~VBATest(){} ~VBATest(){}
void testMiscVBAFunctions(); void testMiscVBAFunctions();
void testObjAssignWithDefaultMember(); void testMiscOLEStuff();
// Adds code needed to register the test suite // Adds code needed to register the test suite
CPPUNIT_TEST_SUITE(VBATest); CPPUNIT_TEST_SUITE(VBATest);
...@@ -30,7 +30,7 @@ namespace ...@@ -30,7 +30,7 @@ namespace
CPPUNIT_TEST(testMiscVBAFunctions); CPPUNIT_TEST(testMiscVBAFunctions);
// not much point even trying to run except on windows // not much point even trying to run except on windows
#if defined(WNT) #if defined(WNT)
CPPUNIT_TEST(testObjAssignWithDefaultMember); CPPUNIT_TEST(testMiscOLEStuff);
#endif #endif
// End of test suite definition // End of test suite definition
...@@ -105,7 +105,7 @@ void VBATest::testMiscVBAFunctions() ...@@ -105,7 +105,7 @@ void VBATest::testMiscVBAFunctions()
} }
} }
void VBATest::testObjAssignWithDefaultMember() void VBATest::testMiscOLEStuff()
{ {
bool bCanRunOleTests = hasOLEEnv(); bool bCanRunOleTests = hasOLEEnv();
if ( !bCanRunOleTests ) if ( !bCanRunOleTests )
...@@ -114,6 +114,7 @@ void VBATest::testObjAssignWithDefaultMember() ...@@ -114,6 +114,7 @@ void VBATest::testObjAssignWithDefaultMember()
const char* macroSource[] = { const char* macroSource[] = {
"ole_ObjAssignNoDflt.vb", "ole_ObjAssignNoDflt.vb",
"ole_ObjAssignToNothing.vb", "ole_ObjAssignToNothing.vb",
"ole_dfltObjDflMethod.vb",
}; };
OUString sMacroPathURL = getURLFromSrc("/basic/qa/vba_tests/"); OUString sMacroPathURL = getURLFromSrc("/basic/qa/vba_tests/");
......
Option VBASupport 1
Option Explicit
Rem Test accessing an object that has default object member
Rem which in turn has a default member that is a method
Function doUnitTest(TestData As String) As String
doUnitTest = "Begin"
Dim modifiedTimout As Long
Dim cnn1 As New ADODB.Connection
Dim rst1 As New ADODB.Recordset
Dim conStr As String
cnn1.Open "Provider=Microsoft.Jet.OLEDB.4.0;" & _
"Data Source=" & TestData & ";" & _
"Extended Properties=""Excel 8.0;HDR=Yes"";"
rst1.Open "SELECT * FROM [Sheet1$];", cnn1, adOpenStatic, adLockReadOnly
Dim val
val = rst1("FirstName")
If val = "Paddy" Then
doUnitTest = "OK"
Else
doUnitTest = "Failed, expected 'Paddy' got " & val
End If
End Function
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment