diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-03-27 16:51:59 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-03-27 16:54:05 +0200 |
commit | 44fe64ac4878ee9909e93de3855e1700217174e7 (patch) | |
tree | 46ef45ea8fb2e491c3f41844ad15c57fd8f920dc /framework | |
parent | 50839cd9143a6de9154564e43d3631248cb14798 (diff) |
cleanup of unoapi test
Diffstat (limited to 'framework')
-rwxr-xr-x | framework/JunitTest_framework_unoapi.mk | 6 | ||||
-rwxr-xr-x | framework/qa/unoapi/Test.java | 52 | ||||
-rw-r--r-- | framework/qa/unoapi/makefile.mk | 48 |
3 files changed, 1 insertions, 105 deletions
diff --git a/framework/JunitTest_framework_unoapi.mk b/framework/JunitTest_framework_unoapi.mk index 1204ee5262c9..de6eef81dcf5 100755 --- a/framework/JunitTest_framework_unoapi.mk +++ b/framework/JunitTest_framework_unoapi.mk @@ -42,12 +42,8 @@ $(eval $(call gb_JunitTest_add_jars,framework_unoapi,\ $(OUTDIR)/bin/jurt.jar \ )) -$(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 \ + org.openoffice.test.UnoApiTester \ )) # vim: set noet sw=4 ts=4: diff --git a/framework/qa/unoapi/Test.java b/framework/qa/unoapi/Test.java deleted file mode 100755 index 71774b4a62bb..000000000000 --- a/framework/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.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 { - @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/framework/qa/unoapi/makefile.mk b/framework/qa/unoapi/makefile.mk deleted file mode 100644 index 38a6cf7cced8..000000000000 --- a/framework/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 = framework -TARGET = qa_unoapi - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = org/openoffice/framework/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 |