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
384dfc91
Commit
384dfc91
authored
Dec 26, 2013
by
Christian Dupuis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix some tests to prevent JMX registration issues
parent
4ed4ed90
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
6 deletions
+13
-6
SpringApplicationHierarchyTests.java
...ctuate/autoconfigure/SpringApplicationHierarchyTests.java
+1
-1
BasicErrorControllerIntegrationTests.java
...oot/actuate/web/BasicErrorControllerIntegrationTests.java
+3
-1
BasicErrorControllerSpecialIntegrationTests.java
...uate/web/BasicErrorControllerSpecialIntegrationTests.java
+9
-4
No files found.
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/SpringApplicationHierarchyTests.java
View file @
384dfc91
...
...
@@ -61,7 +61,7 @@ public class SpringApplicationHierarchyTests {
}
@EnableAutoConfiguration
(
exclude
=
{
ServerPropertiesAutoConfiguration
.
class
,
JolokiaAutoConfiguration
.
class
})
JolokiaAutoConfiguration
.
class
,
EndpointMBeanExportAutoConfiguration
.
class
})
public
static
class
Parent
{
}
...
...
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/BasicErrorControllerIntegrationTests.java
View file @
384dfc91
...
...
@@ -26,6 +26,7 @@ import org.junit.Test;
import
org.junit.runner.RunWith
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.SpringApplication
;
import
org.springframework.boot.actuate.autoconfigure.EndpointMBeanExportAutoConfiguration
;
import
org.springframework.boot.actuate.autoconfigure.ManagementSecurityAutoConfiguration
;
import
org.springframework.boot.actuate.web.BasicErrorControllerIntegrationTests.TestConfiguration
;
import
org.springframework.boot.autoconfigure.EnableAutoConfiguration
;
...
...
@@ -84,7 +85,8 @@ public class BasicErrorControllerIntegrationTests {
@Configuration
@EnableAutoConfiguration
(
exclude
=
{
SecurityAutoConfiguration
.
class
,
ManagementSecurityAutoConfiguration
.
class
})
ManagementSecurityAutoConfiguration
.
class
,
EndpointMBeanExportAutoConfiguration
.
class
})
public
static
class
TestConfiguration
{
// For manual testing
...
...
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/BasicErrorControllerSpecialIntegrationTests.java
View file @
384dfc91
...
...
@@ -19,6 +19,7 @@ package org.springframework.boot.actuate.web;
import
org.junit.After
;
import
org.junit.Test
;
import
org.springframework.boot.SpringApplication
;
import
org.springframework.boot.actuate.autoconfigure.EndpointMBeanExportAutoConfiguration
;
import
org.springframework.boot.actuate.autoconfigure.ManagementSecurityAutoConfiguration
;
import
org.springframework.boot.autoconfigure.EnableAutoConfiguration
;
import
org.springframework.boot.autoconfigure.security.SecurityAutoConfiguration
;
...
...
@@ -80,14 +81,16 @@ public class BasicErrorControllerSpecialIntegrationTests {
@Configuration
@EnableAutoConfiguration
(
exclude
=
{
SecurityAutoConfiguration
.
class
,
ManagementSecurityAutoConfiguration
.
class
})
ManagementSecurityAutoConfiguration
.
class
,
EndpointMBeanExportAutoConfiguration
.
class
})
protected
static
class
ParentConfiguration
{
}
@Configuration
@EnableAutoConfiguration
(
exclude
=
{
SecurityAutoConfiguration
.
class
,
ManagementSecurityAutoConfiguration
.
class
})
ManagementSecurityAutoConfiguration
.
class
,
EndpointMBeanExportAutoConfiguration
.
class
})
@EnableWebMvc
protected
static
class
WebMvcIncludedConfiguration
{
// For manual testing
...
...
@@ -99,7 +102,8 @@ public class BasicErrorControllerSpecialIntegrationTests {
@Configuration
@EnableAutoConfiguration
(
exclude
=
{
SecurityAutoConfiguration
.
class
,
ManagementSecurityAutoConfiguration
.
class
})
ManagementSecurityAutoConfiguration
.
class
,
EndpointMBeanExportAutoConfiguration
.
class
})
protected
static
class
VanillaConfiguration
{
// For manual testing
public
static
void
main
(
String
[]
args
)
{
...
...
@@ -110,7 +114,8 @@ public class BasicErrorControllerSpecialIntegrationTests {
@Configuration
@EnableAutoConfiguration
(
exclude
=
{
SecurityAutoConfiguration
.
class
,
ManagementSecurityAutoConfiguration
.
class
})
ManagementSecurityAutoConfiguration
.
class
,
EndpointMBeanExportAutoConfiguration
.
class
})
protected
static
class
ChildConfiguration
{
// For manual testing
public
static
void
main
(
String
[]
args
)
{
...
...
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