From 1b274cf3758a92cc80b126057ae31bdeea52eee1 Mon Sep 17 00:00:00 2001 From: nsingh Date: Sun, 22 Oct 2017 22:51:25 -0700 Subject: [PATCH] Renamed test cases --- .../conditionals/test/ConditionalsLiveHoverTest.java | 10 +++++----- ...{HelloConfig2.java => ConditionalOnBeanConfig.java} | 2 +- ...Config.java => ConditionalOnMissingBeanConfig.java} | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) rename headless-services/boot-java-language-server/src/test/resources/test-projects/test-conditionals-live-hover/src/main/java/example/{HelloConfig2.java => ConditionalOnBeanConfig.java} (92%) rename headless-services/boot-java-language-server/src/test/resources/test-projects/test-conditionals-live-hover/src/main/java/example/{HelloConfig.java => ConditionalOnMissingBeanConfig.java} (87%) diff --git a/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionals/test/ConditionalsLiveHoverTest.java b/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionals/test/ConditionalsLiveHoverTest.java index cbe73ead3..df17ef969 100644 --- a/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionals/test/ConditionalsLiveHoverTest.java +++ b/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionals/test/ConditionalsLiveHoverTest.java @@ -43,7 +43,7 @@ public class ConditionalsLiveHoverTest { File directory = new File( ProjectsHarness.class.getResource("/test-projects/test-conditionals-live-hover/").toURI()); - String docUri = "file://" +directory.getAbsolutePath() + "/src/main/java/example/HelloConfig.java"; + String docUri = "file://" +directory.getAbsolutePath() + "/src/main/java/example/ConditionalOnMissingBeanConfig.java"; harness.intialize(directory); @@ -59,7 +59,7 @@ public class ConditionalsLiveHoverTest { File directory = new File( ProjectsHarness.class.getResource("/test-projects/test-conditionals-live-hover/").toURI()); - String docUri = "file://" +directory.getAbsolutePath() + "/src/main/java/example/HelloConfig2.java"; + String docUri = "file://" +directory.getAbsolutePath() + "/src/main/java/example/ConditionalOnBeanConfig.java"; // Build a mock running boot app @@ -70,7 +70,7 @@ public class ConditionalsLiveHoverTest { .processId("22022") .host("cfapps.io") .processName("test-conditionals-live-hover") - .getAutoConfigReport("{\"positiveMatches\":{\"HelloConfig2#hi\":[{\"condition\":\"OnBeanCondition\",\"message\":\"@ConditionalOnBean (types: example.Hello; SearchStrategy: all) found bean 'missing'\"}]}}") + .getAutoConfigReport("{\"positiveMatches\":{\"ConditionalOnBeanConfig#hi\":[{\"condition\":\"OnBeanCondition\",\"message\":\"@ConditionalOnBean (types: example.Hello; SearchStrategy: all) found bean 'missing'\"}]}}") .build(); harness.intialize(directory); @@ -87,13 +87,13 @@ public class ConditionalsLiveHoverTest { File directory = new File( ProjectsHarness.class.getResource("/test-projects/test-conditionals-live-hover/").toURI()); - String docUri = "file://" + directory.getAbsolutePath() + "/src/main/java/example/HelloConfig.java"; + String docUri = "file://" + directory.getAbsolutePath() + "/src/main/java/example/ConditionalOnMissingBeanConfig.java"; // Build a mock running boot app mockAppProvider.builder().isSpringBootApp(true).containsLanguageServerProcessPropery(false).port("1111") .processId("22022").host("cfapps.io").processName("test-conditionals-live-hover") .getAutoConfigReport( - "{\"positiveMatches\":{\"HelloConfig#missing\":[{\"condition\":\"OnBeanCondition\",\"message\":\"@ConditionalOnMissingBean (types: example.Hello; SearchStrategy: all) did not find any beans\"}]}}") + "{\"positiveMatches\":{\"ConditionalOnMissingBeanConfig#missing\":[{\"condition\":\"OnBeanCondition\",\"message\":\"@ConditionalOnMissingBean (types: example.Hello; SearchStrategy: all) did not find any beans\"}]}}") .build(); harness.intialize(directory); diff --git a/headless-services/boot-java-language-server/src/test/resources/test-projects/test-conditionals-live-hover/src/main/java/example/HelloConfig2.java b/headless-services/boot-java-language-server/src/test/resources/test-projects/test-conditionals-live-hover/src/main/java/example/ConditionalOnBeanConfig.java similarity index 92% rename from headless-services/boot-java-language-server/src/test/resources/test-projects/test-conditionals-live-hover/src/main/java/example/HelloConfig2.java rename to headless-services/boot-java-language-server/src/test/resources/test-projects/test-conditionals-live-hover/src/main/java/example/ConditionalOnBeanConfig.java index 87f42dbc6..6864d51fd 100644 --- a/headless-services/boot-java-language-server/src/test/resources/test-projects/test-conditionals-live-hover/src/main/java/example/HelloConfig2.java +++ b/headless-services/boot-java-language-server/src/test/resources/test-projects/test-conditionals-live-hover/src/main/java/example/ConditionalOnBeanConfig.java @@ -6,7 +6,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @Configuration -public class HelloConfig2 { +public class ConditionalOnBeanConfig { @Bean @ConditionalOnBean diff --git a/headless-services/boot-java-language-server/src/test/resources/test-projects/test-conditionals-live-hover/src/main/java/example/HelloConfig.java b/headless-services/boot-java-language-server/src/test/resources/test-projects/test-conditionals-live-hover/src/main/java/example/ConditionalOnMissingBeanConfig.java similarity index 87% rename from headless-services/boot-java-language-server/src/test/resources/test-projects/test-conditionals-live-hover/src/main/java/example/HelloConfig.java rename to headless-services/boot-java-language-server/src/test/resources/test-projects/test-conditionals-live-hover/src/main/java/example/ConditionalOnMissingBeanConfig.java index 53eb8178e..e6c08b78a 100644 --- a/headless-services/boot-java-language-server/src/test/resources/test-projects/test-conditionals-live-hover/src/main/java/example/HelloConfig.java +++ b/headless-services/boot-java-language-server/src/test/resources/test-projects/test-conditionals-live-hover/src/main/java/example/ConditionalOnMissingBeanConfig.java @@ -5,7 +5,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @Configuration -public class HelloConfig { +public class ConditionalOnMissingBeanConfig { @Bean @ConditionalOnMissingBean