lsm/initializr
1
0
Fork 0
mirror of https://gitee.com/dcren/initializr.git synced 2025-04-05 17:38:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Polish

Browse Source
This commit is contained in:
Andy Wilkinson 2019-02-19 10:03:40 +00:00
parent fad1d14bf0
commit a049d6e4fc
5 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/SourceCodeProjectGenerationConfigurationTests.java
View File

@ -98,8 +98,10 @@ class SourceCodeProjectGenerationConfigurationTests {
this.projectTester.generate(description, (context) -> { this.projectTester.generate(description, (context) -> {
ServletInitializerContributor bean = context ServletInitializerContributor bean = context
.getBean(ServletInitializerContributor.class); .getBean(ServletInitializerContributor.class);
SourceCode sourceCode = mock(SourceCode.class); SourceCode<TypeDeclaration, CompilationUnit<TypeDeclaration>> sourceCode = mock(
CompilationUnit compilationUnit = mock(CompilationUnit.class); SourceCode.class);
CompilationUnit<TypeDeclaration> compilationUnit = mock(
CompilationUnit.class);
given(sourceCode.createCompilationUnit(any(), any())) given(sourceCode.createCompilationUnit(any(), any()))
.willReturn(compilationUnit); .willReturn(compilationUnit);
TypeDeclaration typeDeclaration = mock(TypeDeclaration.class); TypeDeclaration typeDeclaration = mock(TypeDeclaration.class);

20
initializr-generator/src/test/java/io/spring/initializr/generator/io/IndentingWriterTests.java
View File

@ -16,6 +16,7 @@
package io.spring.initializr.generator.io; package io.spring.initializr.generator.io;
import java.io.IOException;
import java.io.StringWriter; import java.io.StringWriter;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@ -74,17 +75,18 @@ class IndentingWriterTests {
} }
@Test @Test
void customIndentStrategyIsUsed() { void customIndentStrategyIsUsed() throws IOException {
IndentingWriter customIndentingWriter = new IndentingWriter(this.stringWriter, try (IndentingWriter customIndentingWriter = new IndentingWriter(
new SimpleIndentStrategy("\t")); this.stringWriter, new SimpleIndentStrategy("\t"))) {
customIndentingWriter.println("a"); customIndentingWriter.println("a");
customIndentingWriter.indented(() -> {
customIndentingWriter.println("b");
customIndentingWriter.indented(() -> { customIndentingWriter.indented(() -> {
customIndentingWriter.print("c"); customIndentingWriter.println("b");
customIndentingWriter.println("e"); customIndentingWriter.indented(() -> {
customIndentingWriter.print("c");
customIndentingWriter.println("e");
});
}); });
}); }
assertThat(this.stringWriter.toString()).isEqualTo("a\n\tb\n\t\tce\n"); assertThat(this.stringWriter.toString()).isEqualTo("a\n\tb\n\t\tce\n");
} }

1
initializr-generator/src/test/java/io/spring/initializr/generator/test/project/AbstractProjectGenerationTester.java
View File

@ -34,6 +34,7 @@ import io.spring.initializr.generator.project.ProjectGenerationException;
/** /**
* Base tester for project generation. * Base tester for project generation.
* *
* @param <SELF> concrete type of the tester
* @author Stephane Nicoll * @author Stephane Nicoll
*/ */
public abstract class AbstractProjectGenerationTester<SELF extends AbstractProjectGenerationTester<SELF>> { public abstract class AbstractProjectGenerationTester<SELF extends AbstractProjectGenerationTester<SELF>> {

1
initializr-metadata/src/test/java/io/spring/initializr/metadata/InitializrMetadataBuilderTests.java
View File

@ -196,7 +196,6 @@ class InitializrMetadataBuilderTests {
InitializrMetadata metadata = InitializrMetadataBuilder InitializrMetadata metadata = InitializrMetadataBuilder
.fromInitializrProperties(config) .fromInitializrProperties(config)
.withInitializrProperties(forceSslConfig, true).build(); .withInitializrProperties(forceSslConfig, true).build();
InitializrConfiguration.Env defaultEnv = new InitializrConfiguration().getEnv();
InitializrConfiguration.Env actualEnv = metadata.getConfiguration().getEnv(); InitializrConfiguration.Env actualEnv = metadata.getConfiguration().getEnv();
assertThat(actualEnv.isForceSsl()).isEqualTo(true); assertThat(actualEnv.isForceSsl()).isEqualTo(true);
} }

2
initializr-web/src/main/java/io/spring/initializr/web/project/ProjectGenerationInvoker.java
View File

@ -25,7 +25,6 @@ import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import io.spring.initializr.generator.buildsystem.Build;
import io.spring.initializr.generator.buildsystem.BuildItemResolver; import io.spring.initializr.generator.buildsystem.BuildItemResolver;
import io.spring.initializr.generator.project.DefaultProjectAssetGenerator; import io.spring.initializr.generator.project.DefaultProjectAssetGenerator;
import io.spring.initializr.generator.project.ProjectAssetGenerator; import io.spring.initializr.generator.project.ProjectAssetGenerator;
@ -201,7 +200,6 @@ public class ProjectGenerationInvoker {
private void publishProjectGeneratedEvent(ProjectRequest request, private void publishProjectGeneratedEvent(ProjectRequest request,
ProjectGenerationContext context) { ProjectGenerationContext context) {
Build build = context.getBeanProvider(Build.class).getIfAvailable();
InitializrMetadata metadata = context.getBean(InitializrMetadata.class); InitializrMetadata metadata = context.getBean(InitializrMetadata.class);
ProjectGeneratedEvent event = new ProjectGeneratedEvent(request, metadata); ProjectGeneratedEvent event = new ProjectGeneratedEvent(request, metadata);
this.eventPublisher.publishEvent(event); this.eventPublisher.publishEvent(event);