summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2011-11-28 21:58:08 +0100
committerStephan Bergmann <sbergman@redhat.com>2011-11-28 22:05:47 +0100
commitb8d2671fd0d8055bdc3fb30482c898a456ac178f (patch)
treed1508cfa426fc6ad49d66fdc850bb75bedfb2551
parentebdbd2b578c970694597dc163125842e9073bf6c (diff)
Enabled sc/qa/unoapi again.
Currently often fails at shutdown, when Bridge::terminate -> ~ScAutoFormatObj -> ScGlobal::GetAutoFormat after ScGlobal::Clear leads to ScAutoFormat ctor -> ScGlobal::GetRscString with null ppRscString.
-rw-r--r--sc/JunitTest_sc_unoapi.mk48
-rw-r--r--sc/Module_sc.mk3
-rw-r--r--sc/qa/unoapi/Test.java51
-rw-r--r--sc/qa/unoapi/makefile.mk48
4 files changed, 51 insertions, 99 deletions
diff --git a/sc/JunitTest_sc_unoapi.mk b/sc/JunitTest_sc_unoapi.mk
new file mode 100644
index 000000000000..7b31eca1d78d
--- /dev/null
+++ b/sc/JunitTest_sc_unoapi.mk
@@ -0,0 +1,48 @@
+##
+## Version: MPL 1.1 / GPLv3+ / LGPLv3+
+##
+## The contents of this file are subject to the Mozilla Public License Version
+## 1.1 (the "License"); you may not use this file except in compliance with
+## the License or as specified alternatively below. You may obtain a copy of
+## the License at http://www.mozilla.org/MPL/
+##
+## Software distributed under the License is distributed on an "AS IS" basis,
+## WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+## for the specific language governing rights and limitations under the
+## License.
+##
+## Major Contributor(s):
+## [ Copyright (C) 2011 Stephan Bergmann <sbergman@redhat.com> (initial
+## developer) ]
+##
+## All Rights Reserved.
+##
+## For minor contributions see the git repository.
+##
+## Alternatively, the contents of this file may be used under the terms of
+## either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+## the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+## in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+## instead of those above.
+##
+
+$(eval $(call gb_JunitTest_JunitTest,sc_unoapi,SRCDIR))
+
+$(eval $(call gb_JunitTest_add_classes,sc_unoapi, \
+ org.openoffice.test.UnoApiTest \
+))
+
+$(eval $(call gb_JunitTest_add_jars,sc_unoapi, \
+ $(OUTDIR)/bin/OOoRunner.jar \
+ $(OUTDIR)/bin/jurt.jar \
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/test.jar \
+ $(OUTDIR)/bin/unoil.jar \
+))
+
+$(eval $(call gb_JunitTest_set_defs,sc_unoapi,\
+ $$(DEFS) \
+ -Dorg.openoffice.test.arg.sce=$(SRCDIR)/sc/qa/unoapi/sc.sce \
+ -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/sc/qa/unoapi/testdocuments \
+ -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/sc/qa/unoapi/knownissues.xcl \
+))
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 11ca2644fc88..6a18985a9b47 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -40,5 +40,8 @@ $(eval $(call gb_Module_add_check_targets,sc,\
CppunitTest_sc_ucalc \
))
+$(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
+ JunitTest_sc_unoapi \
+))
# vim: set noet sw=4 ts=4:
diff --git a/sc/qa/unoapi/Test.java b/sc/qa/unoapi/Test.java
deleted file mode 100644
index 27d048b8bf51..000000000000
--- a/sc/qa/unoapi/Test.java
+++ /dev/null
@@ -1,51 +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.
-************************************************************************/
-
-package org.openoffice.sc.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", "sc.sce", "-xcl", "knownissues.xcl", "-tdoc",
- "testdocuments", "-cs", connection.getDescription()));
- }
-
- private final OfficeConnection connection = new OfficeConnection();
-}
diff --git a/sc/qa/unoapi/makefile.mk b/sc/qa/unoapi/makefile.mk
deleted file mode 100644
index a4781282a0b3..000000000000
--- a/sc/qa/unoapi/makefile.mk
+++ /dev/null
@@ -1,48 +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_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../..
-PRJNAME = sc
-TARGET = qa_unoapi
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = org/openoffice/sc/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 : javatest
-
-.END