Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
b8070a83
Commit
b8070a83
authored
Sep 02, 2019
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Skip tests on Windows that exceed its file system's limitations
parent
abba4fa9
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
23 additions
and
4 deletions
+23
-4
AbstractEmbeddedServletContainerIntegrationTests.java
...ded/AbstractEmbeddedServletContainerIntegrationTests.java
+5
-0
ApplicationBuilder.java
...ngframework/boot/context/embedded/ApplicationBuilder.java
+10
-4
EmbeddedServletContainerJarDevelopmentIntegrationTests.java
...beddedServletContainerJarDevelopmentIntegrationTests.java
+2
-0
EmbeddedServletContainerJarPackagingIntegrationTests.java
...EmbeddedServletContainerJarPackagingIntegrationTests.java
+2
-0
EmbeddedServletContainerWarDevelopmentIntegrationTests.java
...beddedServletContainerWarDevelopmentIntegrationTests.java
+2
-0
EmbeddedServletContainerWarPackagingIntegrationTests.java
...EmbeddedServletContainerWarPackagingIntegrationTests.java
+2
-0
No files found.
spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerIntegrationTests.java
View file @
b8070a83
...
...
@@ -16,6 +16,7 @@
package
org
.
springframework
.
boot
.
context
.
embedded
;
import
java.io.File
;
import
java.io.IOException
;
import
java.net.URI
;
import
java.util.ArrayList
;
...
...
@@ -110,4 +111,8 @@ public abstract class AbstractEmbeddedServletContainerIntegrationTests {
});
}
protected
boolean
isWindows
()
{
return
File
.
separatorChar
==
'\\'
;
}
}
spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/ApplicationBuilder.java
View file @
b8070a83
...
...
@@ -90,10 +90,12 @@ class ApplicationBuilder {
resourcesJarStream
.
putNextEntry
(
new
ZipEntry
(
"META-INF/resources/nested-meta-inf-resource.txt"
));
resourcesJarStream
.
write
(
"nested"
.
getBytes
());
resourcesJarStream
.
closeEntry
();
resourcesJarStream
.
putNextEntry
(
new
ZipEntry
(
"META-INF/resources/nested-reserved-!#$%&()*+,:=?@[]-meta-inf-resource.txt"
));
resourcesJarStream
.
write
(
"encoded-name"
.
getBytes
());
resourcesJarStream
.
closeEntry
();
if
(!
isWindows
())
{
resourcesJarStream
.
putNextEntry
(
new
ZipEntry
(
"META-INF/resources/nested-reserved-!#$%&()*+,:=?@[]-meta-inf-resource.txt"
));
resourcesJarStream
.
write
(
"encoded-name"
.
getBytes
());
resourcesJarStream
.
closeEntry
();
}
return
resourcesJar
;
}
}
...
...
@@ -154,4 +156,8 @@ class ApplicationBuilder {
assertThat
(
execute
.
getExitCode
()).
isEqualTo
(
0
);
}
private
boolean
isWindows
()
{
return
File
.
separatorChar
==
'\\'
;
}
}
spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerJarDevelopmentIntegrationTests.java
View file @
b8070a83
...
...
@@ -18,6 +18,7 @@ package org.springframework.boot.context.embedded;
import
java.util.Arrays
;
import
org.junit.Assume
;
import
org.junit.Test
;
import
org.junit.runner.RunWith
;
import
org.junit.runners.Parameterized
;
...
...
@@ -56,6 +57,7 @@ public class EmbeddedServletContainerJarDevelopmentIntegrationTests
@Test
public
void
metaInfResourceFromDependencyWithNameThatContainsReservedCharactersIsAvailableViaHttp
()
{
Assume
.
assumeFalse
(
isWindows
());
ResponseEntity
<
String
>
entity
=
this
.
rest
.
getForEntity
(
"/nested-reserved-%21%23%24%25%26%28%29%2A%2B%2C%3A%3D%3F%40%5B%5D-meta-inf-resource.txt"
,
String
.
class
);
...
...
spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerJarPackagingIntegrationTests.java
View file @
b8070a83
...
...
@@ -18,6 +18,7 @@ package org.springframework.boot.context.embedded;
import
java.util.Arrays
;
import
org.junit.Assume
;
import
org.junit.Test
;
import
org.junit.runner.RunWith
;
import
org.junit.runners.Parameterized
;
...
...
@@ -56,6 +57,7 @@ public class EmbeddedServletContainerJarPackagingIntegrationTests
@Test
public
void
nestedMetaInfResourceWithNameThatContainsReservedCharactersIsAvailableViaHttp
()
{
Assume
.
assumeFalse
(
isWindows
());
ResponseEntity
<
String
>
entity
=
this
.
rest
.
getForEntity
(
"/nested-reserved-%21%23%24%25%26%28%29%2A%2B%2C%3A%3D%3F%40%5B%5D-meta-inf-resource.txt"
,
String
.
class
);
...
...
spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarDevelopmentIntegrationTests.java
View file @
b8070a83
...
...
@@ -24,6 +24,7 @@ import java.util.Collections;
import
java.util.List
;
import
java.util.stream.Collectors
;
import
org.junit.Assume
;
import
org.junit.Test
;
import
org.junit.runner.RunWith
;
import
org.junit.runners.Parameterized
;
...
...
@@ -62,6 +63,7 @@ public class EmbeddedServletContainerWarDevelopmentIntegrationTests
@Test
public
void
metaInfResourceFromDependencyWithNameThatContainsReservedCharactersIsAvailableViaHttp
()
{
Assume
.
assumeFalse
(
isWindows
());
ResponseEntity
<
String
>
entity
=
this
.
rest
.
getForEntity
(
"/nested-reserved-%21%23%24%25%26%28%29%2A%2B%2C%3A%3D%3F%40%5B%5D-meta-inf-resource.txt"
,
String
.
class
);
...
...
spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarPackagingIntegrationTests.java
View file @
b8070a83
...
...
@@ -24,6 +24,7 @@ import java.util.Collections;
import
java.util.List
;
import
java.util.stream.Collectors
;
import
org.junit.Assume
;
import
org.junit.Test
;
import
org.junit.runner.RunWith
;
import
org.junit.runners.Parameterized
;
...
...
@@ -62,6 +63,7 @@ public class EmbeddedServletContainerWarPackagingIntegrationTests
@Test
public
void
nestedMetaInfResourceWithNameThatContainsReservedCharactersIsAvailableViaHttp
()
{
Assume
.
assumeFalse
(
isWindows
());
ResponseEntity
<
String
>
entity
=
this
.
rest
.
getForEntity
(
"/nested-reserved-%21%23%24%25%26%28%29%2A%2B%2C%3A%3D%3F%40%5B%5D-meta-inf-resource.txt"
,
String
.
class
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment