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

Revert "Add or avoid proxy configurations for integration tests"

Browse Source 
This reverts commit 251f2805a8.
This commit is contained in:
Dave Syer
2015-11-02 17:38:54 +00:00
parent 251f2805a8
commit fa9724becb
6 changed files with 13 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/ProjectCreator.java
View File

@@ -16,9 +16,7 @@
package org.springframework.boot.gradle;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import org.gradle.tooling.GradleConnector;
@@ -48,8 +46,7 @@ public class ProjectCreator {
projectDirectory.mkdirs();
File gradleScript = new File(projectDirectory, "build.gradle");
writeGradleProperties(projectDirectory);
if (new File("src/test/resources", name).isDirectory()) {
FileSystemUtils.copyRecursively(new File("src/test/resources", name),
projectDirectory);
@@ -65,21 +62,4 @@ public class ProjectCreator {
((DefaultGradleConnector) gradleConnector).embedded(true);
return gradleConnector.forProjectDirectory(projectDirectory).connect();
}
private void writeGradleProperties(File projectDirectory) throws IOException {
File gradleProperties = new File(projectDirectory, "gradle.properties");
BufferedWriter writer = new BufferedWriter(new FileWriter(gradleProperties));
writeProperty(writer, "http.proxyHost");
writeProperty(writer, "https.proxyHost");
writeProperty(writer, "http.proxyPort");
writeProperty(writer, "https.proxyPort");
writer.close();
}
private void writeProperty(BufferedWriter writer, String name) throws IOException {
String value = System.getProperty(name);
if (value != null) {
writer.write("systemProp." + name + "=" + value + "\n");
}
}
}

2
spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/starter/StarterDependenciesIntegrationTests.java
View File

@@ -91,7 +91,7 @@ public class StarterDependenciesIntegrationTests {
public StarterDependenciesIntegrationTests(String starter) {
this.buildArguments = new String[] { "-Pstarter=" + starter,
"-PbootVersion=" + bootVersion, "-PspringVersion=" + springVersion, "--stacktrace" };
"-PbootVersion=" + bootVersion, "-PspringVersion=" + springVersion };
}
@Test