merge UnoApiText and UnoApiXmlTest
in preparation for a follow-up commit Change-Id: I3449c031696fe3ab13d4832e2671da08eb483cdb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199552 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
This commit is contained in:
@@ -45,7 +45,6 @@ $(eval $(call gb_Library_use_externals,subsequenttest,\
|
||||
|
||||
$(eval $(call gb_Library_add_exception_objects,subsequenttest,\
|
||||
test/source/unoapi_test \
|
||||
test/source/unoapixml_test \
|
||||
test/source/a11y/AccessibilityTools \
|
||||
test/source/a11y/XAccessibleActionTester \
|
||||
test/source/a11y/XAccessibleComponentTester \
|
||||
|
||||
@@ -386,4 +386,17 @@ void UnoApiTest::createTempCopy(std::u16string_view fileName)
|
||||
CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, e);
|
||||
}
|
||||
|
||||
xmlDocUniquePtr UnoApiTest::parseExport(OUString const& rStreamName)
|
||||
{
|
||||
std::unique_ptr<SvStream> const pStream(parseExportStream(maTempFile.GetURL(), rStreamName));
|
||||
xmlDocUniquePtr pXmlDoc = parseXmlStream(pStream.get());
|
||||
return pXmlDoc;
|
||||
}
|
||||
|
||||
xmlDocUniquePtr UnoApiTest::parseExportedFile()
|
||||
{
|
||||
auto stream(SvFileStream(maTempFile.GetURL(), StreamMode::READ | StreamMode::TEMPORARY));
|
||||
return parseXmlStream(&stream);
|
||||
}
|
||||
|
||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
||||
|
||||
@@ -1,41 +0,0 @@
|
||||
/* -*- 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/unoapixml_test.hxx>
|
||||
|
||||
#include <com/sun/star/frame/Desktop.hpp>
|
||||
#include <com/sun/star/frame/XStorable.hpp>
|
||||
#include <comphelper/processfactory.hxx>
|
||||
#include <comphelper/propertyvalue.hxx>
|
||||
|
||||
#include <sfx2/app.hxx>
|
||||
#include <sfx2/objsh.hxx>
|
||||
#include <utility>
|
||||
|
||||
using namespace css;
|
||||
|
||||
UnoApiXmlTest::UnoApiXmlTest(OUString path)
|
||||
: UnoApiTest(std::move(path))
|
||||
{
|
||||
}
|
||||
|
||||
xmlDocUniquePtr UnoApiXmlTest::parseExport(OUString const& rStreamName)
|
||||
{
|
||||
std::unique_ptr<SvStream> const pStream(parseExportStream(maTempFile.GetURL(), rStreamName));
|
||||
xmlDocUniquePtr pXmlDoc = parseXmlStream(pStream.get());
|
||||
return pXmlDoc;
|
||||
}
|
||||
|
||||
xmlDocUniquePtr UnoApiXmlTest::parseExportedFile()
|
||||
{
|
||||
auto stream(SvFileStream(maTempFile.GetURL(), StreamMode::READ | StreamMode::TEMPORARY));
|
||||
return parseXmlStream(&stream);
|
||||
}
|
||||
|
||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
||||
Reference in New Issue
Block a user