Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-11024 - Exception still thrown when dropping schema with a managed connection - extend test task dependencies to the matrix-tesing plugin test tasks

This commit is contained in:
Steve Ebersole 2016-08-06 17:15:24 -05:00
parent 2db3d9ad2a
commit 7a70103171
2 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
buildSrc/build.gradle
View File

@ -25,4 +25,5 @@ dependencies {
compile localGroovy() compile localGroovy()
compile 'org.hibernate.build.gradle:gradle-animalSniffer-plugin:1.0.1.Final' compile 'org.hibernate.build.gradle:gradle-animalSniffer-plugin:1.0.1.Final'
compile 'org.hibernate.build.gradle:hibernate-matrix-testing:2.0.0-SNAPSHOT'
} }

38
buildSrc/src/main/groovy/org/hibernate/build/HibernateBuildPlugin.groovy
View File

@ -10,13 +10,22 @@ import org.gradle.api.GradleException
import org.gradle.api.JavaVersion import org.gradle.api.JavaVersion
import org.gradle.api.Plugin import org.gradle.api.Plugin
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.api.logging.Logger
import org.gradle.api.logging.Logging
import org.gradle.api.publish.PublishingExtension import org.gradle.api.publish.PublishingExtension
import org.gradle.api.publish.maven.MavenPublication import org.gradle.api.publish.maven.MavenPublication
import org.gradle.api.tasks.testing.Test
import org.hibernate.build.gradle.testing.database.DatabaseProfile
import org.hibernate.build.gradle.testing.database.DatabaseProfilePlugin
import org.hibernate.build.gradle.testing.matrix.MatrixTestingPlugin
/** /**
* @author Steve Ebersole * @author Steve Ebersole
*/ */
class HibernateBuildPlugin implements Plugin<Project> { class HibernateBuildPlugin implements Plugin<Project> {
private static final Logger log = Logging.getLogger( MatrixTestingPlugin.class);
@Override @Override
void apply(Project project) { void apply(Project project) {
if ( !JavaVersion.current().java8Compatible ) { if ( !JavaVersion.current().java8Compatible ) {
@ -27,6 +36,35 @@ class HibernateBuildPlugin implements Plugin<Project> {
project.afterEvaluate { project.afterEvaluate {
applyPublishing( publishingExtension, project ) applyPublishing( publishingExtension, project )
applyMatrixTestTaskDependencies( project )
}
}
def applyMatrixTestTaskDependencies(Project project) {
final MatrixTestingPlugin matrixTestingPlugin = project.plugins.findPlugin( MatrixTestingPlugin )
if ( matrixTestingPlugin == null ) {
// matrix testing was not applied on this project
return;
}
final DatabaseProfilePlugin databaseProfilePlugin = project.rootProject.plugins.apply( DatabaseProfilePlugin );
if ( databaseProfilePlugin.databaseProfiles == null || databaseProfilePlugin.databaseProfiles.isEmpty() ) {
// no db profiles defined -> nothing to do
return;
}
log.debug( "Project [${project.name}] applied matrix-testing and had db-profiles; checking test task for dependencies" )
// for each db profile, find its execution task and transfer any dependencies from test to it
Test testTask = project.tasks.test
if ( testTask.dependsOn.isEmpty() ) {
return;
}
databaseProfilePlugin.databaseProfiles.each { DatabaseProfile profile ->
log.debug( "db-profile [${profile.name}] on project [${project.name}] : transfering dependencies from test task -> ${testTask.dependsOn}" )
project.tasks.getByPath( "matrix_${profile.name}" ).dependsOn( testTask.dependsOn )
} }
} }