diff --git a/initializr-actuator/pom.xml b/initializr-actuator/pom.xml index 0663bc73..7c834953 100644 --- a/initializr-actuator/pom.xml +++ b/initializr-actuator/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 io.spring.initializr @@ -52,10 +53,20 @@ spring-boot-configuration-processor true - + + org.junit.jupiter + junit-jupiter-engine + test + org.springframework.boot spring-boot-starter-test + + + junit + junit + + test diff --git a/initializr-actuator/src/test/java/io/spring/initializr/actuate/ActuatorIntegrationTests.java b/initializr-actuator/src/test/java/io/spring/initializr/actuate/ActuatorIntegrationTests.java index e04cf936..3744af4f 100755 --- a/initializr-actuator/src/test/java/io/spring/initializr/actuate/ActuatorIntegrationTests.java +++ b/initializr-actuator/src/test/java/io/spring/initializr/actuate/ActuatorIntegrationTests.java @@ -22,7 +22,7 @@ import java.util.List; import com.fasterxml.jackson.databind.JsonNode; import io.spring.initializr.web.AbstractFullStackInitializrIntegrationTests; import io.spring.initializr.web.AbstractInitializrIntegrationTests.Config; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; diff --git a/initializr-actuator/src/test/java/io/spring/initializr/actuate/autoconfigure/InitializrActuatorEndpointsAutoConfigurationTests.java b/initializr-actuator/src/test/java/io/spring/initializr/actuate/autoconfigure/InitializrActuatorEndpointsAutoConfigurationTests.java index 55030beb..f08d6a56 100644 --- a/initializr-actuator/src/test/java/io/spring/initializr/actuate/autoconfigure/InitializrActuatorEndpointsAutoConfigurationTests.java +++ b/initializr-actuator/src/test/java/io/spring/initializr/actuate/autoconfigure/InitializrActuatorEndpointsAutoConfigurationTests.java @@ -19,7 +19,7 @@ package io.spring.initializr.actuate.autoconfigure; import io.spring.initializr.actuate.info.BomRangesInfoContributor; import io.spring.initializr.actuate.info.DependencyRangesInfoContributor; import io.spring.initializr.web.autoconfigure.InitializrAutoConfiguration; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; diff --git a/initializr-actuator/src/test/java/io/spring/initializr/actuate/autoconfigure/InitializrMetricsAutoConfigurationTests.java b/initializr-actuator/src/test/java/io/spring/initializr/actuate/autoconfigure/InitializrMetricsAutoConfigurationTests.java index 11aa0ca4..523d9565 100644 --- a/initializr-actuator/src/test/java/io/spring/initializr/actuate/autoconfigure/InitializrMetricsAutoConfigurationTests.java +++ b/initializr-actuator/src/test/java/io/spring/initializr/actuate/autoconfigure/InitializrMetricsAutoConfigurationTests.java @@ -18,7 +18,7 @@ package io.spring.initializr.actuate.autoconfigure; import io.micrometer.core.instrument.MeterRegistry; import io.spring.initializr.actuate.metric.ProjectGenerationMetricsListener; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration; import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration; diff --git a/initializr-actuator/src/test/java/io/spring/initializr/actuate/autoconfigure/InitializrStatsAutoConfigurationTests.java b/initializr-actuator/src/test/java/io/spring/initializr/actuate/autoconfigure/InitializrStatsAutoConfigurationTests.java index 442b05ea..623400cc 100755 --- a/initializr-actuator/src/test/java/io/spring/initializr/actuate/autoconfigure/InitializrStatsAutoConfigurationTests.java +++ b/initializr-actuator/src/test/java/io/spring/initializr/actuate/autoconfigure/InitializrStatsAutoConfigurationTests.java @@ -19,7 +19,7 @@ package io.spring.initializr.actuate.autoconfigure; import io.spring.initializr.actuate.stat.ProjectGenerationStatPublisher; import io.spring.initializr.metadata.InitializrMetadataProvider; import io.spring.initializr.web.autoconfigure.InitializrAutoConfiguration; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.beans.DirectFieldAccessor; import org.springframework.boot.autoconfigure.AutoConfigurations; diff --git a/initializr-actuator/src/test/java/io/spring/initializr/actuate/info/BomRangesInfoContributorTests.java b/initializr-actuator/src/test/java/io/spring/initializr/actuate/info/BomRangesInfoContributorTests.java index 52c727b8..2ff78b64 100755 --- a/initializr-actuator/src/test/java/io/spring/initializr/actuate/info/BomRangesInfoContributorTests.java +++ b/initializr-actuator/src/test/java/io/spring/initializr/actuate/info/BomRangesInfoContributorTests.java @@ -22,7 +22,7 @@ import io.spring.initializr.metadata.BillOfMaterials; import io.spring.initializr.metadata.InitializrMetadata; import io.spring.initializr.metadata.SimpleInitializrMetadataProvider; import io.spring.initializr.test.metadata.InitializrMetadataTestBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.boot.actuate.info.Info; diff --git a/initializr-actuator/src/test/java/io/spring/initializr/actuate/info/DependencyRangesInfoContributorTests.java b/initializr-actuator/src/test/java/io/spring/initializr/actuate/info/DependencyRangesInfoContributorTests.java index c42dd3c9..9aef8513 100755 --- a/initializr-actuator/src/test/java/io/spring/initializr/actuate/info/DependencyRangesInfoContributorTests.java +++ b/initializr-actuator/src/test/java/io/spring/initializr/actuate/info/DependencyRangesInfoContributorTests.java @@ -23,7 +23,7 @@ import io.spring.initializr.metadata.Dependency; import io.spring.initializr.metadata.InitializrMetadata; import io.spring.initializr.metadata.SimpleInitializrMetadataProvider; import io.spring.initializr.test.metadata.InitializrMetadataTestBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.boot.actuate.info.Info; diff --git a/initializr-actuator/src/test/java/io/spring/initializr/actuate/metric/ProjectGenerationMetricsListenerTests.java b/initializr-actuator/src/test/java/io/spring/initializr/actuate/metric/ProjectGenerationMetricsListenerTests.java index b012d0ac..371d2399 100755 --- a/initializr-actuator/src/test/java/io/spring/initializr/actuate/metric/ProjectGenerationMetricsListenerTests.java +++ b/initializr-actuator/src/test/java/io/spring/initializr/actuate/metric/ProjectGenerationMetricsListenerTests.java @@ -26,8 +26,8 @@ import io.spring.initializr.generator.ProjectRequest; import io.spring.initializr.metadata.Dependency; import io.spring.initializr.metadata.InitializrMetadata; import io.spring.initializr.test.metadata.InitializrMetadataTestBuilder; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @author Stephane Nicoll @@ -41,7 +41,7 @@ public class ProjectGenerationMetricsListenerTests { private MetricsAssert metricsAssert; - @Before + @BeforeEach public void setup() { SimpleMeterRegistry meterRegistry = new SimpleMeterRegistry(); this.listener = new ProjectGenerationMetricsListener(meterRegistry); diff --git a/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/MainControllerStatsIntegrationTests.java b/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/MainControllerStatsIntegrationTests.java index 401aa8f8..9a735d78 100755 --- a/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/MainControllerStatsIntegrationTests.java +++ b/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/MainControllerStatsIntegrationTests.java @@ -23,8 +23,8 @@ import java.util.List; import com.fasterxml.jackson.databind.JsonNode; import io.spring.initializr.actuate.stat.MainControllerStatsIntegrationTests.StatsMockController; import io.spring.initializr.web.AbstractFullStackInitializrIntegrationTests; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Import; @@ -56,7 +56,7 @@ public class MainControllerStatsIntegrationTests @Autowired private ProjectGenerationStatPublisher projectGenerationStatPublisher; - @Before + @BeforeEach public void setup() { this.statsMockController.stats.clear(); // Make sure our mock is going to be invoked with the stats diff --git a/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/ProjectGenerationStatPublisherTests.java b/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/ProjectGenerationStatPublisherTests.java index bc6c2e50..18693130 100755 --- a/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/ProjectGenerationStatPublisherTests.java +++ b/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/ProjectGenerationStatPublisherTests.java @@ -22,8 +22,8 @@ import java.util.UUID; import io.spring.initializr.actuate.stat.StatsProperties.Elastic; import io.spring.initializr.generator.ProjectGeneratedEvent; import io.spring.initializr.generator.ProjectRequest; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.boot.web.client.RestTemplateBuilder; import org.springframework.http.HttpMethod; @@ -54,7 +54,7 @@ public class ProjectGenerationStatPublisherTests extends AbstractInitializrStatT private MockRestServiceServer mockServer; - @Before + @BeforeEach public void setUp() { configureService(createProperties()); } diff --git a/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/ProjectRequestDocumentFactoryTests.java b/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/ProjectRequestDocumentFactoryTests.java index 7781f1db..2594414c 100755 --- a/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/ProjectRequestDocumentFactoryTests.java +++ b/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/ProjectRequestDocumentFactoryTests.java @@ -21,7 +21,7 @@ import java.util.Arrays; import io.spring.initializr.generator.ProjectFailedEvent; import io.spring.initializr.generator.ProjectGeneratedEvent; import io.spring.initializr.generator.ProjectRequest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/StatsPropertiesTests.java b/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/StatsPropertiesTests.java index 78d042cd..c2cea444 100755 --- a/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/StatsPropertiesTests.java +++ b/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/StatsPropertiesTests.java @@ -16,7 +16,7 @@ package io.spring.initializr.actuate.stat; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/initializr-web/pom.xml b/initializr-web/pom.xml index 884559c6..bac32a3c 100644 --- a/initializr-web/pom.xml +++ b/initializr-web/pom.xml @@ -52,11 +52,26 @@ javax.servlet-api provided - + + org.junit.jupiter + junit-jupiter-engine + test + + + org.junit-pioneer + junit-pioneer + test + org.springframework.boot spring-boot-starter-test test + + + junit + junit + + org.springframework.cloud diff --git a/initializr-web/src/test/java/io/spring/initializr/web/AbstractFullStackInitializrIntegrationTests.java b/initializr-web/src/test/java/io/spring/initializr/web/AbstractFullStackInitializrIntegrationTests.java index 64a4afc8..ff5263f8 100755 --- a/initializr-web/src/test/java/io/spring/initializr/web/AbstractFullStackInitializrIntegrationTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/AbstractFullStackInitializrIntegrationTests.java @@ -17,18 +17,15 @@ package io.spring.initializr.web; import io.spring.initializr.web.AbstractInitializrIntegrationTests.Config; -import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.boot.web.server.LocalServerPort; -import org.springframework.test.context.junit4.SpringRunner; /** * @author Stephane Nicoll * @author Dave Syer */ -@RunWith(SpringRunner.class) @SpringBootTest(classes = Config.class, webEnvironment = WebEnvironment.RANDOM_PORT) public abstract class AbstractFullStackInitializrIntegrationTests extends AbstractInitializrIntegrationTests { diff --git a/initializr-web/src/test/java/io/spring/initializr/web/AbstractInitializrIntegrationTests.java b/initializr-web/src/test/java/io/spring/initializr/web/AbstractInitializrIntegrationTests.java index b45247c9..2713962f 100755 --- a/initializr-web/src/test/java/io/spring/initializr/web/AbstractInitializrIntegrationTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/AbstractInitializrIntegrationTests.java @@ -21,6 +21,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.nio.charset.Charset; +import java.nio.file.Path; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -40,10 +41,9 @@ import org.apache.tools.ant.taskdefs.Expand; import org.apache.tools.ant.taskdefs.Untar; import org.json.JSONException; import org.json.JSONObject; -import org.junit.Before; -import org.junit.Rule; -import org.junit.rules.TemporaryFolder; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junitpioneer.jupiter.TempDirectory; import org.skyscreamer.jsonassert.JSONAssert; import org.skyscreamer.jsonassert.JSONCompareMode; @@ -58,7 +58,6 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.StreamUtils; import org.springframework.web.client.RestTemplate; @@ -67,7 +66,7 @@ import static org.assertj.core.api.Assertions.assertThat; /** * @author Stephane Nicoll */ -@RunWith(SpringRunner.class) +@ExtendWith(TempDirectory.class) @SpringBootTest(classes = Config.class) public abstract class AbstractInitializrIntegrationTests { @@ -76,17 +75,17 @@ public abstract class AbstractInitializrIntegrationTests { private static final ObjectMapper objectMapper = new ObjectMapper(); - @Rule - public final TemporaryFolder folder = new TemporaryFolder(); + public File folder; @Autowired private RestTemplateBuilder restTemplateBuilder; private RestTemplate restTemplate; - @Before - public void before() { + @BeforeEach + public void before(@TempDirectory.TempDir Path folder) { this.restTemplate = this.restTemplateBuilder.build(); + this.folder = folder.toFile(); } protected abstract String createUrl(String context); @@ -215,7 +214,7 @@ public abstract class AbstractInitializrIntegrationTests { try { File archiveFile = writeArchive(content); - File project = this.folder.newFolder(); + File project = new File(this.folder, "project"); switch (archiveType) { case ZIP: unzip(archiveFile, project); @@ -251,7 +250,7 @@ public abstract class AbstractInitializrIntegrationTests { } protected File writeArchive(byte[] body) throws IOException { - File archiveFile = this.folder.newFile(); + File archiveFile = new File(this.folder, "archive"); try (FileOutputStream stream = new FileOutputStream(archiveFile)) { stream.write(body); } diff --git a/initializr-web/src/test/java/io/spring/initializr/web/autoconfigure/CloudfoundryEnvironmentPostProcessorTests.java b/initializr-web/src/test/java/io/spring/initializr/web/autoconfigure/CloudfoundryEnvironmentPostProcessorTests.java index bf648fe5..f4cbe7bf 100755 --- a/initializr-web/src/test/java/io/spring/initializr/web/autoconfigure/CloudfoundryEnvironmentPostProcessorTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/autoconfigure/CloudfoundryEnvironmentPostProcessorTests.java @@ -16,7 +16,7 @@ package io.spring.initializr.web.autoconfigure; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.boot.SpringApplication; import org.springframework.mock.env.MockEnvironment; diff --git a/initializr-web/src/test/java/io/spring/initializr/web/autoconfigure/InitializrAutoConfigurationTests.java b/initializr-web/src/test/java/io/spring/initializr/web/autoconfigure/InitializrAutoConfigurationTests.java index 9672334a..c3faa318 100755 --- a/initializr-web/src/test/java/io/spring/initializr/web/autoconfigure/InitializrAutoConfigurationTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/autoconfigure/InitializrAutoConfigurationTests.java @@ -24,7 +24,7 @@ import io.spring.initializr.metadata.InitializrMetadataProvider; import io.spring.initializr.util.TemplateRenderer; import io.spring.initializr.web.project.MainController; import io.spring.initializr.web.ui.UiController; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.beans.DirectFieldAccessor; diff --git a/initializr-web/src/test/java/io/spring/initializr/web/mapper/DependencyMetadataJsonMapperTests.java b/initializr-web/src/test/java/io/spring/initializr/web/mapper/DependencyMetadataJsonMapperTests.java index b312df29..727bb8c9 100755 --- a/initializr-web/src/test/java/io/spring/initializr/web/mapper/DependencyMetadataJsonMapperTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/mapper/DependencyMetadataJsonMapperTests.java @@ -25,7 +25,7 @@ import io.spring.initializr.metadata.DependencyMetadata; import io.spring.initializr.metadata.Repository; import io.spring.initializr.util.Version; import org.json.JSONObject; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/initializr-web/src/test/java/io/spring/initializr/web/mapper/InitializrMetadataJsonMapperTests.java b/initializr-web/src/test/java/io/spring/initializr/web/mapper/InitializrMetadataJsonMapperTests.java index edaa0297..a2fd852f 100755 --- a/initializr-web/src/test/java/io/spring/initializr/web/mapper/InitializrMetadataJsonMapperTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/mapper/InitializrMetadataJsonMapperTests.java @@ -24,7 +24,7 @@ import io.spring.initializr.metadata.Dependency; import io.spring.initializr.metadata.InitializrMetadata; import io.spring.initializr.metadata.Link; import io.spring.initializr.test.metadata.InitializrMetadataTestBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/initializr-web/src/test/java/io/spring/initializr/web/mapper/LinkMapperTests.java b/initializr-web/src/test/java/io/spring/initializr/web/mapper/LinkMapperTests.java index 493ca7b1..de41f4cc 100755 --- a/initializr-web/src/test/java/io/spring/initializr/web/mapper/LinkMapperTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/mapper/LinkMapperTests.java @@ -22,7 +22,7 @@ import java.util.List; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; import io.spring.initializr.metadata.Link; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/initializr-web/src/test/java/io/spring/initializr/web/project/CommandLineExampleIntegrationTests.java b/initializr-web/src/test/java/io/spring/initializr/web/project/CommandLineExampleIntegrationTests.java index 11672a2f..2c8193ca 100755 --- a/initializr-web/src/test/java/io/spring/initializr/web/project/CommandLineExampleIntegrationTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/project/CommandLineExampleIntegrationTests.java @@ -18,7 +18,7 @@ package io.spring.initializr.web.project; import io.spring.initializr.test.generator.PomAssert; import io.spring.initializr.web.AbstractInitializrControllerIntegrationTests; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.http.ResponseEntity; import org.springframework.test.context.ActiveProfiles; diff --git a/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerDefaultsIntegrationTests.java b/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerDefaultsIntegrationTests.java index 02d90bdc..e35f449c 100755 --- a/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerDefaultsIntegrationTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerDefaultsIntegrationTests.java @@ -18,7 +18,7 @@ package io.spring.initializr.web.project; import io.spring.initializr.test.generator.PomAssert; import io.spring.initializr.web.AbstractInitializrControllerIntegrationTests; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.test.context.ActiveProfiles; diff --git a/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerDependenciesTests.java b/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerDependenciesTests.java index 7d487eb0..e80ca215 100755 --- a/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerDependenciesTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerDependenciesTests.java @@ -19,7 +19,7 @@ package io.spring.initializr.web.project; import io.spring.initializr.web.AbstractInitializrControllerIntegrationTests; import org.json.JSONException; import org.json.JSONObject; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.skyscreamer.jsonassert.JSONAssert; import org.skyscreamer.jsonassert.JSONCompareMode; diff --git a/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerEnvIntegrationTests.java b/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerEnvIntegrationTests.java index 99473df4..c3f395ff 100755 --- a/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerEnvIntegrationTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerEnvIntegrationTests.java @@ -20,7 +20,7 @@ import java.net.URI; import io.spring.initializr.test.generator.ProjectAssert; import io.spring.initializr.web.AbstractInitializrControllerIntegrationTests; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerIntegrationTests.java b/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerIntegrationTests.java index 89428727..76778d8a 100755 --- a/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerIntegrationTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerIntegrationTests.java @@ -25,8 +25,8 @@ import io.spring.initializr.web.AbstractInitializrIntegrationTests; import io.spring.initializr.web.mapper.InitializrMetadataVersion; import org.json.JSONException; import org.json.JSONObject; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.skyscreamer.jsonassert.JSONCompareMode; import org.springframework.http.HttpHeaders; @@ -160,7 +160,7 @@ public class MainControllerIntegrationTests } @Test - @Ignore("Need a comparator that does not care about the number of elements in an array") + @Disabled("Need a comparator that does not care about the number of elements in an array") public void currentMetadataCompatibleWithV2() { ResponseEntity response = invokeHome(null, "*/*"); validateMetadata(response, diff --git a/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerServiceMetadataIntegrationTests.java b/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerServiceMetadataIntegrationTests.java index 00fd6d89..84577851 100755 --- a/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerServiceMetadataIntegrationTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerServiceMetadataIntegrationTests.java @@ -22,7 +22,7 @@ import io.spring.initializr.metadata.InitializrMetadataProvider; import io.spring.initializr.web.AbstractFullStackInitializrIntegrationTests; import org.json.JSONException; import org.json.JSONObject; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.skyscreamer.jsonassert.JSONAssert; import org.skyscreamer.jsonassert.JSONCompareMode; diff --git a/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerSslIntegrationTests.java b/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerSslIntegrationTests.java index 35c830cd..3c3afe62 100755 --- a/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerSslIntegrationTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerSslIntegrationTests.java @@ -20,7 +20,7 @@ import java.net.URI; import io.spring.initializr.web.AbstractInitializrControllerIntegrationTests; import io.spring.initializr.web.mapper.InitializrMetadataVersion; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.skyscreamer.jsonassert.JSONCompareMode; import org.springframework.http.HttpStatus; diff --git a/initializr-web/src/test/java/io/spring/initializr/web/project/ProjectGenerationPostProcessorTests.java b/initializr-web/src/test/java/io/spring/initializr/web/project/ProjectGenerationPostProcessorTests.java index 176e7ba6..35fb271a 100755 --- a/initializr-web/src/test/java/io/spring/initializr/web/project/ProjectGenerationPostProcessorTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/project/ProjectGenerationPostProcessorTests.java @@ -21,7 +21,7 @@ import io.spring.initializr.generator.ProjectRequestPostProcessor; import io.spring.initializr.metadata.InitializrMetadata; import io.spring.initializr.web.AbstractInitializrControllerIntegrationTests; import io.spring.initializr.web.project.ProjectGenerationPostProcessorTests.ProjectRequestPostProcessorConfiguration; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/initializr-web/src/test/java/io/spring/initializr/web/project/ProjectGenerationSmokeTests.java b/initializr-web/src/test/java/io/spring/initializr/web/project/ProjectGenerationSmokeTests.java index 79db3ac7..8272f2c5 100755 --- a/initializr-web/src/test/java/io/spring/initializr/web/project/ProjectGenerationSmokeTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/project/ProjectGenerationSmokeTests.java @@ -19,13 +19,16 @@ package io.spring.initializr.web.project; import java.io.File; import java.io.FileInputStream; import java.io.IOException; +import java.nio.file.Path; import io.spring.initializr.test.generator.ProjectAssert; import io.spring.initializr.web.AbstractFullStackInitializrIntegrationTests; -import org.junit.After; -import org.junit.Assume; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assumptions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junitpioneer.jupiter.TempDirectory; import org.openqa.selenium.JavascriptExecutor; import org.openqa.selenium.Keys; import org.openqa.selenium.WebDriver; @@ -44,6 +47,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Dave Syer * @author Stephane Nicoll */ +@ExtendWith(TempDirectory.class) @ActiveProfiles("test-default") public class ProjectGenerationSmokeTests extends AbstractFullStackInitializrIntegrationTests { @@ -54,11 +58,11 @@ public class ProjectGenerationSmokeTests private Action enterAction; - @Before - public void setup() throws IOException { - Assume.assumeTrue("Smoke tests disabled (set System property 'smoke.test')", - Boolean.getBoolean("smoke.test")); - this.downloadDir = this.folder.newFolder(); + @BeforeEach + public void setup(@TempDirectory.TempDir Path folder) throws IOException { + Assumptions.assumeTrue(Boolean.getBoolean("smoke.test"), + "Smoke tests disabled (set System property 'smoke.test')"); + this.downloadDir = folder.toFile(); FirefoxProfile fxProfile = new FirefoxProfile(); fxProfile.setPreference("browser.download.folderList", 2); fxProfile.setPreference("browser.download.manager.showWhenStarting", false); @@ -74,7 +78,7 @@ public class ProjectGenerationSmokeTests this.enterAction = actions.sendKeys(Keys.ENTER).build(); } - @After + @AfterEach public void destroy() { if (this.driver != null) { this.driver.close(); diff --git a/initializr-web/src/test/java/io/spring/initializr/web/support/DefaultDependencyMetadataProviderTests.java b/initializr-web/src/test/java/io/spring/initializr/web/support/DefaultDependencyMetadataProviderTests.java index b4a32f90..3b7f24b0 100755 --- a/initializr-web/src/test/java/io/spring/initializr/web/support/DefaultDependencyMetadataProviderTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/support/DefaultDependencyMetadataProviderTests.java @@ -23,7 +23,7 @@ import io.spring.initializr.metadata.DependencyMetadataProvider; import io.spring.initializr.metadata.InitializrMetadata; import io.spring.initializr.test.metadata.InitializrMetadataTestBuilder; import io.spring.initializr.util.Version; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/initializr-web/src/test/java/io/spring/initializr/web/support/DefaultInitializrMetadataProviderTests.java b/initializr-web/src/test/java/io/spring/initializr/web/support/DefaultInitializrMetadataProviderTests.java index f23b8899..ece90195 100755 --- a/initializr-web/src/test/java/io/spring/initializr/web/support/DefaultInitializrMetadataProviderTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/support/DefaultInitializrMetadataProviderTests.java @@ -22,8 +22,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import io.spring.initializr.metadata.DefaultMetadataElement; import io.spring.initializr.metadata.InitializrMetadata; import io.spring.initializr.test.metadata.InitializrMetadataTestBuilder; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.core.io.ClassPathResource; import org.springframework.http.HttpHeaders; @@ -49,7 +49,7 @@ public class DefaultInitializrMetadataProviderTests { private MockRestServiceServer mockServer; - @Before + @BeforeEach public void setUp() { this.restTemplate = new RestTemplate(); this.mockServer = MockRestServiceServer.createServer(this.restTemplate); diff --git a/initializr-web/src/test/java/io/spring/initializr/web/support/SpringBootMetadataReaderTests.java b/initializr-web/src/test/java/io/spring/initializr/web/support/SpringBootMetadataReaderTests.java index b81482ef..9244beb7 100755 --- a/initializr-web/src/test/java/io/spring/initializr/web/support/SpringBootMetadataReaderTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/support/SpringBootMetadataReaderTests.java @@ -24,7 +24,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import io.spring.initializr.metadata.DefaultMetadataElement; import io.spring.initializr.metadata.InitializrMetadata; import io.spring.initializr.metadata.InitializrMetadataBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.core.io.ClassPathResource; import org.springframework.http.MediaType; diff --git a/initializr-web/src/test/java/io/spring/initializr/web/ui/UiControllerIntegrationTests.java b/initializr-web/src/test/java/io/spring/initializr/web/ui/UiControllerIntegrationTests.java index 2de7e64d..d288324f 100755 --- a/initializr-web/src/test/java/io/spring/initializr/web/ui/UiControllerIntegrationTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/ui/UiControllerIntegrationTests.java @@ -19,7 +19,7 @@ package io.spring.initializr.web.ui; import io.spring.initializr.web.AbstractInitializrControllerIntegrationTests; import org.json.JSONException; import org.json.JSONObject; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.skyscreamer.jsonassert.JSONAssert; import org.skyscreamer.jsonassert.JSONCompareMode;