diff --git a/build.gradle b/build.gradle index 3a7c97cd..a3c535a6 100644 --- a/build.gradle +++ b/build.gradle @@ -19,8 +19,8 @@ dependencies { groovy group: 'org.codehaus.groovy', name: 'groovy', version: '2.0.5' groovy group: 'org.codehaus.groovy', name: 'groovy-templates', version: '2.0.5' testCompile group: 'junit', name: 'junit', version: '4.11' - testCompile group: 'info.cukes', name: 'cucumber-groovy', version: '1.0.14' - testCompile group: 'info.cukes', name: 'cucumber-junit', version: '1.0.14' + testCompile group: 'info.cukes', name: 'cucumber-groovy', version: '1.1.1' + testCompile group: 'info.cukes', name: 'cucumber-junit', version: '1.1.1' testCompile group: 'org.vert-x', name: 'vertx-core', version: '1.3.0.final' testCompile group: 'org.vert-x', name: 'vertx-lang-groovy', version: '1.3.0.final' } diff --git a/src/test/groovy/gvm/RunCukeTests.groovy b/src/test/groovy/gvm/RunCukeTests.groovy index dc88c6e1..12cf08dc 100644 --- a/src/test/groovy/gvm/RunCukeTests.groovy +++ b/src/test/groovy/gvm/RunCukeTests.groovy @@ -1,6 +1,6 @@ package gvm -import cucumber.junit.Cucumber +import cucumber.api.junit.Cucumber import org.junit.runner.RunWith @RunWith(Cucumber.class) diff --git a/src/test/resources/gvm/aeroplane_mode_steps.groovy b/src/test/resources/gvm/aeroplane_mode_steps.groovy index 8b6bb79b..0ad40849 100644 --- a/src/test/resources/gvm/aeroplane_mode_steps.groovy +++ b/src/test/resources/gvm/aeroplane_mode_steps.groovy @@ -1,6 +1,6 @@ package gvm -import static cucumber.runtime.groovy.EN.* +import static cucumber.api.groovy.EN.* Given(~'^the internet is not reachable$') {-> bash = new BashEnv(baseDir, [GVM_DIR: gvmDirEnv, GVM_SERVICE: "http://localhost:0"]) diff --git a/src/test/resources/gvm/broadcast_steps.groovy b/src/test/resources/gvm/broadcast_steps.groovy index c2db0c8d..4f8877aa 100644 --- a/src/test/resources/gvm/broadcast_steps.groovy +++ b/src/test/resources/gvm/broadcast_steps.groovy @@ -1,6 +1,6 @@ package gvm -import static cucumber.runtime.groovy.EN.* +import static cucumber.api.groovy.EN.* Given(~'^no prior Broadcast was received$') { -> broadcastFile.delete() diff --git a/src/test/resources/gvm/command_line_interop_steps.groovy b/src/test/resources/gvm/command_line_interop_steps.groovy index aece8b06..52d85cb6 100644 --- a/src/test/resources/gvm/command_line_interop_steps.groovy +++ b/src/test/resources/gvm/command_line_interop_steps.groovy @@ -1,6 +1,6 @@ package gvm -import static cucumber.runtime.groovy.EN.* +import static cucumber.api.groovy.EN.* When(~'^I enter \"([^\"]*)\"$') { String command -> bash.execute(command) diff --git a/src/test/resources/gvm/env.groovy b/src/test/resources/gvm/env.groovy index d596b610..261799aa 100644 --- a/src/test/resources/gvm/env.groovy +++ b/src/test/resources/gvm/env.groovy @@ -1,6 +1,6 @@ package gvm -import static cucumber.runtime.groovy.Hooks.* +import static cucumber.api.groovy.Hooks.* import static gvm.VertxUtils.* serviceUrlEnv = "http://localhost:8080" diff --git a/src/test/resources/gvm/initialisation_steps.groovy b/src/test/resources/gvm/initialisation_steps.groovy index efe19b3d..633980e0 100644 --- a/src/test/resources/gvm/initialisation_steps.groovy +++ b/src/test/resources/gvm/initialisation_steps.groovy @@ -3,7 +3,7 @@ package gvm import java.util.zip.ZipException import java.util.zip.ZipFile -import static cucumber.runtime.groovy.EN.* +import static cucumber.api.groovy.EN.* Then(~'^the gvm work folder is created$') { -> assert gvmDir.isDirectory(), "The gvm directory does not exist." diff --git a/src/test/resources/gvm/installation_steps.groovy b/src/test/resources/gvm/installation_steps.groovy index 3fada250..731a646d 100644 --- a/src/test/resources/gvm/installation_steps.groovy +++ b/src/test/resources/gvm/installation_steps.groovy @@ -1,12 +1,10 @@ package gvm -import cucumber.runtime.PendingException - import java.nio.file.FileSystems import java.nio.file.Files import java.nio.file.Path -import static cucumber.runtime.groovy.EN.* +import static cucumber.api.groovy.EN.* Given(~'^the default "([^"]*)" candidate is "([^"]*)"$') { String candidate, String version -> def candidateVersion = new URL("${serviceUrlEnv}/candidates/${candidate}/default").text diff --git a/src/test/resources/gvm/selfupdate_steps.groovy b/src/test/resources/gvm/selfupdate_steps.groovy index 6b74785e..d4dc93b2 100644 --- a/src/test/resources/gvm/selfupdate_steps.groovy +++ b/src/test/resources/gvm/selfupdate_steps.groovy @@ -1,6 +1,6 @@ package gvm -import static cucumber.runtime.groovy.EN.* +import static cucumber.api.groovy.EN.* And(~'^the configuration file has been primed with "([^"]*)"$') { String content -> def configFile = "$gvmDir/etc/config" as File diff --git a/src/test/resources/gvm/use_steps.groovy b/src/test/resources/gvm/use_steps.groovy index 471b6b81..1d0b4a8a 100644 --- a/src/test/resources/gvm/use_steps.groovy +++ b/src/test/resources/gvm/use_steps.groovy @@ -2,7 +2,7 @@ package gvm import java.nio.file.* -import static cucumber.runtime.groovy.EN.* +import static cucumber.api.groovy.EN.* Then(~'^the candidate "([^"]*)" version "([^"]*)" is in use$') { String candidate, String version -> def directory = FileSystems.default.getPath("$gvmDir/$candidate/$version")