Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
spring-cloud-netflix
Project
Overview
Details
Activity
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
openSource
spring-cloud-netflix
Commits
0f2fbf8e
Commit
0f2fbf8e
authored
Jun 08, 2015
by
Spencer Gibb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed test broken during rebase
parent
b746ad55
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
9 deletions
+1
-9
RibbonClientDefaultConfigurationTests.java
...ix/ribbon/test/RibbonClientDefaultConfigurationTests.java
+1
-9
No files found.
spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/test/RibbonClientDefaultConfigurationTests.java
View file @
0f2fbf8e
...
@@ -23,12 +23,10 @@ import static org.junit.Assert.assertThat;
...
@@ -23,12 +23,10 @@ import static org.junit.Assert.assertThat;
import
org.junit.Test
;
import
org.junit.Test
;
import
org.junit.runner.RunWith
;
import
org.junit.runner.RunWith
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.autoconfigure.EnableAutoConfiguration
;
import
org.springframework.boot.test.IntegrationTest
;
import
org.springframework.boot.test.IntegrationTest
;
import
org.springframework.boot.test.SpringApplicationConfiguration
;
import
org.springframework.boot.test.SpringApplicationConfiguration
;
import
org.springframework.cloud.netflix.ribbon.SpringClientFactory
;
import
org.springframework.cloud.netflix.ribbon.SpringClientFactory
;
import
org.springframework.cloud.netflix.ribbon.test.RibbonClientDefaultConfigurationTestsConfig.BazServiceList
;
import
org.springframework.cloud.netflix.ribbon.test.RibbonClientDefaultConfigurationTestsConfig.BazServiceList
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.test.annotation.DirtiesContext
;
import
org.springframework.test.annotation.DirtiesContext
;
import
org.springframework.test.context.junit4.SpringJUnit4ClassRunner
;
import
org.springframework.test.context.junit4.SpringJUnit4ClassRunner
;
...
@@ -43,7 +41,7 @@ import com.netflix.loadbalancer.ZoneAwareLoadBalancer;
...
@@ -43,7 +41,7 @@ import com.netflix.loadbalancer.ZoneAwareLoadBalancer;
* @author Spencer Gibb
* @author Spencer Gibb
*/
*/
@RunWith
(
SpringJUnit4ClassRunner
.
class
)
@RunWith
(
SpringJUnit4ClassRunner
.
class
)
@SpringApplicationConfiguration
(
classes
=
RibbonClientDefaultConfigurationTests
.
Test
Config
.
class
)
@SpringApplicationConfiguration
(
classes
=
RibbonClientDefaultConfigurationTestsConfig
.
class
)
@IntegrationTest
(
"ribbon.eureka.enabled=true"
)
@IntegrationTest
(
"ribbon.eureka.enabled=true"
)
@DirtiesContext
@DirtiesContext
public
class
RibbonClientDefaultConfigurationTests
{
public
class
RibbonClientDefaultConfigurationTests
{
...
@@ -80,10 +78,4 @@ public class RibbonClientDefaultConfigurationTests {
...
@@ -80,10 +78,4 @@ public class RibbonClientDefaultConfigurationTests {
is
(
instanceOf
(
ServerListSubsetFilter
.
class
)));
is
(
instanceOf
(
ServerListSubsetFilter
.
class
)));
}
}
@EnableAutoConfiguration
@Configuration
public
static
class
TestConfig
{
}
}
}
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