Update from master repository (DEV300m77).

4 files changed, 80 insertions, 24 deletions

diff --git a/toolkit/qa/unoapi/Test.java b/toolkit/qa/unoapi/Test.java
new file mode 100644
index 000000000000..f27d882314d2
--- /dev/null
+++ b/toolkit/qa/unoapi/Test.java
@@ -0,0 +1,51 @@
+/*************************************************************************
+* 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.toolkit.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", "toolkit.sce", "-xcl", "knownissues.xcl", "-tdoc",
+                "testdocuments", "-cs", connection.getDescription()));
+    }
+
+    private final OfficeConnection connection = new OfficeConnection();
+}
diff --git a/toolkit/qa/unoapi/knownissues.xcl b/toolkit/qa/unoapi/knownissues.xcl
index ef954f00eeeb..6f57f37536a2 100644
--- a/toolkit/qa/unoapi/knownissues.xcl
+++ b/toolkit/qa/unoapi/knownissues.xcl
@@ -90,11 +90,6 @@ toolkit.AccessibleRadioButton
 toolkit.AccessibleToolBox
 # -> disabled in toolkit.sce
 
-### i80788 ### 
-toolkit.Toolkit
-toolkit.UnoControlDialog
-# -> disabled in toolkit.sce
-
 ### i86011 ###
 toolkit.UnoControlFileControl
 # -> disabled in toolkit.sce
@@ -239,4 +234,9 @@ toolkit.AccessibleScrollBar::com::sun::star::accessibility::XAccessibleComponent
 toolkit.UnoScrollBarControl::com::sun::star::awt::XScrollBar
 
 ### i94344 ###
-toolkit.AccessibleTabPage::com::sun::star::accessibility::XAccessibleText
\ No newline at end of file
+toolkit.AccessibleTabPage::com::sun::star::accessibility::XAccessibleText
+
+### i109643 ###
+toolkit.AccessibleMenu::com::sun::star::accessibility::XAccessibleValue
+toolkit.AccessibleMenuBar::com::sun::star::accessibility::XAccessibleEventBroadcaster
+toolkit.AccessibleMenuBar::com::sun::star::accessibility::XAccessibleSelection
diff --git a/toolkit/qa/unoapi/makefile.mk b/toolkit/qa/unoapi/makefile.mk
index a24f81d7c6ef..9517601c3917 100644
--- a/toolkit/qa/unoapi/makefile.mk
+++ b/toolkit/qa/unoapi/makefile.mk
@@ -1,7 +1,6 @@
 #*************************************************************************
-#
 # 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
@@ -22,22 +21,28 @@
 # version 3 along with OpenOffice.org.  If not, see
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
-#
-#*************************************************************************
+#***********************************************************************/
 
-PRJ=..$/..
+.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
+nothing .PHONY:
+.ELSE
 
-PRJNAME=toolkit
-TARGET=qa_unoapi
+PRJ = ../..
+PRJNAME = toolkit
+TARGET = qa_unoapi
 
-.INCLUDE: settings.mk
+.IF "$(OOO_JUNIT_JAR)" != ""
+PACKAGE = org/openoffice/toolkit/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 : UNOAPI_TEST
+ALLTAR : javatest
 
-UNOAPI_TEST:
-    +$(SOLARENV)$/bin$/checkapi -sce toolkit.sce -xcl knownissues.xcl -tdoc $(PWD)$/testdocuments
-    @echo =======================================================================
-    @echo In case you noticed a failures of toolkit.AccessibleToolBoxItem make sure that the object bar is configured as text and not as icons
-    @echo =======================================================================	
+.END
diff --git a/toolkit/qa/unoapi/toolkit.sce b/toolkit/qa/unoapi/toolkit.sce
index dad24165e2d2..1c8ad0c95181 100644
--- a/toolkit/qa/unoapi/toolkit.sce
+++ b/toolkit/qa/unoapi/toolkit.sce
@@ -17,8 +17,8 @@
 -o toolkit.AccessibleScrollBar
 -o toolkit.AccessibleStatusBar
 -o toolkit.AccessibleStatusBarItem
--o toolkit.AccessibleTabControl
--o toolkit.AccessibleTabPage
+#i109643 -o toolkit.AccessibleTabControl
+#i109643 -o toolkit.AccessibleTabPage
 #i86287 -o toolkit.AccessibleToolBox
 #i88605 -o toolkit.AccessibleToolBoxItem
 -o toolkit.AccessibleWindow
@@ -26,7 +26,7 @@
 -o toolkit.MutableTreeNode
 -o toolkit.TabController
 -o toolkit.TabControllerModel
-#i80788 -o toolkit.Toolkit
+-o toolkit.Toolkit
 -o toolkit.UnoControlButton
 -o toolkit.UnoControlButtonModel
 -o toolkit.UnoControlCheckBox
@@ -39,7 +39,7 @@
 -o toolkit.UnoControlCurrencyFieldModel
 -o toolkit.UnoControlDateField
 -o toolkit.UnoControlDateFieldModel
-#i80788 -o toolkit.UnoControlDialog
+#allegedly was i80788, but still broken: -o toolkit.UnoControlDialog
 -o toolkit.UnoControlDialogModel
 -o toolkit.UnoControlEdit
 -o toolkit.UnoControlEditModel