summaryrefslogtreecommitdiff
path: root/toolkit
diff options
context:
space:
mode:
Diffstat (limited to 'toolkit')
-rwxr-xr-xtoolkit/JunitTest_toolkit_unoapi.mk6
-rw-r--r--toolkit/qa/unoapi/Test.java52
-rw-r--r--toolkit/qa/unoapi/makefile.mk48
3 files changed, 1 insertions, 105 deletions
diff --git a/toolkit/JunitTest_toolkit_unoapi.mk b/toolkit/JunitTest_toolkit_unoapi.mk
index 27dc89e13478..5484517db0e5 100755
--- a/toolkit/JunitTest_toolkit_unoapi.mk
+++ b/toolkit/JunitTest_toolkit_unoapi.mk
@@ -42,12 +42,8 @@ $(eval $(call gb_JunitTest_add_jars,toolkit_unoapi,\
$(OUTDIR)/bin/jurt.jar \
))
-$(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 \
+ org.openoffice.test.UnoApiTest \
))
# vim: set noet sw=4 ts=4:
diff --git a/toolkit/qa/unoapi/Test.java b/toolkit/qa/unoapi/Test.java
deleted file mode 100644
index 0543fee83f9f..000000000000
--- a/toolkit/qa/unoapi/Test.java
+++ /dev/null
@@ -1,52 +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.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 {
- @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", Argument.get("sce"), "-xcl", Argument.get("xcl"), "-tdoc",
- Argument.get("tdoc"), "-cs", connection.getDescription()));
- }
-
- private final OfficeConnection connection = new OfficeConnection();
-}
diff --git a/toolkit/qa/unoapi/makefile.mk b/toolkit/qa/unoapi/makefile.mk
deleted file mode 100644
index 9517601c3917..000000000000
--- a/toolkit/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 = toolkit
-TARGET = qa_unoapi
-
-.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 : javatest
-
-.END