@@ -84,7 +84,7 @@ class Tester {
84
84
String currentTestFilename = ' '
85
85
// A convenient list of normalised service descriptor option names
86
86
// i.e. 'arg.volumes' becomes 'volumes' (also contains expanded ranges)
87
- List< String > optionNames = []
87
+ def optionNames = []
88
88
def optionDefaults = [:]
89
89
// Files created by the entire test collection.
90
90
// Defined in the 'setup_collection.creates' block.
@@ -110,7 +110,7 @@ class Tester {
110
110
// along with other test-specific objects
111
111
currentTestFilename = path. split(File . separator)[-1 ]
112
112
currentTestFilename = currentTestFilename.
113
- take(currentTestFilename. length() - testExt. length())
113
+ take(currentTestFilename. length() - testExt. length())
114
114
sectionNumber = 0
115
115
testScriptVersion = 0
116
116
testTimeoutSeconds = 30
@@ -618,7 +618,7 @@ class Tester {
618
618
// Now swap-out the original '-o'...
619
619
String redirectedOutputOption = " -o ${ testOutputFile.toString()} "
620
620
pipelineCommand = pipelineCommand. replaceAll(/ $outputRegex/ ,
621
- redirectedOutputOption)
621
+ redirectedOutputOption)
622
622
623
623
}
624
624
@@ -632,8 +632,8 @@ class Tester {
632
632
//
633
633
int executeAnchorDirPos = filename. indexOf(executeAnchorDir)
634
634
File testExecutionDir =
635
- new File (filename. take(filename. indexOf(File . separator,
636
- executeAnchorDirPos + executeAnchorDir. length())))
635
+ new File (filename. take(filename. indexOf(File . separator,
636
+ executeAnchorDirPos + executeAnchorDir. length())))
637
637
info(" Dir : $testExecutionDir " )
638
638
// And the expanded and redirected command...
639
639
info(" Cmd : $pipelineCommand " )
@@ -660,7 +660,7 @@ class Tester {
660
660
boolean validated = true
661
661
if (exitValue == 0 ) {
662
662
663
- List< String > testCreates = collectionCreates
663
+ def testCreates = collectionCreates. collect()
664
664
if (createsBlock != null ) {
665
665
testCreates. addAll(createsBlock)
666
666
}
0 commit comments