From 5ca3d39b02e86d34b9251db9895e6835ff445e3f Mon Sep 17 00:00:00 2001 From: Alejandra Ferreiro Vidal Date: Tue, 21 Nov 2017 14:27:05 +0100 Subject: [PATCH] adapt setUp method --- test/groovy/FileUtilsTest.groovy | 2 +- test/groovy/MTABuildTest.groovy | 5 +++-- test/groovy/NeoDeploymentTest.groovy | 4 ++-- test/groovy/PiperTestBase.groovy | 2 +- test/groovy/ToolValidateTest.groovy | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/test/groovy/FileUtilsTest.groovy b/test/groovy/FileUtilsTest.groovy index e5946974f..236f18ae3 100644 --- a/test/groovy/FileUtilsTest.groovy +++ b/test/groovy/FileUtilsTest.groovy @@ -23,7 +23,7 @@ class FileUtilsTest { @Before - void setup() { + void setUp() { emptyDir = tmp.newFolder('emptyDir') notEmptyDir = tmp.newFolder('notEmptyDir') diff --git a/test/groovy/MTABuildTest.groovy b/test/groovy/MTABuildTest.groovy index b3b8e141e..20f102131 100644 --- a/test/groovy/MTABuildTest.groovy +++ b/test/groovy/MTABuildTest.groovy @@ -22,8 +22,9 @@ public class MTABuildTest extends PiperTestBase { @Before - public void setup(){ - super._setUp() + void setUp() { + + super.setUp() currentDir = tmp.newFolder().toURI().getPath()[0..-2] //omit final '/' otherDir = tmp.newFolder().toURI().getPath()[0..-2] //omit final '/' diff --git a/test/groovy/NeoDeploymentTest.groovy b/test/groovy/NeoDeploymentTest.groovy index 01a67515c..9d16d7de5 100644 --- a/test/groovy/NeoDeploymentTest.groovy +++ b/test/groovy/NeoDeploymentTest.groovy @@ -21,9 +21,9 @@ class NeoDeploymentTest extends PiperTestBase { def archivePath @Before - void setup() { + void setUp() { - super._setUp() + super.setUp() archivePath = "${tmp.newFolder("workspace").toURI().getPath()}archiveName.mtar" diff --git a/test/groovy/PiperTestBase.groovy b/test/groovy/PiperTestBase.groovy index 91dd79549..a7842450a 100644 --- a/test/groovy/PiperTestBase.groovy +++ b/test/groovy/PiperTestBase.groovy @@ -15,7 +15,7 @@ public class PiperTestBase extends BasePipelineTest { protected messages = [], shellCalls = [] - protected final void _setUp() { + void setUp() { super.setUp() diff --git a/test/groovy/ToolValidateTest.groovy b/test/groovy/ToolValidateTest.groovy index 1f5bda91c..693bcd57e 100644 --- a/test/groovy/ToolValidateTest.groovy +++ b/test/groovy/ToolValidateTest.groovy @@ -20,9 +20,9 @@ class ToolValidateTest extends PiperTestBase { @Before - void setup() { + void setUp() { - super._setUp() + super.setUp() script = withPipeline(defaultPipeline())