sdext/CppunitTest_sdext_pdfimport.mk | 3 ++-
sdext/qa/unit/pdfimport.cxx | 18 +++++++++---------
solenv/clang-format/excludelist | 2 +-
3 files changed, 12 insertions(+), 11 deletions(-)
New commits:
commit fd05a0f9ccebaee6f0175281fdeb6fe3f3168fd2
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Fri Nov 25 09:55:37 2022 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Fri Nov 25 17:46:46 2022 +0100
CppunitTest_sdext_pdfimport: move it to 'qa' folder
like the rest of folders in the project
Change-Id: Ifb833aa8acedc8549c74383b2d76737d4f425c09
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143277
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sdext/CppunitTest_sdext_pdfimport.mk
b/sdext/CppunitTest_sdext_pdfimport.mk
index b2676d32002b..864fb7084c88 100644
--- a/sdext/CppunitTest_sdext_pdfimport.mk
+++ b/sdext/CppunitTest_sdext_pdfimport.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_CppunitTest_use_sdk_api,sdext_pdfimport))
$(eval $(call gb_CppunitTest_set_include,sdext_pdfimport,\
-I$(SRCDIR)/sdext/source/pdfimport/inc \
+ -I$(SRCDIR)/sdext/source/pdfimport/test \
$$(INCLUDE) \
))
@@ -38,7 +39,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sdext_pdfimport,\
$(eval $(call gb_CppunitTest_use_library_objects,sdext_pdfimport,pdfimport))
$(eval $(call gb_CppunitTest_add_exception_objects,sdext_pdfimport,\
- sdext/source/pdfimport/test/tests \
+ sdext/qa/unit/pdfimport \
))
$(eval $(call gb_CppunitTest_use_executable,sdext_pdfimport,xpdfimport))
diff --git a/sdext/source/pdfimport/test/testdocs/tdf104597_textrun.pdf
b/sdext/qa/unit/data/tdf104597_textrun.pdf
similarity index 100%
rename from sdext/source/pdfimport/test/testdocs/tdf104597_textrun.pdf
rename to sdext/qa/unit/data/tdf104597_textrun.pdf
diff --git
a/sdext/source/pdfimport/test/testdocs/tdf78427-MyraidPro-Semibold-Light.pdf
b/sdext/qa/unit/data/tdf78427-MyraidPro-Semibold-Light.pdf
similarity index 100%
rename from
sdext/source/pdfimport/test/testdocs/tdf78427-MyraidPro-Semibold-Light.pdf
rename to sdext/qa/unit/data/tdf78427-MyraidPro-Semibold-Light.pdf
diff --git a/sdext/source/pdfimport/test/testdocs/tdf78427-testFontFeatures.pdf
b/sdext/qa/unit/data/tdf78427-testFontFeatures.pdf
similarity index 100%
rename from sdext/source/pdfimport/test/testdocs/tdf78427-testFontFeatures.pdf
rename to sdext/qa/unit/data/tdf78427-testFontFeatures.pdf
diff --git a/sdext/source/pdfimport/test/testdocs/testSpace.pdf
b/sdext/qa/unit/data/testSpace.pdf
similarity index 100%
rename from sdext/source/pdfimport/test/testdocs/testSpace.pdf
rename to sdext/qa/unit/data/testSpace.pdf
diff --git a/sdext/source/pdfimport/test/testdocs/testTdf141709_chinesechar.pdf
b/sdext/qa/unit/data/testTdf141709_chinesechar.pdf
similarity index 100%
rename from sdext/source/pdfimport/test/testdocs/testTdf141709_chinesechar.pdf
rename to sdext/qa/unit/data/testTdf141709_chinesechar.pdf
diff --git a/sdext/source/pdfimport/test/testdocs/testTdf143959.pdf
b/sdext/qa/unit/data/testTdf143959.pdf
similarity index 100%
rename from sdext/source/pdfimport/test/testdocs/testTdf143959.pdf
rename to sdext/qa/unit/data/testTdf143959.pdf
diff --git a/sdext/source/pdfimport/test/tests.cxx b/sdext/qa/unit/pdfimport.cxx
similarity index 98%
rename from sdext/source/pdfimport/test/tests.cxx
rename to sdext/qa/unit/pdfimport.cxx
index 7c10c85b29a5..bb09202897ec 100644
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/qa/unit/pdfimport.cxx
@@ -19,12 +19,12 @@
#include <config_features.h>
-#include "outputwrap.hxx"
+#include <outputwrap.hxx>
#include <contentsink.hxx>
#include <pdfihelper.hxx>
#include <wrapper.hxx>
#include <pdfparse.hxx>
-#include "../pdfiadaptor.hxx"
+#include <../pdfiadaptor.hxx>
#include <rtl/math.hxx>
#include <osl/file.hxx>
@@ -565,7 +565,7 @@ namespace
OString aOutput;
CPPUNIT_ASSERT_MESSAGE("Exporting to ODF",
-
xAdaptor->odfConvert(m_directories.getURLFromSrc(u"/sdext/source/pdfimport/test/testdocs/testTdf141709_chinesechar.pdf"),
+
xAdaptor->odfConvert(m_directories.getURLFromSrc(u"/sdext/qa/unit/data/testTdf141709_chinesechar.pdf"),
new OutputWrapString(aOutput),
nullptr));
xmlDocUniquePtr pXmlDoc(xmlParseDoc(reinterpret_cast<xmlChar const
*>(aOutput.getStr())));
@@ -588,7 +588,7 @@ namespace
OString aOutput;
CPPUNIT_ASSERT_MESSAGE("Converting PDF to ODF XML",
xAdaptor->odfConvert( m_directories.getURLFromSrc(
-
u"/sdext/source/pdfimport/test/testdocs/tdf78427-testFontFeatures.pdf"),
+ u"/sdext/qa/unit/data/tdf78427-testFontFeatures.pdf"),
new OutputWrapString(aOutput),
nullptr ));
// Un-comment the following debug line to see the content of
generated XML content in
@@ -720,7 +720,7 @@ namespace
OString aOutput;
CPPUNIT_ASSERT_MESSAGE("Converting PDF to ODF XML",
xAdaptor->odfConvert( m_directories.getURLFromSrc(
-
u"/sdext/source/pdfimport/test/testdocs/tdf78427-MyraidPro-Semibold-Light.pdf"),
+
u"/sdext/qa/unit/data/tdf78427-MyraidPro-Semibold-Light.pdf"),
new OutputWrapString(aOutput),
nullptr ));
//std::cout << aOutput << std::endl;
@@ -754,7 +754,7 @@ namespace
OString aOutput;
CPPUNIT_ASSERT_MESSAGE("Converting PDF to ODF XML",
- xAdaptor->odfConvert(
m_directories.getURLFromSrc(u"/sdext/source/pdfimport/test/testdocs/testTdf143959.pdf"),
+ xAdaptor->odfConvert(
m_directories.getURLFromSrc(u"/sdext/qa/unit/data/testTdf143959.pdf"),
new
OutputWrapString(aOutput),
nullptr ));
@@ -789,7 +789,7 @@ namespace
OString aOutput;
CPPUNIT_ASSERT_MESSAGE("Converting PDF to ODF XML",
-
xAdaptor->odfConvert(m_directories.getURLFromSrc(u"/sdext/source/pdfimport/test/testdocs/tdf104597_textrun.pdf"),
+
xAdaptor->odfConvert(m_directories.getURLFromSrc(u"/sdext/qa/unit/data/tdf104597_textrun.pdf"),
new OutputWrapString(aOutput),
nullptr));
@@ -826,7 +826,7 @@ namespace
// Test pdf text run in the Writer PDF import filter
xAdaptor->setTreeVisitorFactory(createWriterTreeVisitorFactory());
OString aOutput2;
-
xAdaptor->odfConvert(m_directories.getURLFromSrc(u"/sdext/source/pdfimport/test/testdocs/tdf104597_textrun.pdf"),
+
xAdaptor->odfConvert(m_directories.getURLFromSrc(u"/sdext/qa/unit/data/tdf104597_textrun.pdf"),
new OutputWrapString(aOutput2),
nullptr);
xmlDocUniquePtr pXmlDoc2(xmlParseDoc(reinterpret_cast<xmlChar
const *>(aOutput2.getStr())));
@@ -849,7 +849,7 @@ namespace
xAdaptor->setTreeVisitorFactory(createWriterTreeVisitorFactory());
OString aOutput;
-
xAdaptor->odfConvert(m_directories.getURLFromSrc(u"/sdext/source/pdfimport/test/testdocs/testSpace.pdf"),
+
xAdaptor->odfConvert(m_directories.getURLFromSrc(u"/sdext/qa/unit/data/testSpace.pdf"),
new OutputWrapString(aOutput),
nullptr);
xmlDocUniquePtr pXmlDoc(xmlParseDoc(reinterpret_cast<xmlChar const
*>(aOutput.getStr())));
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 9a76c3d739e2..96a2e2b549a4 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -10097,6 +10097,7 @@ sd/source/ui/view/viewshe3.cxx
sd/source/ui/view/viewshel.cxx
sd/workben/custompanel/ctp_panel.cxx
sd/workben/custompanel/ctp_panel.hxx
+sdext/qa/unit/pdfimport.cxx
sdext/source/minimizer/configurationaccess.cxx
sdext/source/minimizer/configurationaccess.hxx
sdext/source/minimizer/fileopendialog.cxx
@@ -10147,7 +10148,6 @@ sdext/source/pdfimport/sax/saxattrlist.hxx
sdext/source/pdfimport/test/outputwrap.hxx
sdext/source/pdfimport/test/pdf2xml.cxx
sdext/source/pdfimport/test/pdfunzip.cxx
-sdext/source/pdfimport/test/tests.cxx
sdext/source/pdfimport/tree/drawtreevisiting.cxx
sdext/source/pdfimport/tree/drawtreevisiting.hxx
sdext/source/pdfimport/tree/genericelements.cxx
