diff options
author | sb <sb@openoffice.org> | 2010-04-22 10:19:10 +0200 |
---|---|---|
committer | sb <sb@openoffice.org> | 2010-04-22 10:19:10 +0200 |
commit | 3e6c047dea8318a3b271f59521843fdd72f25a2c (patch) | |
tree | 5b214fd90775f6dc7cddf7a3905d7f3f35eef4b6 /configmgr | |
parent | e6f3ad0eaac8b32918bb8bcee36cdc0be7fbfc29 (diff) | |
parent | 515792c312abc929b4616c757b8eaced67718d10 (diff) |
sb121: merged in DEV300_m77
Diffstat (limited to 'configmgr')
-rw-r--r-- | configmgr/prj/build.lst | 1 | ||||
-rw-r--r-- | configmgr/qa/unit/makefile.mk | 2 | ||||
-rw-r--r-- | configmgr/qa/unoapi/Test.java | 50 | ||||
-rw-r--r-- | configmgr/qa/unoapi/makefile.mk | 20 |
4 files changed, 69 insertions, 4 deletions
diff --git a/configmgr/prj/build.lst b/configmgr/prj/build.lst index 2fd4e03fa442..9fcccbc73b4c 100644 --- a/configmgr/prj/build.lst +++ b/configmgr/prj/build.lst @@ -1,3 +1,4 @@ cg configmgr : BOOST:boost comphelper cppu cppuhelper offuh sal salhelper stlport NULL cg configmgr\inc nmake - all cg_inc NULL cg configmgr\source nmake - all cg_source cg_inc NULL +cg configmgr\qa\unoapi nmake - all cg_qa_unoapi NULL diff --git a/configmgr/qa/unit/makefile.mk b/configmgr/qa/unit/makefile.mk index 916c40ffedf5..25035d7e9dda 100644 --- a/configmgr/qa/unit/makefile.mk +++ b/configmgr/qa/unit/makefile.mk @@ -33,6 +33,8 @@ ENABLE_EXCEPTIONS = TRUE .INCLUDE: settings.mk +CFLAGSCXX += $(CPPUNIT_CFLAGS) + SLOFILES = $(SLO)/test.obj SHL1OBJS = $(SLOFILES) diff --git a/configmgr/qa/unoapi/Test.java b/configmgr/qa/unoapi/Test.java new file mode 100644 index 000000000000..4d1f5a3c4be7 --- /dev/null +++ b/configmgr/qa/unoapi/Test.java @@ -0,0 +1,50 @@ +/************************************************************************* +* 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", "module.sce", "-cs", connection.getDescription())); + } + + private final OfficeConnection connection = new OfficeConnection(); +} diff --git a/configmgr/qa/unoapi/makefile.mk b/configmgr/qa/unoapi/makefile.mk index 5af6b0729660..252e4a0d9af4 100644 --- a/configmgr/qa/unoapi/makefile.mk +++ b/configmgr/qa/unoapi/makefile.mk @@ -25,14 +25,26 @@ # #***********************************************************************/ +.IF "$(OOO_SUBSEQUENT_TESTS)" == "" +nothing .PHONY: +.ELSE + PRJ = ../.. PRJNAME = configmgr -TARGET = unoapi +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: TEST +ALLTAR : javatest -TEST .PHONY: - $(SOLARENV)/bin/checkapi -sce module.sce +.END |