diff --git a/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java b/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java index 7a781bb7e7..c59423a771 100644 --- a/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java +++ b/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java @@ -684,14 +684,14 @@ class ResolvableTypeTests { @Test void resolveBoundedTypeVariableResult() throws Exception { - ResolvableType type = ResolvableType.forMethodReturnType(Methods.class.getMethod("boundedTypeVaraibleResult")); + ResolvableType type = ResolvableType.forMethodReturnType(Methods.class.getMethod("boundedTypeVariableResult")); assertThat(type.resolve()).isEqualTo(CharSequence.class); } @Test void resolveBoundedTypeVariableWildcardResult() throws Exception { - ResolvableType type = ResolvableType.forMethodReturnType(Methods.class.getMethod("boundedTypeVaraibleWildcardResult")); + ResolvableType type = ResolvableType.forMethodReturnType(Methods.class.getMethod("boundedTypeVariableWildcardResult")); assertThat(type.getGeneric(1).asCollection().resolveGeneric()).isEqualTo(CharSequence.class); } @@ -702,27 +702,14 @@ class ResolvableTypeTests { } @Test - void resolveTypeVaraibleFromMethodReturn() throws Exception { - ResolvableType type = ResolvableType.forMethodReturnType(Methods.class.getMethod("typedReturn")); - assertThat(type.resolve()).isNull(); - } - - @Test - void resolveTypeVaraibleFromMethodReturnWithInstanceClass() throws Exception { - ResolvableType type = ResolvableType.forMethodReturnType( - Methods.class.getMethod("typedReturn"), TypedMethods.class); - assertThat(type.resolve()).isEqualTo(String.class); - } - - @Test - void resolveTypeVaraibleFromSimpleInterfaceType() { + void resolveTypeVariableFromSimpleInterfaceType() { ResolvableType type = ResolvableType.forClass( MySimpleInterfaceType.class).as(MyInterfaceType.class); assertThat(type.resolveGeneric()).isEqualTo(String.class); } @Test - void resolveTypeVaraibleFromSimpleCollectionInterfaceType() { + void resolveTypeVariableFromSimpleCollectionInterfaceType() { ResolvableType type = ResolvableType.forClass( MyCollectionInterfaceType.class).as(MyInterfaceType.class); assertThat(type.resolveGeneric()).isEqualTo(Collection.class); @@ -730,14 +717,14 @@ class ResolvableTypeTests { } @Test - void resolveTypeVaraibleFromSimpleSuperclassType() { + void resolveTypeVariableFromSimpleSuperclassType() { ResolvableType type = ResolvableType.forClass( MySimpleSuperclassType.class).as(MySuperclassType.class); assertThat(type.resolveGeneric()).isEqualTo(String.class); } @Test - void resolveTypeVaraibleFromSimpleCollectionSuperclassType() { + void resolveTypeVariableFromSimpleCollectionSuperclassType() { ResolvableType type = ResolvableType.forClass( MyCollectionSuperclassType.class).as(MySuperclassType.class); assertThat(type.resolveGeneric()).isEqualTo(Collection.class); @@ -1422,9 +1409,9 @@ class ResolvableTypeTests { void charSequenceParameter(List cs); - R boundedTypeVaraibleResult(); + R boundedTypeVariableResult(); - Map> boundedTypeVaraibleWildcardResult(); + Map> boundedTypeVariableWildcardResult(); void nested(Map, Map> p);