diff options
author | sb <sb@openoffice.org> | 2010-02-16 11:53:58 +0100 |
---|---|---|
committer | sb <sb@openoffice.org> | 2010-02-16 11:53:58 +0100 |
commit | e3f3cc2d7f5dc477a01eef94601ca3082e82e3a9 (patch) | |
tree | 6c7fdf5a21048c377071cf8a8de18f3cddd0d8b1 /configmgr | |
parent | f8e5730d9966d33983de11377ee1ba3f1e8ad987 (diff) |
sb118: adapted remaining */qa/unoapi tests to new framework
Diffstat (limited to 'configmgr')
-rw-r--r-- | configmgr/prj/build.lst | 2 | ||||
-rw-r--r-- | configmgr/qa/unoapi/Test.java | 51 | ||||
-rw-r--r-- | configmgr/qa/unoapi/makefile.mk | 42 |
3 files changed, 73 insertions, 22 deletions
diff --git a/configmgr/prj/build.lst b/configmgr/prj/build.lst index a3d93b598abe..46edcd8b9f28 100644 --- a/configmgr/prj/build.lst +++ b/configmgr/prj/build.lst @@ -15,4 +15,4 @@ cg configmgr\source\registry nmake - all cg_reg cg_inc NULL cg configmgr\source\platformbe nmake - all cg_platformbe cg_inc NULL cg configmgr\util nmake - all cg_util cg_platformbe cg_api cg_api2 cg_misc cg_reg cg_trcache cg_data cg_tree cg_treemgr cg_xml cg_backend cg_localbe NULL cg configmgr\source\localbe nmake - all cg_localbe cg_inc NULL - +cg configmgr\qa\unoapi nmake - all cg_qa_unoapi NULL diff --git a/configmgr/qa/unoapi/Test.java b/configmgr/qa/unoapi/Test.java new file mode 100644 index 000000000000..5c820ed53dc1 --- /dev/null +++ b/configmgr/qa/unoapi/Test.java @@ -0,0 +1,51 @@ +/************************************************************************* +* 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.configmgr.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", "cfgmgr2.sce", "-xcl", "knownissues.xcl", "-cs", + connection.getDescription())); + } + + private final OfficeConnection connection = new OfficeConnection(); +} diff --git a/configmgr/qa/unoapi/makefile.mk b/configmgr/qa/unoapi/makefile.mk index 6be9331b2cc4..879e3bebde74 100644 --- a/configmgr/qa/unoapi/makefile.mk +++ b/configmgr/qa/unoapi/makefile.mk @@ -1,14 +1,9 @@ #************************************************************************* -# # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ +# Copyright 2000, 2010 Oracle and/or its affiliates. # -# $Revision: 1.7 $ +# OpenOffice.org - a multi-platform office productivity suite # # This file is part of OpenOffice.org. # @@ -26,23 +21,28 @@ # version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. -# -#************************************************************************* +#***********************************************************************/ -PRJ=..$/.. -PRJNAME=configmgr -TARGET=qa_unoapi +.IF "$(OOO_SUBSEQUENT_TESTS)" == "" +nothing .PHONY: +.ELSE -.INCLUDE: settings.mk +PRJ = ../.. +PRJNAME = configmgr +TARGET = qa_unoapi +.IF "$(OOO_JUNIT_JAR)" != "" +PACKAGE = org/openoffice/configmgr/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 : UNOAPI_TEST +ALLTAR : javatest -UNOAPI_TEST: - +$(SOLARENV)$/bin$/checkapi -sce cfgmgr2.sce -xcl knownissues.xcl -tdoc $(PWD)$/testdocuments - @echo ======================================================================= - @echo In case of problems with sysmgr1.SystemIntegration make sure that you - @echo ======================================================================= - @echo built and registered qadevOOo/testsdocs/backend/org/openoffice/JavaSystemBackend - @echo ======================================================================= +.END |