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
d4affd7f
Commit
d4affd7f
authored
Aug 15, 2019
by
dreis2211
Committed by
Stephane Nicoll
Aug 17, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use hasSize() assertion in favor of length checks
See gh-17874
parent
04b63cda
Changes
17
Show whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
36 additions
and
37 deletions
+36
-37
RabbitAutoConfigurationTests.java
...boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java
+2
-2
CassandraDataAutoConfigurationTests.java
...e/data/cassandra/CassandraDataAutoConfigurationTests.java
+1
-1
ElasticsearchAutoConfigurationTests.java
...ta/elasticsearch/ElasticsearchAutoConfigurationTests.java
+1
-1
ArtemisAutoConfigurationTests.java
...oconfigure/jms/artemis/ArtemisAutoConfigurationTests.java
+1
-1
ArtemisEmbeddedConfigurationFactoryTests.java
...jms/artemis/ArtemisEmbeddedConfigurationFactoryTests.java
+1
-1
JooqAutoConfigurationTests.java
...k/boot/autoconfigure/jooq/JooqAutoConfigurationTests.java
+4
-4
EmbeddedLdapAutoConfigurationTests.java
...ure/ldap/embedded/EmbeddedLdapAutoConfigurationTests.java
+1
-1
JettyWebServerFactoryCustomizerTests.java
...re/web/embedded/JettyWebServerFactoryCustomizerTests.java
+1
-1
AetherGrapeEngineTests.java
...ework/boot/cli/compiler/grape/AetherGrapeEngineTests.java
+8
-8
FrameTests.java
.../springframework/boot/devtools/livereload/FrameTests.java
+1
-1
SpringBootMockServletContextTests.java
...boot/test/mock/web/SpringBootMockServletContextTests.java
+3
-4
RepackagerTests.java
...rg/springframework/boot/loader/tools/RepackagerTests.java
+1
-1
RunArgumentsTests.java
...ava/org/springframework/boot/maven/RunArgumentsTests.java
+7
-7
ImageBannerTests.java
.../test/java/org/springframework/boot/ImageBannerTests.java
+1
-1
TomcatReactiveWebServerFactoryTests.java
.../embedded/tomcat/TomcatReactiveWebServerFactoryTests.java
+1
-1
TomcatServletWebServerFactoryTests.java
...b/embedded/tomcat/TomcatServletWebServerFactoryTests.java
+1
-1
AbstractServletWebServerFactoryTests.java
.../servlet/server/AbstractServletWebServerFactoryTests.java
+1
-1
No files found.
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java
View file @
d4affd7f
...
@@ -471,7 +471,7 @@ class RabbitAutoConfigurationTests {
...
@@ -471,7 +471,7 @@ class RabbitAutoConfigurationTests {
RetryPolicy
retryPolicy
)
{
RetryPolicy
retryPolicy
)
{
Advice
[]
adviceChain
=
rabbitListenerContainerFactory
.
getAdviceChain
();
Advice
[]
adviceChain
=
rabbitListenerContainerFactory
.
getAdviceChain
();
assertThat
(
adviceChain
).
isNotNull
();
assertThat
(
adviceChain
).
isNotNull
();
assertThat
(
adviceChain
.
length
).
isEqualTo
(
1
);
assertThat
(
adviceChain
).
hasSize
(
1
);
Advice
advice
=
adviceChain
[
0
];
Advice
advice
=
adviceChain
[
0
];
RetryTemplate
retryTemplate
=
(
RetryTemplate
)
ReflectionTestUtils
.
getField
(
advice
,
"retryOperations"
);
RetryTemplate
retryTemplate
=
(
RetryTemplate
)
ReflectionTestUtils
.
getField
(
advice
,
"retryOperations"
);
assertThat
(
retryTemplate
).
hasFieldOrPropertyWithValue
(
"retryPolicy"
,
retryPolicy
);
assertThat
(
retryTemplate
).
hasFieldOrPropertyWithValue
(
"retryPolicy"
,
retryPolicy
);
...
@@ -533,7 +533,7 @@ class RabbitAutoConfigurationTests {
...
@@ -533,7 +533,7 @@ class RabbitAutoConfigurationTests {
assertThat
(
containerFactory
).
hasFieldOrPropertyWithValue
(
"idleEventInterval"
,
5L
);
assertThat
(
containerFactory
).
hasFieldOrPropertyWithValue
(
"idleEventInterval"
,
5L
);
Advice
[]
adviceChain
=
containerFactory
.
getAdviceChain
();
Advice
[]
adviceChain
=
containerFactory
.
getAdviceChain
();
assertThat
(
adviceChain
).
isNotNull
();
assertThat
(
adviceChain
).
isNotNull
();
assertThat
(
adviceChain
.
length
).
isEqualTo
(
1
);
assertThat
(
adviceChain
).
hasSize
(
1
);
Advice
advice
=
adviceChain
[
0
];
Advice
advice
=
adviceChain
[
0
];
MessageRecoverer
messageRecoverer
=
context
.
getBean
(
"myMessageRecoverer"
,
MessageRecoverer
.
class
);
MessageRecoverer
messageRecoverer
=
context
.
getBean
(
"myMessageRecoverer"
,
MessageRecoverer
.
class
);
MethodInvocationRecoverer
<?>
mir
=
(
MethodInvocationRecoverer
<?>)
ReflectionTestUtils
.
getField
(
advice
,
MethodInvocationRecoverer
<?>
mir
=
(
MethodInvocationRecoverer
<?>)
ReflectionTestUtils
.
getField
(
advice
,
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationTests.java
View file @
d4affd7f
...
@@ -64,7 +64,7 @@ class CassandraDataAutoConfigurationTests {
...
@@ -64,7 +64,7 @@ class CassandraDataAutoConfigurationTests {
@Test
@Test
void
templateExists
()
{
void
templateExists
()
{
load
(
TestExcludeConfiguration
.
class
);
load
(
TestExcludeConfiguration
.
class
);
assertThat
(
this
.
context
.
getBeanNamesForType
(
CassandraTemplate
.
class
)
.
length
).
isEqualTo
(
1
);
assertThat
(
this
.
context
.
getBeanNamesForType
(
CassandraTemplate
.
class
)
).
hasSize
(
1
);
}
}
@Test
@Test
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchAutoConfigurationTests.java
View file @
d4affd7f
...
@@ -69,7 +69,7 @@ class ElasticsearchAutoConfigurationTests {
...
@@ -69,7 +69,7 @@ class ElasticsearchAutoConfigurationTests {
this
.
context
.
register
(
CustomConfiguration
.
class
,
PropertyPlaceholderAutoConfiguration
.
class
,
this
.
context
.
register
(
CustomConfiguration
.
class
,
PropertyPlaceholderAutoConfiguration
.
class
,
ElasticsearchAutoConfiguration
.
class
);
ElasticsearchAutoConfiguration
.
class
);
this
.
context
.
refresh
();
this
.
context
.
refresh
();
assertThat
(
this
.
context
.
getBeanNamesForType
(
Client
.
class
)
.
length
).
isEqualTo
(
1
);
assertThat
(
this
.
context
.
getBeanNamesForType
(
Client
.
class
)
).
hasSize
(
1
);
assertThat
(
this
.
context
.
getBean
(
"myClient"
)).
isSameAs
(
this
.
context
.
getBean
(
Client
.
class
));
assertThat
(
this
.
context
.
getBean
(
"myClient"
)).
isSameAs
(
this
.
context
.
getBean
(
Client
.
class
));
}
}
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfigurationTests.java
View file @
d4affd7f
...
@@ -376,7 +376,7 @@ class ArtemisAutoConfigurationTests {
...
@@ -376,7 +376,7 @@ class ArtemisAutoConfigurationTests {
private
TransportConfiguration
getSingleTransportConfiguration
(
ActiveMQConnectionFactory
connectionFactory
)
{
private
TransportConfiguration
getSingleTransportConfiguration
(
ActiveMQConnectionFactory
connectionFactory
)
{
TransportConfiguration
[]
transportConfigurations
=
connectionFactory
.
getServerLocator
()
TransportConfiguration
[]
transportConfigurations
=
connectionFactory
.
getServerLocator
()
.
getStaticTransportConfigurations
();
.
getStaticTransportConfigurations
();
assertThat
(
transportConfigurations
.
length
).
isEqualTo
(
1
);
assertThat
(
transportConfigurations
).
hasSize
(
1
);
return
transportConfigurations
[
0
];
return
transportConfigurations
[
0
];
}
}
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisEmbeddedConfigurationFactoryTests.java
View file @
d4affd7f
...
@@ -59,7 +59,7 @@ class ArtemisEmbeddedConfigurationFactoryTests {
...
@@ -59,7 +59,7 @@ class ArtemisEmbeddedConfigurationFactoryTests {
void
generatedClusterPassword
()
{
void
generatedClusterPassword
()
{
ArtemisProperties
properties
=
new
ArtemisProperties
();
ArtemisProperties
properties
=
new
ArtemisProperties
();
Configuration
configuration
=
new
ArtemisEmbeddedConfigurationFactory
(
properties
).
createConfiguration
();
Configuration
configuration
=
new
ArtemisEmbeddedConfigurationFactory
(
properties
).
createConfiguration
();
assertThat
(
configuration
.
getClusterPassword
()
.
length
()).
isEqualTo
(
36
);
assertThat
(
configuration
.
getClusterPassword
()
).
hasSize
(
36
);
}
}
@Test
@Test
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jooq/JooqAutoConfigurationTests.java
View file @
d4affd7f
...
@@ -122,13 +122,13 @@ class JooqAutoConfigurationTests {
...
@@ -122,13 +122,13 @@ class JooqAutoConfigurationTests {
assertThat
(
dsl
.
configuration
().
recordUnmapperProvider
().
getClass
())
assertThat
(
dsl
.
configuration
().
recordUnmapperProvider
().
getClass
())
.
isEqualTo
(
TestRecordUnmapperProvider
.
class
);
.
isEqualTo
(
TestRecordUnmapperProvider
.
class
);
assertThat
(
dsl
.
configuration
().
executorProvider
().
getClass
()).
isEqualTo
(
TestExecutorProvider
.
class
);
assertThat
(
dsl
.
configuration
().
executorProvider
().
getClass
()).
isEqualTo
(
TestExecutorProvider
.
class
);
assertThat
(
dsl
.
configuration
().
recordListenerProviders
()
.
length
).
isEqualTo
(
1
);
assertThat
(
dsl
.
configuration
().
recordListenerProviders
()
).
hasSize
(
1
);
ExecuteListenerProvider
[]
executeListenerProviders
=
dsl
.
configuration
().
executeListenerProviders
();
ExecuteListenerProvider
[]
executeListenerProviders
=
dsl
.
configuration
().
executeListenerProviders
();
assertThat
(
executeListenerProviders
.
length
).
isEqualTo
(
2
);
assertThat
(
executeListenerProviders
).
hasSize
(
2
);
assertThat
(
executeListenerProviders
[
0
]).
isInstanceOf
(
DefaultExecuteListenerProvider
.
class
);
assertThat
(
executeListenerProviders
[
0
]).
isInstanceOf
(
DefaultExecuteListenerProvider
.
class
);
assertThat
(
executeListenerProviders
[
1
]).
isInstanceOf
(
TestExecuteListenerProvider
.
class
);
assertThat
(
executeListenerProviders
[
1
]).
isInstanceOf
(
TestExecuteListenerProvider
.
class
);
assertThat
(
dsl
.
configuration
().
visitListenerProviders
()
.
length
).
isEqualTo
(
1
);
assertThat
(
dsl
.
configuration
().
visitListenerProviders
()
).
hasSize
(
1
);
assertThat
(
dsl
.
configuration
().
transactionListenerProviders
()
.
length
).
isEqualTo
(
1
);
assertThat
(
dsl
.
configuration
().
transactionListenerProviders
()
).
hasSize
(
1
);
});
});
}
}
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapAutoConfigurationTests.java
View file @
d4affd7f
...
@@ -108,7 +108,7 @@ class EmbeddedLdapAutoConfigurationTests {
...
@@ -108,7 +108,7 @@ class EmbeddedLdapAutoConfigurationTests {
void
testQueryEmbeddedLdap
()
{
void
testQueryEmbeddedLdap
()
{
this
.
contextRunner
.
withPropertyValues
(
"spring.ldap.embedded.base-dn:dc=spring,dc=org"
)
this
.
contextRunner
.
withPropertyValues
(
"spring.ldap.embedded.base-dn:dc=spring,dc=org"
)
.
withConfiguration
(
AutoConfigurations
.
of
(
LdapAutoConfiguration
.
class
)).
run
((
context
)
->
{
.
withConfiguration
(
AutoConfigurations
.
of
(
LdapAutoConfiguration
.
class
)).
run
((
context
)
->
{
assertThat
(
context
.
getBeanNamesForType
(
LdapTemplate
.
class
).
length
).
isEqualTo
(
1
);
assertThat
(
context
).
hasSingleBean
(
LdapTemplate
.
class
);
LdapTemplate
ldapTemplate
=
context
.
getBean
(
LdapTemplate
.
class
);
LdapTemplate
ldapTemplate
=
context
.
getBean
(
LdapTemplate
.
class
);
assertThat
(
ldapTemplate
.
list
(
"ou=company1,c=Sweden,dc=spring,dc=org"
)).
hasSize
(
4
);
assertThat
(
ldapTemplate
.
list
(
"ou=company1,c=Sweden,dc=spring,dc=org"
)).
hasSize
(
4
);
});
});
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/JettyWebServerFactoryCustomizerTests.java
View file @
d4affd7f
...
@@ -93,7 +93,7 @@ class JettyWebServerFactoryCustomizerTests {
...
@@ -93,7 +93,7 @@ class JettyWebServerFactoryCustomizerTests {
JettyWebServer
server
=
customizeAndGetServer
();
JettyWebServer
server
=
customizeAndGetServer
();
CustomRequestLog
requestLog
=
getRequestLog
(
server
);
CustomRequestLog
requestLog
=
getRequestLog
(
server
);
assertThat
(
requestLog
.
getFormatString
()).
isEqualTo
(
CustomRequestLog
.
EXTENDED_NCSA_FORMAT
);
assertThat
(
requestLog
.
getFormatString
()).
isEqualTo
(
CustomRequestLog
.
EXTENDED_NCSA_FORMAT
);
assertThat
(
requestLog
.
getIgnorePaths
()
.
length
).
isEqualTo
(
2
);
assertThat
(
requestLog
.
getIgnorePaths
()
).
hasSize
(
2
);
assertThat
(
requestLog
.
getIgnorePaths
()).
containsExactly
(
"/a/path"
,
"/b/path"
);
assertThat
(
requestLog
.
getIgnorePaths
()).
containsExactly
(
"/a/path"
,
"/b/path"
);
RequestLogWriter
logWriter
=
getLogWriter
(
requestLog
);
RequestLogWriter
logWriter
=
getLogWriter
(
requestLog
);
assertThat
(
logWriter
.
getFileName
()).
isEqualTo
(
logFile
.
getAbsolutePath
());
assertThat
(
logWriter
.
getFileName
()).
isEqualTo
(
logFile
.
getAbsolutePath
());
...
...
spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineTests.java
View file @
d4affd7f
...
@@ -108,7 +108,7 @@ class AetherGrapeEngineTests {
...
@@ -108,7 +108,7 @@ class AetherGrapeEngineTests {
createDependency
(
"org.springframework"
,
"spring-jdbc"
,
"3.2.4.RELEASE"
),
createDependency
(
"org.springframework"
,
"spring-jdbc"
,
"3.2.4.RELEASE"
),
createDependency
(
"org.springframework"
,
"spring-beans"
,
"3.2.4.RELEASE"
));
createDependency
(
"org.springframework"
,
"spring-beans"
,
"3.2.4.RELEASE"
));
assertThat
(
this
.
groovyClassLoader
.
getURLs
()
.
length
).
isEqualTo
(
3
);
assertThat
(
this
.
groovyClassLoader
.
getURLs
()
).
hasSize
(
3
);
}
}
@Test
@Test
...
@@ -117,7 +117,7 @@ class AetherGrapeEngineTests {
...
@@ -117,7 +117,7 @@ class AetherGrapeEngineTests {
createGrapeEngine
().
grab
(
args
,
createDependency
(
"org.springframework"
,
"spring-jdbc"
,
"3.2.4.RELEASE"
,
false
));
createGrapeEngine
().
grab
(
args
,
createDependency
(
"org.springframework"
,
"spring-jdbc"
,
"3.2.4.RELEASE"
,
false
));
assertThat
(
this
.
groovyClassLoader
.
getURLs
()
.
length
).
isEqualTo
(
1
);
assertThat
(
this
.
groovyClassLoader
.
getURLs
()
).
hasSize
(
1
);
}
}
@Test
@Test
...
@@ -129,8 +129,8 @@ class AetherGrapeEngineTests {
...
@@ -129,8 +129,8 @@ class AetherGrapeEngineTests {
createGrapeEngine
(
this
.
springMilestones
).
grab
(
args
,
createGrapeEngine
(
this
.
springMilestones
).
grab
(
args
,
createDependency
(
"org.springframework"
,
"spring-jdbc"
,
null
));
createDependency
(
"org.springframework"
,
"spring-jdbc"
,
null
));
assertThat
(
this
.
groovyClassLoader
.
getURLs
()
.
length
).
isEqualTo
(
0
);
assertThat
(
this
.
groovyClassLoader
.
getURLs
()
).
isEmpty
(
);
assertThat
(
customClassLoader
.
getURLs
()
.
length
).
isEqualTo
(
5
);
assertThat
(
customClassLoader
.
getURLs
()
).
hasSize
(
5
);
}
}
@Test
@Test
...
@@ -142,7 +142,7 @@ class AetherGrapeEngineTests {
...
@@ -142,7 +142,7 @@ class AetherGrapeEngineTests {
"0.1.1.RELEASE"
);
"0.1.1.RELEASE"
);
dependency
.
put
(
"ext"
,
"zip"
);
dependency
.
put
(
"ext"
,
"zip"
);
grapeEngine
.
grab
(
args
,
dependency
);
grapeEngine
.
grab
(
args
,
dependency
);
assertThat
(
this
.
groovyClassLoader
.
getURLs
()
.
length
).
isEqualTo
(
1
);
assertThat
(
this
.
groovyClassLoader
.
getURLs
()
).
hasSize
(
1
);
}
}
@Test
@Test
...
@@ -162,7 +162,7 @@ class AetherGrapeEngineTests {
...
@@ -162,7 +162,7 @@ class AetherGrapeEngineTests {
dependency
.
put
(
"type"
,
"pom"
);
dependency
.
put
(
"type"
,
"pom"
);
createGrapeEngine
().
grab
(
args
,
dependency
);
createGrapeEngine
().
grab
(
args
,
dependency
);
URL
[]
urls
=
this
.
groovyClassLoader
.
getURLs
();
URL
[]
urls
=
this
.
groovyClassLoader
.
getURLs
();
assertThat
(
urls
.
length
).
isEqualTo
(
1
);
assertThat
(
urls
).
hasSize
(
1
);
assertThat
(
urls
[
0
].
toExternalForm
().
endsWith
(
".pom"
)).
isTrue
();
assertThat
(
urls
[
0
].
toExternalForm
().
endsWith
(
".pom"
)).
isTrue
();
}
}
...
@@ -174,7 +174,7 @@ class AetherGrapeEngineTests {
...
@@ -174,7 +174,7 @@ class AetherGrapeEngineTests {
dependency
.
put
(
"ext"
,
"pom"
);
dependency
.
put
(
"ext"
,
"pom"
);
createGrapeEngine
().
grab
(
args
,
dependency
);
createGrapeEngine
().
grab
(
args
,
dependency
);
URL
[]
urls
=
this
.
groovyClassLoader
.
getURLs
();
URL
[]
urls
=
this
.
groovyClassLoader
.
getURLs
();
assertThat
(
urls
.
length
).
isEqualTo
(
1
);
assertThat
(
urls
).
hasSize
(
1
);
assertThat
(
urls
[
0
].
toExternalForm
().
endsWith
(
".pom"
)).
isTrue
();
assertThat
(
urls
[
0
].
toExternalForm
().
endsWith
(
".pom"
)).
isTrue
();
}
}
...
@@ -187,7 +187,7 @@ class AetherGrapeEngineTests {
...
@@ -187,7 +187,7 @@ class AetherGrapeEngineTests {
createGrapeEngine
().
grab
(
args
,
dependency
);
createGrapeEngine
().
grab
(
args
,
dependency
);
URL
[]
urls
=
this
.
groovyClassLoader
.
getURLs
();
URL
[]
urls
=
this
.
groovyClassLoader
.
getURLs
();
assertThat
(
urls
.
length
).
isEqualTo
(
1
);
assertThat
(
urls
).
hasSize
(
1
);
assertThat
(
urls
[
0
].
toExternalForm
().
endsWith
(
"-sources.jar"
)).
isTrue
();
assertThat
(
urls
[
0
].
toExternalForm
().
endsWith
(
"-sources.jar"
)).
isTrue
();
}
}
...
...
spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/livereload/FrameTests.java
View file @
d4affd7f
...
@@ -75,7 +75,7 @@ class FrameTests {
...
@@ -75,7 +75,7 @@ class FrameTests {
ByteArrayOutputStream
bos
=
new
ByteArrayOutputStream
();
ByteArrayOutputStream
bos
=
new
ByteArrayOutputStream
();
frame
.
write
(
bos
);
frame
.
write
(
bos
);
byte
[]
bytes
=
bos
.
toByteArray
();
byte
[]
bytes
=
bos
.
toByteArray
();
assertThat
(
bytes
.
length
).
isEqualTo
(
130
);
assertThat
(
bytes
).
hasSize
(
130
);
assertThat
(
bytes
[
0
]).
isEqualTo
((
byte
)
0x81
);
assertThat
(
bytes
[
0
]).
isEqualTo
((
byte
)
0x81
);
assertThat
(
bytes
[
1
]).
isEqualTo
((
byte
)
0x7E
);
assertThat
(
bytes
[
1
]).
isEqualTo
((
byte
)
0x7E
);
assertThat
(
bytes
[
2
]).
isEqualTo
((
byte
)
0x00
);
assertThat
(
bytes
[
2
]).
isEqualTo
((
byte
)
0x00
);
...
...
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/web/SpringBootMockServletContextTests.java
View file @
d4affd7f
...
@@ -35,7 +35,6 @@ import org.springframework.test.context.web.WebAppConfiguration;
...
@@ -35,7 +35,6 @@ import org.springframework.test.context.web.WebAppConfiguration;
import
org.springframework.web.context.ServletContextAware
;
import
org.springframework.web.context.ServletContextAware
;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
import
static
org
.
hamcrest
.
Matchers
.
nullValue
;
/**
/**
* Tests for {@link SpringBootMockServletContext}.
* Tests for {@link SpringBootMockServletContext}.
...
@@ -81,12 +80,12 @@ class SpringBootMockServletContextTests implements ServletContextAware {
...
@@ -81,12 +80,12 @@ class SpringBootMockServletContextTests implements ServletContextAware {
}
}
};
};
URL
resource
=
context
.
getResource
(
"/"
);
URL
resource
=
context
.
getResource
(
"/"
);
assertThat
(
resource
).
isNot
EqualTo
(
nullValue
()
);
assertThat
(
resource
).
isNot
Null
(
);
File
file
=
new
File
(
URLDecoder
.
decode
(
resource
.
getPath
(),
"UTF-8"
));
File
file
=
new
File
(
URLDecoder
.
decode
(
resource
.
getPath
(),
"UTF-8"
));
assertThat
(
file
).
exists
().
isDirectory
();
assertThat
(
file
).
exists
().
isDirectory
();
String
[]
contents
=
file
.
list
((
dir
,
name
)
->
!(
"."
.
equals
(
name
)
||
".."
.
equals
(
name
)));
String
[]
contents
=
file
.
list
((
dir
,
name
)
->
!(
"."
.
equals
(
name
)
||
".."
.
equals
(
name
)));
assertThat
(
contents
).
isNot
EqualTo
(
nullValue
()
);
assertThat
(
contents
).
isNot
Null
(
);
assertThat
(
contents
.
length
).
isEqualTo
(
0
);
assertThat
(
contents
).
isEmpty
(
);
}
}
@Configuration
(
proxyBeanMethods
=
false
)
@Configuration
(
proxyBeanMethods
=
false
)
...
...
spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/RepackagerTests.java
View file @
d4affd7f
...
@@ -296,7 +296,7 @@ class RepackagerTests {
...
@@ -296,7 +296,7 @@ class RepackagerTests {
assertThat
(
entry
.
getTime
()).
isEqualTo
(
JAN_1_1985
);
assertThat
(
entry
.
getTime
()).
isEqualTo
(
JAN_1_1985
);
entry
=
getEntry
(
file
,
"BOOT-INF/lib/"
+
libJarFileToUnpack
.
getName
());
entry
=
getEntry
(
file
,
"BOOT-INF/lib/"
+
libJarFileToUnpack
.
getName
());
assertThat
(
entry
.
getComment
()).
startsWith
(
"UNPACK:"
);
assertThat
(
entry
.
getComment
()).
startsWith
(
"UNPACK:"
);
assertThat
(
entry
.
getComment
()
.
length
()).
isEqualTo
(
47
);
assertThat
(
entry
.
getComment
()
).
hasSize
(
47
);
}
}
@Test
@Test
...
...
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/RunArgumentsTests.java
View file @
d4affd7f
...
@@ -31,14 +31,14 @@ class RunArgumentsTests {
...
@@ -31,14 +31,14 @@ class RunArgumentsTests {
void
parseNull
()
{
void
parseNull
()
{
String
[]
args
=
parseArgs
(
null
);
String
[]
args
=
parseArgs
(
null
);
assertThat
(
args
).
isNotNull
();
assertThat
(
args
).
isNotNull
();
assertThat
(
args
.
length
).
isEqualTo
(
0
);
assertThat
(
args
).
isEmpty
(
);
}
}
@Test
@Test
void
parseNullArray
()
{
void
parseNullArray
()
{
String
[]
args
=
new
RunArguments
((
String
[])
null
).
asArray
();
String
[]
args
=
new
RunArguments
((
String
[])
null
).
asArray
();
assertThat
(
args
).
isNotNull
();
assertThat
(
args
).
isNotNull
();
assertThat
(
args
.
length
).
isEqualTo
(
0
);
assertThat
(
args
).
isEmpty
(
);
}
}
@Test
@Test
...
@@ -59,13 +59,13 @@ class RunArgumentsTests {
...
@@ -59,13 +59,13 @@ class RunArgumentsTests {
void
parseEmpty
()
{
void
parseEmpty
()
{
String
[]
args
=
parseArgs
(
" "
);
String
[]
args
=
parseArgs
(
" "
);
assertThat
(
args
).
isNotNull
();
assertThat
(
args
).
isNotNull
();
assertThat
(
args
.
length
).
isEqualTo
(
0
);
assertThat
(
args
).
isEmpty
(
);
}
}
@Test
@Test
void
parseDebugFlags
()
{
void
parseDebugFlags
()
{
String
[]
args
=
parseArgs
(
"-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"
);
String
[]
args
=
parseArgs
(
"-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"
);
assertThat
(
args
.
length
).
isEqualTo
(
2
);
assertThat
(
args
).
hasSize
(
2
);
assertThat
(
args
[
0
]).
isEqualTo
(
"-Xdebug"
);
assertThat
(
args
[
0
]).
isEqualTo
(
"-Xdebug"
);
assertThat
(
args
[
1
]).
isEqualTo
(
"-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"
);
assertThat
(
args
[
1
]).
isEqualTo
(
"-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"
);
}
}
...
@@ -73,7 +73,7 @@ class RunArgumentsTests {
...
@@ -73,7 +73,7 @@ class RunArgumentsTests {
@Test
@Test
void
parseWithExtraSpaces
()
{
void
parseWithExtraSpaces
()
{
String
[]
args
=
parseArgs
(
" -Dfoo=bar -Dfoo2=bar2 "
);
String
[]
args
=
parseArgs
(
" -Dfoo=bar -Dfoo2=bar2 "
);
assertThat
(
args
.
length
).
isEqualTo
(
2
);
assertThat
(
args
).
hasSize
(
2
);
assertThat
(
args
[
0
]).
isEqualTo
(
"-Dfoo=bar"
);
assertThat
(
args
[
0
]).
isEqualTo
(
"-Dfoo=bar"
);
assertThat
(
args
[
1
]).
isEqualTo
(
"-Dfoo2=bar2"
);
assertThat
(
args
[
1
]).
isEqualTo
(
"-Dfoo2=bar2"
);
}
}
...
@@ -81,7 +81,7 @@ class RunArgumentsTests {
...
@@ -81,7 +81,7 @@ class RunArgumentsTests {
@Test
@Test
void
parseWithNewLinesAndTabs
()
{
void
parseWithNewLinesAndTabs
()
{
String
[]
args
=
parseArgs
(
" -Dfoo=bar \n\t\t -Dfoo2=bar2 "
);
String
[]
args
=
parseArgs
(
" -Dfoo=bar \n\t\t -Dfoo2=bar2 "
);
assertThat
(
args
.
length
).
isEqualTo
(
2
);
assertThat
(
args
).
hasSize
(
2
);
assertThat
(
args
[
0
]).
isEqualTo
(
"-Dfoo=bar"
);
assertThat
(
args
[
0
]).
isEqualTo
(
"-Dfoo=bar"
);
assertThat
(
args
[
1
]).
isEqualTo
(
"-Dfoo2=bar2"
);
assertThat
(
args
[
1
]).
isEqualTo
(
"-Dfoo2=bar2"
);
}
}
...
@@ -89,7 +89,7 @@ class RunArgumentsTests {
...
@@ -89,7 +89,7 @@ class RunArgumentsTests {
@Test
@Test
void
quoteHandledProperly
()
{
void
quoteHandledProperly
()
{
String
[]
args
=
parseArgs
(
"-Dvalue=\"My Value\" "
);
String
[]
args
=
parseArgs
(
"-Dvalue=\"My Value\" "
);
assertThat
(
args
.
length
).
isEqualTo
(
1
);
assertThat
(
args
).
hasSize
(
1
);
assertThat
(
args
[
0
]).
isEqualTo
(
"-Dvalue=My Value"
);
assertThat
(
args
[
0
]).
isEqualTo
(
"-Dvalue=My Value"
);
}
}
...
...
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ImageBannerTests.java
View file @
d4affd7f
...
@@ -165,7 +165,7 @@ class ImageBannerTests {
...
@@ -165,7 +165,7 @@ class ImageBannerTests {
int
frames
=
138
;
int
frames
=
138
;
int
linesPerFrame
=
36
;
int
linesPerFrame
=
36
;
assertThat
(
banner
).
contains
(
"\r"
);
assertThat
(
banner
).
contains
(
"\r"
);
assertThat
(
lines
.
length
).
isEqualTo
(
frames
*
linesPerFrame
-
1
);
assertThat
(
lines
).
hasSize
(
frames
*
linesPerFrame
-
1
);
}
}
private
int
getBannerHeight
(
String
banner
)
{
private
int
getBannerHeight
(
String
banner
)
{
...
...
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/TomcatReactiveWebServerFactoryTests.java
View file @
d4affd7f
...
@@ -185,7 +185,7 @@ class TomcatReactiveWebServerFactoryTests extends AbstractReactiveWebServerFacto
...
@@ -185,7 +185,7 @@ class TomcatReactiveWebServerFactoryTests extends AbstractReactiveWebServerFacto
factory
.
addAdditionalTomcatConnectors
(
connectors
);
factory
.
addAdditionalTomcatConnectors
(
connectors
);
this
.
webServer
=
factory
.
getWebServer
(
mock
(
HttpHandler
.
class
));
this
.
webServer
=
factory
.
getWebServer
(
mock
(
HttpHandler
.
class
));
Map
<
Service
,
Connector
[]>
connectorsByService
=
((
TomcatWebServer
)
this
.
webServer
).
getServiceConnectors
();
Map
<
Service
,
Connector
[]>
connectorsByService
=
((
TomcatWebServer
)
this
.
webServer
).
getServiceConnectors
();
assertThat
(
connectorsByService
.
values
().
iterator
().
next
()
.
length
).
isEqualTo
(
connectors
.
length
+
1
);
assertThat
(
connectorsByService
.
values
().
iterator
().
next
()
).
hasSize
(
connectors
.
length
+
1
);
}
}
@Test
@Test
...
...
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactoryTests.java
View file @
d4affd7f
...
@@ -225,7 +225,7 @@ class TomcatServletWebServerFactoryTests extends AbstractServletWebServerFactory
...
@@ -225,7 +225,7 @@ class TomcatServletWebServerFactoryTests extends AbstractServletWebServerFactory
factory
.
addAdditionalTomcatConnectors
(
connectors
);
factory
.
addAdditionalTomcatConnectors
(
connectors
);
this
.
webServer
=
factory
.
getWebServer
();
this
.
webServer
=
factory
.
getWebServer
();
Map
<
Service
,
Connector
[]>
connectorsByService
=
((
TomcatWebServer
)
this
.
webServer
).
getServiceConnectors
();
Map
<
Service
,
Connector
[]>
connectorsByService
=
((
TomcatWebServer
)
this
.
webServer
).
getServiceConnectors
();
assertThat
(
connectorsByService
.
values
().
iterator
().
next
()
.
length
).
isEqualTo
(
connectors
.
length
+
1
);
assertThat
(
connectorsByService
.
values
().
iterator
().
next
()
).
hasSize
(
connectors
.
length
+
1
);
}
}
@Test
@Test
...
...
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java
View file @
d4affd7f
...
@@ -665,7 +665,7 @@ public abstract class AbstractServletWebServerFactoryTests {
...
@@ -665,7 +665,7 @@ public abstract class AbstractServletWebServerFactoryTests {
getResponse
(
getLocalUrl
(
"/session"
));
getResponse
(
getLocalUrl
(
"/session"
));
this
.
webServer
.
stop
();
this
.
webServer
.
stop
();
File
[]
dirContents
=
sessionStoreDir
.
listFiles
((
dir
,
name
)
->
!(
"."
.
equals
(
name
)
||
".."
.
equals
(
name
)));
File
[]
dirContents
=
sessionStoreDir
.
listFiles
((
dir
,
name
)
->
!(
"."
.
equals
(
name
)
||
".."
.
equals
(
name
)));
assertThat
(
dirContents
.
length
).
isGreaterThan
(
0
);
assertThat
(
dirContents
).
isNotEmpty
(
);
}
}
@Test
@Test
...
...
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