Skip to content

Allowing plugin to work with projects built with gradle 5 #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
billmcmath wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Allowing plugin to work with projects built with gradle 5 #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68ab742
Replacing leftShift method with doLast for Gradle 5 compatibility
May 21, 2019
bc3bb0b
Corrected location of call to doLast method
May 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 25 additions & 17 deletions src/main/groovy/io/advantageous/gradle/docker/DockerTestPlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,34 +10,42 @@ public class DockerTestPlugin implements Plugin<Project> {
def testDockerContainers = project.container(DockerContainer)
project.extensions.testDockerContainers = testDockerContainers

project.task("showDockerContainers") << {
project.extensions.testDockerContainers.forEach { println it }
project.task("showDockerContainers") {
doLast {
project.extensions.testDockerContainers.forEach { println it }
}
}

project.task("startTestDocker", description: "Start up dependent docker containers for testing") << {
project.extensions.testDockerContainers.forEach {
def result = DockerUtils.runCommand it.runCommand()
if (result[0] != 0) throw new IllegalStateException(result[1].toString())
if (it.waitAfterRun > 0) {
sleep(it.waitAfterRun * 1_000)
project.task("startTestDocker", description: "Start up dependent docker containers for testing") {
doLast {
project.extensions.testDockerContainers.forEach {
def result = DockerUtils.runCommand it.runCommand()
if (result[0] != 0) throw new IllegalStateException(result[1].toString())
if (it.waitAfterRun > 0) {
sleep(it.waitAfterRun * 1_000)
}
}
}
}
def startTestDocker = project.tasks.getByName("startTestDocker")

project.task("stopTestDocker", description: "Stop docker containers used in tests") << {
project.extensions.testDockerContainers.forEach {
def result = DockerUtils.stopContainer it.getContainerName()
if (result[0] != 0) throw new IllegalStateException(result[1].toString())
result = DockerUtils.removeContainer it.getContainerName()
if (result[0] != 0) throw new IllegalStateException(result[1].toString())
project.task("stopTestDocker", description: "Stop docker containers used in tests") {
doLast {
project.extensions.testDockerContainers.forEach {
def result = DockerUtils.stopContainer it.getContainerName()
if (result[0] != 0) throw new IllegalStateException(result[1].toString())
result = DockerUtils.removeContainer it.getContainerName()
if (result[0] != 0) throw new IllegalStateException(result[1].toString())
}
}
}
def stopTestDocker = project.tasks.getByName("stopTestDocker")

project.task("dockerTest", type: Test, description: "Run docker integration tests") << {
useJUnit {
includeCategories 'io.advantageous.test.DockerTest'
project.task("dockerTest", type: Test, description: "Run docker integration tests") {
doLast {
useJUnit {
includeCategories 'io.advantageous.test.DockerTest'
}
}
}
def dockerTest = project.tasks.getByName("dockerTest")
Expand Down