d9e322d60f
Instead of returning ErrCode class everywhere, return a new class ErrrCodeMsg, which combines an ErrCode with the other parameters that are used to control the error reporting. I do not change everything that uses ErrCode here, I started from SfxBaseController/SfxMedium and worked outwards. This change serves two purposes (1) Replace the extremely whacky ErrorInfo mechanism we were using to smuggle information into the error handler reporting mechanism with a very straightforward approach of just combining it into the error class. (2) Allow us to capture the source location that produced the error, which makes debugging the source of a problem soooo much easier. Change-Id: I978b8f00c9851b41a216c7ebdef2ef94251d5519 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157440 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
117 lines
4.1 KiB
C++
117 lines
4.1 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*/
|
|
|
|
#include <sal/config.h>
|
|
#include "basictest.hxx"
|
|
#include <basic/sberrors.hxx>
|
|
#include <unotest/bootstrapfixturebase.hxx>
|
|
|
|
CPPUNIT_TEST_FIXTURE(CppUnit::TestFixture, testRedefineArgument)
|
|
{
|
|
MacroSnippet aMacro("Sub doUnitTest(argName)\n"
|
|
" If False Then\n"
|
|
" Dim argName\n"
|
|
" End If\n"
|
|
"End Sub\n");
|
|
aMacro.Compile();
|
|
CPPUNIT_ASSERT(aMacro.HasError());
|
|
CPPUNIT_ASSERT_EQUAL(ERRCODE_BASIC_VAR_DEFINED, aMacro.getError().GetCode());
|
|
}
|
|
|
|
CPPUNIT_TEST_FIXTURE(CppUnit::TestFixture, testDoubleArgument)
|
|
{
|
|
MacroSnippet aMacro("Sub doUnitTest(argName, argName)\n"
|
|
"End Sub\n");
|
|
aMacro.Compile();
|
|
CPPUNIT_ASSERT(aMacro.HasError());
|
|
CPPUNIT_ASSERT_EQUAL(ERRCODE_BASIC_VAR_DEFINED, aMacro.getError().GetCode());
|
|
}
|
|
|
|
CPPUNIT_TEST_FIXTURE(CppUnit::TestFixture, testTdf149157)
|
|
{
|
|
MacroSnippet aMacro("Function extentComment() As Integer\n"
|
|
" ' _\n"
|
|
" If Not extentComment Then\n"
|
|
" extentComment = 1\n"
|
|
" End If\n"
|
|
"End Function\n");
|
|
aMacro.Compile();
|
|
CPPUNIT_ASSERT(!aMacro.HasError());
|
|
}
|
|
|
|
CPPUNIT_TEST_FIXTURE(CppUnit::TestFixture, testTdf149157_compatible)
|
|
{
|
|
MacroSnippet aMacro("Option Compatible\n"
|
|
"Function extentComment() As Integer\n"
|
|
" ' _\n"
|
|
"\n"
|
|
" If Not extentComment Then\n"
|
|
" extentComment = 1\n"
|
|
" End If\n"
|
|
"End Function\n");
|
|
aMacro.Compile();
|
|
CPPUNIT_ASSERT(!aMacro.HasError());
|
|
}
|
|
|
|
CPPUNIT_TEST_FIXTURE(CppUnit::TestFixture, testTdf149157_vba)
|
|
{
|
|
MacroSnippet aMacro("Option VBASupport 1\n"
|
|
"Function extentComment() As Integer\n"
|
|
" ' _\n"
|
|
"\n"
|
|
" If Not extentComment Then\n"
|
|
" extentComment = 1\n"
|
|
" End If\n"
|
|
"End Function\n");
|
|
aMacro.Compile();
|
|
CPPUNIT_ASSERT(!aMacro.HasError());
|
|
}
|
|
|
|
CPPUNIT_TEST_FIXTURE(CppUnit::TestFixture, testTdf149402)
|
|
{
|
|
MacroSnippet aMacro("Function extentComment() As Integer\n"
|
|
" ' _ \n"
|
|
" If Not extentComment Then\n"
|
|
" extentComment = 1\n"
|
|
" Else\n"
|
|
" End If\n"
|
|
"End Function\n");
|
|
aMacro.Compile();
|
|
CPPUNIT_ASSERT(!aMacro.HasError());
|
|
}
|
|
|
|
CPPUNIT_TEST_FIXTURE(CppUnit::TestFixture, testTdf149402_compatible)
|
|
{
|
|
MacroSnippet aMacro("Option Compatible\n"
|
|
"Function extentComment() As Integer\n"
|
|
" ' _ \n"
|
|
" If Not extentComment Then\n"
|
|
" extentComment = 1\n"
|
|
" Else\n"
|
|
" End If\n"
|
|
"End Function\n");
|
|
aMacro.Compile();
|
|
CPPUNIT_ASSERT(!aMacro.HasError());
|
|
}
|
|
|
|
CPPUNIT_TEST_FIXTURE(CppUnit::TestFixture, testTdf149402_vba)
|
|
{
|
|
MacroSnippet aMacro("Option VBASupport 1\n"
|
|
"Function extentComment() As Integer\n"
|
|
" ' _ \n"
|
|
" If Not extentComment Then\n"
|
|
" extentComment = 1\n"
|
|
" Else\n"
|
|
" End If\n"
|
|
"End Function\n");
|
|
aMacro.Compile();
|
|
CPPUNIT_ASSERT(!aMacro.HasError());
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
|