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
7d54eda6
Commit
7d54eda6
authored
Sep 07, 2018
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix tests
parent
0b07c026
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
54 additions
and
6 deletions
+54
-6
RabbitAutoConfigurationCompatibilityTests.java
...igure/amqp/RabbitAutoConfigurationCompatibilityTests.java
+49
-0
RabbitAutoConfigurationTests.java
...boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java
+5
-6
No files found.
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationCompatibilityTests.java
0 → 100644
View file @
7d54eda6
/*
* Copyright 2012-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org
.
springframework
.
boot
.
autoconfigure
.
amqp
;
import
javax.net.ssl.TrustManager
;
import
com.rabbitmq.client.NullTrustManager
;
import
org.junit.Test
;
import
org.junit.runner.RunWith
;
import
org.springframework.boot.junit.runner.classpath.ClassPathOverrides
;
import
org.springframework.boot.junit.runner.classpath.ModifiedClassPathRunner
;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
/**
* Compatibility tests for RabbitMQ with amqp-client 4.0.x
*
* @author Stephane Nicoll
*/
@RunWith
(
ModifiedClassPathRunner
.
class
)
@ClassPathOverrides
(
"com.rabbitmq:amqp-client:4.0.3"
)
public
class
RabbitAutoConfigurationCompatibilityTests
extends
RabbitAutoConfigurationTests
{
@Test
public
void
enableSslWithValidateServerCertificateFalse
()
{
load
(
TestConfiguration
.
class
,
"spring.rabbitmq.ssl.enabled:true"
,
"spring.rabbitmq.ssl.validateServerCertificate=false"
);
com
.
rabbitmq
.
client
.
ConnectionFactory
rabbitConnectionFactory
=
getTargetConnectionFactory
();
TrustManager
trustManager
=
getTrustManager
(
rabbitConnectionFactory
);
assertThat
(
trustManager
).
isInstanceOf
(
NullTrustManager
.
class
);
}
}
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java
View file @
7d54eda6
...
...
@@ -22,6 +22,7 @@ import javax.net.ssl.TrustManager;
import
com.rabbitmq.client.Address
;
import
com.rabbitmq.client.NullTrustManager
;
import
com.rabbitmq.client.TrustEverythingTrustManager
;
import
org.aopalliance.aop.Advice
;
import
org.junit.After
;
import
org.junit.Rule
;
...
...
@@ -66,8 +67,6 @@ import static org.mockito.Mockito.verify;
*
* @author Greg Turnquist
* @author Stephane Nicoll
* @author Gary Russell
* @author Stephane Nicoll
*/
public
class
RabbitAutoConfigurationTests
{
...
...
@@ -438,7 +437,7 @@ public class RabbitAutoConfigurationTests {
"spring.rabbitmq.ssl.validateServerCertificate=false"
);
com
.
rabbitmq
.
client
.
ConnectionFactory
rabbitConnectionFactory
=
getTargetConnectionFactory
();
TrustManager
trustManager
=
getTrustManager
(
rabbitConnectionFactory
);
assertThat
(
trustManager
).
isInstanceOf
(
Null
TrustManager
.
class
);
assertThat
(
trustManager
).
isInstanceOf
(
TrustEverything
TrustManager
.
class
);
}
@Test
...
...
@@ -449,7 +448,7 @@ public class RabbitAutoConfigurationTests {
assertThat
(
trustManager
).
isNotInstanceOf
(
NullTrustManager
.
class
);
}
pr
ivate
TrustManager
getTrustManager
(
pr
otected
TrustManager
getTrustManager
(
com
.
rabbitmq
.
client
.
ConnectionFactory
rabbitConnectionFactory
)
{
Object
sslContext
=
ReflectionTestUtils
.
getField
(
rabbitConnectionFactory
,
"sslContext"
);
...
...
@@ -461,7 +460,7 @@ public class RabbitAutoConfigurationTests {
return
(
TrustManager
)
trustManager
;
}
pr
ivate
com
.
rabbitmq
.
client
.
ConnectionFactory
getTargetConnectionFactory
()
{
pr
otected
com
.
rabbitmq
.
client
.
ConnectionFactory
getTargetConnectionFactory
()
{
CachingConnectionFactory
connectionFactory
=
this
.
context
.
getBean
(
CachingConnectionFactory
.
class
);
return
(
com
.
rabbitmq
.
client
.
ConnectionFactory
)
new
DirectFieldAccessor
(
...
...
@@ -475,7 +474,7 @@ public class RabbitAutoConfigurationTests {
return
expression
.
getValue
();
}
pr
ivate
void
load
(
Class
<?>
config
,
String
...
environment
)
{
pr
otected
void
load
(
Class
<?>
config
,
String
...
environment
)
{
load
(
new
Class
<?>[]
{
config
},
environment
);
}
...
...
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