[Libreoffice-commits] core.git: unoxml/CppunitTest_unoxml_domtest.mk unoxml/Module_unoxml.mk unoxml/test
unoxml/CppunitTest_unoxml_domtest.mk | 47 ++
unoxml/Module_unoxml.mk |4
unoxml/test/domtest.cxx | 150 ---
3 files changed, 103 insertions(+), 98 deletions(-)
New commits:
commit dbbd89efdeaa44421d1f2ad774c342009d881d9b
Author: Tobias Madl tobias.madl@gmail.com
Date: Tue Sep 23 11:43:14 2014 +
fdo#39625 Make existing CppUnit tests work
As in the ticket description, this test is now working, but
some parts of it are still commented out, because they are waiting
for a fix of another bug (Bug 84237). Once it is fixed, it should
be possible to just uncomment them, and then they should work.
Change-Id: I73d1cc7391080e357c08cb3442616e2901070c1f
Signed-off-by: Stephan Bergmann sberg...@redhat.com (with minor
amendments)
diff --git a/unoxml/CppunitTest_unoxml_domtest.mk
b/unoxml/CppunitTest_unoxml_domtest.mk
new file mode 100644
index 000..b12fd1e
--- /dev/null
+++ b/unoxml/CppunitTest_unoxml_domtest.mk
@@ -0,0 +1,47 @@
+# -*- 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,unoxml_domtest))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,unoxml_domtest, \
+unoxml/test/domtest \
+))
+
+$(eval $(call gb_CppunitTest_use_api,unoxml_domtest,\
+offapi \
+udkapi \
+))
+
+$(eval $(call gb_CppunitTest_use_components,unoxml_domtest,\
+configmgr/source/configmgr \
+framework/util/fwk \
+i18npool/util/i18npool \
+sfx2/util/sfx \
+ucb/source/core/ucb1 \
+ucb/source/ucp/file/ucpfile1 \
+unoxml/source/service/unoxml \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,unoxml_domtest, \
+boost_headers \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,unoxml_domtest, \
+comphelper \
+cppu \
+cppuhelper \
+sal \
+test \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,unoxml_domtest))
+$(eval $(call gb_CppunitTest_use_ure,unoxml_domtest))
+$(eval $(call gb_CppunitTest_use_vcl,unoxml_domtest))
+
+# vim: set noet sw=4 ts=4:
diff --git a/unoxml/Module_unoxml.mk b/unoxml/Module_unoxml.mk
index 53cf589..bb06953 100644
--- a/unoxml/Module_unoxml.mk
+++ b/unoxml/Module_unoxml.mk
@@ -24,6 +24,10 @@ $(eval $(call gb_Module_add_targets,unoxml,\
Library_unordf \
))
+$(eval $(call gb_Module_add_slowcheck_targets,unoxml,\
+CppunitTest_unoxml_domtest \
+))
+
ifneq ($(OOO_JUNIT_JAR),)
$(eval $(call gb_Module_add_subsequentcheck_targets,unoxml,\
JunitTest_unoxml_complex \
diff --git a/unoxml/test/domtest.cxx b/unoxml/test/domtest.cxx
index 5d49922..07d1738 100644
--- a/unoxml/test/domtest.cxx
+++ b/unoxml/test/domtest.cxx
@@ -17,28 +17,34 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-// autogenerated file with codegen.pl
-
-#include testshl/simpleheader.hxx
-
#include rtl/ref.hxx
+#include rtl/byteseq.hxx
#include osl/file.hxx
#include osl/process.h
#include comphelper/seqstream.hxx
#include comphelper/sequence.hxx
+#include comphelper/processfactory.hxx
#include cppuhelper/compbase1.hxx
#include cppuhelper/bootstrap.hxx
#include cppuhelper/basemutex.hxx
+#include cppunit/TestFixture.h
+#include cppunit/extensions/HelperMacros.h
+#include cppunit/plugin/TestPlugIn.h
+#include unotest/macros_test.hxx
+#include test/bootstrapfixture.hxx
+#include com/sun/star/xml/dom/DocumentBuilder.hpp
#include com/sun/star/xml/sax/FastToken.hpp
#include com/sun/star/xml/sax/XSAXSerializable.hpp
#include com/sun/star/xml/sax/XFastSAXSerializable.hpp
-
#include ../source/dom/documentbuilder.hxx
using namespace ::DOM;
using namespace ::comphelper;
using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
+using css::xml::dom::XDocumentBuilder;
+using css::xml::dom::DocumentBuilder;
namespace
{
@@ -96,17 +102,17 @@ struct ErrorHandler
ErrorHandler() : mnErrCount(0), mnFatalCount(0), mnWarnCount(0)
{}
-virtual void SAL_CALL error( const uno::Any ) throw
(xml::sax::SAXException, uno::RuntimeException)
+virtual void SAL_CALL error( const uno::Any ) throw
(xml::sax::SAXException, uno::RuntimeException) SAL_OVERRIDE
{
++mnErrCount;
}
-virtual void SAL_CALL fatalError( const uno::Any ) throw
(xml::sax::SAXException, uno::RuntimeException)
+virtual void SAL_CALL fatalError( const uno::Any ) throw
(xml::sax::SAXException, uno::RuntimeException) SAL_OVERRIDE
{
++mnFatalCount;
}
-virtual void SAL_CALL warning( const uno::Any ) throw
(xml::sax::SAXException, uno::RuntimeException)
+virtual void SAL_CALL warning( const uno::Any ) throw
(xml::sax::SAXException, uno::RuntimeException)
[Libreoffice-commits] core.git: unoxml/CppunitTest_unoxml_domtest.mk
unoxml/CppunitTest_unoxml_domtest.mk |1 + 1 file changed, 1 insertion(+) New commits: commit ee777116d01511060cff8b845126fecbad038234 Author: Michael Stahl mst...@redhat.com Date: Thu Sep 25 22:32:47 2014 +0200 unoxml: domtest needs unotest library on WNT Change-Id: I9614e1495e6d990e050c651c2aed0ba0e43d51fe diff --git a/unoxml/CppunitTest_unoxml_domtest.mk b/unoxml/CppunitTest_unoxml_domtest.mk index b12fd1e..692d51c 100644 --- a/unoxml/CppunitTest_unoxml_domtest.mk +++ b/unoxml/CppunitTest_unoxml_domtest.mk @@ -38,6 +38,7 @@ $(eval $(call gb_CppunitTest_use_libraries,unoxml_domtest, \ cppuhelper \ sal \ test \ +unotest \ )) $(eval $(call gb_CppunitTest_use_configuration,unoxml_domtest)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: unoxml/CppunitTest_unoxml_domtest.mk unoxml/qa unoxml/test
unoxml/CppunitTest_unoxml_domtest.mk |2
unoxml/qa/unit/domtest.cxx | 334 ++
unoxml/test/domtest.cxx | 336 ---
unoxml/test/export.map | 25 --
unoxml/test/makefile.mk | 95 -
5 files changed, 335 insertions(+), 457 deletions(-)
New commits:
commit df73f4115cfe4d07e4159adf087571687eb173ec
Author: Matúš Kukan matus.ku...@collabora.com
Date: Thu Sep 25 23:26:28 2014 +0200
Remove unused files and move test to qa/
Change-Id: Ia8c022c958f5547d710f9cb196672b89292bbb49
diff --git a/unoxml/CppunitTest_unoxml_domtest.mk
b/unoxml/CppunitTest_unoxml_domtest.mk
index 692d51c..127a767 100644
--- a/unoxml/CppunitTest_unoxml_domtest.mk
+++ b/unoxml/CppunitTest_unoxml_domtest.mk
@@ -10,7 +10,7 @@
$(eval $(call gb_CppunitTest_CppunitTest,unoxml_domtest))
$(eval $(call gb_CppunitTest_add_exception_objects,unoxml_domtest, \
-unoxml/test/domtest \
+unoxml/qa/unit/domtest \
))
$(eval $(call gb_CppunitTest_use_api,unoxml_domtest,\
diff --git a/unoxml/test/domtest.cxx b/unoxml/qa/unit/domtest.cxx
similarity index 99%
rename from unoxml/test/domtest.cxx
rename to unoxml/qa/unit/domtest.cxx
index 07d1738..49eefe0 100644
--- a/unoxml/test/domtest.cxx
+++ b/unoxml/qa/unit/domtest.cxx
@@ -37,9 +37,7 @@
#include com/sun/star/xml/sax/FastToken.hpp
#include com/sun/star/xml/sax/XSAXSerializable.hpp
#include com/sun/star/xml/sax/XFastSAXSerializable.hpp
-#include ../source/dom/documentbuilder.hxx
-using namespace ::DOM;
using namespace ::comphelper;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/unoxml/test/export.map b/unoxml/test/export.map
deleted file mode 100644
index 06b6a4a..000
--- a/unoxml/test/export.map
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# 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 incorporates work covered by the following license notice:
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed
-# with this work for additional information regarding copyright
-# ownership. The ASF licenses this file to you under the Apache
-# License, Version 2.0 (the License); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-UDK_3_0_0 {
-global:
-registerAllTestFunction;
-
-local:
-*;
-};
diff --git a/unoxml/test/makefile.mk b/unoxml/test/makefile.mk
deleted file mode 100644
index 682cedb..000
--- a/unoxml/test/makefile.mk
+++ /dev/null
@@ -1,95 +0,0 @@
-#
-# 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 incorporates work covered by the following license notice:
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed
-# with this work for additional information regarding copyright
-# ownership. The ASF licenses this file to you under the Apache
-# License, Version 2.0 (the License); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-PRJ=..
-
-PRJNAME=unoxml
-TARGET=tests
-TARGETTYPE=GUI
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -
-
-.INCLUDE : settings.mk
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-# --- Common --
-
-# BEGIN
-# auto generated Target:tests by codegen.pl
-SHL1OBJS= \
-$(SLO)$/domtest.obj
-
-# the following three libs are a bit of a hack: cannot link against
-# unoxml here, because not yet delivered (and does not export
-# ~anything). Need the functionality to test, so we're linking it in
-# statically. Need to keep this in sync with
-# source/services/makefile.mk
-SHL1LIBS= \
-$(SLB)$/domimpl.lib \
-$(SLB)$/xpathimpl.lib \
-$(SLB)$/eventsimpl.lib
-
-SHL1TARGET= tests
-SHL1STDLIBS= \
-$(UCBHELPERLIB) \
-$(LIBXML2LIB) \
-$(TOOLSLIB)\
-$(COMPHELPERLIB) \
-$(CPPUHELPERLIB) \
-$(CPPUNITLIB) \
-$(CPPULIB) \
-$(SAXLIB) \
-$(SALLIB)\
-$(EXPATASCII3RDLIB)
-
-SHL1IMPLIB= i$(SHL1TARGET)
-
-DEF1NAME=$(SHL1TARGET)
-SHL1VERSIONMAP = export.map
-
-# END
