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
d1cf308b
Commit
d1cf308b
authored
Sep 18, 2017
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
parent
febf30ef
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
29 deletions
+25
-29
ConfigurationPropertiesReportEndpointAutoConfigurationTests.java
...rationPropertiesReportEndpointAutoConfigurationTests.java
+1
-1
EnvironmentEndpointAutoConfigurationTests.java
...figure/env/EnvironmentEndpointAutoConfigurationTests.java
+1
-1
RabbitAutoConfigurationTests.java
...boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java
+21
-26
EndpointMappingTests.java
...ringframework/boot/endpoint/web/EndpointMappingTests.java
+2
-1
No files found.
spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/context/properties/ConfigurationPropertiesReportEndpointAutoConfigurationTests.java
View file @
d1cf308b
...
@@ -68,7 +68,7 @@ public class ConfigurationPropertiesReportEndpointAutoConfigurationTests {
...
@@ -68,7 +68,7 @@ public class ConfigurationPropertiesReportEndpointAutoConfigurationTests {
private
ContextConsumer
<
AssertableApplicationContext
>
validateTestProperties
(
private
ContextConsumer
<
AssertableApplicationContext
>
validateTestProperties
(
String
dbPassword
,
String
myTestProperty
)
{
String
dbPassword
,
String
myTestProperty
)
{
return
context
->
{
return
(
context
)
->
{
assertThat
(
context
)
assertThat
(
context
)
.
hasSingleBean
(
ConfigurationPropertiesReportEndpoint
.
class
);
.
hasSingleBean
(
ConfigurationPropertiesReportEndpoint
.
class
);
ConfigurationPropertiesReportEndpoint
endpoint
=
context
ConfigurationPropertiesReportEndpoint
endpoint
=
context
...
...
spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/env/EnvironmentEndpointAutoConfigurationTests.java
View file @
d1cf308b
...
@@ -65,7 +65,7 @@ public class EnvironmentEndpointAutoConfigurationTests {
...
@@ -65,7 +65,7 @@ public class EnvironmentEndpointAutoConfigurationTests {
private
ContextConsumer
<
AssertableApplicationContext
>
validateSystemProperties
(
private
ContextConsumer
<
AssertableApplicationContext
>
validateSystemProperties
(
String
dbPassword
,
String
apiKey
)
{
String
dbPassword
,
String
apiKey
)
{
return
context
->
{
return
(
context
)
->
{
assertThat
(
context
).
hasSingleBean
(
EnvironmentEndpoint
.
class
);
assertThat
(
context
).
hasSingleBean
(
EnvironmentEndpoint
.
class
);
EnvironmentEndpoint
endpoint
=
context
.
getBean
(
EnvironmentEndpoint
.
class
);
EnvironmentEndpoint
endpoint
=
context
.
getBean
(
EnvironmentEndpoint
.
class
);
EnvironmentDescriptor
env
=
endpoint
.
environment
(
null
);
EnvironmentDescriptor
env
=
endpoint
.
environment
(
null
);
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java
View file @
d1cf308b
...
@@ -543,77 +543,72 @@ public class RabbitAutoConfigurationTests {
...
@@ -543,77 +543,72 @@ public class RabbitAutoConfigurationTests {
@Test
@Test
// Make sure that we at least attempt to load the store
// Make sure that we at least attempt to load the store
public
void
enableSslWithNonExistingKeystoreShouldFail
()
{
public
void
enableSslWithNonExistingKeystoreShouldFail
()
{
this
.
contextRunner
this
.
contextRunner
.
withUserConfiguration
(
TestConfiguration
.
class
)
.
withUserConfiguration
(
TestConfiguration
.
class
)
.
withPropertyValues
(
"spring.rabbitmq.ssl.enabled:true"
,
.
withPropertyValues
(
"spring.rabbitmq.ssl.enabled:true"
,
"spring.rabbitmq.ssl.keyStore=foo"
,
"spring.rabbitmq.ssl.keyStore=foo"
,
"spring.rabbitmq.ssl.keyStorePassword=secret"
)
"spring.rabbitmq.ssl.keyStorePassword=secret"
)
.
run
(
context
->
{
.
run
(
(
context
)
->
{
assertThat
(
context
).
hasFailed
();
assertThat
(
context
).
hasFailed
();
assertThat
(
context
).
getFailure
().
hasMessageContaining
(
"foo"
);
assertThat
(
context
).
getFailure
().
hasMessageContaining
(
"foo"
);
assertThat
(
context
).
getFailure
().
hasMessageContaining
(
"does not exist"
);
assertThat
(
context
).
getFailure
()
.
hasMessageContaining
(
"does not exist"
);
});
});
}
}
@Test
@Test
// Make sure that we at least attempt to load the store
// Make sure that we at least attempt to load the store
public
void
enableSslWithNonExistingTrustStoreShouldFail
()
{
public
void
enableSslWithNonExistingTrustStoreShouldFail
()
{
this
.
contextRunner
this
.
contextRunner
.
withUserConfiguration
(
TestConfiguration
.
class
)
.
withUserConfiguration
(
TestConfiguration
.
class
)
.
withPropertyValues
(
"spring.rabbitmq.ssl.enabled:true"
,
.
withPropertyValues
(
"spring.rabbitmq.ssl.enabled:true"
,
"spring.rabbitmq.ssl.trustStore=bar"
,
"spring.rabbitmq.ssl.trustStore=bar"
,
"spring.rabbitmq.ssl.trustStorePassword=secret"
)
"spring.rabbitmq.ssl.trustStorePassword=secret"
)
.
run
((
context
)
->
{
.
run
((
context
)
->
{
assertThat
(
context
).
hasFailed
();
assertThat
(
context
).
hasFailed
();
assertThat
(
context
).
getFailure
().
hasMessageContaining
(
"bar"
);
assertThat
(
context
).
getFailure
().
hasMessageContaining
(
"bar"
);
assertThat
(
context
).
getFailure
().
hasMessageContaining
(
"does not exist"
);
assertThat
(
context
).
getFailure
()
.
hasMessageContaining
(
"does not exist"
);
});
});
}
}
@Test
@Test
public
void
enableSslWithInvalidKeystoreTypeShouldFail
()
throws
Exception
{
public
void
enableSslWithInvalidKeystoreTypeShouldFail
()
throws
Exception
{
this
.
contextRunner
this
.
contextRunner
.
withUserConfiguration
(
TestConfiguration
.
class
)
.
withUserConfiguration
(
TestConfiguration
.
class
)
.
withPropertyValues
(
"spring.rabbitmq.ssl.enabled:true"
,
.
withPropertyValues
(
"spring.rabbitmq.ssl.enabled:true"
,
"spring.rabbitmq.ssl.keyStore=foo"
,
"spring.rabbitmq.ssl.keyStore=foo"
,
"spring.rabbitmq.ssl.keyStoreType=fooType"
)
"spring.rabbitmq.ssl.keyStoreType=fooType"
)
.
run
(
context
->
{
.
run
(
(
context
)
->
{
assertThat
(
context
).
hasFailed
();
assertThat
(
context
).
hasFailed
();
assertThat
(
context
).
getFailure
().
hasMessageContaining
(
"fooType"
);
assertThat
(
context
).
getFailure
().
hasMessageContaining
(
"fooType"
);
assertThat
(
context
).
getFailure
().
hasRootCauseInstanceOf
(
NoSuchAlgorithmException
.
class
);
assertThat
(
context
).
getFailure
()
.
hasRootCauseInstanceOf
(
NoSuchAlgorithmException
.
class
);
});
});
}
}
@Test
@Test
public
void
enableSslWithInvalidTrustStoreTypeShouldFail
()
throws
Exception
{
public
void
enableSslWithInvalidTrustStoreTypeShouldFail
()
throws
Exception
{
this
.
contextRunner
this
.
contextRunner
.
withUserConfiguration
(
TestConfiguration
.
class
)
.
withUserConfiguration
(
TestConfiguration
.
class
)
.
withPropertyValues
(
"spring.rabbitmq.ssl.enabled:true"
,
.
withPropertyValues
(
"spring.rabbitmq.ssl.enabled:true"
,
"spring.rabbitmq.ssl.trustStore=bar"
,
"spring.rabbitmq.ssl.trustStore=bar"
,
"spring.rabbitmq.ssl.trustStoreType=barType"
)
"spring.rabbitmq.ssl.trustStoreType=barType"
)
.
run
(
context
->
{
.
run
(
(
context
)
->
{
assertThat
(
context
).
hasFailed
();
assertThat
(
context
).
hasFailed
();
assertThat
(
context
).
getFailure
().
hasMessageContaining
(
"barType"
);
assertThat
(
context
).
getFailure
().
hasMessageContaining
(
"barType"
);
assertThat
(
context
).
getFailure
().
hasRootCauseInstanceOf
(
NoSuchAlgorithmException
.
class
);
assertThat
(
context
).
getFailure
()
.
hasRootCauseInstanceOf
(
NoSuchAlgorithmException
.
class
);
});
});
}
}
@Test
@Test
public
void
enableSslWithKeystoreTypeAndTrustStoreTypeShouldWork
()
throws
Exception
{
public
void
enableSslWithKeystoreTypeAndTrustStoreTypeShouldWork
()
throws
Exception
{
this
.
contextRunner
this
.
contextRunner
.
withUserConfiguration
(
TestConfiguration
.
class
)
.
withUserConfiguration
(
TestConfiguration
.
class
)
.
withPropertyValues
(
"spring.rabbitmq.ssl.enabled:true"
,
.
withPropertyValues
(
"spring.rabbitmq.ssl.enabled:true"
,
"spring.rabbitmq.ssl.keyStore=/org/springframework/boot/autoconfigure/amqp/test.jks"
,
"spring.rabbitmq.ssl.keyStore=/org/springframework/boot/autoconfigure/amqp/test.jks"
,
"spring.rabbitmq.ssl.keyStoreType=jks"
,
"spring.rabbitmq.ssl.keyStoreType=jks"
,
"spring.rabbitmq.ssl.keyStorePassword=secret"
,
"spring.rabbitmq.ssl.keyStorePassword=secret"
,
"spring.rabbitmq.ssl.trustStore=/org/springframework/boot/autoconfigure/amqp/test.jks"
,
"spring.rabbitmq.ssl.trustStore=/org/springframework/boot/autoconfigure/amqp/test.jks"
,
"spring.rabbitmq.ssl.trustStoreType=jks"
,
"spring.rabbitmq.ssl.trustStoreType=jks"
,
"spring.rabbitmq.ssl.trustStorePassword=secret"
)
"spring.rabbitmq.ssl.trustStorePassword=secret"
)
.
run
(
context
->
assertThat
(
context
).
hasNotFailed
());
.
run
(
(
context
)
->
assertThat
(
context
).
hasNotFailed
());
}
}
private
com
.
rabbitmq
.
client
.
ConnectionFactory
getTargetConnectionFactory
(
private
com
.
rabbitmq
.
client
.
ConnectionFactory
getTargetConnectionFactory
(
...
...
spring-boot/src/test/java/org/springframework/boot/endpoint/web/EndpointMappingTests.java
View file @
d1cf308b
...
@@ -70,7 +70,8 @@ public class EndpointMappingTests {
...
@@ -70,7 +70,8 @@ public class EndpointMappingTests {
@Test
@Test
public
void
subPathWithoutALeadingSlashIsSeparatedFromBasePathBySingleSlash
()
{
public
void
subPathWithoutALeadingSlashIsSeparatedFromBasePathBySingleSlash
()
{
assertThat
(
new
EndpointMapping
(
"/test"
).
createSubPath
(
"one"
)).
isEqualTo
(
"/test/one"
);
assertThat
(
new
EndpointMapping
(
"/test"
).
createSubPath
(
"one"
))
.
isEqualTo
(
"/test/one"
);
}
}
@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