Polish "Explicit error message if source is not an archive"
See gh-31997
This commit is contained in:
parent
a0f273a041
commit
e94ddfa589
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright 2012-2021 the original author or authors.
|
* Copyright 2012-2022 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
|
@ -56,7 +56,7 @@ class Context {
|
||||||
*/
|
*/
|
||||||
Context(File archiveFile, File workingDir) {
|
Context(File archiveFile, File workingDir) {
|
||||||
Assert.state(isExistingFile(archiveFile), "Unable to find source archive");
|
Assert.state(isExistingFile(archiveFile), "Unable to find source archive");
|
||||||
Assert.state(isJarOrWar(archiveFile), "Source archive doesn't end with .jar or .war");
|
Assert.state(isJarOrWar(archiveFile), "Source archive " + archiveFile + " must end with .jar or .war");
|
||||||
this.archiveFile = archiveFile;
|
this.archiveFile = archiveFile;
|
||||||
this.workingDir = workingDir;
|
this.workingDir = workingDir;
|
||||||
this.relativeDir = deduceRelativeDir(archiveFile.getParentFile(), this.workingDir);
|
this.relativeDir = deduceRelativeDir(archiveFile.getParentFile(), this.workingDir);
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright 2012-2021 the original author or authors.
|
* Copyright 2012-2022 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
|
@ -55,7 +55,7 @@ class ContextTests {
|
||||||
File zip = new File(this.temp, "test.zip");
|
File zip = new File(this.temp, "test.zip");
|
||||||
Files.createFile(zip.toPath());
|
Files.createFile(zip.toPath());
|
||||||
assertThatIllegalStateException().isThrownBy(() -> new Context(zip, this.temp))
|
assertThatIllegalStateException().isThrownBy(() -> new Context(zip, this.temp))
|
||||||
.withMessage("Unable to find source archive");
|
.withMessageContaining("test.zip must end with .jar or .war");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|
Loading…
Reference in New Issue