Skip to content

Commit 998f6af

Browse files
bclozelbclozel
committed
Move integration tests to dedicated module
This commit moves the dependency management and test source files related to integration tests to a dedicated module. This allows us to focus the root project on building the Spring Framework. See gh-23282
1 parent 6008c61 commit 998f6af

File tree

41 files changed

+25
-18
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+25
-18
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ classes/
2121
/build
2222
buildSrc/build
2323
/spring-*/build
24+
/integration-tests/build
2425
/src/asciidoc/build
2526
target/
2627

‎build.gradle

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,8 @@ configure(allprojects) { project ->
179179
] as String[]
180180
}
181181

182-
configure(subprojects.findAll { (it.name != "spring-core-coroutines") } ) { subproject ->
182+
configure(subprojects.findAll { (it.name != "spring-core-coroutines"
183+
&& it.name != "spring-integration-tests") } ) { subproject ->
183184
apply from: "${gradleScriptDir}/publish-maven.gradle"
184185

185186
jar {
@@ -260,23 +261,7 @@ configure(rootProject) {
260261
// Don't publish the default jar for the root project
261262
configurations.archives.artifacts.clear()
262263

263-
dependencies { // for integration tests
264-
testCompile(project(":spring-aop"))
265-
testCompile(project(":spring-beans"))
266-
testCompile(project(":spring-context"))
267-
testCompile(project(":spring-core"))
268-
testCompile(project(":spring-expression"))
269-
testCompile(project(":spring-jdbc"))
270-
testCompile(project(":spring-orm"))
271-
testCompile(project(":spring-test"))
272-
testCompile(project(":spring-tx"))
273-
testCompile(project(":spring-web"))
274-
testCompile("javax.inject:javax.inject:1")
275-
testCompile("javax.resource:javax.resource-api:1.7.1")
276-
testCompile("javax.servlet:javax.servlet-api:3.1.0")
277-
testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
278-
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
279-
testCompile("org.hibernate:hibernate-core:5.1.17.Final")
264+
dependencies {
280265
asciidoctor("io.spring.asciidoctor:spring-asciidoctor-extensions:0.1.3.RELEASE")
281266
}
282267

‎integration-tests/integration-tests.gradle

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
description = "Spring Integration Tests"
2+
3+
dependencies {
4+
testCompile(project(":spring-aop"))
5+
testCompile(project(":spring-beans"))
6+
testCompile(project(":spring-context"))
7+
testCompile(project(":spring-core"))
8+
testCompile(project(":spring-expression"))
9+
testCompile(project(":spring-jdbc"))
10+
testCompile(project(":spring-orm"))
11+
testCompile(project(":spring-test"))
12+
testCompile(project(":spring-tx"))
13+
testCompile(project(":spring-web"))
14+
testCompile("javax.inject:javax.inject:1")
15+
testCompile("javax.resource:javax.resource-api:1.7.1")
16+
testCompile("javax.servlet:javax.servlet-api:4.0.1")
17+
testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
18+
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
19+
testCompile("org.hibernate:hibernate-core:5.1.17.Final")
20+
}

‎src/test/java/.gitignore renamed to ‎integration-tests/src/test/java/.gitignore

File renamed without changes.

‎src/test/java/com/foo/Component.java renamed to ‎integration-tests/src/test/java/com/foo/Component.java

File renamed without changes.

‎src/test/java/com/foo/ComponentBeanDefinitionParser.java renamed to ‎integration-tests/src/test/java/com/foo/ComponentBeanDefinitionParser.java

File renamed without changes.

‎src/test/java/com/foo/ComponentBeanDefinitionParserTests.java renamed to ‎integration-tests/src/test/java/com/foo/ComponentBeanDefinitionParserTests.java

File renamed without changes.

‎src/test/java/com/foo/ComponentFactoryBean.java renamed to ‎integration-tests/src/test/java/com/foo/ComponentFactoryBean.java

File renamed without changes.

‎src/test/java/com/foo/ComponentNamespaceHandler.java renamed to ‎integration-tests/src/test/java/com/foo/ComponentNamespaceHandler.java

File renamed without changes.

‎src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests.java renamed to ‎integration-tests/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests.java

File renamed without changes.

‎src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java renamed to ‎integration-tests/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java

File renamed without changes.

‎src/test/java/org/springframework/cache/annotation/EnableCachingIntegrationTests.java renamed to ‎integration-tests/src/test/java/org/springframework/cache/annotation/EnableCachingIntegrationTests.java

File renamed without changes.

‎src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java renamed to ‎integration-tests/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java

File renamed without changes.

‎src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java renamed to ‎integration-tests/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java

File renamed without changes.

‎src/test/java/org/springframework/core/env/EnvironmentSystemIntegrationTests.java renamed to ‎integration-tests/src/test/java/org/springframework/core/env/EnvironmentSystemIntegrationTests.java

File renamed without changes.

‎src/test/java/org/springframework/core/env/PropertyPlaceholderConfigurerEnvironmentIntegrationTests.java renamed to ‎integration-tests/src/test/java/org/springframework/core/env/PropertyPlaceholderConfigurerEnvironmentIntegrationTests.java

File renamed without changes.

‎src/test/java/org/springframework/core/env/scan1/Config.java renamed to ‎integration-tests/src/test/java/org/springframework/core/env/scan1/Config.java

File renamed without changes.

‎src/test/java/org/springframework/core/env/scan1/DevConfig.java renamed to ‎integration-tests/src/test/java/org/springframework/core/env/scan1/DevConfig.java

File renamed without changes.

‎src/test/java/org/springframework/core/env/scan1/ProdConfig.java renamed to ‎integration-tests/src/test/java/org/springframework/core/env/scan1/ProdConfig.java

File renamed without changes.

‎src/test/java/org/springframework/core/env/scan2/DevBean.java renamed to ‎integration-tests/src/test/java/org/springframework/core/env/scan2/DevBean.java

File renamed without changes.

‎src/test/java/org/springframework/core/env/scan2/ProdBean.java renamed to ‎integration-tests/src/test/java/org/springframework/core/env/scan2/ProdBean.java

File renamed without changes.

‎src/test/java/org/springframework/expression/spel/support/BeanFactoryTypeConverter.java renamed to ‎integration-tests/src/test/java/org/springframework/expression/spel/support/BeanFactoryTypeConverter.java

File renamed without changes.

‎src/test/java/org/springframework/expression/spel/support/Spr7538Tests.java renamed to ‎integration-tests/src/test/java/org/springframework/expression/spel/support/Spr7538Tests.java

File renamed without changes.

‎src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java renamed to ‎integration-tests/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java

File renamed without changes.

‎src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java renamed to ‎integration-tests/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java

File renamed without changes.

‎src/test/java/org/springframework/transaction/annotation/ProxyAnnotationDiscoveryTests.java renamed to ‎integration-tests/src/test/java/org/springframework/transaction/annotation/ProxyAnnotationDiscoveryTests.java

File renamed without changes.

‎src/test/resources/META-INF/spring.handlers renamed to ‎integration-tests/src/test/resources/META-INF/spring.handlers

File renamed without changes.

‎src/test/resources/META-INF/spring.schemas renamed to ‎integration-tests/src/test/resources/META-INF/spring.schemas

File renamed without changes.

‎src/test/resources/com/foo/component-config.xml renamed to ‎integration-tests/src/test/resources/com/foo/component-config.xml

File renamed without changes.

‎src/test/resources/com/foo/component.xsd renamed to ‎integration-tests/src/test/resources/com/foo/component.xsd

File renamed without changes.

‎src/test/resources/log4j2-test.xml renamed to ‎integration-tests/src/test/resources/log4j2-test.xml

File renamed without changes.

‎src/test/resources/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests-context.xml renamed to ‎integration-tests/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests-context.xml

File renamed without changes.

‎src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests-context.xml renamed to ‎integration-tests/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests-context.xml

File renamed without changes.

‎src/test/resources/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.xml renamed to ‎integration-tests/src/test/resources/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.xml

File renamed without changes.

‎src/test/resources/org/springframework/core/env/EnvironmentSystemIntegrationTests-context-dev.xml renamed to ‎integration-tests/src/test/resources/org/springframework/core/env/EnvironmentSystemIntegrationTests-context-dev.xml

File renamed without changes.

‎src/test/resources/org/springframework/core/env/EnvironmentSystemIntegrationTests-context-prod.xml renamed to ‎integration-tests/src/test/resources/org/springframework/core/env/EnvironmentSystemIntegrationTests-context-prod.xml

File renamed without changes.

‎src/test/resources/org/springframework/core/env/EnvironmentSystemIntegrationTests-context.xml renamed to ‎integration-tests/src/test/resources/org/springframework/core/env/EnvironmentSystemIntegrationTests-context.xml

File renamed without changes.

‎src/test/resources/org/springframework/transaction/annotation/enable-caching.xml renamed to ‎integration-tests/src/test/resources/org/springframework/transaction/annotation/enable-caching.xml

File renamed without changes.

‎src/test/resources/org/springframework/util/testlog4j.properties renamed to ‎integration-tests/src/test/resources/org/springframework/util/testlog4j.properties

File renamed without changes.

‎src/test/resources/org/springframework/web/util/testlog4j.properties renamed to ‎integration-tests/src/test/resources/org/springframework/web/util/testlog4j.properties

File renamed without changes.

‎settings.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ include "spring-webmvc"
2121
include "spring-webflux"
2222
include "spring-websocket"
2323
include "spring-framework-bom"
24+
include "integration-tests"
2425

2526
rootProject.name = "spring"
2627
rootProject.children.each {project ->

0 commit comments

Comments
 (0)