Skip to content

Commit 0cb9f60

Browse files
marcphilippBukama
authored andcommitted
Move DefaultLocaleExtension to junit-jupiter-api
Since the extension should only be active when the `@DefaultLocale` annotation is used.
1 parent b7a6bc8 commit 0cb9f60

File tree

5 files changed

+14
-17
lines changed

5 files changed

+14
-17
lines changed

junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/DefaultLocale.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,16 @@
1010

1111
package org.junit.jupiter.api.util;
1212

13+
import static org.apiguardian.api.API.Status.STABLE;
14+
1315
import java.lang.annotation.ElementType;
1416
import java.lang.annotation.Inherited;
1517
import java.lang.annotation.Retention;
1618
import java.lang.annotation.RetentionPolicy;
1719
import java.lang.annotation.Target;
1820

1921
import org.apiguardian.api.API;
22+
import org.junit.jupiter.api.extension.ExtendWith;
2023

2124
/**
2225
* {@code @DefaultLocale} is a JUnit Jupiter extension to change the value
@@ -69,7 +72,8 @@
6972
@Target({ ElementType.METHOD, ElementType.TYPE })
7073
@Inherited
7174
@WritesDefaultLocale
72-
@API(status = API.Status.STABLE, since = "6.1")
75+
@API(status = STABLE, since = "6.1")
76+
@ExtendWith(DefaultLocaleExtension.class)
7377
public @interface DefaultLocale {
7478

7579
/**
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* https://www.eclipse.org/legal/epl-v20.html
99
*/
1010

11-
package org.junit.jupiter.engine.extension;
11+
package org.junit.jupiter.api.util;
1212

1313
import java.util.Locale;
1414
import java.util.Optional;
@@ -19,13 +19,13 @@
1919
import org.junit.jupiter.api.extension.ExtensionConfigurationException;
2020
import org.junit.jupiter.api.extension.ExtensionContext;
2121
import org.junit.jupiter.api.extension.ExtensionContext.Namespace;
22-
import org.junit.jupiter.api.util.DefaultLocale;
23-
import org.junit.jupiter.api.util.LocaleProvider;
2422
import org.junit.jupiter.api.util.LocaleProvider.NullLocaleProvider;
25-
import org.junit.jupiter.engine.support.JupiterLocaleUtils;
2623
import org.junit.platform.commons.support.AnnotationSupport;
2724
import org.junit.platform.commons.support.ReflectionSupport;
2825

26+
/**
27+
* @since 6.1
28+
*/
2929
class DefaultLocaleExtension implements BeforeAllCallback, BeforeEachCallback, AfterEachCallback {
3030

3131
private static final Namespace NAMESPACE = Namespace.create(DefaultLocaleExtension.class);
Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,16 @@
88
* https://www.eclipse.org/legal/epl-v20.html
99
*/
1010

11-
package org.junit.jupiter.engine.support;
11+
package org.junit.jupiter.api.util;
1212

1313
import java.util.Locale;
1414

15-
import org.apiguardian.api.API;
16-
1715
/**
1816
* Utility class to create {@code Locale}.
17+
*
18+
* @since 6.1
1919
*/
20-
@API(status = API.Status.INTERNAL, since = "6.1")
21-
public class JupiterLocaleUtils {
20+
class JupiterLocaleUtils {
2221

2322
private JupiterLocaleUtils() {
2423
// private constructor to prevent instantiation of utility class

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ public static MutableExtensionRegistry createRegistryWithDefaultExtensions(Jupit
8383
DEFAULT_STATELESS_EXTENSIONS.forEach(extensionRegistry::registerDefaultExtension);
8484

8585
extensionRegistry.registerDefaultExtension(new TempDirectory(configuration));
86-
extensionRegistry.registerDefaultExtension(new DefaultLocaleExtension());
8786
extensionRegistry.registerDefaultExtension(new DefaultTimeZoneExtension());
8887

8988
if (configuration.isExtensionAutoDetectionEnabled()) {
Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* https://www.eclipse.org/legal/epl-v20.html
99
*/
1010

11-
package org.junit.jupiter.engine.extension;
11+
package org.junit.jupiter.api.util;
1212

1313
import static org.assertj.core.api.Assertions.assertThat;
1414
import static org.junit.jupiter.testkit.JUnitJupiterTestKit.executeTestClass;
@@ -27,11 +27,6 @@
2727
import org.junit.jupiter.api.Test;
2828
import org.junit.jupiter.api.TestInstance;
2929
import org.junit.jupiter.api.extension.ExtensionConfigurationException;
30-
import org.junit.jupiter.api.util.DefaultLocale;
31-
import org.junit.jupiter.api.util.LocaleProvider;
32-
import org.junit.jupiter.api.util.ReadsDefaultLocale;
33-
import org.junit.jupiter.api.util.WritesDefaultLocale;
34-
import org.junit.jupiter.engine.support.JupiterLocaleUtils;
3530
import org.junit.jupiter.testkit.ExecutionResults;
3631

3732
@DisplayName("DefaultLocale extension")

0 commit comments

Comments
 (0)