This is an automated email from the ASF dual-hosted git repository. jleroux pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit f8ad232565558c07c176985d25ac4a0b66608e59 Author: Jacques Le Roux <[email protected]> AuthorDate: Mon Oct 14 17:53:44 2024 +0200 Updated several (transitive) dependencies (OFBIZ-13123) (#819) ServicePurgeTest.groovy and SimpleTests.groovy are no longer integration tests. So they should be put in sourceSets block test part. Thjs also means to delete now useledd basetests.xml and to remove service-purge-test test case from service/testdef/servicetests.xml This does it to allow integration tests to pass and to add ServicePurgeTest.groovy and SimpleTests.groovy in Junit tests --- build.gradle | 2 ++ framework/base/testdef/basetests.xml | 27 --------------------------- framework/service/testdef/servicetests.xml | 5 ----- 3 files changed, 2 insertions(+), 32 deletions(-) diff --git a/build.gradle b/build.gradle index 66d4a1dc51..0c102612ac 100644 --- a/build.gradle +++ b/build.gradle @@ -267,6 +267,8 @@ sourceSets { include 'org/apache/ofbiz/service/ModelServiceTest.groovy' include 'org/apache/ofbiz/test/TestServices.groovy' include 'org/apache/ofbiz/base/util/FileUtilTests.groovy' + include 'org/apache/ofbiz/service/test/ServicePurgeTest.groovy' + include 'org.apache.ofbiz.base.test.SimpleTests.groovy' } resources { srcDirs = getDirectoryInActiveComponentsIfExists('src/test/resources') diff --git a/framework/base/testdef/basetests.xml b/framework/base/testdef/basetests.xml deleted file mode 100644 index b0e20dd5de..0000000000 --- a/framework/base/testdef/basetests.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. - --> - -<test-suite suite-name="basetests" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd";> - <test-group case-name="basetests"> - <junit-test-suite class-name="org.apache.ofbiz.base.test.SimpleTests"/> - </test-group> -</test-suite> diff --git a/framework/service/testdef/servicetests.xml b/framework/service/testdef/servicetests.xml index f5b04f2e7b..3d5bafa869 100644 --- a/framework/service/testdef/servicetests.xml +++ b/framework/service/testdef/servicetests.xml @@ -75,9 +75,4 @@ under the License. <test-case case-name="service-permission-tests"> <junit-test-suite class-name="org.apache.ofbiz.service.test.ServicePermissionTests"/> </test-case> - - <test-case case-name="service-purge-test"> - <junit-test-suite class-name="org.apache.ofbiz.service.test.ServicePurgeTest"/> - </test-case> - </test-suite>
