[Libreoffice-commits] .: 2 commits - forms/JunitTest_forms_complex.mk forms/JunitTest_forms_unoapi.mk forms/Makefile forms/Module_forms.mk forms/prj forms/qa
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Sun Mar 27 17:46:26 PDT 2011
forms/JunitTest_forms_complex.mk | 46 +++++++++++++++++++++++++++++++++++
forms/JunitTest_forms_unoapi.mk | 49 +++++++++++++++++++++++++++++++++++++
forms/Makefile | 38 +++++++++++++++++++++++++++++
forms/Module_forms.mk | 35 ++++++++++++++++++++++++++
forms/prj/build.lst | 3 --
forms/qa/unoapi/Test.java | 51 ---------------------------------------
forms/qa/unoapi/knownissues.xcl | 6 ++++
forms/qa/unoapi/makefile.mk | 48 ------------------------------------
8 files changed, 174 insertions(+), 102 deletions(-)
New commits:
commit 70c135ea253442c4529af32687ceda7aa66017ea
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Mar 28 01:15:13 2011 +0200
migrate forms subsequenttests to gbuild
diff --git a/forms/JunitTest_forms_complex.mk b/forms/JunitTest_forms_complex.mk
new file mode 100644
index 0000000..9631879
--- /dev/null
+++ b/forms/JunitTest_forms_complex.mk
@@ -0,0 +1,46 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# Bjoern Michaelsen, Canonical Ltd. <bjoern.michaelsen at canonical.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_JunitTest_JunitTest,forms_complex))
+
+$(eval $(call gb_JunitTest_add_jars,forms_complex,\
+ $(OUTDIR)/bin/OOoRunner.jar \
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/test.jar \
+ $(OUTDIR)/bin/unoil.jar \
+ $(OUTDIR)/bin/jurt.jar \
+))
+
+$(eval $(call gb_JunitTest_add_sourcefiles,forms_complex,\
+ forms/qa/complex/forms/CheckOGroupBoxModel \
+))
+
+$(eval $(call gb_JunitTest_add_classes,forms_complex,\
+ complex.forms.CheckOGroupBoxModel \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/forms/JunitTest_forms_unoapi.mk b/forms/JunitTest_forms_unoapi.mk
new file mode 100644
index 0000000..931d8ae
--- /dev/null
+++ b/forms/JunitTest_forms_unoapi.mk
@@ -0,0 +1,49 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# Bjoern Michaelsen, Canonical Ltd. <bjoern.michaelsen at canonical.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_JunitTest_JunitTest,forms_unoapi))
+
+$(eval $(call gb_JunitTest_set_defs,forms_unoapi,\
+ $$(DEFS) \
+ -Dorg.openoffice.test.arg.sce=$(SRCDIR)/forms/qa/unoapi/forms.sce \
+ -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/forms/qa/unoapi/knownissues.xcl \
+ -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/forms/qa/unoapi/testdocuments \
+))
+
+$(eval $(call gb_JunitTest_add_jars,forms_unoapi,\
+ $(OUTDIR)/bin/OOoRunner.jar \
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/test.jar \
+ $(OUTDIR)/bin/unoil.jar \
+ $(OUTDIR)/bin/jurt.jar \
+))
+
+$(eval $(call gb_JunitTest_add_classes,forms_unoapi,\
+ org.openoffice.test.UnoApiTest \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/forms/Makefile b/forms/Makefile
new file mode 100644
index 0000000..a79aff8
--- /dev/null
+++ b/forms/Makefile
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 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.
+#
+#*************************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/forms/Module_forms.mk b/forms/Module_forms.mk
new file mode 100644
index 0000000..77068ce
--- /dev/null
+++ b/forms/Module_forms.mk
@@ -0,0 +1,35 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# Bjoern Michaelsen, Canonical Ltd. <bjoern.michaelsen at canonical.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Module_Module,forms))
+
+$(eval $(call gb_Module_add_subsequentcheck_targets,forms,\
+ JunitTest_forms_unoapi \
+ JunitTest_forms_complex \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/forms/prj/build.lst b/forms/prj/build.lst
index 6aecb3a..8475556 100644
--- a/forms/prj/build.lst
+++ b/forms/prj/build.lst
@@ -15,6 +15,3 @@ fm forms\source\richtext nmake - all fm_richtext fm_inc N
fm forms\source\runtime nmake - all frm_runtime NULL
fm forms\util nmake - all fm_util fm_component fm_solar_component fm_solar_control fm_helper fm_misc fm_resource fm_richtext frm_runtime fm_xforms NULL
fm forms\qa nmake - all fm_qa NULL
-# fd#35693 disabled because they hang on exit
-#fm forms\qa\complex\forms nmake - all fm_qa_complex NULL
-#fm forms\qa\unoapi nmake - all fm_qa_unoapi NULL
diff --git a/forms/qa/unoapi/Test.java b/forms/qa/unoapi/Test.java
deleted file mode 100644
index 5213021..0000000
--- a/forms/qa/unoapi/Test.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*************************************************************************
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-* Copyright 2000, 2010 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.
-************************************************************************/
-
-package org.openoffice.forms.qa.unoapi;
-
-import org.openoffice.Runner;
-import org.openoffice.test.OfficeConnection;
-import static org.junit.Assert.*;
-
-public final class Test {
- @org.junit.Before public void setUp() throws Exception {
- connection.setUp();
- }
-
- @org.junit.After public void tearDown()
- throws InterruptedException, com.sun.star.uno.Exception
- {
- connection.tearDown();
- }
-
- @org.junit.Test public void test() {
- assertTrue(
- Runner.run(
- "-sce", "forms.sce", "-xcl", "knownissues.xcl", "-tdoc",
- "testdocuments", "-cs", connection.getDescription()));
- }
-
- private final OfficeConnection connection = new OfficeConnection();
-}
diff --git a/forms/qa/unoapi/makefile.mk b/forms/qa/unoapi/makefile.mk
deleted file mode 100644
index 50c83e5..0000000
--- a/forms/qa/unoapi/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 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.
-#***********************************************************************/
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../..
-PRJNAME = forms
-TARGET = qa_unoapi
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = org/openoffice/forms/qa/unoapi
-JAVATESTFILES = Test.java
-JAVAFILES = $(JAVATESTFILES)
-JARFILES = OOoRunner.jar ridl.jar test.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
commit c1b17991c45c97b56d9d702d58f93c95bf6474e2
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Mar 28 01:14:42 2011 +0200
fd#35728: various forms.OGridControlModel unoapitests fail
* forms.OGridControlModel::com::sun::star::form::component::GridControl
* forms.OGridControlModel::com::sun::star::beans::XMultiPropertySet
* forms.OGridControlModel::com::sun::star::beans::XPropertySet
* forms.OGridControlModel::com::sun::star::beans::XFastPropertySet
diff --git a/forms/qa/unoapi/knownissues.xcl b/forms/qa/unoapi/knownissues.xcl
index 66e02dc..a4bb193 100644
--- a/forms/qa/unoapi/knownissues.xcl
+++ b/forms/qa/unoapi/knownissues.xcl
@@ -129,3 +129,9 @@ forms.OGridControlModel::com::sun::star::view::XSelectionSupplier
### i111333 ###
forms.OImageControlControl::com::sun::star::awt::XControl
+
+### fd#35728 ###
+forms.OGridControlModel::com::sun::star::form::component::GridControl
+forms.OGridControlModel::com::sun::star::beans::XMultiPropertySet
+forms.OGridControlModel::com::sun::star::beans::XPropertySet
+forms.OGridControlModel::com::sun::star::beans::XFastPropertySet
More information about the Libreoffice-commits
mailing list