diff options
-rwxr-xr-x | framework/JunitTest_framework_complex.mk | 92 | ||||
-rwxr-xr-x | framework/JunitTest_framework_unoapi.mk | 45 | ||||
-rw-r--r-- | framework/Module_framework.mk | 4 | ||||
-rw-r--r-- | framework/qa/complex/broken_document/TestDocument.java | 3 | ||||
-rw-r--r-- | framework/qa/unoapi/Test.java | 5 | ||||
-rwxr-xr-x | sfx2/JunitTest_sfx2_complex.mk | 2 | ||||
-rw-r--r-- | sfx2/qa/complex/framework/TestDocument.java | 2 | ||||
-rw-r--r-- | sfx2/qa/cppunit/test_metadatable.cxx | 1 | ||||
-rwxr-xr-x | xmloff/JunitTest_xmloff_unoapi.mk | 45 | ||||
-rw-r--r-- | xmloff/Module_xmloff.mk | 4 | ||||
-rw-r--r-- | xmloff/prj/build.lst | 3 | ||||
-rw-r--r-- | xmloff/qa/unoapi/Test.java | 5 |
12 files changed, 201 insertions, 10 deletions
diff --git a/framework/JunitTest_framework_complex.mk b/framework/JunitTest_framework_complex.mk new file mode 100755 index 000000000000..037486d13bfa --- /dev/null +++ b/framework/JunitTest_framework_complex.mk @@ -0,0 +1,92 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_JunitTest_JunitTest,framework_complex)) + +$(eval $(call gb_JunitTest_set_defs,framework_complex,\ + $$(DEFS) \ + -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/framework/qa/complex/broken_document/test_documents \ +)) + +$(eval $(call gb_JunitTest_add_sourcefiles,framework_complex,\ + framework/qa/complex/disposing/GetServiceWhileDisposingOffice \ + framework/qa/complex/path_substitution/PathSubstitutionTest \ + framework/qa/complex/loadAllDocuments/InteractionHandler \ + framework/qa/complex/loadAllDocuments/StreamSimulator \ + framework/qa/complex/loadAllDocuments/TestDocument \ + framework/qa/complex/loadAllDocuments/CheckXComponentLoader \ + framework/qa/complex/loadAllDocuments/StatusIndicator \ + framework/qa/complex/broken_document/TestDocument \ + framework/qa/complex/broken_document/LoadDocument \ + framework/qa/complex/XUserInputInterception/EventTest \ + framework/qa/complex/framework/autosave/AutoSave \ + framework/qa/complex/framework/autosave/Protocol \ + framework/qa/complex/framework/autosave/ConfigHelper \ + framework/qa/complex/framework/recovery/TimeoutThread \ + framework/qa/complex/framework/recovery/KlickButtonThread \ + framework/qa/complex/framework/recovery/RecoveryTools \ + framework/qa/complex/framework/recovery/RecoveryTest \ + framework/qa/complex/framework/recovery/CrashThread \ + framework/qa/complex/accelerators/AcceleratorsConfigurationTest \ + framework/qa/complex/accelerators/KeyMapping \ + framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor \ + framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor \ + framework/qa/complex/path_settings/PathSettingsTest \ + framework/qa/complex/desktop/DesktopTerminate \ + framework/qa/complex/imageManager/_XComponent \ + framework/qa/complex/imageManager/CheckImageManager \ + framework/qa/complex/imageManager/_XTypeProvider \ + framework/qa/complex/imageManager/_XInitialization \ + framework/qa/complex/imageManager/_XImageManager \ + framework/qa/complex/imageManager/_XUIConfigurationPersistence \ + framework/qa/complex/imageManager/_XUIConfiguration \ + framework/qa/complex/api_internal/CheckAPI \ + framework/qa/complex/dispatches/Interceptor \ + framework/qa/complex/dispatches/checkdispatchapi \ + framework/qa/complex/ModuleManager/CheckXModuleManager \ +)) + +$(eval $(call gb_JunitTest_add_classes,framework_complex,\ +)) +# these were disabled in the old build system too, please check +# carefully before reenabling +# complex.ModuleManager.CheckXModuleManager \ + complex.XUserInputInterception.EventTest \ + complex.accelerators.AcceleratorsConfigurationTest \ + complex.dispatches.checkdispatchapi \ + complex.api_internal.CheckAPI \ + complex.broken_document.LoadDocument \ + complex.desktop.DesktopTerminate \ + complex.disposing.GetServiceWhileDisposingOffice \ + complex.framework.autosave.AutoSave \ + complex.framework.recovery.RecoveryTest \ + complex.imageManager.CheckImageManager \ + complex.loadAllDocuments.CheckXComponentLoader \ + complex.path_settings.PathSettingsTest \ + complex.path_substitution.PathSubstitutionTest \ + +# vim: set noet sw=4 ts=4: diff --git a/framework/JunitTest_framework_unoapi.mk b/framework/JunitTest_framework_unoapi.mk new file mode 100755 index 000000000000..0ccb2df8d7cb --- /dev/null +++ b/framework/JunitTest_framework_unoapi.mk @@ -0,0 +1,45 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_JunitTest_JunitTest,framework_unoapi)) + +$(eval $(call gb_JunitTest_set_defs,framework_unoapi,\ + $$(DEFS) \ + -Dorg.openoffice.test.arg.sce=$(SRCDIR)/framework/qa/unoapi/framework.sce \ + -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/framework/qa/unoapi/knownissues.xcl \ + -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/framework/qa/unoapi/testdocuments \ +)) + +$(eval $(call gb_JunitTest_add_sourcefiles,framework_unoapi,\ + framework/qa/unoapi/Test \ +)) + +$(eval $(call gb_JunitTest_add_classes,framework_unoapi,\ + org.openoffice.framework.qa.unoapi.Test \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/framework/Module_framework.mk b/framework/Module_framework.mk index 28b2e087b60f..ddc0abc152bd 100644 --- a/framework/Module_framework.mk +++ b/framework/Module_framework.mk @@ -40,4 +40,8 @@ $(eval $(call gb_Module_add_targets,framework,\ Package_unotypes \ )) +$(eval $(call gb_Module_add_subsequentcheck_targets,framework,\ + JunitTest_framework_complex \ + JunitTest_framework_unoapi \ +)) # vim: set noet ts=4 sw=4: diff --git a/framework/qa/complex/broken_document/TestDocument.java b/framework/qa/complex/broken_document/TestDocument.java index c282790211e3..47a5176734d5 100644 --- a/framework/qa/complex/broken_document/TestDocument.java +++ b/framework/qa/complex/broken_document/TestDocument.java @@ -29,12 +29,13 @@ package complex.broken_document; import java.io.File; import org.openoffice.test.OfficeFileUrl; +import org.openoffice.test.Argument; final class TestDocument { public static String getUrl(String name) { - return OfficeFileUrl.getAbsolute(new File("test_documents", name)); + return OfficeFileUrl.getAbsolute(new File(Argument.get("tdoc"), name)); } private TestDocument() {} diff --git a/framework/qa/unoapi/Test.java b/framework/qa/unoapi/Test.java index da9bb3bd5020..71774b4a62bb 100644 --- a/framework/qa/unoapi/Test.java +++ b/framework/qa/unoapi/Test.java @@ -27,6 +27,7 @@ package org.openoffice.framework.qa.unoapi; import org.openoffice.Runner; import org.openoffice.test.OfficeConnection; +import org.openoffice.test.Argument; import static org.junit.Assert.*; public final class Test { @@ -43,8 +44,8 @@ public final class Test { @org.junit.Test public void test() { assertTrue( Runner.run( - "-sce", "framework.sce", "-xcl", "knownissues.xcl", "-tdoc", - "testdocuments", "-cs", connection.getDescription())); + "-sce", Argument.get("sce"), "-xcl", Argument.get("xcl"), "-tdoc", + Argument.get("tdoc"), "-cs", connection.getDescription())); } private final OfficeConnection connection = new OfficeConnection(); diff --git a/sfx2/JunitTest_sfx2_complex.mk b/sfx2/JunitTest_sfx2_complex.mk index 3513b63b06c8..ab8c90e47347 100755 --- a/sfx2/JunitTest_sfx2_complex.mk +++ b/sfx2/JunitTest_sfx2_complex.mk @@ -29,7 +29,7 @@ $(eval $(call gb_JunitTest_JunitTest,sfx2_complex)) $(eval $(call gb_JunitTest_set_defs,sfx2_complex,\ $$(DEFS) \ - -Dorg.openoffice.test.arg.docpath=$(SRCDIR)/sfx2/qa/complex/framework/testdocuments \ + -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/sfx2/qa/complex/framework/testdocuments \ )) $(eval $(call gb_JunitTest_add_sourcefiles,sfx2_complex,\ diff --git a/sfx2/qa/complex/framework/TestDocument.java b/sfx2/qa/complex/framework/TestDocument.java index fa60ff2057a2..1c47d9302f9d 100644 --- a/sfx2/qa/complex/framework/TestDocument.java +++ b/sfx2/qa/complex/framework/TestDocument.java @@ -33,7 +33,7 @@ import org.openoffice.test.Argument; final class TestDocument { public static String getUrl(String name) { - return OfficeFileUrl.getAbsolute(new File(org.openoffice.test.Argument.get("docpath"), name)); + return OfficeFileUrl.getAbsolute(new File(Argument.get("tdoc"), name)); } private TestDocument() {} diff --git a/sfx2/qa/cppunit/test_metadatable.cxx b/sfx2/qa/cppunit/test_metadatable.cxx index 9930d61acf20..d3d11bdf57ad 100644 --- a/sfx2/qa/cppunit/test_metadatable.cxx +++ b/sfx2/qa/cppunit/test_metadatable.cxx @@ -95,6 +95,7 @@ static bool operator==(beans::StringPair p1, beans::StringPair p2) void MetadatableTest::test() { + CPPUNIT_ASSERT_MESSAGE("fail",false); OSL_TRACE("SwMetadatable test(): start\n"); ::std::auto_ptr< ::sfx2::IXmlIdRegistry > const pReg( ::sfx2::createXmlIdRegistry(false) ); diff --git a/xmloff/JunitTest_xmloff_unoapi.mk b/xmloff/JunitTest_xmloff_unoapi.mk new file mode 100755 index 000000000000..78cd23137410 --- /dev/null +++ b/xmloff/JunitTest_xmloff_unoapi.mk @@ -0,0 +1,45 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_JunitTest_JunitTest,xmloff_unoapi)) + +$(eval $(call gb_JunitTest_set_defs,xmloff_unoapi,\ + $$(DEFS) \ + -Dorg.openoffice.test.arg.sce=$(SRCDIR)/xmloff/qa/unoapi/xmloff.sce \ + -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/xmloff/qa/unoapi/knownissues.xcl \ + -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/xmloff/qa/unoapi/testdocuments \ +)) + +$(eval $(call gb_JunitTest_add_sourcefiles,xmloff_unoapi,\ + xmloff/qa/unoapi/Test \ +)) + +$(eval $(call gb_JunitTest_add_classes,xmloff_unoapi,\ + org.openoffice.xmloff.qa.unoapi.Test \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/xmloff/Module_xmloff.mk b/xmloff/Module_xmloff.mk index eacc83068dad..d17caa0c3b4b 100644 --- a/xmloff/Module_xmloff.mk +++ b/xmloff/Module_xmloff.mk @@ -34,6 +34,10 @@ $(eval $(call gb_Module_add_targets,xmloff,\ Package_inc \ )) +$(eval $(call gb_Module_add_subsequentcheck_targets,xmloff,\ + JunitTest_xmloff_unoapi \ +)) + #todo: map file #todo: xmlkywd.lib - built, but never used?! diff --git a/xmloff/prj/build.lst b/xmloff/prj/build.lst index d075f1fc6fcb..4c79df8777a9 100644 --- a/xmloff/prj/build.lst +++ b/xmloff/prj/build.lst @@ -1,5 +1,2 @@ xo xmloff : LIBXSLT:libxslt offapi svl vos NULL zxo xmloff\prj nmake - all xo_prj NULL - -xo xmloff\qa\unoapi nmake - all xo_qa_unoapi NULL - diff --git a/xmloff/qa/unoapi/Test.java b/xmloff/qa/unoapi/Test.java index d66144f108e7..833c2d770c9f 100644 --- a/xmloff/qa/unoapi/Test.java +++ b/xmloff/qa/unoapi/Test.java @@ -27,6 +27,7 @@ package org.openoffice.xmloff.qa.unoapi; import org.openoffice.Runner; import org.openoffice.test.OfficeConnection; +import org.openoffice.test.Argument; import static org.junit.Assert.*; public final class Test { @@ -43,8 +44,8 @@ public final class Test { @org.junit.Test public void test() { assertTrue( Runner.run( - "-sce", "xmloff.sce", "-xcl", "knownissues.xcl", "-tdoc", - "testdocuments", "-cs", connection.getDescription())); + "-sce", Argument.get("sce"), "-xcl", Argument.get("xcl"), "-tdoc", + Argument.get("tdoc"), "-cs", connection.getDescription())); } private final OfficeConnection connection = new OfficeConnection(); |