gnumake3: more work on junit subsequenttest migration

5 files changed, 146 insertions, 3 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();