mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge pull request #31997 from nilshartmann
* pr/31997: Polish "Explicit error message if source is not an archive" Explicit error message if source is not an archive Closes gh-31997
This commit is contained in:
commit
f7fba30345
@ -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");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@ -55,7 +55,8 @@ class Context {
|
||||
* @param workingDir the working directory
|
||||
*/
|
||||
Context(File archiveFile, File workingDir) {
|
||||
Assert.state(isExistingFile(archiveFile) && isJarOrWar(archiveFile), "Unable to find source archive");
|
||||
Assert.state(isExistingFile(archiveFile), "Unable to find source archive");
|
||||
Assert.state(isJarOrWar(archiveFile), "Source archive " + archiveFile + " must end with .jar or .war");
|
||||
this.archiveFile = archiveFile;
|
||||
this.workingDir = 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");
|
||||
* 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");
|
||||
Files.createFile(zip.toPath());
|
||||
assertThatIllegalStateException().isThrownBy(() -> new Context(zip, this.temp))
|
||||
.withMessage("Unable to find source archive");
|
||||
.withMessageContaining("test.zip must end with .jar or .war");
|
||||
}
|
||||
|
||||
@Test
|
||||
|
Loading…
Reference in New Issue
Block a user