split toolkit unoapi test for performance

- test previously took 3m18s here
- slowest part is now 60s

Change-Id: Ibbcdf9a7f408fcca189bcb7b182a864aea1f7159
Reviewed-on: https://gerrit.libreoffice.org/15958
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>

10 files changed, 277 insertions, 97 deletions

diff --git a/toolkit/JunitTest_toolkit_unoapi.mk b/toolkit/JunitTest_toolkit_unoapi_1.mk
index f178e868aa69..5feec1b8f6ca 100644
--- a/toolkit/JunitTest_toolkit_unoapi.mk
+++ b/toolkit/JunitTest_toolkit_unoapi_1.mk
@@ -17,16 +17,16 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 
-$(eval $(call gb_JunitTest_JunitTest,toolkit_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,toolkit_unoapi_1))
 
-$(eval $(call gb_JunitTest_set_defs,toolkit_unoapi,\
+$(eval $(call gb_JunitTest_set_defs,toolkit_unoapi_1,\
     $$(DEFS) \
-    -Dorg.openoffice.test.arg.sce=$(SRCDIR)/toolkit/qa/unoapi/toolkit.sce \
+    -Dorg.openoffice.test.arg.sce=$(SRCDIR)/toolkit/qa/unoapi/toolkit_1.sce \
     -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/toolkit/qa/unoapi/knownissues.xcl \
     -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/toolkit/qa/unoapi/testdocuments \
 ))
 
-$(eval $(call gb_JunitTest_use_jars,toolkit_unoapi,\
+$(eval $(call gb_JunitTest_use_jars,toolkit_unoapi_1,\
     OOoRunner \
     ridl \
     test \
@@ -34,7 +34,7 @@ $(eval $(call gb_JunitTest_use_jars,toolkit_unoapi,\
     jurt \
 ))
 
-$(eval $(call gb_JunitTest_add_classes,toolkit_unoapi,\
+$(eval $(call gb_JunitTest_add_classes,toolkit_unoapi_1,\
     org.openoffice.test.UnoApiTest \
 ))
 
diff --git a/toolkit/JunitTest_toolkit_unoapi_2.mk b/toolkit/JunitTest_toolkit_unoapi_2.mk
new file mode 100644
index 000000000000..4838cb656055
--- /dev/null
+++ b/toolkit/JunitTest_toolkit_unoapi_2.mk
@@ -0,0 +1,41 @@
+# -*- 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/.
+#
+# 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 .
+#
+
+$(eval $(call gb_JunitTest_JunitTest,toolkit_unoapi_2))
+
+$(eval $(call gb_JunitTest_set_defs,toolkit_unoapi_2,\
+    $$(DEFS) \
+    -Dorg.openoffice.test.arg.sce=$(SRCDIR)/toolkit/qa/unoapi/toolkit_2.sce \
+    -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/toolkit/qa/unoapi/knownissues.xcl \
+    -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/toolkit/qa/unoapi/testdocuments \
+))
+
+$(eval $(call gb_JunitTest_use_jars,toolkit_unoapi_2,\
+    OOoRunner \
+    ridl \
+    test \
+    unoil \
+    jurt \
+))
+
+$(eval $(call gb_JunitTest_add_classes,toolkit_unoapi_2,\
+    org.openoffice.test.UnoApiTest \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/toolkit/JunitTest_toolkit_unoapi_3.mk b/toolkit/JunitTest_toolkit_unoapi_3.mk
new file mode 100644
index 000000000000..0489f6f6931e
--- /dev/null
+++ b/toolkit/JunitTest_toolkit_unoapi_3.mk
@@ -0,0 +1,41 @@
+# -*- 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/.
+#
+# 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 .
+#
+
+$(eval $(call gb_JunitTest_JunitTest,toolkit_unoapi_3))
+
+$(eval $(call gb_JunitTest_set_defs,toolkit_unoapi_3,\
+    $$(DEFS) \
+    -Dorg.openoffice.test.arg.sce=$(SRCDIR)/toolkit/qa/unoapi/toolkit_3.sce \
+    -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/toolkit/qa/unoapi/knownissues.xcl \
+    -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/toolkit/qa/unoapi/testdocuments \
+))
+
+$(eval $(call gb_JunitTest_use_jars,toolkit_unoapi_3,\
+    OOoRunner \
+    ridl \
+    test \
+    unoil \
+    jurt \
+))
+
+$(eval $(call gb_JunitTest_add_classes,toolkit_unoapi_3,\
+    org.openoffice.test.UnoApiTest \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/toolkit/JunitTest_toolkit_unoapi_4.mk b/toolkit/JunitTest_toolkit_unoapi_4.mk
new file mode 100644
index 000000000000..35af1fb5de17
--- /dev/null
+++ b/toolkit/JunitTest_toolkit_unoapi_4.mk
@@ -0,0 +1,41 @@
+# -*- 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/.
+#
+# 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 .
+#
+
+$(eval $(call gb_JunitTest_JunitTest,toolkit_unoapi_4))
+
+$(eval $(call gb_JunitTest_set_defs,toolkit_unoapi_4,\
+    $$(DEFS) \
+    -Dorg.openoffice.test.arg.sce=$(SRCDIR)/toolkit/qa/unoapi/toolkit_4.sce \
+    -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/toolkit/qa/unoapi/knownissues.xcl \
+    -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/toolkit/qa/unoapi/testdocuments \
+))
+
+$(eval $(call gb_JunitTest_use_jars,toolkit_unoapi_4,\
+    OOoRunner \
+    ridl \
+    test \
+    unoil \
+    jurt \
+))
+
+$(eval $(call gb_JunitTest_add_classes,toolkit_unoapi_4,\
+    org.openoffice.test.UnoApiTest \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/toolkit/Module_toolkit.mk b/toolkit/Module_toolkit.mk
index dc6508d539b4..25db0b66052c 100644
--- a/toolkit/Module_toolkit.mk
+++ b/toolkit/Module_toolkit.mk
@@ -26,7 +26,10 @@ $(eval $(call gb_Module_add_targets,toolkit,\
 ifneq ($(OOO_JUNIT_JAR),)
 $(eval $(call gb_Module_add_subsequentcheck_targets,toolkit,\
     JunitTest_toolkit_complex \
-    JunitTest_toolkit_unoapi \
+    JunitTest_toolkit_unoapi_1 \
+    JunitTest_toolkit_unoapi_2 \
+    JunitTest_toolkit_unoapi_3 \
+    JunitTest_toolkit_unoapi_4 \
 ))
 endif
 
diff --git a/toolkit/qa/unoapi/toolkit.sce b/toolkit/qa/unoapi/toolkit.sce
deleted file mode 100644
index 3ec384dded3d..000000000000
--- a/toolkit/qa/unoapi/toolkit.sce
+++ /dev/null
@@ -1,91 +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 .
-#
-
-#i86007 -o toolkit.AccessibleButton
-#i88332 -o toolkit.AccessibleCheckBox
-#i86008 -o toolkit.AccessibleComboBox
--o toolkit.AccessibleDropDownComboBox
--o toolkit.AccessibleDropDownListBox
-#i86110 -o toolkit.AccessibleEdit
--o toolkit.AccessibleFixedText
-#i86110 -o toolkit.AccessibleList
-#i86110 -o toolkit.AccessibleListBox
-#i86110 -o toolkit.AccessibleListItem
--o toolkit.AccessibleMenu
--o toolkit.AccessibleMenuBar
-#i86009 -o toolkit.AccessibleMenuItem
--o toolkit.AccessibleMenuSeparator
-#i52607 -o toolkit.AccessiblePopupMenu
-#i86107,i86110 -o toolkit.AccessibleRadioButton
--o toolkit.AccessibleScrollBar
-#i111225 -o toolkit.AccessibleStatusBar
--o toolkit.AccessibleStatusBarItem
-#i109643 -o toolkit.AccessibleTabControl
-#i109643 -o toolkit.AccessibleTabPage
-#i86287 -o toolkit.AccessibleToolBox
-#i88605 -o toolkit.AccessibleToolBoxItem
--o toolkit.AccessibleWindow
--o toolkit.MutableTreeDataModel
--o toolkit.MutableTreeNode
--o toolkit.TabController
--o toolkit.TabControllerModel
--o toolkit.Toolkit
--o toolkit.UnoControlButton
--o toolkit.UnoControlButtonModel
--o toolkit.UnoControlCheckBox
--o toolkit.UnoControlCheckBoxModel
--o toolkit.UnoControlComboBox
--o toolkit.UnoControlComboBoxModel
--o toolkit.UnoControlContainer
--o toolkit.UnoControlContainerModel
--o toolkit.UnoControlCurrencyField
--o toolkit.UnoControlCurrencyFieldModel
--o toolkit.UnoControlDateField
--o toolkit.UnoControlDateFieldModel
-#allegedly was i80788, but still broken: -o toolkit.UnoControlDialog
--o toolkit.UnoControlDialogModel
--o toolkit.UnoControlEdit
--o toolkit.UnoControlEditModel
-#i86011 -o toolkit.UnoControlFileControl
--o toolkit.UnoControlFileControlModel
--o toolkit.UnoControlFixedLineModel
--o toolkit.UnoControlFixedText
--o toolkit.UnoControlFixedTextModel
-#i86013 -o toolkit.UnoControlFormattedField
--o toolkit.UnoControlFormattedFieldModel
--o toolkit.UnoControlGroupBox
--o toolkit.UnoControlGroupBoxModel
--o toolkit.UnoControlImageControl
--o toolkit.UnoControlImageControlModel
-#i86019 -o toolkit.UnoControlListBox
--o toolkit.UnoControlListBoxModel
--o toolkit.UnoControlNumericField
--o toolkit.UnoControlNumericFieldModel
--o toolkit.UnoControlPatternField
--o toolkit.UnoControlPatternFieldModel
--o toolkit.UnoControlProgressBarModel
--o toolkit.UnoControlRadioButton
--o toolkit.UnoControlRadioButtonModel
--o toolkit.UnoControlScrollBarModel
--o toolkit.UnoControlTimeField
--o toolkit.UnoControlTimeFieldModel
--o toolkit.UnoScrollBarControl
--o toolkit.UnoSpinButtonControl
--o toolkit.UnoSpinButtonControlModel
-#i86298 -o toolkit.UnoTreeControl
--o toolkit.UnoTreeModel
diff --git a/toolkit/qa/unoapi/toolkit_1.sce b/toolkit/qa/unoapi/toolkit_1.sce
new file mode 100644
index 000000000000..17eb7a752059
--- /dev/null
+++ b/toolkit/qa/unoapi/toolkit_1.sce
@@ -0,0 +1,41 @@
+#
+# 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 .
+#
+
+#i86007 -o toolkit.AccessibleButton
+#i88332 -o toolkit.AccessibleCheckBox
+#i86008 -o toolkit.AccessibleComboBox
+-o toolkit.AccessibleDropDownComboBox
+-o toolkit.AccessibleDropDownListBox
+#i86110 -o toolkit.AccessibleEdit
+-o toolkit.AccessibleFixedText
+#i86110 -o toolkit.AccessibleList
+#i86110 -o toolkit.AccessibleListBox
+#i86110 -o toolkit.AccessibleListItem
+-o toolkit.AccessibleMenu
+-o toolkit.AccessibleMenuBar
+#i86009 -o toolkit.AccessibleMenuItem
+-o toolkit.AccessibleMenuSeparator
+#i52607 -o toolkit.AccessiblePopupMenu
+#i86107,i86110 -o toolkit.AccessibleRadioButton
+-o toolkit.AccessibleScrollBar
+#i111225 -o toolkit.AccessibleStatusBar
+-o toolkit.AccessibleStatusBarItem
+#i109643 -o toolkit.AccessibleTabControl
+#i109643 -o toolkit.AccessibleTabPage
+#i86287 -o toolkit.AccessibleToolBox
+#i88605 -o toolkit.AccessibleToolBoxItem
diff --git a/toolkit/qa/unoapi/toolkit_2.sce b/toolkit/qa/unoapi/toolkit_2.sce
new file mode 100644
index 000000000000..2c5957f34f99
--- /dev/null
+++ b/toolkit/qa/unoapi/toolkit_2.sce
@@ -0,0 +1,36 @@
+#
+# 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 .
+#
+
+-o toolkit.AccessibleWindow
+-o toolkit.MutableTreeDataModel
+-o toolkit.MutableTreeNode
+-o toolkit.TabController
+-o toolkit.TabControllerModel
+-o toolkit.Toolkit
+-o toolkit.UnoControlButton
+-o toolkit.UnoControlButtonModel
+-o toolkit.UnoControlCheckBox
+-o toolkit.UnoControlCheckBoxModel
+-o toolkit.UnoControlComboBox
+-o toolkit.UnoControlComboBoxModel
+-o toolkit.UnoControlContainer
+-o toolkit.UnoControlContainerModel
+-o toolkit.UnoControlCurrencyField
+-o toolkit.UnoControlCurrencyFieldModel
+-o toolkit.UnoControlDateField
+-o toolkit.UnoControlDateFieldModel
diff --git a/toolkit/qa/unoapi/toolkit_3.sce b/toolkit/qa/unoapi/toolkit_3.sce
new file mode 100644
index 000000000000..91f07709e2a4
--- /dev/null
+++ b/toolkit/qa/unoapi/toolkit_3.sce
@@ -0,0 +1,37 @@
+#
+# 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 .
+#
+
+#allegedly was i80788, but still broken: -o toolkit.UnoControlDialog
+-o toolkit.UnoControlDialogModel
+-o toolkit.UnoControlEdit
+-o toolkit.UnoControlEditModel
+#i86011 -o toolkit.UnoControlFileControl
+-o toolkit.UnoControlFileControlModel
+-o toolkit.UnoControlFixedLineModel
+-o toolkit.UnoControlFixedText
+-o toolkit.UnoControlFixedTextModel
+#i86013 -o toolkit.UnoControlFormattedField
+-o toolkit.UnoControlFormattedFieldModel
+-o toolkit.UnoControlGroupBox
+-o toolkit.UnoControlGroupBoxModel
+-o toolkit.UnoControlImageControl
+-o toolkit.UnoControlImageControlModel
+#i86019 -o toolkit.UnoControlListBox
+-o toolkit.UnoControlListBoxModel
+-o toolkit.UnoControlNumericField
+-o toolkit.UnoControlNumericFieldModel
diff --git a/toolkit/qa/unoapi/toolkit_4.sce b/toolkit/qa/unoapi/toolkit_4.sce
new file mode 100644
index 000000000000..d8cdcbe3805f
--- /dev/null
+++ b/toolkit/qa/unoapi/toolkit_4.sce
@@ -0,0 +1,31 @@
+#
+# 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 .
+#
+
+-o toolkit.UnoControlPatternField
+-o toolkit.UnoControlPatternFieldModel
+-o toolkit.UnoControlProgressBarModel
+-o toolkit.UnoControlRadioButton
+-o toolkit.UnoControlRadioButtonModel
+-o toolkit.UnoControlScrollBarModel
+-o toolkit.UnoControlTimeField
+-o toolkit.UnoControlTimeFieldModel
+-o toolkit.UnoScrollBarControl
+-o toolkit.UnoSpinButtonControl
+-o toolkit.UnoSpinButtonControlModel
+#i86298 -o toolkit.UnoTreeControl
+-o toolkit.UnoTreeModel