Update to remove obsolete tests in ControllerAdviceBeanTests

Author: tafjwr

spring-web/src/test/java/org/springframework/web/method/ControllerAdviceBeanTests.java

@@ -88,41 +88,25 @@ void shouldFailWhenControllerAdviceNull() {
 	}
 
 	@Test
-	void equalsHashCodeAndToStringForBeanName() {
+	void equalsHashCodeAndToString() {
 		String beanName = getSingletonBeanName(SimpleControllerAdvice.class);
 		ControllerAdviceBean bean1 = createSingletonControllerAdviceBean(SimpleControllerAdvice.class);
 		ControllerAdviceBean bean2 = createSingletonControllerAdviceBean(SimpleControllerAdvice.class);
 		assertEqualsHashCodeAndToString(bean1, bean2, beanName);
 	}
 
 	@Test
-	void orderedWithLowestPrecedenceByDefaultForBeanName() {
+	void orderedWithLowestPrecedenceByDefault() {
 		assertOrder(SimpleControllerAdvice.class, Ordered.LOWEST_PRECEDENCE);
 	}
 
 	@Test
-	void orderedWithLowestPrecedenceByDefaultForBeanInstance() {
-		assertOrder(SimpleControllerAdvice.class, Ordered.LOWEST_PRECEDENCE);
-	}
-
-	@Test
-	void orderedViaOrderedInterfaceForBeanName() {
+	void orderedViaOrderedInterface() {
 		assertOrder(OrderedControllerAdvice.class, 42);
 	}
 
 	@Test
-	void orderedViaOrderedInterfaceForBeanInstance() {
-		assertOrder(OrderedControllerAdvice.class, 42);
-	}
-
-	@Test
-	void orderedViaAnnotationForBeanName() {
-		assertOrder(OrderAnnotationControllerAdvice.class, 100);
-		assertOrder(PriorityAnnotationControllerAdvice.class, 200);
-	}
-
-	@Test
-	void orderedViaAnnotationForBeanInstance() {
+	void orderedViaAnnotation() {
 		assertOrder(OrderAnnotationControllerAdvice.class, 100);
 		assertOrder(PriorityAnnotationControllerAdvice.class, 200);
 	}