[Libreoffice-commits] core.git: Branch 'feature/dialog-screenshots' - chart2/CppunitTest_chart2_dialogs_test.mk chart2/Module_chart2.mk chart2/qa cui/qa
Armin Le Grand
Armin.Le.Grand at cib.de
Fri Jul 22 13:09:53 UTC 2016
chart2/CppunitTest_chart2_dialogs_test.mk | 69 ++++++++++++
chart2/Module_chart2.mk | 4
chart2/qa/unit/chart2-dialogs-test.cxx | 150 ++++++++++++++++++++++++++++
chart2/qa/unit/data/chart2-dialogs-test.txt | 69 ++++++++++++
cui/qa/unit/cui-dialogs-test.cxx | 2
5 files changed, 293 insertions(+), 1 deletion(-)
New commits:
commit 2ec11c900d1cd92b4c40492d4afcf728dde7e124
Author: Armin Le Grand <Armin.Le.Grand at cib.de>
Date: Fri Jul 22 15:08:31 2016 +0200
Added dialog test case for screenshot creation for chart2
All *.ui files create a screenshot, but not all look useful
Change-Id: I90d977ae84a65e9576ba9cc9b178407997e4ba79
diff --git a/chart2/CppunitTest_chart2_dialogs_test.mk b/chart2/CppunitTest_chart2_dialogs_test.mk
new file mode 100644
index 0000000..a58559c
--- /dev/null
+++ b/chart2/CppunitTest_chart2_dialogs_test.mk
@@ -0,0 +1,69 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# 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/.
+#
+#*************************************************************************
+
+$(eval $(call gb_CppunitTest_CppunitTest,chart2_dialogs_test))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,chart2_dialogs_test, \
+ chart2/qa/unit/chart2-dialogs-test \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,chart2_dialogs_test))
+
+$(eval $(call gb_CppunitTest_set_include,chart2_dialogs_test,\
+ -I$(SRCDIR)/chart2/source/inc \
+ -I$(SRCDIR)/chart2/inc \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,chart2_dialogs_test, \
+ basegfx \
+ comphelper \
+ cppu \
+ cppuhelper \
+ drawinglayer \
+ editeng \
+ i18nlangtag \
+ i18nutil \
+ msfilter \
+ oox \
+ sal \
+ salhelper \
+ sax \
+ sfx \
+ sot \
+ svl \
+ svt \
+ svx \
+ svxcore \
+ test \
+ tl \
+ tk \
+ ucbhelper \
+ unotest \
+ utl \
+ vcl \
+ xo \
+ $(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_external,chart2_dialogs_test,boost_headers))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,chart2_dialogs_test))
+
+$(eval $(call gb_CppunitTest_use_ure,chart2_dialogs_test))
+$(eval $(call gb_CppunitTest_use_vcl_non_headless_with_windows,chart2_dialogs_test))
+
+$(eval $(call gb_CppunitTest_use_rdb,chart2_dialogs_test,services))
+
+# $(eval $(call gb_CppunitTest_use_configuration,chart2_dialogs_test))
+$(eval $(call gb_CppunitTest_use_instdir_configuration,chart2_dialogs_test))
+
+# vim: set noet sw=4 ts=4:
diff --git a/chart2/Module_chart2.mk b/chart2/Module_chart2.mk
index 3b32e1c..38937d1 100644
--- a/chart2/Module_chart2.mk
+++ b/chart2/Module_chart2.mk
@@ -46,4 +46,8 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,chart2,\
JunitTest_chart2_unoapi \
))
+$(eval $(call gb_Module_add_slowcheck_targets,chart2,\
+ CppunitTest_chart2_dialogs_test \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/chart2/qa/unit/chart2-dialogs-test.cxx b/chart2/qa/unit/chart2-dialogs-test.cxx
new file mode 100644
index 0000000..9a9921f
--- /dev/null
+++ b/chart2/qa/unit/chart2-dialogs-test.cxx
@@ -0,0 +1,150 @@
+/* -*- 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 <sal/config.h>
+#include <test/screenshot_test.hxx>
+#include <rtl/strbuf.hxx>
+#include <osl/file.hxx>
+#include <sfx2/app.hxx>
+#include <vcl/abstdlg.hxx>
+
+using namespace ::com::sun::star;
+
+/// Test opening a dialog in chart2
+class Chart2DialogsTest : public ScreenshotTest
+{
+private:
+ /// helper method to populate KnownDialogs, called in setUp(). Needs to be
+ /// written and has to add entries to KnownDialogs
+ virtual void registerKnownDialogsByID(mapType& rKnownDialogs) override;
+
+ /// dialog creation for known dialogs by ID. Has to be implemented for
+ /// each registered known dialog
+ virtual VclAbstractDialog* createDialogByID(sal_uInt32 nID) override;
+
+public:
+ Chart2DialogsTest();
+ virtual ~Chart2DialogsTest();
+
+ virtual void setUp() override;
+
+ // try to open a dialog
+ void openAnyDialog();
+
+ CPPUNIT_TEST_SUITE(Chart2DialogsTest);
+ CPPUNIT_TEST(openAnyDialog);
+ CPPUNIT_TEST_SUITE_END();
+};
+
+Chart2DialogsTest::Chart2DialogsTest()
+{
+}
+
+Chart2DialogsTest::~Chart2DialogsTest()
+{
+}
+
+void Chart2DialogsTest::setUp()
+{
+ ScreenshotTest::setUp();
+}
+
+void Chart2DialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
+{
+ // fill map of known dilogs
+}
+
+VclAbstractDialog* Chart2DialogsTest::createDialogByID(sal_uInt32 /*nID*/)
+{
+ return nullptr;
+}
+
+void Chart2DialogsTest::openAnyDialog()
+{
+ /// example how to process an input file containing the UXMLDescriptions of the dialogs
+ /// to dump
+ if (true)
+ {
+ test::Directories aDirectories;
+ OUString aURL = aDirectories.getURLFromSrc("chart2/qa/unit/data/chart2-dialogs-test.txt");
+ SvFileStream aStream(aURL, StreamMode::READ);
+ OString aNextUIFile;
+ const OString aComment("#");
+
+ while (aStream.ReadLine(aNextUIFile))
+ {
+ if (!aNextUIFile.isEmpty() && !aNextUIFile.startsWith(aComment))
+ {
+ // first check if it's a known dialog
+ std::unique_ptr<VclAbstractDialog> pDlg(createDialogByName(aNextUIFile));
+
+ if (pDlg)
+ {
+ // known dialog, dump screenshot to path
+ dumpDialogToPath(*pDlg);
+ }
+ else
+ {
+ // unknown dialog, try fallback to generic created
+ // VclBuilder-generated instance. Keep in mind that Dialogs
+ // using this mechanism will probably not be layouted well
+ // since the setup/initialization part is missing. Thus,
+ // only use for fallback when only the UI file is available.
+ dumpDialogToPath(aNextUIFile);
+ }
+ }
+ }
+ }
+
+ /// example how to dump all known dialogs
+ if (false)
+ {
+ // example for SfxTabDialog: 5 -> "modules/sdraw/ui/drawpagedialog.ui"
+ // example for TabDialog: 22 -> "modules/simpress/ui/headerfooterdialog.ui"
+ // example for self-adapted wizard: 0 -> "modules/simpress/ui/publishingdialog.ui"
+ for (mapType::const_iterator i = getKnownDialogs().begin(); i != getKnownDialogs().end(); i++)
+ {
+ std::unique_ptr<VclAbstractDialog> pDlg(createDialogByID((*i).second));
+
+ if (pDlg)
+ {
+ // known dialog, dump screenshot to path
+ dumpDialogToPath(*pDlg);
+ }
+ else
+ {
+ // unknown dialog, should not happen in this basic loop.
+ // You have probably forgotten to add a case and
+ // implementastion to createDialogByID, please do this
+ }
+ }
+ }
+
+ /// example how to dump a dialog using fallback functionality
+ if (false)
+ {
+ // unknown dialog, try fallback to generic created
+ // VclBuilder-generated instance. Keep in mind that Dialogs
+ // using this mechanism will probably not be layouted well
+ // since the setup/initialization part is missing. Thus,
+ // only use for fallback when only the UI file is available.
+ //
+ // Take any example here, it's only for demonstration - using
+ // even a known one to demonstrate the fallback possibility
+ const OString aUIXMLDescription("modules/schart/ui/datarangedialog.ui");
+
+ dumpDialogToPath(aUIXMLDescription);
+ }
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(Chart2DialogsTest);
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/qa/unit/data/chart2-dialogs-test.txt b/chart2/qa/unit/data/chart2-dialogs-test.txt
new file mode 100644
index 0000000..57893cb
--- /dev/null
+++ b/chart2/qa/unit/data/chart2-dialogs-test.txt
@@ -0,0 +1,69 @@
+# -*- 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/.
+#
+
+# This file contains all dialogs that the unit tests in the module
+# will work on if it is in script mode. It will read one-by-one,
+# try to open it and create a screenshot that will be saved in
+# workdir/screenshots using the pattern of the ui-file name.
+#
+# Syntax:
+# - emty lines are allowed
+# - lines starting with '#' are treated as comment
+# - all other lines should contain a *.ui filename in the same
+# notation as in the dialog constructors (see code)
+
+#
+# The 'known' dialogs which have a hard-coded representation
+# in registerKnownDialogsByID/createDialogByID
+#
+
+# No known dialogs in chart2 for now
+
+#
+# Dialogs without a hard-coded representation. These will
+# be visualized using a fallback based on VclBuilder
+#
+
+# currently deactivated, leads to problems and the test to not work
+# This is typically a hint that these should be hard-coded in the
+# test case since they need some document and model data to work
+
+modules/schart/ui/datarangedialog.ui
+modules/schart/ui/attributedialog.ui
+modules/schart/ui/chardialog.ui
+modules/schart/ui/paradialog.ui
+modules/schart/ui/3dviewdialog.ui
+modules/schart/ui/tp_3D_SceneAppearance.ui
+modules/schart/ui/tp_3D_SceneGeometry.ui
+modules/schart/ui/tp_3D_SceneIllumination.ui
+modules/schart/ui/tp_axisLabel.ui
+modules/schart/ui/tp_AxisPositions.ui
+modules/schart/ui/tp_DataLabel.ui
+modules/schart/ui/tp_ErrorBars.ui
+modules/schart/ui/tp_LegendPosition.ui
+modules/schart/ui/tp_ChartType.ui
+modules/schart/ui/tp_PolarOptions.ui
+modules/schart/ui/tp_Scale.ui
+modules/schart/ui/tp_SeriesToAxis.ui
+modules/schart/ui/titlerotationtabpage.ui
+modules/schart/ui/tp_Trendline.ui
+modules/schart/ui/tp_ChartType.ui
+modules/schart/ui/tp_DataSource.ui
+modules/schart/ui/tp_RangeChooser.ui
+modules/schart/ui/wizelementspage.ui
+modules/schart/ui/charttypedialog.ui
+modules/schart/ui/chartdatadialog.ui
+modules/schart/ui/insertaxisdlg.ui
+modules/schart/ui/insertgriddlg.ui
+modules/schart/ui/dlg_DataLabel.ui
+modules/schart/ui/dlg_InsertErrorBars.ui
+modules/schart/ui/dlg_InsertLegend.ui
+modules/schart/ui/inserttitledlg.ui
+modules/schart/ui/smoothlinesdlg.ui
+modules/schart/ui/steppedlinesdlg.ui
diff --git a/cui/qa/unit/cui-dialogs-test.cxx b/cui/qa/unit/cui-dialogs-test.cxx
index 0d903e3..5e819ce 100644
--- a/cui/qa/unit/cui-dialogs-test.cxx
+++ b/cui/qa/unit/cui-dialogs-test.cxx
@@ -137,7 +137,7 @@ void CuiDialogsTest::openAnyDialog()
//
// Take any example here, it's only for demonstration - using
// even a known one to demonstrate the fallback possibility
- const OString aUIXMLDescription("modules/swriter/ui/abstractdialog.ui");
+ const OString aUIXMLDescription("cui/ui/customizedialog.ui");
dumpDialogToPath(aUIXMLDescription);
}
More information about the Libreoffice-commits
mailing list