sb118: adapted remaining */qa/unoapi tests to new framework

This commit is contained in:
sb 2010-02-16 11:53:58 +01:00
parent 91fa813aab
commit 52b23e4bfa
6 changed files with 143 additions and 40 deletions

View file

@ -34,3 +34,4 @@ ex extensions\source\update\feed nmake - all ex_updchkfeed ex
ex extensions\source\update\check nmake - all ex_updchk ex_inc NULL
ex extensions\source\update\ui nmake - all ex_updchkui ex_inc NULL
ex extensions\util nmake - all ex_util ex_preload ex_abpilot ex_dbpilots ex_logging ex_ldap ex_propctrlr ex_bib ex_plutil ex_oooimprovecore NULL
ex extensions\qa\unoapi nmake - all ex_qa_unoapi NULL

View file

@ -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.extensions.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", "extensions.sce", "-cs", connection.getDescription()));
}
private final OfficeConnection connection = new OfficeConnection();
}

View file

@ -1,15 +1,10 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# Copyright 2008 by Sun Microsystems, Inc.
#
# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.5 $
#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
@ -26,19 +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=..$/..
.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
nothing .PHONY:
.ELSE
PRJNAME=extensions
TARGET=qa_unoapi
PRJ = ../..
PRJNAME = extensions
TARGET = qa_unoapi
.IF "$(OOO_JUNIT_JAR)" != ""
PACKAGE = org/openoffice/extensions/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 $(PRJNAME).sce -THRCNT 1
.END

View file

@ -15,3 +15,4 @@ fm forms\source\richtext nmake - all fm_richtext fm_inc N
fm forms\source\runtime nmake - all frm_runtime NULL
fm forms\util nmake - all fm_util fm_component fm_solar_component fm_solar_control fm_helper fm_misc fm_resource fm_richtext frm_runtime fm_xforms NULL
fm forms\qa nmake - all fm_qa NULL
fm forms\qa\unoapi nmake - all fm_qa_unoapi NULL

51
forms/qa/unoapi/Test.java Normal file
View file

@ -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.forms.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", "forms.sce", "-xcl", "knownissues.xcl", "-tdoc",
"testdocuments", "-cs", connection.getDescription()));
}
private final OfficeConnection connection = new OfficeConnection();
}

View file

@ -1,15 +1,10 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# Copyright 2008 by Sun Microsystems, Inc.
#
# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.8 $
#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
@ -26,27 +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=..$/..
.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
nothing .PHONY:
.ELSE
PRJNAME=forms
TARGET=qa_unoapi
PRJ = ../..
PRJNAME = forms
TARGET = qa_unoapi
.IF "$(OOO_JUNIT_JAR)" != ""
PACKAGE = org/openoffice/forms/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 forms.sce -xcl knownissues.xcl -DOCPTH $(PWD)$/testdocuments -THRCNT 1 -tdoc $(PWD)$/testdocuments
@echo =======================================================================
@echo Problems with controls might me focus problems during the run of XView
@echo these seems to appear by chance ... just re-run those testcases with
@echo $(SOLARENV)$/bin$/checkapi -o componentName -xcl knownissues.xcl -DOCPTH $(PWD)$/testdocuments -THRCNT 1 -tdoc $(PWD)$/testdocuments
@echo =======================================================================
run_%:
+$(SOLARENV)$/bin$/checkapi -o $(PRJNAME).$(@:s/run_//) -xcl knownissues.xcl -DOCPTH $(PWD)$/testdocuments -THRCNT 1 -tdoc $(PWD)$/testdocuments
.END