Browse Source

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
pull/23487/head
Brian Clozel 5 years ago
parent
commit
998f6af290
  1. 1
      .gitignore
  2. 21
      build.gradle
  3. 20
      integration-tests/integration-tests.gradle
  4. 0
      integration-tests/src/test/java/.gitignore
  5. 0
      integration-tests/src/test/java/com/foo/Component.java
  6. 0
      integration-tests/src/test/java/com/foo/ComponentBeanDefinitionParser.java
  7. 0
      integration-tests/src/test/java/com/foo/ComponentBeanDefinitionParserTests.java
  8. 0
      integration-tests/src/test/java/com/foo/ComponentFactoryBean.java
  9. 0
      integration-tests/src/test/java/com/foo/ComponentNamespaceHandler.java
  10. 0
      integration-tests/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests.java
  11. 0
      integration-tests/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java
  12. 0
      integration-tests/src/test/java/org/springframework/cache/annotation/EnableCachingIntegrationTests.java
  13. 0
      integration-tests/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java
  14. 0
      integration-tests/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java
  15. 0
      integration-tests/src/test/java/org/springframework/core/env/EnvironmentSystemIntegrationTests.java
  16. 0
      integration-tests/src/test/java/org/springframework/core/env/PropertyPlaceholderConfigurerEnvironmentIntegrationTests.java
  17. 0
      integration-tests/src/test/java/org/springframework/core/env/scan1/Config.java
  18. 0
      integration-tests/src/test/java/org/springframework/core/env/scan1/DevConfig.java
  19. 0
      integration-tests/src/test/java/org/springframework/core/env/scan1/ProdConfig.java
  20. 0
      integration-tests/src/test/java/org/springframework/core/env/scan2/DevBean.java
  21. 0
      integration-tests/src/test/java/org/springframework/core/env/scan2/ProdBean.java
  22. 0
      integration-tests/src/test/java/org/springframework/expression/spel/support/BeanFactoryTypeConverter.java
  23. 0
      integration-tests/src/test/java/org/springframework/expression/spel/support/Spr7538Tests.java
  24. 0
      integration-tests/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java
  25. 0
      integration-tests/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java
  26. 0
      integration-tests/src/test/java/org/springframework/transaction/annotation/ProxyAnnotationDiscoveryTests.java
  27. 0
      integration-tests/src/test/resources/META-INF/spring.handlers
  28. 0
      integration-tests/src/test/resources/META-INF/spring.schemas
  29. 0
      integration-tests/src/test/resources/com/foo/component-config.xml
  30. 0
      integration-tests/src/test/resources/com/foo/component.xsd
  31. 0
      integration-tests/src/test/resources/log4j2-test.xml
  32. 0
      integration-tests/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests-context.xml
  33. 0
      integration-tests/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests-context.xml
  34. 0
      integration-tests/src/test/resources/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.xml
  35. 0
      integration-tests/src/test/resources/org/springframework/core/env/EnvironmentSystemIntegrationTests-context-dev.xml
  36. 0
      integration-tests/src/test/resources/org/springframework/core/env/EnvironmentSystemIntegrationTests-context-prod.xml
  37. 0
      integration-tests/src/test/resources/org/springframework/core/env/EnvironmentSystemIntegrationTests-context.xml
  38. 0
      integration-tests/src/test/resources/org/springframework/transaction/annotation/enable-caching.xml
  39. 0
      integration-tests/src/test/resources/org/springframework/util/testlog4j.properties
  40. 0
      integration-tests/src/test/resources/org/springframework/web/util/testlog4j.properties
  41. 1
      settings.gradle

1
.gitignore vendored

@ -21,6 +21,7 @@ classes/ @@ -21,6 +21,7 @@ classes/
/build
buildSrc/build
/spring-*/build
/integration-tests/build
/src/asciidoc/build
target/

21
build.gradle

@ -179,7 +179,8 @@ configure(allprojects) { project -> @@ -179,7 +179,8 @@ configure(allprojects) { project ->
] as String[]
}
configure(subprojects.findAll { (it.name != "spring-core-coroutines") } ) { subproject ->
configure(subprojects.findAll { (it.name != "spring-core-coroutines"
&& it.name != "spring-integration-tests") } ) { subproject ->
apply from: "${gradleScriptDir}/publish-maven.gradle"
jar {
@ -260,23 +261,7 @@ configure(rootProject) { @@ -260,23 +261,7 @@ configure(rootProject) {
// Don't publish the default jar for the root project
configurations.archives.artifacts.clear()
dependencies { // for integration tests
testCompile(project(":spring-aop"))
testCompile(project(":spring-beans"))
testCompile(project(":spring-context"))
testCompile(project(":spring-core"))
testCompile(project(":spring-expression"))
testCompile(project(":spring-jdbc"))
testCompile(project(":spring-orm"))
testCompile(project(":spring-test"))
testCompile(project(":spring-tx"))
testCompile(project(":spring-web"))
testCompile("javax.inject:javax.inject:1")
testCompile("javax.resource:javax.resource-api:1.7.1")
testCompile("javax.servlet:javax.servlet-api:3.1.0")
testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
testCompile("org.hibernate:hibernate-core:5.1.17.Final")
dependencies {
asciidoctor("io.spring.asciidoctor:spring-asciidoctor-extensions:0.1.3.RELEASE")
}

20
integration-tests/integration-tests.gradle

@ -0,0 +1,20 @@ @@ -0,0 +1,20 @@
description = "Spring Integration Tests"
dependencies {
testCompile(project(":spring-aop"))
testCompile(project(":spring-beans"))
testCompile(project(":spring-context"))
testCompile(project(":spring-core"))
testCompile(project(":spring-expression"))
testCompile(project(":spring-jdbc"))
testCompile(project(":spring-orm"))
testCompile(project(":spring-test"))
testCompile(project(":spring-tx"))
testCompile(project(":spring-web"))
testCompile("javax.inject:javax.inject:1")
testCompile("javax.resource:javax.resource-api:1.7.1")
testCompile("javax.servlet:javax.servlet-api:4.0.1")
testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
testCompile("org.hibernate:hibernate-core:5.1.17.Final")
}

0
src/test/java/.gitignore → integration-tests/src/test/java/.gitignore vendored

0
src/test/java/com/foo/Component.java → integration-tests/src/test/java/com/foo/Component.java

0
src/test/java/com/foo/ComponentBeanDefinitionParser.java → integration-tests/src/test/java/com/foo/ComponentBeanDefinitionParser.java

0
src/test/java/com/foo/ComponentBeanDefinitionParserTests.java → integration-tests/src/test/java/com/foo/ComponentBeanDefinitionParserTests.java

0
src/test/java/com/foo/ComponentFactoryBean.java → integration-tests/src/test/java/com/foo/ComponentFactoryBean.java

0
src/test/java/com/foo/ComponentNamespaceHandler.java → integration-tests/src/test/java/com/foo/ComponentNamespaceHandler.java

0
src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests.java → integration-tests/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests.java

0
src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java → integration-tests/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java

0
src/test/java/org/springframework/cache/annotation/EnableCachingIntegrationTests.java → integration-tests/src/test/java/org/springframework/cache/annotation/EnableCachingIntegrationTests.java vendored

0
src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java → integration-tests/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java

0
src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java → integration-tests/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java

0
src/test/java/org/springframework/core/env/EnvironmentSystemIntegrationTests.java → integration-tests/src/test/java/org/springframework/core/env/EnvironmentSystemIntegrationTests.java vendored

0
src/test/java/org/springframework/core/env/PropertyPlaceholderConfigurerEnvironmentIntegrationTests.java → integration-tests/src/test/java/org/springframework/core/env/PropertyPlaceholderConfigurerEnvironmentIntegrationTests.java vendored

0
src/test/java/org/springframework/core/env/scan1/Config.java → integration-tests/src/test/java/org/springframework/core/env/scan1/Config.java vendored

0
src/test/java/org/springframework/core/env/scan1/DevConfig.java → integration-tests/src/test/java/org/springframework/core/env/scan1/DevConfig.java vendored

0
src/test/java/org/springframework/core/env/scan1/ProdConfig.java → integration-tests/src/test/java/org/springframework/core/env/scan1/ProdConfig.java vendored

0
src/test/java/org/springframework/core/env/scan2/DevBean.java → integration-tests/src/test/java/org/springframework/core/env/scan2/DevBean.java vendored

0
src/test/java/org/springframework/core/env/scan2/ProdBean.java → integration-tests/src/test/java/org/springframework/core/env/scan2/ProdBean.java vendored

0
src/test/java/org/springframework/expression/spel/support/BeanFactoryTypeConverter.java → integration-tests/src/test/java/org/springframework/expression/spel/support/BeanFactoryTypeConverter.java

0
src/test/java/org/springframework/expression/spel/support/Spr7538Tests.java → integration-tests/src/test/java/org/springframework/expression/spel/support/Spr7538Tests.java

0
src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java → integration-tests/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java

0
src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java → integration-tests/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java

0
src/test/java/org/springframework/transaction/annotation/ProxyAnnotationDiscoveryTests.java → integration-tests/src/test/java/org/springframework/transaction/annotation/ProxyAnnotationDiscoveryTests.java

0
src/test/resources/META-INF/spring.handlers → integration-tests/src/test/resources/META-INF/spring.handlers

0
src/test/resources/META-INF/spring.schemas → integration-tests/src/test/resources/META-INF/spring.schemas

0
src/test/resources/com/foo/component-config.xml → integration-tests/src/test/resources/com/foo/component-config.xml

0
src/test/resources/com/foo/component.xsd → integration-tests/src/test/resources/com/foo/component.xsd

0
src/test/resources/log4j2-test.xml → integration-tests/src/test/resources/log4j2-test.xml

0
src/test/resources/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests-context.xml → integration-tests/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests-context.xml

0
src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests-context.xml → integration-tests/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests-context.xml

0
src/test/resources/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.xml → integration-tests/src/test/resources/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.xml

0
src/test/resources/org/springframework/core/env/EnvironmentSystemIntegrationTests-context-dev.xml → integration-tests/src/test/resources/org/springframework/core/env/EnvironmentSystemIntegrationTests-context-dev.xml vendored

0
src/test/resources/org/springframework/core/env/EnvironmentSystemIntegrationTests-context-prod.xml → integration-tests/src/test/resources/org/springframework/core/env/EnvironmentSystemIntegrationTests-context-prod.xml vendored

0
src/test/resources/org/springframework/core/env/EnvironmentSystemIntegrationTests-context.xml → integration-tests/src/test/resources/org/springframework/core/env/EnvironmentSystemIntegrationTests-context.xml vendored

0
src/test/resources/org/springframework/transaction/annotation/enable-caching.xml → integration-tests/src/test/resources/org/springframework/transaction/annotation/enable-caching.xml

0
src/test/resources/org/springframework/util/testlog4j.properties → integration-tests/src/test/resources/org/springframework/util/testlog4j.properties

0
src/test/resources/org/springframework/web/util/testlog4j.properties → integration-tests/src/test/resources/org/springframework/web/util/testlog4j.properties

1
settings.gradle

@ -21,6 +21,7 @@ include "spring-webmvc" @@ -21,6 +21,7 @@ include "spring-webmvc"
include "spring-webflux"
include "spring-websocket"
include "spring-framework-bom"
include "integration-tests"
rootProject.name = "spring"
rootProject.children.each {project ->

Loading…
Cancel
Save