Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use settings.xml to pass repository into server integration tests

Browse Source 
Closes gh-12293
This commit is contained in:
Andy Wilkinson
2018-03-01 11:36:29 +00:00
parent a1ee9bc6c7
commit d0b8a84821
3 changed files with 44 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/ApplicationBuilder.java
View File

@@ -24,7 +24,6 @@ import java.io.IOException;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
import java.util.jar.JarOutputStream;
import java.util.zip.ZipEntry;
@@ -37,7 +36,6 @@ import org.apache.maven.shared.invoker.MavenInvocationException;
import org.junit.rules.TemporaryFolder;
import org.springframework.util.FileCopyUtils;
import org.springframework.util.StringUtils;
import static org.assertj.core.api.Assertions.assertThat;
@@ -74,6 +72,7 @@ class ApplicationBuilder {
File resourcesJar = createResourcesJar();
File appFolder = new File(containerFolder, "app");
appFolder.mkdirs();
writeSettingsXml(appFolder);
writePom(appFolder, resourcesJar);
copyApplicationSource(appFolder);
packageApplication(appFolder);
@@ -110,6 +109,16 @@ class ApplicationBuilder {
out.close();
}
private void writeSettingsXml(File appFolder) throws IOException {
Map<String, Object> context = new HashMap<>();
context.put("repository", System.getProperty("repository"));
FileWriter out = new FileWriter(new File(appFolder, "settings.xml"));
Mustache.compiler().escapeHTML(false)
.compile(new FileReader("src/test/resources/settings-template.xml"))
.execute(context, out);
out.close();
}
private void copyApplicationSource(File appFolder) throws IOException {
File examplePackage = new File(appFolder, "src/main/java/com/example");
examplePackage.mkdirs();
@@ -128,12 +137,7 @@ class ApplicationBuilder {
InvocationRequest invocation = new DefaultInvocationRequest();
invocation.setBaseDirectory(appFolder);
invocation.setGoals(Collections.singletonList("package"));
String repository = System.getProperty("repository");
if (StringUtils.hasText(repository) && !repository.equals("${repository}")) {
Properties properties = new Properties();
properties.put("repository", repository);
invocation.setProperties(properties);
}
invocation.setUserSettingsFile(new File(appFolder, "settings.xml"));
InvocationResult execute = new DefaultInvoker().execute(invocation);
assertThat(execute.getExitCode()).isEqualTo(0);
}

28
spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/resources/pom-template.xml
View File

@@ -61,32 +61,4 @@
</snapshots>
</repository>
</repositories>
<profiles>
<profile>
<id>repository</id>
<activation>
<property>
<name>repository</name>
</property>
</activation>
<repositories>
<repository>
<id>repository</id>
<url>${repository}</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>repository</id>
<url>${repository}</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</profile>
</profiles>
</project>

32
spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/resources/settings-template.xml Normal file
View File

@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 https://maven.apache.org/xsd/settings-1.0.0.xsd">
<profiles>
<profile>
<id>repository</id>
<activation>
<property>
<name>repository</name>
</property>
</activation>
<repositories>
<repository>
<id>repository</id>
<url>${repository}</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>repository</id>
<url>${repository}</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</profile>
</profiles>
</settings>