Renames classes to reduce duplicate names.
This will make test failures easier to diagnose.
This commit is contained in:
@@ -7,9 +7,9 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
* @author Dave Syer
|
||||
*/
|
||||
@SpringBootApplication
|
||||
public class StandaloneClientApplication {
|
||||
public class BusApplication {
|
||||
|
||||
public static void main(String[] args) {
|
||||
SpringApplication.run(StandaloneClientApplication.class, args);
|
||||
SpringApplication.run(BusApplication.class, args);
|
||||
}
|
||||
}
|
||||
@@ -13,7 +13,7 @@ import org.springframework.test.context.junit4.SpringRunner;
|
||||
@RunWith(SpringRunner.class)
|
||||
@SpringBootTest
|
||||
@DirtiesContext
|
||||
public class StandaloneClientApplicationTests {
|
||||
public class BusApplicationTests {
|
||||
|
||||
@Autowired
|
||||
private ConfigServicePropertySourceLocator locator;
|
||||
@@ -7,9 +7,9 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
* @author Dave Syer
|
||||
*/
|
||||
@SpringBootApplication
|
||||
public class StandaloneClientApplication {
|
||||
public class ConfigClientApplication {
|
||||
|
||||
public static void main(String[] args) {
|
||||
SpringApplication.run(StandaloneClientApplication.class, args);
|
||||
SpringApplication.run(ConfigClientApplication.class, args);
|
||||
}
|
||||
}
|
||||
@@ -13,7 +13,7 @@ import org.springframework.test.context.junit4.SpringRunner;
|
||||
@RunWith(SpringRunner.class)
|
||||
@SpringBootTest
|
||||
@DirtiesContext
|
||||
public class StandaloneClientApplicationTests {
|
||||
public class ConfigClientApplicationTests {
|
||||
|
||||
@Autowired
|
||||
private ConfigServicePropertySourceLocator locator;
|
||||
@@ -8,10 +8,10 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
|
||||
* @author Dave Syer
|
||||
*/
|
||||
@SpringBootApplication
|
||||
public class StandaloneClientApplication {
|
||||
public class ConfigClientRetryApplication {
|
||||
|
||||
public static void main(String[] args) {
|
||||
new SpringApplicationBuilder(StandaloneClientApplication.class).properties(
|
||||
new SpringApplicationBuilder(ConfigClientRetryApplication.class).properties(
|
||||
"spring.cloud.config.enabled=true").run(args);
|
||||
}
|
||||
}
|
||||
@@ -34,7 +34,7 @@ import apps.ConfigServer;
|
||||
@SpringBootTest(properties={ "spring.cloud.config.enabled=true",
|
||||
"logging.level.org.springframework.retry=TRACE" })
|
||||
@DirtiesContext
|
||||
public class StandaloneClientApplicationTests {
|
||||
public class ConfigClientRetryApplicationTests {
|
||||
|
||||
@Autowired
|
||||
private ConfigServicePropertySourceLocator locator;
|
||||
@@ -9,7 +9,7 @@ import org.springframework.test.context.junit4.SpringRunner;
|
||||
@RunWith(SpringRunner.class)
|
||||
@SpringBootTest
|
||||
@DirtiesContext
|
||||
public class ConfigServerEurekaApplicationTests {
|
||||
public class ConfigServerBootstrapApplicationTests {
|
||||
|
||||
@Test
|
||||
public void contextLoads() {
|
||||
@@ -17,9 +17,9 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
|
||||
*/
|
||||
@SpringBootApplication
|
||||
@EnableDiscoveryClient
|
||||
public class StandaloneClientApplication implements CommandLineRunner {
|
||||
public class EurekaNoWebApplication implements CommandLineRunner {
|
||||
|
||||
private static Log logger = LogFactory.getLog(StandaloneClientApplication.class);
|
||||
private static Log logger = LogFactory.getLog(EurekaNoWebApplication.class);
|
||||
|
||||
@Autowired
|
||||
private DiscoveryClient client;
|
||||
@@ -31,6 +31,6 @@ public class StandaloneClientApplication implements CommandLineRunner {
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
SpringApplication.run(StandaloneClientApplication.class, args);
|
||||
SpringApplication.run(EurekaNoWebApplication.class, args);
|
||||
}
|
||||
}
|
||||
@@ -14,7 +14,7 @@ import static org.junit.Assert.assertTrue;
|
||||
@RunWith(SpringRunner.class)
|
||||
@SpringBootTest(properties = "eureka.client.enabled=false")
|
||||
@DirtiesContext
|
||||
public class DefaultStandaloneClientApplicationTests {
|
||||
public class DefaultEurekaNoWebApplicationTests {
|
||||
|
||||
@Autowired
|
||||
private DiscoveryClient discoveryClient;
|
||||
@@ -15,7 +15,7 @@ import org.springframework.test.context.junit4.SpringRunner;
|
||||
@RunWith(SpringRunner.class)
|
||||
@SpringBootTest
|
||||
@DirtiesContext
|
||||
public class StandaloneClientApplicationTests {
|
||||
public class EurekaNoWebApplicationTests {
|
||||
|
||||
@Autowired
|
||||
private DiscoveryClient discoveryClient;
|
||||
Reference in New Issue
Block a user