fs34b: integrated complex test cases into GNUMake's subsequentcheck target

3 files changed, 57 insertions, 97 deletions

diff --git a/toolkit/JunitTest_toolkit_complex.mk b/toolkit/JunitTest_toolkit_complex.mk
new file mode 100755
index 000000000000..77bf7544afc1
--- /dev/null
+++ b/toolkit/JunitTest_toolkit_complex.mk
@@ -0,0 +1,56 @@
+#*************************************************************************
+#
+# 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,toolkit_complex))
+
+$(eval $(call gb_JunitTest_add_jars,toolkit_complex,\
+    $(OUTDIR)/bin/OOoRunner.jar \
+    $(OUTDIR)/bin/ridl.jar \
+    $(OUTDIR)/bin/test.jar \
+    $(OUTDIR)/bin/unoil.jar \
+))
+
+$(eval $(call gb_JunitTest_add_sourcefiles,toolkit_complex,\
+    toolkit/qa/complex/toolkit/accessibility/_XAccessibleComponent \
+    toolkit/qa/complex/toolkit/accessibility/_XAccessibleContext \
+    toolkit/qa/complex/toolkit/accessibility/_XAccessibleEventBroadcaster \
+    toolkit/qa/complex/toolkit/accessibility/_XAccessibleExtendedComponent \
+    toolkit/qa/complex/toolkit/accessibility/_XAccessibleText \
+    toolkit/qa/complex/toolkit/Assert \
+    toolkit/qa/complex/toolkit/awtgrid/GridDataListener \
+    toolkit/qa/complex/toolkit/awtgrid/TMutableGridDataModel \
+    toolkit/qa/complex/toolkit/awtgrid/DummyColumn \
+    toolkit/qa/complex/toolkit/GridControl \
+    toolkit/qa/complex/toolkit/UnitConversion \
+))
+
+$(eval $(call gb_JunitTest_add_classes,toolkit_complex,\
+    complex.toolkit.GridControl \
+    complex.toolkit.UnitConversion \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/toolkit/Module_toolkit.mk b/toolkit/Module_toolkit.mk
index a35461413ed9..dc83aad16f2d 100644
--- a/toolkit/Module_toolkit.mk
+++ b/toolkit/Module_toolkit.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_Module_add_targets,toolkit,\
 ))
 
 $(eval $(call gb_Module_add_subsequentcheck_targets,toolkit,\
+    JunitTest_toolkit_complex \
     JunitTest_toolkit_unoapi \
 ))
 
diff --git a/toolkit/qa/complex/toolkit/makefile.mk b/toolkit/qa/complex/toolkit/makefile.mk
deleted file mode 100644
index ecb173f9bdac..000000000000
--- a/toolkit/qa/complex/toolkit/makefile.mk
+++ /dev/null
@@ -1,97 +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_JUNIT_JAR)" == ""
-nothing .PHONY:
-    @echo -----------------------------------------------------
-    @echo - JUnit not available, not building anything
-    @echo -----------------------------------------------------
-.ELSE   # IF "$(OOO_JUNIT_JAR)" != ""
-
-PRJ = ../../..
-PRJNAME = toolkit
-TARGET = qa_complex_toolkit
-PACKAGE = complex/toolkit
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-#----- compile .java files -----------------------------------------
-
-JARFILES = OOoRunnerLight.jar ridl.jar test.jar unoil.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-
-JAVAFILES = \
-    $(JAVATESTFILES) \
-    accessibility/_XAccessibleComponent.java \
-    accessibility/_XAccessibleContext.java \
-    accessibility/_XAccessibleEventBroadcaster.java \
-    accessibility/_XAccessibleExtendedComponent.java \
-    accessibility/_XAccessibleText.java \
-    Assert.java \
-    awtgrid/GridDataListener.java \
-    awtgrid/TMutableGridDataModel.java \
-    awtgrid/DummyColumn.java \
-
-#----- create a jar from compiled files ----------------------------
-
-JARTARGET       = $(TARGET).jar
-
-#----- JUnit tests class -------------------------------------------
-
-JAVATESTFILES = \
-    GridControl.java \
-    UnitConversion.java \
-
-
-# disabled for now - the tests fail on at least one platform
-# no issue, yet (not sure this is worth it. Don't know who to give the issue to, and don't know whether the test really makes sense)
-DISABLED_JAVA_TEST_FILES=\
-    AccessibleStatusBar.java\
-    AccessibleStatusBarItem.java
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE: target.mk
-
-ALL :   ALLTAR
-
-# --- subsequent tests ---------------------------------------------
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" != ""
-
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-    # Sample how to debug
-    # JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
-
-.END    # "$(OOO_SUBSEQUENT_TESTS)" == ""
-
-.END    # ELSE "$(OOO_JUNIT_JAR)" != ""