GH-1326 - Remove @nested from EnableScenarioIntegrationTests.

Author: odrotbohm

spring-modulith-integration-test/src/test/java/com/acme/myproject/moduleA/ApplicationModuleTestIntegrationTests.java

@@ -22,16 +22,17 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
 import org.springframework.context.ApplicationContext;
-import org.springframework.modulith.test.ApplicationModuleTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.web.reactive.server.WebTestClient;
 
+import com.acme.myproject.NonVerifyingModuleTest;
+
 /**
  * Integration tests for {@link ApplicationModuleTest}.
  *
  * @author Oliver Drotbohm
  */
-@ApplicationModuleTest(verifyAutomatically = false)
+@NonVerifyingModuleTest
 class ApplicationModuleTestIntegrationTests {
 
 	@Test // GH-173
@@ -46,7 +47,7 @@ void bootstrapsSecondLevelMestMethod() {}
 
 	// GH-253
 	@Nested
-	@ApplicationModuleTest(verifyAutomatically = false)
+	@NonVerifyingModuleTest
 	@ContextConfiguration
 	@AutoConfigureWebTestClient
 	class SampleTest {

spring-modulith-integration-test/src/test/java/com/acme/myproject/moduleB/ModuleBTest.java

@@ -22,10 +22,10 @@
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigurationPackages;
-import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.modulith.test.ApplicationModuleTest.BootstrapMode;
 import org.springframework.modulith.test.TestUtils;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 
 import com.acme.myproject.NonVerifyingModuleTest;
 import com.acme.myproject.moduleA.ServiceComponentA;
@@ -37,7 +37,7 @@
 class ModuleBTest {
 
 	@Nested
-	static class WithoutMocksTest {
+	class WithoutMocksTest {
 
 		@Autowired ServiceComponentB serviceComponentB;
 
@@ -52,7 +52,7 @@ void failsToStartBecauseServiceComponentAIsMissing() throws Exception {
 
 	@Nested
 	@NonVerifyingModuleTest
-	static class WithMocksTest {
+	class WithMocksTest {
 
 		@Autowired ApplicationContext context;
 		@MockitoBean ServiceComponentA serviceComponentA;
@@ -80,7 +80,7 @@ void tweaksAutoConfigurationPackageToModulePackage() {
 
 	@Nested
 	@NonVerifyingModuleTest(BootstrapMode.DIRECT_DEPENDENCIES)
-	static class WithUpstreamModuleTest {
+	class WithUpstreamModuleTest {
 
 		@Autowired ServiceComponentA componentA;
 		@Autowired ServiceComponentB componentB;

spring-modulith-integration-test/src/test/java/com/acme/myproject/moduleC/ModuleCTest.java

@@ -20,9 +20,9 @@
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.modulith.test.ApplicationModuleTest.BootstrapMode;
 import org.springframework.modulith.test.TestUtils;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 
 import com.acme.myproject.NonVerifyingModuleTest;
 import com.acme.myproject.moduleA.ServiceComponentA;
@@ -34,7 +34,7 @@
 class ModuleCTest {
 
 	@Nested
-	public static class FailsStandaloneTest {
+	class FailsStandaloneTest {
 
 		@NonVerifyingModuleTest
 		static class Config {}
@@ -46,7 +46,7 @@ void failsStandalone() {
 	}
 
 	@Nested
-	static class FailsWithDirectDependencyTest {
+	class FailsWithDirectDependencyTest {
 
 		@NonVerifyingModuleTest(BootstrapMode.DIRECT_DEPENDENCIES)
 		static class Config {}
@@ -59,7 +59,7 @@ void failsWithDirectDependency() {
 
 	@Nested
 	@NonVerifyingModuleTest(BootstrapMode.DIRECT_DEPENDENCIES)
-	static class SucceedsWithDirectDependencyPlusItsDependenciesMocksTest {
+	class SucceedsWithDirectDependencyPlusItsDependenciesMocksTest {
 
 		@MockitoBean ServiceComponentA serviceComponentA;
 
@@ -71,7 +71,7 @@ void bootstrapsContext() {
 
 	@Nested
 	@NonVerifyingModuleTest(BootstrapMode.ALL_DEPENDENCIES)
-	static class SucceedsWithAllDependenciesTest {
+	class SucceedsWithAllDependenciesTest {
 
 		@Autowired ServiceComponentA serviceComponentA;
 		@Autowired ServiceComponentB serviceComponentB;

spring-modulith-test/src/test/java/org/springframework/modulith/test/EnableScenarioIntegrationTests.java

@@ -20,7 +20,6 @@
 
 import example.TestConfiguration;
 
-import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.Bean;
@@ -34,7 +33,6 @@
  *
  * @author Oliver Drotbohm
  */
-@Nested
 @EnableScenarios
 @SpringBootTest(classes = { TestConfiguration.class, TransactionTemplateTestConfiguration.class })
 class EnableScenarioIntegrationTests {