Skip to content

Commit b8070a8

Browse files
committed
Skip tests on Windows that exceed its file system's limitations
1 parent abba4fa commit b8070a8

File tree

6 files changed

+23
-4
lines changed

6 files changed

+23
-4
lines changed

spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerIntegrationTests.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package org.springframework.boot.context.embedded;
1818

19+
import java.io.File;
1920
import java.io.IOException;
2021
import java.net.URI;
2122
import java.util.ArrayList;
@@ -110,4 +111,8 @@ public URI expand(String uriTemplate, Map<String, ?> uriVariables) {
110111
});
111112
}
112113

114+
protected boolean isWindows() {
115+
return File.separatorChar == '\\';
116+
}
117+
113118
}

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,12 @@ private File createResourcesJar() throws IOException {
9090
resourcesJarStream.putNextEntry(new ZipEntry("META-INF/resources/nested-meta-inf-resource.txt"));
9191
resourcesJarStream.write("nested".getBytes());
9292
resourcesJarStream.closeEntry();
93-
resourcesJarStream.putNextEntry(
94-
new ZipEntry("META-INF/resources/nested-reserved-!#$%&()*+,:=?@[]-meta-inf-resource.txt"));
95-
resourcesJarStream.write("encoded-name".getBytes());
96-
resourcesJarStream.closeEntry();
93+
if (!isWindows()) {
94+
resourcesJarStream.putNextEntry(
95+
new ZipEntry("META-INF/resources/nested-reserved-!#$%&()*+,:=?@[]-meta-inf-resource.txt"));
96+
resourcesJarStream.write("encoded-name".getBytes());
97+
resourcesJarStream.closeEntry();
98+
}
9799
return resourcesJar;
98100
}
99101
}
@@ -154,4 +156,8 @@ private void packageApplication(File appFolder, File settingsXml) throws MavenIn
154156
assertThat(execute.getExitCode()).isEqualTo(0);
155157
}
156158

159+
private boolean isWindows() {
160+
return File.separatorChar == '\\';
161+
}
162+
157163
}

spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerJarDevelopmentIntegrationTests.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import java.util.Arrays;
2020

21+
import org.junit.Assume;
2122
import org.junit.Test;
2223
import org.junit.runner.RunWith;
2324
import org.junit.runners.Parameterized;
@@ -56,6 +57,7 @@ public void metaInfResourceFromDependencyIsAvailableViaHttp() {
5657

5758
@Test
5859
public void metaInfResourceFromDependencyWithNameThatContainsReservedCharactersIsAvailableViaHttp() {
60+
Assume.assumeFalse(isWindows());
5961
ResponseEntity<String> entity = this.rest.getForEntity(
6062
"/nested-reserved-%21%23%24%25%26%28%29%2A%2B%2C%3A%3D%3F%40%5B%5D-meta-inf-resource.txt",
6163
String.class);

spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerJarPackagingIntegrationTests.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import java.util.Arrays;
2020

21+
import org.junit.Assume;
2122
import org.junit.Test;
2223
import org.junit.runner.RunWith;
2324
import org.junit.runners.Parameterized;
@@ -56,6 +57,7 @@ public void nestedMetaInfResourceIsAvailableViaHttp() {
5657

5758
@Test
5859
public void nestedMetaInfResourceWithNameThatContainsReservedCharactersIsAvailableViaHttp() {
60+
Assume.assumeFalse(isWindows());
5961
ResponseEntity<String> entity = this.rest.getForEntity(
6062
"/nested-reserved-%21%23%24%25%26%28%29%2A%2B%2C%3A%3D%3F%40%5B%5D-meta-inf-resource.txt",
6163
String.class);

spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarDevelopmentIntegrationTests.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.util.List;
2525
import java.util.stream.Collectors;
2626

27+
import org.junit.Assume;
2728
import org.junit.Test;
2829
import org.junit.runner.RunWith;
2930
import org.junit.runners.Parameterized;
@@ -62,6 +63,7 @@ public void metaInfResourceFromDependencyIsAvailableViaHttp() {
6263

6364
@Test
6465
public void metaInfResourceFromDependencyWithNameThatContainsReservedCharactersIsAvailableViaHttp() {
66+
Assume.assumeFalse(isWindows());
6567
ResponseEntity<String> entity = this.rest.getForEntity(
6668
"/nested-reserved-%21%23%24%25%26%28%29%2A%2B%2C%3A%3D%3F%40%5B%5D-meta-inf-resource.txt",
6769
String.class);

spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarPackagingIntegrationTests.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.util.List;
2525
import java.util.stream.Collectors;
2626

27+
import org.junit.Assume;
2728
import org.junit.Test;
2829
import org.junit.runner.RunWith;
2930
import org.junit.runners.Parameterized;
@@ -62,6 +63,7 @@ public void nestedMetaInfResourceIsAvailableViaHttp() {
6263

6364
@Test
6465
public void nestedMetaInfResourceWithNameThatContainsReservedCharactersIsAvailableViaHttp() {
66+
Assume.assumeFalse(isWindows());
6567
ResponseEntity<String> entity = this.rest.getForEntity(
6668
"/nested-reserved-%21%23%24%25%26%28%29%2A%2B%2C%3A%3D%3F%40%5B%5D-meta-inf-resource.txt",
6769
String.class);

0 commit comments

Comments
 (0)