gnumake3: more work on junit subsequenttest migration

svl/JunitTest_svl_complex.mk

+#*************************************************************************
+#
+# 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,svl_complex))
+
+$(eval $(call gb_JunitTest_set_defs,svl_complex,\
+    $$(DEFS) \
+    -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/svl/qa/complex/broken_document/test_documents \
+))
+
+$(eval $(call gb_JunitTest_add_sourcefiles,svl_complex,\
+    svl/qa/complex/ConfigItems/CheckConfigItems \
+    svl/qa/complex/passwordcontainer/PasswordContainerUnitTest \
+    svl/qa/complex/passwordcontainer/TestHelper \
+    svl/qa/complex/passwordcontainer/Test03 \
+    svl/qa/complex/passwordcontainer/Test02 \
+    svl/qa/complex/passwordcontainer/Test01 \
+    svl/qa/complex/passwordcontainer/PasswordContainerTest \
+    svl/qa/complex/passwordcontainer/MasterPasswdHandler \
+))
+
+$(eval $(call gb_JunitTest_add_classes,svl_complex,\
+    complex.passwordcontainer.PasswordContainerUnitTest \
+))
+
+# vim: set noet sw=4 ts=4:

svl/Module_svl.mk

@@ -35,6 +35,10 @@ $(eval $(call gb_Module_add_targets,svl,\
     Package_inc \
 ))
 
+$(eval $(call gb_Module_add_subsequentcheck_targets,svl,\
+    JunitTest_svl_complex \
+))
+
 #todo: dde platform dependent
 #todo: package_inc
 #todo: map file

svtools/JunitTest_svtools_unoapi.mk

+#*************************************************************************
+#
+# 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,svtools_unoapi))
+
+$(eval $(call gb_JunitTest_set_defs,svtools_unoapi,\
+    $$(DEFS) \
+    -Dorg.openoffice.test.arg.sce=$(SRCDIR)/svtools/qa/unoapi/svtools.sce \
+    -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/svtools/qa/unoapi/knownissues.xcl \
+    -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/svtools/qa/unoapi/testdocuments \
+))
+
+$(eval $(call gb_JunitTest_add_sourcefiles,svtools_unoapi,\
+    svtools/qa/unoapi/Test \
+))
+
+$(eval $(call gb_JunitTest_add_classes,svtools_unoapi,\
+    org.openoffice.svtools.qa.unoapi.Test \
+))
+
+# vim: set noet sw=4 ts=4:

svtools/Module_svtools.mk

@@ -39,6 +39,10 @@ $(eval $(call gb_Module_add_targets,svtools,\
     Package_inc \
 ))
 
+$(eval $(call gb_Module_add_subsequentcheck_targets,svtools,\
+    JunitTest_svtools_unoapi \
+))
+
 #todo: javapatchres
 #todo: jpeg on mac in svtools/util/makefile.mk
 #todo: deliver errtxt.src as ehdl.srs

svtools/qa/unoapi/Test.java

@@ -27,6 +27,7 @@ package org.openoffice.svtools.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", "svtools.sce", "-xcl", "knownissues.xcl", "-cs",
-                connection.getDescription()));
+                "-sce", Argument.get("sce"), "-xcl", Argument.get("xcl"), "-tdoc",
+                Argument.get("tdoc"), "-cs", connection.getDescription()));
     }
 
     private final OfficeConnection connection = new OfficeConnection();

toolkit/JunitTest_toolkit_unoapi.mk

+#*************************************************************************
+#
+# 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_unoapi))
+
+$(eval $(call gb_JunitTest_set_defs,toolkit_unoapi,\
+    $$(DEFS) \
+    -Dorg.openoffice.test.arg.sce=$(SRCDIR)/toolkit/qa/unoapi/toolkit.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_add_sourcefiles,toolkit_unoapi,\
+    toolkit/qa/unoapi/Test \
+))
+
+$(eval $(call gb_JunitTest_add_classes,toolkit_unoapi,\
+    org.openoffice.toolkit.qa.unoapi.Test \
+))
+
+# vim: set noet sw=4 ts=4:

toolkit/Module_toolkit.mk

@@ -35,4 +35,8 @@ $(eval $(call gb_Module_add_targets,toolkit,\
     Package_util \
 ))
 
+$(eval $(call gb_Module_add_subsequentcheck_targets,toolkit,\
+    JunitTest_toolkit_unoapi \
+))
+
 # vim: set noet sw=4 ts=4:

toolkit/qa/unoapi/Test.java

@@ -27,6 +27,7 @@ package org.openoffice.toolkit.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", "toolkit.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();