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>
67 lines
1.9 KiB
C++
67 lines
1.9 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* 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 <test/bootstrapfixture.hxx>
|
|
#include <cppunit/TestAssert.h>
|
|
|
|
#include <vcl/errinf.hxx>
|
|
|
|
class ErrorHandlerTest;
|
|
|
|
namespace {
|
|
|
|
class MockErrorHandler : private ErrorHandler
|
|
{
|
|
friend ErrorHandlerTest;
|
|
|
|
protected:
|
|
virtual bool CreateString(const ErrCodeMsg&, OUString &rErrString) const override
|
|
{
|
|
rErrString = "Non-dynamic error";
|
|
return true;
|
|
}
|
|
};
|
|
|
|
}
|
|
|
|
class ErrorHandlerTest : public test::BootstrapFixture
|
|
{
|
|
public:
|
|
ErrorHandlerTest() : BootstrapFixture(true, false) {}
|
|
|
|
void testGetErrorString();
|
|
|
|
CPPUNIT_TEST_SUITE(ErrorHandlerTest);
|
|
CPPUNIT_TEST(testGetErrorString);
|
|
CPPUNIT_TEST_SUITE_END();
|
|
};
|
|
|
|
void ErrorHandlerTest::testGetErrorString()
|
|
{
|
|
MockErrorHandler aErrHdlr;
|
|
OUString aErrStr;
|
|
|
|
CPPUNIT_ASSERT_MESSAGE("GetErrorString(ERRCODE_ABORT, aErrStr) should return false",
|
|
!ErrorHandler::GetErrorString(ERRCODE_ABORT, aErrStr));
|
|
// normally protected, but MockErrorHandler is a friend of this class
|
|
aErrHdlr.CreateString(ERRCODE_ABORT, aErrStr);
|
|
CPPUNIT_ASSERT_EQUAL_MESSAGE("error message should be non-dynamic", OUString("Non-dynamic error"), aErrStr);
|
|
|
|
CPPUNIT_ASSERT_MESSAGE("GetErrorString(ERRCODE_NONE, aErrStr) should return false",
|
|
!ErrorHandler::GetErrorString(ERRCODE_NONE, aErrStr));
|
|
aErrHdlr.CreateString(ERRCODE_NONE, aErrStr);
|
|
CPPUNIT_ASSERT_EQUAL_MESSAGE("error message should be non-dynamic", OUString("Non-dynamic error"), aErrStr);
|
|
}
|
|
|
|
CPPUNIT_TEST_SUITE_REGISTRATION(ErrorHandlerTest);
|
|
|
|
CPPUNIT_PLUGIN_IMPLEMENT();
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|