mirror of
https://gitee.com/dcren/initializr.git
synced 2025-09-18 17:48:14 +08:00
Polish migration to JUnit5
See gh-802
This commit is contained in:
@@ -37,11 +37,10 @@ import static org.assertj.core.api.Assertions.assertThat;
|
||||
*/
|
||||
@ActiveProfiles("test-default")
|
||||
@SpringBootTest(classes = Config.class, webEnvironment = WebEnvironment.RANDOM_PORT, properties = "management.endpoints.web.exposure.include=info,metrics")
|
||||
public class ActuatorIntegrationTests
|
||||
extends AbstractFullStackInitializrIntegrationTests {
|
||||
class ActuatorIntegrationTests extends AbstractFullStackInitializrIntegrationTests {
|
||||
|
||||
@Test
|
||||
public void infoHasExternalProperties() {
|
||||
void infoHasExternalProperties() {
|
||||
String body = getRestTemplate().getForObject(createUrl("/actuator/info"),
|
||||
String.class);
|
||||
assertThat(body).contains("\"spring-boot\"");
|
||||
@@ -49,7 +48,7 @@ public class ActuatorIntegrationTests
|
||||
}
|
||||
|
||||
@Test
|
||||
public void metricsAreRegistered() {
|
||||
void metricsAreRegistered() {
|
||||
downloadZip("/starter.zip?packaging=jar&javaVersion=1.8&style=web&style=jpa");
|
||||
JsonNode result = metricsEndpoint();
|
||||
JsonNode names = result.get("names");
|
||||
|
@@ -33,7 +33,7 @@ import static org.assertj.core.api.Assertions.assertThat;
|
||||
*
|
||||
* @author Madhura Bhave
|
||||
*/
|
||||
public class InitializrActuatorEndpointsAutoConfigurationTests {
|
||||
class InitializrActuatorEndpointsAutoConfigurationTests {
|
||||
|
||||
private ApplicationContextRunner contextRunner = new ApplicationContextRunner()
|
||||
.withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class,
|
||||
@@ -42,13 +42,13 @@ public class InitializrActuatorEndpointsAutoConfigurationTests {
|
||||
InitializrActuatorEndpointsAutoConfiguration.class));
|
||||
|
||||
@Test
|
||||
public void autoConfigRegistersBomRangesInfoContributor() {
|
||||
void autoConfigRegistersBomRangesInfoContributor() {
|
||||
this.contextRunner.run((context) -> assertThat(context)
|
||||
.hasSingleBean(BomRangesInfoContributor.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void autoConfigRegistersDependencyRangesInfoContributor() {
|
||||
void autoConfigRegistersDependencyRangesInfoContributor() {
|
||||
this.contextRunner.run((context) -> assertThat(context)
|
||||
.hasSingleBean(DependencyRangesInfoContributor.class));
|
||||
}
|
||||
|
@@ -33,7 +33,7 @@ import static org.assertj.core.api.Assertions.assertThat;
|
||||
*
|
||||
* @author Madhura Bhave
|
||||
*/
|
||||
public class InitializrMetricsAutoConfigurationTests {
|
||||
class InitializrMetricsAutoConfigurationTests {
|
||||
|
||||
private ApplicationContextRunner contextRunner = new ApplicationContextRunner()
|
||||
.withConfiguration(AutoConfigurations.of(MetricsAutoConfiguration.class,
|
||||
@@ -41,13 +41,13 @@ public class InitializrMetricsAutoConfigurationTests {
|
||||
InitializrMetricsAutoConfiguration.class));
|
||||
|
||||
@Test
|
||||
public void autoConfigRegistersProjectGenerationMetricsListenerBean() {
|
||||
void autoConfigRegistersProjectGenerationMetricsListenerBean() {
|
||||
this.contextRunner.run((context) -> assertThat(context)
|
||||
.hasSingleBean(ProjectGenerationMetricsListener.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void autoConfigConditionalOnMeterRegistryClass() {
|
||||
void autoConfigConditionalOnMeterRegistryClass() {
|
||||
this.contextRunner.withClassLoader(new FilteredClassLoader(MeterRegistry.class))
|
||||
.run((context) -> assertThat(context)
|
||||
.doesNotHaveBean(ProjectGenerationMetricsListener.class));
|
||||
|
@@ -45,7 +45,7 @@ import static org.mockito.Mockito.mock;
|
||||
* @author Stephane Nicoll
|
||||
* @author Madhura Bhave
|
||||
*/
|
||||
public class InitializrStatsAutoConfigurationTests {
|
||||
class InitializrStatsAutoConfigurationTests {
|
||||
|
||||
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
|
||||
.withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class,
|
||||
@@ -54,7 +54,7 @@ public class InitializrStatsAutoConfigurationTests {
|
||||
InitializrStatsAutoConfiguration.class));
|
||||
|
||||
@Test
|
||||
public void autoConfigRegistersProjectGenerationStatPublisher() {
|
||||
void autoConfigRegistersProjectGenerationStatPublisher() {
|
||||
this.contextRunner
|
||||
.withPropertyValues("initializr.stats.elastic.uri=http://localhost:9200")
|
||||
.run((context) -> assertThat(context)
|
||||
@@ -62,14 +62,14 @@ public class InitializrStatsAutoConfigurationTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void autoConfigRegistersRetryTemplate() {
|
||||
void autoConfigRegistersRetryTemplate() {
|
||||
this.contextRunner
|
||||
.withPropertyValues("initializr.stats.elastic.uri=http://localhost:9200")
|
||||
.run((context) -> assertThat(context).hasSingleBean(RetryTemplate.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void statsRetryTemplateConditionalOnMissingBean() {
|
||||
void statsRetryTemplateConditionalOnMissingBean() {
|
||||
this.contextRunner
|
||||
.withUserConfiguration(CustomStatsRetryTemplateConfiguration.class)
|
||||
.withPropertyValues("initializr.stats.elastic.uri=http://localhost:9200")
|
||||
@@ -83,7 +83,7 @@ public class InitializrStatsAutoConfigurationTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void customRestTemplateBuilderIsUsed() {
|
||||
void customRestTemplateBuilderIsUsed() {
|
||||
this.contextRunner.withUserConfiguration(CustomRestTemplateConfiguration.class)
|
||||
.withPropertyValues("initializr.stats.elastic.uri=http://localhost:9200")
|
||||
.run((context) -> {
|
||||
|
@@ -34,10 +34,10 @@ import static org.assertj.core.api.Assertions.entry;
|
||||
*
|
||||
* @author Stephane Nicoll
|
||||
*/
|
||||
public class BomRangesInfoContributorTests {
|
||||
class BomRangesInfoContributorTests {
|
||||
|
||||
@Test
|
||||
public void noBom() {
|
||||
void noBom() {
|
||||
InitializrMetadata metadata = InitializrMetadataTestBuilder.withDefaults()
|
||||
.build();
|
||||
Info info = getInfo(metadata);
|
||||
@@ -45,7 +45,7 @@ public class BomRangesInfoContributorTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void noMapping() {
|
||||
void noMapping() {
|
||||
BillOfMaterials bom = BillOfMaterials.create("com.example", "bom", "1.0.0");
|
||||
InitializrMetadata metadata = InitializrMetadataTestBuilder.withDefaults()
|
||||
.addBom("foo", bom).build();
|
||||
@@ -54,7 +54,7 @@ public class BomRangesInfoContributorTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void withMappings() {
|
||||
void withMappings() {
|
||||
BillOfMaterials bom = BillOfMaterials.create("com.example", "bom", "1.0.0");
|
||||
bom.getMappings().add(
|
||||
BillOfMaterials.Mapping.create("[1.3.0.RELEASE,1.3.8.RELEASE]", "1.1.0"));
|
||||
|
@@ -35,10 +35,10 @@ import static org.assertj.core.api.Assertions.entry;
|
||||
*
|
||||
* @author Stephane Nicoll
|
||||
*/
|
||||
public class DependencyRangesInfoContributorTests {
|
||||
class DependencyRangesInfoContributorTests {
|
||||
|
||||
@Test
|
||||
public void noDependencyWithVersion() {
|
||||
void noDependencyWithVersion() {
|
||||
InitializrMetadata metadata = InitializrMetadataTestBuilder.withDefaults()
|
||||
.build();
|
||||
Info info = getInfo(metadata);
|
||||
@@ -46,7 +46,7 @@ public class DependencyRangesInfoContributorTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void dependencyWithNoMapping() {
|
||||
void dependencyWithNoMapping() {
|
||||
Dependency dependency = Dependency.withId("foo", "com.example", "foo",
|
||||
"1.2.3.RELEASE");
|
||||
InitializrMetadata metadata = InitializrMetadataTestBuilder.withDefaults()
|
||||
@@ -56,7 +56,7 @@ public class DependencyRangesInfoContributorTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void dependencyWithRangeOnArtifact() {
|
||||
void dependencyWithRangeOnArtifact() {
|
||||
Dependency dependency = Dependency.withId("foo", "com.example", "foo",
|
||||
"1.2.3.RELEASE");
|
||||
dependency.getMappings().add(Dependency.Mapping
|
||||
@@ -68,7 +68,7 @@ public class DependencyRangesInfoContributorTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void dependencyWithRangeAndBom() {
|
||||
void dependencyWithRangeAndBom() {
|
||||
BillOfMaterials bom = BillOfMaterials.create("com.example", "bom", "1.0.0");
|
||||
Dependency dependency = Dependency.withId("foo", "com.example", "foo",
|
||||
"1.2.3.RELEASE");
|
||||
@@ -82,7 +82,7 @@ public class DependencyRangesInfoContributorTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void dependencyNoMappingSimpleRange() {
|
||||
void dependencyNoMappingSimpleRange() {
|
||||
Dependency dependency = Dependency.withId("foo", "com.example", "foo",
|
||||
"1.2.3.RELEASE");
|
||||
dependency.setVersionRange("[1.1.0.RELEASE, 1.5.0.RELEASE)");
|
||||
@@ -101,7 +101,7 @@ public class DependencyRangesInfoContributorTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void dependencyWithMappingAndOpenRange() {
|
||||
void dependencyWithMappingAndOpenRange() {
|
||||
Dependency dependency = Dependency.withId("foo", null, null, "0.3.0.RELEASE");
|
||||
dependency.getMappings().add(Dependency.Mapping
|
||||
.create("[1.1.0.RELEASE, 1.2.0.RELEASE)", null, null, "0.1.0.RELEASE"));
|
||||
@@ -118,7 +118,7 @@ public class DependencyRangesInfoContributorTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void dependencyWithMappingAndNoOpenRange() {
|
||||
void dependencyWithMappingAndNoOpenRange() {
|
||||
Dependency dependency = Dependency.withId("foo", null, null, "0.3.0.RELEASE");
|
||||
dependency.getMappings().add(Dependency.Mapping
|
||||
.create("[1.1.0.RELEASE, 1.2.0.RELEASE)", null, null, "0.1.0.RELEASE"));
|
||||
|
@@ -32,7 +32,7 @@ import org.junit.jupiter.api.Test;
|
||||
/**
|
||||
* @author Stephane Nicoll
|
||||
*/
|
||||
public class ProjectGenerationMetricsListenerTests {
|
||||
class ProjectGenerationMetricsListenerTests {
|
||||
|
||||
private InitializrMetadata metadata = InitializrMetadataTestBuilder.withDefaults()
|
||||
.addDependencyGroup("core", "web", "security", "spring-data").build();
|
||||
@@ -49,7 +49,7 @@ public class ProjectGenerationMetricsListenerTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void projectGenerationCount() {
|
||||
void projectGenerationCount() {
|
||||
ProjectRequest request = initialize();
|
||||
request.resolve(this.metadata);
|
||||
fireProjectGeneratedEvent(request);
|
||||
@@ -57,7 +57,7 @@ public class ProjectGenerationMetricsListenerTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void projectGenerationCountWithFailure() {
|
||||
void projectGenerationCountWithFailure() {
|
||||
ProjectRequest request = initialize();
|
||||
request.resolve(this.metadata);
|
||||
fireProjectFailedEvent(request);
|
||||
@@ -66,7 +66,7 @@ public class ProjectGenerationMetricsListenerTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void dependencies() {
|
||||
void dependencies() {
|
||||
ProjectRequest request = initialize();
|
||||
request.getStyle().addAll(Arrays.asList("security", "spring-data"));
|
||||
request.resolve(this.metadata);
|
||||
@@ -76,7 +76,7 @@ public class ProjectGenerationMetricsListenerTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void noDependencies() {
|
||||
void noDependencies() {
|
||||
ProjectRequest request = initialize();
|
||||
request.resolve(this.metadata);
|
||||
fireProjectGeneratedEvent(request);
|
||||
@@ -84,7 +84,7 @@ public class ProjectGenerationMetricsListenerTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void resolvedWebDependency() {
|
||||
void resolvedWebDependency() {
|
||||
ProjectRequest request = initialize();
|
||||
request.getStyle().add("spring-data");
|
||||
request.setPackaging("war");
|
||||
@@ -95,7 +95,7 @@ public class ProjectGenerationMetricsListenerTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void aliasedDependencyUseStandardId() {
|
||||
void aliasedDependencyUseStandardId() {
|
||||
Dependency dependency = new Dependency();
|
||||
dependency.setId("foo");
|
||||
dependency.getAliases().add("foo-old");
|
||||
@@ -111,7 +111,7 @@ public class ProjectGenerationMetricsListenerTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void defaultType() {
|
||||
void defaultType() {
|
||||
ProjectRequest request = initialize();
|
||||
request.resolve(this.metadata);
|
||||
fireProjectGeneratedEvent(request);
|
||||
@@ -119,7 +119,7 @@ public class ProjectGenerationMetricsListenerTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void explicitType() {
|
||||
void explicitType() {
|
||||
ProjectRequest request = initialize();
|
||||
request.setType("gradle-build");
|
||||
request.resolve(this.metadata);
|
||||
@@ -128,7 +128,7 @@ public class ProjectGenerationMetricsListenerTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void defaultPackaging() {
|
||||
void defaultPackaging() {
|
||||
ProjectRequest request = initialize();
|
||||
request.resolve(this.metadata);
|
||||
fireProjectGeneratedEvent(request);
|
||||
@@ -136,7 +136,7 @@ public class ProjectGenerationMetricsListenerTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void explicitPackaging() {
|
||||
void explicitPackaging() {
|
||||
ProjectRequest request = initialize();
|
||||
request.setPackaging("war");
|
||||
request.resolve(this.metadata);
|
||||
@@ -145,7 +145,7 @@ public class ProjectGenerationMetricsListenerTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void defaultJavaVersion() {
|
||||
void defaultJavaVersion() {
|
||||
ProjectRequest request = initialize();
|
||||
request.resolve(this.metadata);
|
||||
fireProjectGeneratedEvent(request);
|
||||
@@ -153,7 +153,7 @@ public class ProjectGenerationMetricsListenerTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void explicitJavaVersion() {
|
||||
void explicitJavaVersion() {
|
||||
ProjectRequest request = initialize();
|
||||
request.setJavaVersion("1.7");
|
||||
request.resolve(this.metadata);
|
||||
@@ -162,7 +162,7 @@ public class ProjectGenerationMetricsListenerTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void defaultLanguage() {
|
||||
void defaultLanguage() {
|
||||
ProjectRequest request = initialize();
|
||||
request.resolve(this.metadata);
|
||||
fireProjectGeneratedEvent(request);
|
||||
@@ -170,7 +170,7 @@ public class ProjectGenerationMetricsListenerTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void explicitGroovyLanguage() {
|
||||
void explicitGroovyLanguage() {
|
||||
ProjectRequest request = initialize();
|
||||
request.setLanguage("groovy");
|
||||
request.resolve(this.metadata);
|
||||
@@ -179,7 +179,7 @@ public class ProjectGenerationMetricsListenerTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void explicitKotlinLanguage() {
|
||||
void explicitKotlinLanguage() {
|
||||
ProjectRequest request = initialize();
|
||||
request.setLanguage("kotlin");
|
||||
request.resolve(this.metadata);
|
||||
@@ -188,7 +188,7 @@ public class ProjectGenerationMetricsListenerTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void defaultBootVersion() {
|
||||
void defaultBootVersion() {
|
||||
ProjectRequest request = initialize();
|
||||
request.resolve(this.metadata);
|
||||
fireProjectGeneratedEvent(request);
|
||||
@@ -196,7 +196,7 @@ public class ProjectGenerationMetricsListenerTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void explicitBootVersion() {
|
||||
void explicitBootVersion() {
|
||||
ProjectRequest request = initialize();
|
||||
request.setBootVersion("1.5.17.RELEASE");
|
||||
request.resolve(this.metadata);
|
||||
@@ -205,7 +205,7 @@ public class ProjectGenerationMetricsListenerTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void userAgentAvailable() {
|
||||
void userAgentAvailable() {
|
||||
ProjectRequest request = initialize();
|
||||
request.getParameters().put("user-agent", "HTTPie/0.9.2");
|
||||
request.resolve(this.metadata);
|
||||
@@ -214,7 +214,7 @@ public class ProjectGenerationMetricsListenerTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void collectAllMetrics() {
|
||||
void collectAllMetrics() {
|
||||
ProjectRequest request = initialize();
|
||||
request.getStyle().addAll(Arrays.asList("web", "security"));
|
||||
request.setType("gradle-project");
|
||||
@@ -234,7 +234,7 @@ public class ProjectGenerationMetricsListenerTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void incrementMetrics() {
|
||||
void incrementMetrics() {
|
||||
ProjectRequest request = initialize();
|
||||
request.getStyle().addAll(Arrays.asList("security", "spring-data"));
|
||||
request.resolve(this.metadata);
|
||||
|
@@ -47,7 +47,7 @@ import static org.assertj.core.api.Assertions.fail;
|
||||
*/
|
||||
@Import(StatsMockController.class)
|
||||
@ActiveProfiles({ "test-default", "test-custom-stats" })
|
||||
public class MainControllerStatsIntegrationTests
|
||||
class MainControllerStatsIntegrationTests
|
||||
extends AbstractFullStackInitializrIntegrationTests {
|
||||
|
||||
@Autowired
|
||||
@@ -65,7 +65,7 @@ public class MainControllerStatsIntegrationTests
|
||||
}
|
||||
|
||||
@Test
|
||||
public void simpleProject() {
|
||||
void simpleProject() {
|
||||
downloadArchive("/starter.zip?groupId=com.foo&artifactId=bar&dependencies=web");
|
||||
assertThat(this.statsMockController.stats).as("No stat got generated").hasSize(1);
|
||||
StatsMockController.Content content = this.statsMockController.stats.get(0);
|
||||
@@ -79,7 +79,7 @@ public class MainControllerStatsIntegrationTests
|
||||
}
|
||||
|
||||
@Test
|
||||
public void authorizationHeaderIsSet() {
|
||||
void authorizationHeaderIsSet() {
|
||||
downloadArchive("/starter.zip");
|
||||
assertThat(this.statsMockController.stats).as("No stat got generated").hasSize(1);
|
||||
StatsMockController.Content content = this.statsMockController.stats.get(0);
|
||||
@@ -94,7 +94,7 @@ public class MainControllerStatsIntegrationTests
|
||||
}
|
||||
|
||||
@Test
|
||||
public void requestIpNotSetByDefault() {
|
||||
void requestIpNotSetByDefault() {
|
||||
downloadArchive("/starter.zip?groupId=com.foo&artifactId=bar&dependencies=web");
|
||||
assertThat(this.statsMockController.stats).as("No stat got generated").hasSize(1);
|
||||
StatsMockController.Content content = this.statsMockController.stats.get(0);
|
||||
@@ -105,7 +105,7 @@ public class MainControllerStatsIntegrationTests
|
||||
}
|
||||
|
||||
@Test
|
||||
public void requestIpIsSetWhenHeaderIsPresent() throws Exception {
|
||||
void requestIpIsSetWhenHeaderIsPresent() throws Exception {
|
||||
RequestEntity<?> request = RequestEntity.get(new URI(createUrl("/starter.zip")))
|
||||
.header("X-FORWARDED-FOR", "10.0.0.123").build();
|
||||
getRestTemplate().exchange(request, String.class);
|
||||
@@ -118,7 +118,7 @@ public class MainControllerStatsIntegrationTests
|
||||
}
|
||||
|
||||
@Test
|
||||
public void requestIpv4IsNotSetWhenHeaderHasGarbage() throws Exception {
|
||||
void requestIpv4IsNotSetWhenHeaderHasGarbage() throws Exception {
|
||||
RequestEntity<?> request = RequestEntity.get(new URI(createUrl("/starter.zip")))
|
||||
.header("x-forwarded-for", "foo-bar").build();
|
||||
getRestTemplate().exchange(request, String.class);
|
||||
@@ -132,7 +132,7 @@ public class MainControllerStatsIntegrationTests
|
||||
}
|
||||
|
||||
@Test
|
||||
public void requestCountryIsNotSetWhenHeaderIsSetToXX() throws Exception {
|
||||
void requestCountryIsNotSetWhenHeaderIsSetToXX() throws Exception {
|
||||
RequestEntity<?> request = RequestEntity.get(new URI(createUrl("/starter.zip")))
|
||||
.header("cf-ipcountry", "XX").build();
|
||||
getRestTemplate().exchange(request, String.class);
|
||||
@@ -146,7 +146,7 @@ public class MainControllerStatsIntegrationTests
|
||||
}
|
||||
|
||||
@Test
|
||||
public void invalidProjectSillHasStats() {
|
||||
void invalidProjectSillHasStats() {
|
||||
try {
|
||||
downloadArchive("/starter.zip?type=invalid-type");
|
||||
fail("Should have failed to generate project with invalid type");
|
||||
@@ -167,7 +167,7 @@ public class MainControllerStatsIntegrationTests
|
||||
}
|
||||
|
||||
@Test
|
||||
public void errorPublishingStatsDoesNotBubbleUp() {
|
||||
void errorPublishingStatsDoesNotBubbleUp() {
|
||||
this.projectGenerationStatPublisher.updateRequestUrl(
|
||||
URI.create("http://localhost:" + this.port + "/elastic-error"));
|
||||
downloadArchive("/starter.zip");
|
||||
|
@@ -46,7 +46,7 @@ import static org.springframework.test.web.client.response.MockRestResponseCreat
|
||||
*
|
||||
* @author Stephane Nicoll
|
||||
*/
|
||||
public class ProjectGenerationStatPublisherTests extends AbstractInitializrStatTests {
|
||||
class ProjectGenerationStatPublisherTests extends AbstractInitializrStatTests {
|
||||
|
||||
private RetryTemplate retryTemplate;
|
||||
|
||||
@@ -70,7 +70,7 @@ public class ProjectGenerationStatPublisherTests extends AbstractInitializrStatT
|
||||
}
|
||||
|
||||
@Test
|
||||
public void publishDocumentWithUserNameAndPassword() {
|
||||
void publishDocumentWithUserNameAndPassword() {
|
||||
StatsProperties properties = new StatsProperties();
|
||||
properties.getElastic().setUri("http://example.com/elastic");
|
||||
properties.getElastic().setUsername("foo");
|
||||
@@ -81,7 +81,7 @@ public class ProjectGenerationStatPublisherTests extends AbstractInitializrStatT
|
||||
}
|
||||
|
||||
@Test
|
||||
public void publishDocumentWithUserInfo() {
|
||||
void publishDocumentWithUserInfo() {
|
||||
StatsProperties properties = new StatsProperties();
|
||||
properties.getElastic().setUri("https://elastic:secret@es.example.com");
|
||||
configureService(properties);
|
||||
@@ -90,7 +90,7 @@ public class ProjectGenerationStatPublisherTests extends AbstractInitializrStatT
|
||||
}
|
||||
|
||||
@Test
|
||||
public void publishDocumentWithUserInfoOverridesUserNamePassword() {
|
||||
void publishDocumentWithUserInfoOverridesUserNamePassword() {
|
||||
StatsProperties properties = new StatsProperties();
|
||||
properties.getElastic().setUri("https://elastic:secret@es.example.com");
|
||||
properties.getElastic().setUsername("another");
|
||||
@@ -101,7 +101,7 @@ public class ProjectGenerationStatPublisherTests extends AbstractInitializrStatT
|
||||
}
|
||||
|
||||
@Test
|
||||
public void publishDocumentWithNoAuthentication() {
|
||||
void publishDocumentWithNoAuthentication() {
|
||||
StatsProperties properties = new StatsProperties();
|
||||
properties.getElastic().setUri("https://example.com/test/");
|
||||
configureService(properties);
|
||||
@@ -125,7 +125,7 @@ public class ProjectGenerationStatPublisherTests extends AbstractInitializrStatT
|
||||
}
|
||||
|
||||
@Test
|
||||
public void publishDocument() {
|
||||
void publishDocument() {
|
||||
ProjectRequest request = createProjectRequest();
|
||||
request.setGroupId("com.example.foo");
|
||||
request.setArtifactId("my-project");
|
||||
@@ -143,7 +143,7 @@ public class ProjectGenerationStatPublisherTests extends AbstractInitializrStatT
|
||||
}
|
||||
|
||||
@Test
|
||||
public void recoverFromError() {
|
||||
void recoverFromError() {
|
||||
ProjectRequest request = createProjectRequest();
|
||||
|
||||
this.mockServer.expect(requestTo("http://example.com/elastic/initializr/request"))
|
||||
@@ -165,7 +165,7 @@ public class ProjectGenerationStatPublisherTests extends AbstractInitializrStatT
|
||||
}
|
||||
|
||||
@Test
|
||||
public void fatalErrorOnlyLogs() {
|
||||
void fatalErrorOnlyLogs() {
|
||||
ProjectRequest request = createProjectRequest();
|
||||
this.retryTemplate.setRetryPolicy(new SimpleRetryPolicy(2,
|
||||
Collections.singletonMap(Exception.class, true)));
|
||||
|
@@ -28,13 +28,13 @@ import static org.assertj.core.api.Assertions.assertThat;
|
||||
/**
|
||||
* @author Stephane Nicoll
|
||||
*/
|
||||
public class ProjectRequestDocumentFactoryTests extends AbstractInitializrStatTests {
|
||||
class ProjectRequestDocumentFactoryTests extends AbstractInitializrStatTests {
|
||||
|
||||
private final ProjectRequestDocumentFactory factory = new ProjectRequestDocumentFactory(
|
||||
createProvider(getMetadata()));
|
||||
|
||||
@Test
|
||||
public void createDocumentForSimpleProject() {
|
||||
void createDocumentForSimpleProject() {
|
||||
ProjectRequest request = createProjectRequest();
|
||||
ProjectGeneratedEvent event = new ProjectGeneratedEvent(request);
|
||||
ProjectRequestDocument document = this.factory.createDocument(event);
|
||||
@@ -53,7 +53,7 @@ public class ProjectRequestDocumentFactoryTests extends AbstractInitializrStatTe
|
||||
}
|
||||
|
||||
@Test
|
||||
public void createDocumentWithRequestIp() {
|
||||
void createDocumentWithRequestIp() {
|
||||
ProjectRequest request = createProjectRequest();
|
||||
request.getParameters().put("x-forwarded-for", "10.0.0.123");
|
||||
ProjectGeneratedEvent event = new ProjectGeneratedEvent(request);
|
||||
@@ -64,7 +64,7 @@ public class ProjectRequestDocumentFactoryTests extends AbstractInitializrStatTe
|
||||
}
|
||||
|
||||
@Test
|
||||
public void createDocumentWithRequestIpv6() {
|
||||
void createDocumentWithRequestIpv6() {
|
||||
ProjectRequest request = createProjectRequest();
|
||||
request.getParameters().put("x-forwarded-for", "2001:db8:a0b:12f0::1");
|
||||
ProjectGeneratedEvent event = new ProjectGeneratedEvent(request);
|
||||
@@ -75,7 +75,7 @@ public class ProjectRequestDocumentFactoryTests extends AbstractInitializrStatTe
|
||||
}
|
||||
|
||||
@Test
|
||||
public void createDocumentWithCloudFlareHeaders() {
|
||||
void createDocumentWithCloudFlareHeaders() {
|
||||
ProjectRequest request = createProjectRequest();
|
||||
request.getParameters().put("cf-connecting-ip", "10.0.0.123");
|
||||
request.getParameters().put("cf-ipcountry", "BE");
|
||||
@@ -87,7 +87,7 @@ public class ProjectRequestDocumentFactoryTests extends AbstractInitializrStatTe
|
||||
}
|
||||
|
||||
@Test
|
||||
public void createDocumentWithCloudFlareIpv6() {
|
||||
void createDocumentWithCloudFlareIpv6() {
|
||||
ProjectRequest request = createProjectRequest();
|
||||
request.getParameters().put("cf-connecting-ip", "2001:db8:a0b:12f0::1");
|
||||
ProjectGeneratedEvent event = new ProjectGeneratedEvent(request);
|
||||
@@ -98,7 +98,7 @@ public class ProjectRequestDocumentFactoryTests extends AbstractInitializrStatTe
|
||||
}
|
||||
|
||||
@Test
|
||||
public void createDocumentWithCloudFlareHeadersAndOtherHeaders() {
|
||||
void createDocumentWithCloudFlareHeadersAndOtherHeaders() {
|
||||
ProjectRequest request = createProjectRequest();
|
||||
request.getParameters().put("cf-connecting-ip", "10.0.0.123");
|
||||
request.getParameters().put("x-forwarded-for", "192.168.1.101");
|
||||
@@ -110,7 +110,7 @@ public class ProjectRequestDocumentFactoryTests extends AbstractInitializrStatTe
|
||||
}
|
||||
|
||||
@Test
|
||||
public void createDocumentWithCloudFlareCountrySetToXX() {
|
||||
void createDocumentWithCloudFlareCountrySetToXX() {
|
||||
ProjectRequest request = createProjectRequest();
|
||||
request.getParameters().put("cf-connecting-ip", "Xx"); // case insensitive
|
||||
ProjectGeneratedEvent event = new ProjectGeneratedEvent(request);
|
||||
@@ -119,7 +119,7 @@ public class ProjectRequestDocumentFactoryTests extends AbstractInitializrStatTe
|
||||
}
|
||||
|
||||
@Test
|
||||
public void createDocumentWithUserAgent() {
|
||||
void createDocumentWithUserAgent() {
|
||||
ProjectRequest request = createProjectRequest();
|
||||
request.getParameters().put("user-agent", "HTTPie/0.8.0");
|
||||
ProjectGeneratedEvent event = new ProjectGeneratedEvent(request);
|
||||
@@ -129,7 +129,7 @@ public class ProjectRequestDocumentFactoryTests extends AbstractInitializrStatTe
|
||||
}
|
||||
|
||||
@Test
|
||||
public void createDocumentWithUserAgentNoVersion() {
|
||||
void createDocumentWithUserAgentNoVersion() {
|
||||
ProjectRequest request = createProjectRequest();
|
||||
request.getParameters().put("user-agent", "IntelliJ IDEA");
|
||||
ProjectGeneratedEvent event = new ProjectGeneratedEvent(request);
|
||||
@@ -139,7 +139,7 @@ public class ProjectRequestDocumentFactoryTests extends AbstractInitializrStatTe
|
||||
}
|
||||
|
||||
@Test
|
||||
public void createDocumentInvalidJavaVersion() {
|
||||
void createDocumentInvalidJavaVersion() {
|
||||
ProjectRequest request = createProjectRequest();
|
||||
request.setJavaVersion("1.2");
|
||||
ProjectGeneratedEvent event = new ProjectGeneratedEvent(request);
|
||||
@@ -150,7 +150,7 @@ public class ProjectRequestDocumentFactoryTests extends AbstractInitializrStatTe
|
||||
}
|
||||
|
||||
@Test
|
||||
public void createDocumentInvalidLanguage() {
|
||||
void createDocumentInvalidLanguage() {
|
||||
ProjectRequest request = createProjectRequest();
|
||||
request.setLanguage("c++");
|
||||
ProjectGeneratedEvent event = new ProjectGeneratedEvent(request);
|
||||
@@ -161,7 +161,7 @@ public class ProjectRequestDocumentFactoryTests extends AbstractInitializrStatTe
|
||||
}
|
||||
|
||||
@Test
|
||||
public void createDocumentInvalidPackaging() {
|
||||
void createDocumentInvalidPackaging() {
|
||||
ProjectRequest request = createProjectRequest();
|
||||
request.setPackaging("ear");
|
||||
ProjectGeneratedEvent event = new ProjectGeneratedEvent(request);
|
||||
@@ -172,7 +172,7 @@ public class ProjectRequestDocumentFactoryTests extends AbstractInitializrStatTe
|
||||
}
|
||||
|
||||
@Test
|
||||
public void createDocumentInvalidType() {
|
||||
void createDocumentInvalidType() {
|
||||
ProjectRequest request = createProjectRequest();
|
||||
request.setType("ant-project");
|
||||
ProjectGeneratedEvent event = new ProjectGeneratedEvent(request);
|
||||
@@ -183,7 +183,7 @@ public class ProjectRequestDocumentFactoryTests extends AbstractInitializrStatTe
|
||||
}
|
||||
|
||||
@Test
|
||||
public void createDocumentInvalidDependency() {
|
||||
void createDocumentInvalidDependency() {
|
||||
ProjectRequest request = createProjectRequest();
|
||||
request.setDependencies(Arrays.asList("web", "invalid", "data-jpa", "invalid-2"));
|
||||
ProjectGeneratedEvent event = new ProjectGeneratedEvent(request);
|
||||
@@ -198,7 +198,7 @@ public class ProjectRequestDocumentFactoryTests extends AbstractInitializrStatTe
|
||||
}
|
||||
|
||||
@Test
|
||||
public void createDocumentWithProjectFailedEvent() {
|
||||
void createDocumentWithProjectFailedEvent() {
|
||||
ProjectRequest request = createProjectRequest();
|
||||
ProjectFailedEvent event = new ProjectFailedEvent(request,
|
||||
new IllegalStateException("my test message"));
|
||||
|
@@ -25,12 +25,12 @@ import static org.assertj.core.api.Assertions.assertThat;
|
||||
*
|
||||
* @author Stephane Nicoll
|
||||
*/
|
||||
public class StatsPropertiesTests {
|
||||
class StatsPropertiesTests {
|
||||
|
||||
private final StatsProperties properties = new StatsProperties();
|
||||
|
||||
@Test
|
||||
public void cleanTrailingSlash() {
|
||||
void cleanTrailingSlash() {
|
||||
this.properties.getElastic().setUri("http://example.com/");
|
||||
assertThat(this.properties.getElastic().getUri()).isEqualTo("http://example.com");
|
||||
}
|
||||
|
Reference in New Issue
Block a user