From 4536dfa5e323cf66ec7dfcc914ab6e657378f59a Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 22 Aug 2018 10:48:28 -0700 Subject: [PATCH] Refactor GemFireServer Gradle Plugin to handle both Boot and WAR based integration tests. --- .../groovy/build/GemFireServerPlugin.groovy | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/buildSrc/src/main/groovy/build/GemFireServerPlugin.groovy b/buildSrc/src/main/groovy/build/GemFireServerPlugin.groovy index 0d144a1..2618469 100644 --- a/buildSrc/src/main/groovy/build/GemFireServerPlugin.groovy +++ b/buildSrc/src/main/groovy/build/GemFireServerPlugin.groovy @@ -17,9 +17,17 @@ class GemFireServerPlugin implements Plugin { project.tasks.gemfireServer.process?.destroy() } - project.tasks.prepareAppServerForIntegrationTests { - dependsOn project.tasks.gemfireServer - doFirst { + if (project.tasks.findByName("bootRun") != null) { + project.tasks.integrationTest.dependsOn project.tasks.gemfireServer + project.tasks.integrationTest.doFirst { + systemProperties['spring.data.gemfire.cache.server.port'] = project.tasks.gemfireServer.port + systemProperties['spring.data.gemfire.pool.servers'] = "localhost[${project.tasks.gemfireServer.port}]" + } + } + + project.tasks.findByName("prepareAppServerForIntegrationTests")?.configure { task -> + task.dependsOn project.tasks.gemfireServer + task.doFirst { project.gretty { jvmArgs = [ "-Dspring.data.gemfire.cache.server.port=${project.tasks.gemfireServer.port}", @@ -66,7 +74,11 @@ class GemFireServerPlugin implements Plugin { //println commandLine - project.tasks.appRun.ext.process = process = commandLine.execute() + process = commandLine.execute() + + if (project.tasks.findByName("appRun") != null) { + project.tasks.appRun.ext.process = process + } process.consumeProcessOutput(out, err) }