@@ -209,23 +209,20 @@ public void findAnnotationAttributesInheritedFromAbstractMethod() throws NoSuchM
209
209
}
210
210
211
211
/**
212
- * TODO [SPR-12738] Enable test.
213
- *
214
212
* <p>{@code AbstractClassWithInheritedAnnotation} declares {@code handleParameterized(T)}; whereas,
215
213
* {@code ConcreteClassWithInheritedAnnotation} declares {@code handleParameterized(String)}.
216
214
*
217
- * <p>Thus, this test fails because {@code AnnotatedElementUtils.processWithFindSemantics()}
218
- * does not resolve an equivalent method for {@code handleParameterized(String)}
219
- * in {@code AbstractClassWithInheritedAnnotation} .
215
+ * <p>As of Spring 4.2 RC1, {@code AnnotatedElementUtils.processWithFindSemantics()} does not resolve an
216
+ * <em> equivalent</em> method in {@code AbstractClassWithInheritedAnnotation} for the <em>bridged</em>
217
+ * {@code handleParameterized(String)} method .
220
218
*
221
219
* @since 4.2
222
220
*/
223
- @ Ignore ("Disabled until SPR-12738 is resolved" )
224
221
@ Test
225
222
public void findAnnotationAttributesInheritedFromBridgedMethod () throws NoSuchMethodException {
226
223
Method method = ConcreteClassWithInheritedAnnotation .class .getMethod ("handleParameterized" , String .class );
227
224
AnnotationAttributes attributes = findAnnotationAttributes (method , Transactional .class );
228
- assertNotNull ("Should find @Transactional on ConcreteClassWithInheritedAnnotation.handleParameterized() method" , attributes );
225
+ assertNull ("Should not find @Transactional on bridged ConcreteClassWithInheritedAnnotation.handleParameterized() method" , attributes );
229
226
}
230
227
231
228
/**
@@ -252,7 +249,7 @@ public void findAnnotationAttributesFromBridgeMethod() throws NoSuchMethodExcept
252
249
assertTrue (bridgedMethod != null && !bridgedMethod .isBridge ());
253
250
254
251
AnnotationAttributes attributes = findAnnotationAttributes (bridgeMethod , Order .class );
255
- assertNotNull ("Should find @Order on StringGenericParameter.getFor() method" , attributes );
252
+ assertNotNull ("Should find @Order on StringGenericParameter.getFor() bridge method" , attributes );
256
253
}
257
254
258
255
0 commit comments