lsm/initializr
1
0
Fork 0
mirror of https://gitee.com/dcren/initializr.git synced 2025-09-19 01:58:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Polish

Browse Source
This commit is contained in:
Stephane Nicoll
2019-03-15 11:50:10 +01:00
parent 52c9237399
commit 9465a70fa6
12 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleBuildProjectContributorTests.java
View File

@@ -19,13 +19,13 @@ package io.spring.initializr.generator.spring.build.gradle;
import java.io.IOException;
import java.io.StringWriter;
import java.nio.file.Path;
import java.util.Arrays;
import java.util.List;
import io.spring.initializr.generator.buildsystem.gradle.GradleBuild;
import io.spring.initializr.generator.buildsystem.gradle.GradleBuildWriter;
import io.spring.initializr.generator.io.IndentingWriterFactory;
import io.spring.initializr.generator.io.SimpleIndentStrategy;
import io.spring.initializr.generator.test.io.TextTestUtils;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
@@ -83,7 +83,7 @@ class GradleBuildProjectContributorTests {
StringWriter writer = new StringWriter();
new GradleBuildProjectContributor(new GradleBuildWriter(), build,
indentingWriterFactory).writeBuild(writer);
return Arrays.asList(writer.toString().split("\\r?\\n"));
return TextTestUtils.readAllLines(writer.toString());
}
}

4
initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/maven/MavenBuildProjectContributorTests.java
View File

@@ -19,12 +19,12 @@ package io.spring.initializr.generator.spring.build.maven;
import java.io.IOException;
import java.io.StringWriter;
import java.nio.file.Path;
import java.util.Arrays;
import java.util.List;
import io.spring.initializr.generator.buildsystem.maven.MavenBuild;
import io.spring.initializr.generator.io.IndentingWriterFactory;
import io.spring.initializr.generator.io.SimpleIndentStrategy;
import io.spring.initializr.generator.test.io.TextTestUtils;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
@@ -88,7 +88,7 @@ class MavenBuildProjectContributorTests {
StringWriter writer = new StringWriter();
new MavenBuildProjectContributor(mavenBuild, indentingWriterFactory)
.writeBuild(writer);
return Arrays.asList(writer.toString().split("\\r?\\n"));
return TextTestUtils.readAllLines(writer.toString());
}
}

4
initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/scm/git/GitProjectGenerationConfigurationTests.java
View File

@@ -19,12 +19,12 @@ package io.spring.initializr.generator.spring.scm.git;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.nio.file.Path;
import java.util.Arrays;
import java.util.List;
import io.spring.initializr.generator.buildsystem.gradle.GradleBuildSystem;
import io.spring.initializr.generator.buildsystem.maven.MavenBuildSystem;
import io.spring.initializr.generator.project.ProjectDescription;
import io.spring.initializr.generator.test.io.TextTestUtils;
import io.spring.initializr.generator.test.project.ProjectAssetTester;
import io.spring.initializr.generator.version.Version;
import org.junit.jupiter.api.Test;
@@ -90,7 +90,7 @@ class GitProjectGenerationConfigurationTests {
GitIgnore gitIgnore = context.getBean(GitIgnore.class);
StringWriter out = new StringWriter();
gitIgnore.write(new PrintWriter(out));
return Arrays.asList(out.toString().split("\\r?\\n"));
return TextTestUtils.readAllLines(out.toString());
});
}

4
initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/Gradle3BuildWriterTests.java
View File

@@ -18,11 +18,11 @@ package io.spring.initializr.generator.buildsystem.gradle;
import java.io.IOException;
import java.io.StringWriter;
import java.util.Arrays;
import java.util.List;
import io.spring.initializr.generator.buildsystem.DependencyScope;
import io.spring.initializr.generator.io.IndentingWriter;
import io.spring.initializr.generator.test.io.TextTestUtils;
import io.spring.initializr.generator.version.VersionReference;
import org.junit.jupiter.api.Test;
@@ -124,7 +124,7 @@ class Gradle3BuildWriterTests {
Gradle3BuildWriter writer = new Gradle3BuildWriter();
StringWriter out = new StringWriter();
writer.writeTo(new IndentingWriter(out), build);
return Arrays.asList(out.toString().split("\\r?\\n"));
return TextTestUtils.readAllLines(out.toString());
}
}

4
initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/GradleBuildWriterTests.java
View File

@@ -18,11 +18,11 @@ package io.spring.initializr.generator.buildsystem.gradle;
import java.io.IOException;
import java.io.StringWriter;
import java.util.Arrays;
import java.util.List;
import io.spring.initializr.generator.buildsystem.DependencyScope;
import io.spring.initializr.generator.io.IndentingWriter;
import io.spring.initializr.generator.test.io.TextTestUtils;
import io.spring.initializr.generator.version.VersionProperty;
import io.spring.initializr.generator.version.VersionReference;
import org.junit.jupiter.api.Test;
@@ -397,7 +397,7 @@ class GradleBuildWriterTests {
GradleBuildWriter writer = new GradleBuildWriter();
StringWriter out = new StringWriter();
writer.writeTo(new IndentingWriter(out), build);
return Arrays.asList(out.toString().split("\\r?\\n"));
return TextTestUtils.readAllLines(out.toString());
}
}

4
initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/GradleSettingsWriterTests.java
View File

@@ -18,10 +18,10 @@ package io.spring.initializr.generator.buildsystem.gradle;
import java.io.IOException;
import java.io.StringWriter;
import java.util.Arrays;
import java.util.List;
import io.spring.initializr.generator.io.IndentingWriter;
import io.spring.initializr.generator.test.io.TextTestUtils;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
@@ -84,7 +84,7 @@ class GradleSettingsWriterTests {
GradleSettingsWriter writer = new GradleSettingsWriter();
StringWriter out = new StringWriter();
writer.writeTo(new IndentingWriter(out), build);
return Arrays.asList(out.toString().split("\\r?\\n"));
return TextTestUtils.readAllLines(out.toString());
}
}

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

@@ -18,9 +18,9 @@ package io.spring.initializr.generator.io;
import java.io.IOException;
import java.io.StringWriter;
import java.util.Arrays;
import java.util.List;
import io.spring.initializr.generator.test.io.TextTestUtils;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
@@ -93,7 +93,7 @@ class IndentingWriterTests {
}
private List<String> readLines() {
return Arrays.asList(this.stringWriter.toString().split("\\r?\\n"));
return TextTestUtils.readAllLines(this.stringWriter.toString());
}
}

4
initializr-generator/src/test/java/io/spring/initializr/generator/language/groovy/GroovySourceCodeWriterTests.java
View File

@@ -26,7 +26,7 @@ import java.util.List;
import io.spring.initializr.generator.io.IndentingWriterFactory;
import io.spring.initializr.generator.language.Annotation;
import io.spring.initializr.generator.language.Parameter;
import io.spring.initializr.generator.test.io.PathTestUtils;
import io.spring.initializr.generator.test.io.TextTestUtils;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
@@ -213,7 +213,7 @@ class GroovySourceCodeWriterTests {
private List<String> writeSingleType(GroovySourceCode sourceCode, String location)
throws IOException {
Path source = writeSourceCode(sourceCode).resolve(location);
return PathTestUtils.readAllLines(source);
return TextTestUtils.readAllLines(source);
}
private Path writeSourceCode(GroovySourceCode sourceCode) throws IOException {

4
initializr-generator/src/test/java/io/spring/initializr/generator/language/java/JavaSourceCodeWriterTests.java
View File

@@ -26,7 +26,7 @@ import java.util.List;
import io.spring.initializr.generator.io.IndentingWriterFactory;
import io.spring.initializr.generator.language.Annotation;
import io.spring.initializr.generator.language.Parameter;
import io.spring.initializr.generator.test.io.PathTestUtils;
import io.spring.initializr.generator.test.io.TextTestUtils;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
@@ -215,7 +215,7 @@ class JavaSourceCodeWriterTests {
private List<String> writeSingleType(JavaSourceCode sourceCode, String location)
throws IOException {
Path source = writeSourceCode(sourceCode).resolve(location);
return PathTestUtils.readAllLines(source);
return TextTestUtils.readAllLines(source);
}
private Path writeSourceCode(JavaSourceCode sourceCode) throws IOException {

4
initializr-generator/src/test/java/io/spring/initializr/generator/language/kotlin/KotlinSourceCodeWriterTests.java
View File

@@ -25,7 +25,7 @@ import java.util.List;
import io.spring.initializr.generator.io.IndentingWriterFactory;
import io.spring.initializr.generator.language.Annotation;
import io.spring.initializr.generator.language.Parameter;
import io.spring.initializr.generator.test.io.PathTestUtils;
import io.spring.initializr.generator.test.io.TextTestUtils;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
@@ -225,7 +225,7 @@ class KotlinSourceCodeWriterTests {
private List<String> writeSingleType(KotlinSourceCode sourceCode, String location)
throws IOException {
Path source = writeSourceCode(sourceCode).resolve(location);
return PathTestUtils.readAllLines(source);
return TextTestUtils.readAllLines(source);
}
private Path writeSourceCode(KotlinSourceCode sourceCode) throws IOException {

14
initializr-generator/src/test/java/io/spring/initializr/generator/test/io/PathTestUtils.java → initializr-generator/src/test/java/io/spring/initializr/generator/test/io/TextTestUtils.java
View File

@@ -30,13 +30,18 @@ import org.springframework.util.FileCopyUtils;
import static org.assertj.core.api.Assertions.assertThat;
/**
* {@link Path}-related test utilities.
* Text content related test utilities.
*
* @author Stephane Nicoll
*/
public final class PathTestUtils {
public final class TextTestUtils {
private PathTestUtils() {
private TextTestUtils() {
}
public static List<String> readAllLines(String source) {
String[] lines = source.split("\\r?\\n");
return Arrays.asList(lines);
}
/**
@@ -53,9 +58,8 @@ public final class PathTestUtils {
StringWriter writer = new StringWriter();
FileCopyUtils.copy(reader, writer);
String content = writer.toString();
String[] lines = content.split("\\r?\\n");
assertThat(content).endsWith(System.lineSeparator());
return Arrays.asList(lines);
return readAllLines(content);
}
catch (IOException ex) {
throw new IllegalStateException(ex);

6
initializr-generator/src/test/java/io/spring/initializr/generator/test/project/ProjectStructure.java
View File

@@ -25,7 +25,7 @@ import java.nio.file.attribute.BasicFileAttributes;
import java.util.ArrayList;
import java.util.List;
import io.spring.initializr.generator.test.io.PathTestUtils;
import io.spring.initializr.generator.test.io.TextTestUtils;
/**
* Test helper to assert content of a generated project structure.
@@ -68,10 +68,10 @@ public class ProjectStructure {
* newline.
* @param other the path string to resolve against the root of the project structure
* @return all lines from the resolve file
* @see PathTestUtils#readAllLines(Path)
* @see TextTestUtils#readAllLines(Path)
*/
public List<String> readAllLines(String other) {
return PathTestUtils.readAllLines(resolve(other));
return TextTestUtils.readAllLines(resolve(other));
}
/**