Browse Source
This commit adds AOT support for discovering @Nested test classes within a @ClassTemplate test class, which includes @ParameterizedClass test classes. Closes gh-35744pull/35768/head
Sam Brannen
2 months ago
7 changed files with 329 additions and 31 deletions
@ -0,0 +1,82 @@
@@ -0,0 +1,82 @@
|
||||
/* |
||||
* Copyright 2002-present the original author or authors. |
||||
* |
||||
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
* you may not use this file except in compliance with the License. |
||||
* You may obtain a copy of the License at |
||||
* |
||||
* https://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
|
||||
package org.springframework.test.context.aot.samples.basic; |
||||
|
||||
import org.junit.jupiter.api.Nested; |
||||
import org.junit.jupiter.api.Test; |
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired; |
||||
import org.springframework.beans.factory.annotation.Value; |
||||
import org.springframework.context.ApplicationContext; |
||||
import org.springframework.test.context.TestPropertySource; |
||||
import org.springframework.test.context.aot.samples.common.MessageService; |
||||
import org.springframework.test.context.aot.samples.management.ManagementConfiguration; |
||||
import org.springframework.test.context.env.YamlTestProperties; |
||||
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; |
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat; |
||||
|
||||
/** |
||||
* Abstract base test class which declares {@link Nested @Nested} test classes |
||||
* that will be inherited by concrete subclasses. |
||||
* |
||||
* @author Sam Brannen |
||||
* @since 7.0 |
||||
*/ |
||||
@SpringJUnitConfig({BasicTestConfiguration.class, ManagementConfiguration.class}) |
||||
@TestPropertySource(properties = "test.engine = jupiter") |
||||
@YamlTestProperties({ |
||||
"classpath:org/springframework/test/context/aot/samples/basic/test1.yaml", |
||||
"classpath:org/springframework/test/context/aot/samples/basic/test2.yaml" |
||||
}) |
||||
public abstract class AbstractSpringJupiterParameterizedClassTests { |
||||
|
||||
@Nested |
||||
public class InheritedNestedTests { |
||||
|
||||
@Test |
||||
void test(@Autowired ApplicationContext context, @Autowired MessageService messageService, |
||||
@Value("${test.engine}") String testEngine, @Value("${foo}") String foo) { |
||||
|
||||
assertThat(messageService.generateMessage()).isEqualTo("Hello, AOT!"); |
||||
assertThat(foo).isEqualTo("${foo}"); |
||||
assertThat(testEngine).isEqualTo("jupiter"); |
||||
BasicSpringJupiterTests.assertEnvProperties(context); |
||||
} |
||||
|
||||
@Nested |
||||
@TestPropertySource(properties = "foo=quux") |
||||
public class InheritedDoublyNestedTests { |
||||
|
||||
@Test |
||||
void test(@Autowired ApplicationContext context, @Autowired MessageService messageService, |
||||
@Value("${test.engine}") String testEngine, @Value("${foo}") String foo) { |
||||
|
||||
assertThat(messageService.generateMessage()).isEqualTo("Hello, AOT!"); |
||||
assertThat(foo).isEqualTo("quux"); |
||||
assertThat(testEngine).isEqualTo("jupiter"); |
||||
BasicSpringJupiterTests.assertEnvProperties(context); |
||||
} |
||||
} |
||||
} |
||||
|
||||
// This is here to ensure that an inner class is only considered a nested test
|
||||
// class if it's annotated with @Nested.
|
||||
public class InheritedNotReallyNestedTests { |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,101 @@
@@ -0,0 +1,101 @@
|
||||
/* |
||||
* Copyright 2002-present the original author or authors. |
||||
* |
||||
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
* you may not use this file except in compliance with the License. |
||||
* You may obtain a copy of the License at |
||||
* |
||||
* https://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
|
||||
package org.springframework.test.context.aot.samples.basic; |
||||
|
||||
import jakarta.annotation.Resource; |
||||
import org.junit.jupiter.api.Nested; |
||||
import org.junit.jupiter.api.Test; |
||||
import org.junit.jupiter.params.ParameterizedClass; |
||||
import org.junit.jupiter.params.provider.ValueSource; |
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired; |
||||
import org.springframework.beans.factory.annotation.Value; |
||||
import org.springframework.context.ApplicationContext; |
||||
import org.springframework.test.context.ActiveProfiles; |
||||
import org.springframework.test.context.TestPropertySource; |
||||
import org.springframework.test.context.aot.samples.common.MessageService; |
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat; |
||||
|
||||
/** |
||||
* {@link ParameterizedClass @ParameterizedClass} variant of {@link BasicSpringJupiterTests}. |
||||
* |
||||
* @author Sam Brannen |
||||
* @since 7.0 |
||||
*/ |
||||
@ParameterizedClass |
||||
@ValueSource(strings = {"foo", "bar"}) |
||||
public class BasicSpringJupiterParameterizedClassTests extends AbstractSpringJupiterParameterizedClassTests { |
||||
|
||||
private final String parameterizedString; |
||||
|
||||
@Resource |
||||
Integer magicNumber; |
||||
|
||||
|
||||
BasicSpringJupiterParameterizedClassTests(String parameterizedString) { |
||||
this.parameterizedString = parameterizedString; |
||||
} |
||||
|
||||
|
||||
@Test |
||||
void test(@Autowired ApplicationContext context, @Autowired MessageService messageService, |
||||
@Value("${test.engine}") String testEngine) { |
||||
assertThat("foo".equals(parameterizedString) || "bar".equals(parameterizedString)).isTrue(); |
||||
assertThat(messageService.generateMessage()).isEqualTo("Hello, AOT!"); |
||||
assertThat(testEngine).isEqualTo("jupiter"); |
||||
assertThat(magicNumber).isEqualTo(42); |
||||
BasicSpringJupiterTests.assertEnvProperties(context); |
||||
} |
||||
|
||||
@Nested |
||||
@TestPropertySource(properties = "foo=bar") |
||||
@ActiveProfiles(resolver = SpanishActiveProfilesResolver.class) |
||||
public class NestedTests { |
||||
|
||||
@Test |
||||
void test(@Autowired ApplicationContext context, @Autowired MessageService messageService, |
||||
@Value("${test.engine}") String testEngine, @Value("${foo}") String foo) { |
||||
assertThat("foo".equals(parameterizedString) || "bar".equals(parameterizedString)).isTrue(); |
||||
assertThat(messageService.generateMessage()).isEqualTo("¡Hola, AOT!"); |
||||
assertThat(foo).isEqualTo("bar"); |
||||
assertThat(testEngine).isEqualTo("jupiter"); |
||||
BasicSpringJupiterTests.assertEnvProperties(context); |
||||
} |
||||
|
||||
@Nested |
||||
@TestPropertySource(properties = "foo=quux") |
||||
public class DoublyNestedTests { |
||||
|
||||
@Test |
||||
void test(@Autowired ApplicationContext context, @Autowired MessageService messageService, |
||||
@Value("${test.engine}") String testEngine, @Value("${foo}") String foo) { |
||||
assertThat("foo".equals(parameterizedString) || "bar".equals(parameterizedString)).isTrue(); |
||||
assertThat(messageService.generateMessage()).isEqualTo("¡Hola, AOT!"); |
||||
assertThat(foo).isEqualTo("quux"); |
||||
assertThat(testEngine).isEqualTo("jupiter"); |
||||
BasicSpringJupiterTests.assertEnvProperties(context); |
||||
} |
||||
} |
||||
} |
||||
|
||||
// This is here to ensure that an inner class is only considered a nested test
|
||||
// class if it's annotated with @Nested.
|
||||
public class NotReallyNestedTests { |
||||
} |
||||
|
||||
} |
||||
Loading…
Reference in new issue