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

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());
}
}

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());
}
}

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());
});
}