migrate forms subsequenttests to gbuild
This commit is contained in:
Bjoern Michaelsen
@@ -0,0 +1,46 @@
|
||||
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
|
||||
#
|
||||
# The contents of this file are subject to the Mozilla Public License Version
|
||||
# 1.1 (the "License"); you may not use this file except in compliance with
|
||||
# the License or as specified alternatively below. You may obtain a copy of
|
||||
# the License at http://www.mozilla.org/MPL/
|
||||
#
|
||||
# Software distributed under the License is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
# for the specific language governing rights and limitations under the
|
||||
# License.
|
||||
#
|
||||
# The Initial Developer of the Original Code is
|
||||
# Bjoern Michaelsen, Canonical Ltd. <bjoern.michaelsen@canonical.com>
|
||||
# Portions created by the Initial Developer are Copyright (C) 2010 the
|
||||
# Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Major Contributor(s):
|
||||
#
|
||||
# For minor contributions see the git repository.
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
|
||||
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
|
||||
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
|
||||
# instead of those above.
|
||||
|
||||
$(eval $(call gb_JunitTest_JunitTest,forms_complex))
|
||||
|
||||
$(eval $(call gb_JunitTest_add_jars,forms_complex,\
|
||||
$(OUTDIR)/bin/OOoRunner.jar \
|
||||
$(OUTDIR)/bin/ridl.jar \
|
||||
$(OUTDIR)/bin/test.jar \
|
||||
$(OUTDIR)/bin/unoil.jar \
|
||||
$(OUTDIR)/bin/jurt.jar \
|
||||
))
|
||||
|
||||
$(eval $(call gb_JunitTest_add_sourcefiles,forms_complex,\
|
||||
forms/qa/complex/forms/CheckOGroupBoxModel \
|
||||
))
|
||||
|
||||
$(eval $(call gb_JunitTest_add_classes,forms_complex,\
|
||||
complex.forms.CheckOGroupBoxModel \
|
||||
))
|
||||
|
||||
# vim: set noet sw=4 ts=4:
|
||||
@@ -0,0 +1,49 @@
|
||||
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
|
||||
#
|
||||
# The contents of this file are subject to the Mozilla Public License Version
|
||||
# 1.1 (the "License"); you may not use this file except in compliance with
|
||||
# the License or as specified alternatively below. You may obtain a copy of
|
||||
# the License at http://www.mozilla.org/MPL/
|
||||
#
|
||||
# Software distributed under the License is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
# for the specific language governing rights and limitations under the
|
||||
# License.
|
||||
#
|
||||
# The Initial Developer of the Original Code is
|
||||
# Bjoern Michaelsen, Canonical Ltd. <bjoern.michaelsen@canonical.com>
|
||||
# Portions created by the Initial Developer are Copyright (C) 2010 the
|
||||
# Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Major Contributor(s):
|
||||
#
|
||||
# For minor contributions see the git repository.
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
|
||||
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
|
||||
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
|
||||
# instead of those above.
|
||||
|
||||
$(eval $(call gb_JunitTest_JunitTest,forms_unoapi))
|
||||
|
||||
$(eval $(call gb_JunitTest_set_defs,forms_unoapi,\
|
||||
$$(DEFS) \
|
||||
-Dorg.openoffice.test.arg.sce=$(SRCDIR)/forms/qa/unoapi/forms.sce \
|
||||
-Dorg.openoffice.test.arg.xcl=$(SRCDIR)/forms/qa/unoapi/knownissues.xcl \
|
||||
-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/forms/qa/unoapi/testdocuments \
|
||||
))
|
||||
|
||||
$(eval $(call gb_JunitTest_add_jars,forms_unoapi,\
|
||||
$(OUTDIR)/bin/OOoRunner.jar \
|
||||
$(OUTDIR)/bin/ridl.jar \
|
||||
$(OUTDIR)/bin/test.jar \
|
||||
$(OUTDIR)/bin/unoil.jar \
|
||||
$(OUTDIR)/bin/jurt.jar \
|
||||
))
|
||||
|
||||
$(eval $(call gb_JunitTest_add_classes,forms_unoapi,\
|
||||
org.openoffice.test.UnoApiTest \
|
||||
))
|
||||
|
||||
# vim: set noet sw=4 ts=4:
|
||||
@@ -1,6 +1,7 @@
|
||||
#*************************************************************************
|
||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
#
|
||||
# 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
|
||||
@@ -21,28 +22,17 @@
|
||||
# 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
|
||||
ifeq ($(strip $(SOLARENV)),)
|
||||
$(error No environment set!)
|
||||
endif
|
||||
|
||||
PRJ = ../..
|
||||
PRJNAME = forms
|
||||
TARGET = qa_unoapi
|
||||
gb_PARTIALBUILD := T
|
||||
GBUILDDIR := $(SOLARENV)/gbuild
|
||||
include $(GBUILDDIR)/gbuild.mk
|
||||
|
||||
.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
|
||||
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
|
||||
|
||||
.INCLUDE: settings.mk
|
||||
.INCLUDE: target.mk
|
||||
.INCLUDE: installationtest.mk
|
||||
|
||||
ALLTAR : javatest
|
||||
|
||||
.END
|
||||
# vim: set noet sw=4 ts=4:
|
||||
@@ -0,0 +1,35 @@
|
||||
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
|
||||
#
|
||||
# The contents of this file are subject to the Mozilla Public License Version
|
||||
# 1.1 (the "License"); you may not use this file except in compliance with
|
||||
# the License or as specified alternatively below. You may obtain a copy of
|
||||
# the License at http://www.mozilla.org/MPL/
|
||||
#
|
||||
# Software distributed under the License is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
# for the specific language governing rights and limitations under the
|
||||
# License.
|
||||
#
|
||||
# The Initial Developer of the Original Code is
|
||||
# Bjoern Michaelsen, Canonical Ltd. <bjoern.michaelsen@canonical.com>
|
||||
# Portions created by the Initial Developer are Copyright (C) 2010 the
|
||||
# Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Major Contributor(s):
|
||||
#
|
||||
# For minor contributions see the git repository.
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
|
||||
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
|
||||
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
|
||||
# instead of those above.
|
||||
|
||||
$(eval $(call gb_Module_Module,forms))
|
||||
|
||||
$(eval $(call gb_Module_add_subsequentcheck_targets,forms,\
|
||||
JunitTest_forms_unoapi \
|
||||
JunitTest_forms_complex \
|
||||
))
|
||||
|
||||
# vim: set noet ts=4 sw=4:
|
||||
@@ -15,6 +15,3 @@ 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
|
||||
# fd#35693 disabled because they hang on exit
|
||||
#fm forms\qa\complex\forms nmake - all fm_qa_complex NULL
|
||||
#fm forms\qa\unoapi nmake - all fm_qa_unoapi NULL
|
||||
|
||||
@@ -1,51 +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.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();
|
||||
}
|
||||
Reference in New Issue
Block a user