Skip to content

Commit d6fae97

Browse files
breskebyjozala
andauthored
Update build-tools/src/testFixtures/groovy/org/elasticsearch/gradle/fixtures/AbstractGradleFuncTest.groovy
Co-authored-by: Mariusz Józala <[email protected]>
1 parent 56bdc32 commit d6fae97

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

build-tools/src/testFixtures/groovy/org/elasticsearch/gradle/fixtures/AbstractGradleFuncTest.groovy

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -239,14 +239,13 @@ checkstyle = "com.puppycrawl.tools:checkstyle:10.3"
239239
}
240240

241241
ZipAssertion zip(String relativePath) {
242-
try (ZipFile zipFile = new ZipFile(file(relativePath))) {
243-
def files = new HashMap<>()
244-
zipFile.entries().collect { entry ->
245-
files.put(entry.name, new ZipAssertionFile(file(relativePath), entry))
242+
File archiveFile = file(relativePath);
243+
try (ZipFile zipFile = new ZipFile(archiveFile)) {
244+
Map<String, ZipAssertionFile> files = zipFile.entries().collectEntries { ZipEntry entry ->
245+
[(entry.name): new ZipAssertionFile(archiveFile, entry)]
246246
}
247-
return new ZipAssertion(files)
247+
return new ZipAssertion(files);
248248
}
249-
null
250249
}
251250

252251
static class ZipAssertion {

0 commit comments

Comments
 (0)