From fcbca7d569256ca2abc793fbcbe2827737950179 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Mon, 12 Aug 2019 12:45:14 +0200 Subject: [PATCH] Remove obsolete references to JUnit 4's ArrayComparisonFailure See gh-23451 --- .../core/annotation/AnnotatedElementUtilsTests.java | 3 +-- .../core/annotation/MergedAnnotationsTests.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/spring-core/src/test/java/org/springframework/core/annotation/AnnotatedElementUtilsTests.java b/spring-core/src/test/java/org/springframework/core/annotation/AnnotatedElementUtilsTests.java index 3bf718e8a1..17a4559f4b 100644 --- a/spring-core/src/test/java/org/springframework/core/annotation/AnnotatedElementUtilsTests.java +++ b/spring-core/src/test/java/org/springframework/core/annotation/AnnotatedElementUtilsTests.java @@ -36,7 +36,6 @@ import javax.annotation.meta.When; import org.junit.Ignore; import org.junit.Test; -import org.junit.internal.ArrayComparisonFailure; import org.springframework.core.annotation.AnnotationUtilsTests.ExtendsBaseClassWithGenericAnnotatedMethod; import org.springframework.core.annotation.AnnotationUtilsTests.ImplementsInterfaceWithGenericAnnotatedMethod; @@ -754,7 +753,7 @@ public class AnnotatedElementUtilsTests { assertWebMapping(WebController.class.getMethod("getMappedWithPathAttribute")); } - private void assertWebMapping(AnnotatedElement element) throws ArrayComparisonFailure { + private void assertWebMapping(AnnotatedElement element) { WebMapping webMapping = findMergedAnnotation(element, WebMapping.class); assertThat(webMapping).isNotNull(); assertThat(webMapping.value()).as("value attribute: ").isEqualTo(asArray("/test")); 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 2680d7094f..8069aed36f 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 @@ -37,7 +37,6 @@ import java.util.stream.Stream; import javax.annotation.Resource; import org.junit.Test; -import org.junit.internal.ArrayComparisonFailure; import org.springframework.core.Ordered; import org.springframework.core.annotation.MergedAnnotation.Adapt; @@ -664,7 +663,7 @@ public class MergedAnnotationsTests { WebController.class.getMethod("getMappedWithPathAttribute")); } - private void testGetWithTypeHierarchyWebMapping(AnnotatedElement element) throws ArrayComparisonFailure { + private void testGetWithTypeHierarchyWebMapping(AnnotatedElement element) { MergedAnnotation annotation = MergedAnnotations.from(element, SearchStrategy.TYPE_HIERARCHY).get(RequestMapping.class); assertThat(annotation.getStringArray("value")).containsExactly("/test");