From f78c21e40b99707827e815efd06de7f92cfc5f70 Mon Sep 17 00:00:00 2001 From: Qimiao Chen Date: Sun, 23 Feb 2020 01:32:02 +0800 Subject: [PATCH] Fix typos in tests Closes gh-24566 --- .../core/annotation/AnnotationsScannerTests.java | 10 +++++----- .../core/annotation/MergedAnnotationsTests.java | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/spring-core/src/test/java/org/springframework/core/annotation/AnnotationsScannerTests.java b/spring-core/src/test/java/org/springframework/core/annotation/AnnotationsScannerTests.java index 190b0b3330..4c60994d32 100644 --- a/spring-core/src/test/java/org/springframework/core/annotation/AnnotationsScannerTests.java +++ b/spring-core/src/test/java/org/springframework/core/annotation/AnnotationsScannerTests.java @@ -45,7 +45,7 @@ import static org.assertj.core.api.Assertions.assertThat; class AnnotationsScannerTests { @Test - void directStrategyOnClassWhenNotAnnoatedScansNone() { + void directStrategyOnClassWhenNotAnnotatedScansNone() { Class source = WithNoAnnotations.class; assertThat(scan(source, SearchStrategy.DIRECT)).isEmpty(); } @@ -423,7 +423,7 @@ class AnnotationsScannerTests { @Test void typeHierarchyStrategyOnMethodWithIgnorablesScansAnnotations() throws Exception { - Method source = methodFrom(Ignoreable.class); + Method source = methodFrom(Ignorable.class); assertThat(scan(source, SearchStrategy.TYPE_HIERARCHY)).containsExactly( "0:TestAnnotation1"); } @@ -752,7 +752,7 @@ class AnnotationsScannerTests { } @SuppressWarnings("serial") - static class Ignoreable implements IgnoreableOverrideInterface1, IgnoreableOverrideInterface2, Serializable { + static class Ignorable implements IgnorableOverrideInterface1, IgnorableOverrideInterface2, Serializable { @Override @TestAnnotation1 @@ -760,13 +760,13 @@ class AnnotationsScannerTests { } } - interface IgnoreableOverrideInterface1 { + interface IgnorableOverrideInterface1 { @Nullable void method(); } - interface IgnoreableOverrideInterface2 { + interface IgnorableOverrideInterface2 { @Nullable void method(); diff --git a/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java b/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java index 4b6ab16ca9..9bbc20e957 100644 --- a/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java +++ b/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java @@ -338,8 +338,8 @@ class MergedAnnotationsTests { @Test void getWithInheritedAnnotationsFromHalfConventionBasedAndHalfAliasedComposedAnnotation1() { - // SPR-13554: convention mapping mixed with AlaisFor annotations - // xmlConfigFiles can be used because it has an AlaisFor annotation + // SPR-13554: convention mapping mixed with AliasFor annotations + // xmlConfigFiles can be used because it has an AliasFor annotation MergedAnnotation annotation = MergedAnnotations.from( HalfConventionBasedAndHalfAliasedComposedContextConfigurationClass1.class, SearchStrategy.INHERITED_ANNOTATIONS).get(ContextConfiguration.class); @@ -351,8 +351,8 @@ class MergedAnnotationsTests { @Test void withInheritedAnnotationsFromHalfConventionBasedAndHalfAliasedComposedAnnotation2() { - // SPR-13554: convention mapping mixed with AlaisFor annotations - // locations doesn't apply because it has no AlaisFor annotation + // SPR-13554: convention mapping mixed with AliasFor annotations + // locations doesn't apply because it has no AliasFor annotation MergedAnnotation annotation = MergedAnnotations.from( HalfConventionBasedAndHalfAliasedComposedContextConfigurationClass2.class, SearchStrategy.INHERITED_ANNOTATIONS).get(ContextConfiguration.class);