mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '3.1.x' into 3.2.x
Closes gh-40605
This commit is contained in:
commit
888ae040e4
@ -165,7 +165,7 @@ public class InitCommand extends OptionParsingCommand {
|
|||||||
this.packaging = option(Arrays.asList("packaging", "p"), "Project packaging (for example 'jar')")
|
this.packaging = option(Arrays.asList("packaging", "p"), "Project packaging (for example 'jar')")
|
||||||
.withRequiredArg();
|
.withRequiredArg();
|
||||||
this.build = option("build", "Build system to use (for example 'maven' or 'gradle')").withRequiredArg()
|
this.build = option("build", "Build system to use (for example 'maven' or 'gradle')").withRequiredArg()
|
||||||
.defaultsTo("maven");
|
.defaultsTo("gradle");
|
||||||
this.format = option("format", "Format of the generated content (for example 'build' for a build file, "
|
this.format = option("format", "Format of the generated content (for example 'build' for a build file, "
|
||||||
+ "'project' for a project archive)")
|
+ "'project' for a project archive)")
|
||||||
.withRequiredArg()
|
.withRequiredArg()
|
||||||
|
@ -344,7 +344,7 @@ class InitCommandTests extends AbstractHttpClientMockTests {
|
|||||||
void parseTypeOnly() throws Exception {
|
void parseTypeOnly() throws Exception {
|
||||||
this.handler.disableProjectGeneration();
|
this.handler.disableProjectGeneration();
|
||||||
this.command.run("-t=ant-project");
|
this.command.run("-t=ant-project");
|
||||||
assertThat(this.handler.lastRequest.getBuild()).isEqualTo("maven");
|
assertThat(this.handler.lastRequest.getBuild()).isEqualTo("gradle");
|
||||||
assertThat(this.handler.lastRequest.getFormat()).isEqualTo("project");
|
assertThat(this.handler.lastRequest.getFormat()).isEqualTo("project");
|
||||||
assertThat(this.handler.lastRequest.isDetectType()).isFalse();
|
assertThat(this.handler.lastRequest.isDetectType()).isFalse();
|
||||||
assertThat(this.handler.lastRequest.getType()).isEqualTo("ant-project");
|
assertThat(this.handler.lastRequest.getType()).isEqualTo("ant-project");
|
||||||
@ -364,7 +364,7 @@ class InitCommandTests extends AbstractHttpClientMockTests {
|
|||||||
void parseFormatOnly() throws Exception {
|
void parseFormatOnly() throws Exception {
|
||||||
this.handler.disableProjectGeneration();
|
this.handler.disableProjectGeneration();
|
||||||
this.command.run("--format=web");
|
this.command.run("--format=web");
|
||||||
assertThat(this.handler.lastRequest.getBuild()).isEqualTo("maven");
|
assertThat(this.handler.lastRequest.getBuild()).isEqualTo("gradle");
|
||||||
assertThat(this.handler.lastRequest.getFormat()).isEqualTo("web");
|
assertThat(this.handler.lastRequest.getFormat()).isEqualTo("web");
|
||||||
assertThat(this.handler.lastRequest.isDetectType()).isTrue();
|
assertThat(this.handler.lastRequest.isDetectType()).isTrue();
|
||||||
assertThat(this.handler.lastRequest.getType()).isNull();
|
assertThat(this.handler.lastRequest.getType()).isNull();
|
||||||
|
Loading…
Reference in New Issue
Block a user