@@ -273,60 +273,12 @@ void shouldPreferDirectlyDeclaredPreviewMethods() throws Exception {
273273 assertEquals (DirectChange .class , change .getApplyMethod ().getDeclaringClass ());
274274 }
275275
276- @ Test
277- void shouldSkipIntermediateOverloadsForInheritedPreviewSignatures () throws Exception {
278- for (boolean legacy : new boolean []{false , true }) {
279- CodeLoadedChange change = CodeLoadedChangeBuilder .getInstanceFromPreview (
280- signaturePreview (OverloadLeaf .class , "apply" , "rollback" ,
281- Collections .singletonList (String .class .getName ()), legacy )).build ();
282- OverloadLeaf instance = new OverloadLeaf ();
283- assertArrayEquals (new Class <?>[]{String .class }, change .getApplyMethod ().getParameterTypes ());
284- assertArrayEquals (new Class <?>[]{String .class }, change .getRollbackMethod ().get ().getParameterTypes ());
285- change .getApplyMethod ().invoke (instance , "applied" );
286- assertEquals ("applied" , instance .effect );
287- change .getRollbackMethod ().get ().invoke (instance , "rolled back" );
288- assertEquals ("rolled back" , instance .effect );
289- }
290- }
291-
292- @ Test
293- void shouldResolveInheritedPreviewSignaturesWithConcreteOverloads () throws Exception {
294- for (boolean legacy : new boolean []{false , true }) {
295- CodeLoadedChange change = CodeLoadedChangeBuilder .getInstanceFromPreview (
296- signaturePreview (OverloadChild .class , "apply" , "rollback" ,
297- Collections .singletonList (String .class .getName ()), legacy )).build ();
298- OverloadChild instance = new OverloadChild ();
299- assertArrayEquals (new Class <?>[]{String .class }, change .getApplyMethod ().getParameterTypes ());
300- assertArrayEquals (new Class <?>[]{String .class }, change .getRollbackMethod ().get ().getParameterTypes ());
301- change .getApplyMethod ().invoke (instance , "applied" );
302- assertEquals ("applied" , instance .effect );
303- change .getRollbackMethod ().get ().invoke (instance , "rolled back" );
304- assertEquals ("rolled back" , instance .effect );
305- }
306- }
307-
308- @ Test
309- void shouldResolveDirectPreviewSignaturesWithInheritedOverloads () throws Exception {
310- for (boolean legacy : new boolean []{false , true }) {
311- CodeLoadedChange change = CodeLoadedChangeBuilder .getInstanceFromPreview (
312- signaturePreview (OverloadChild .class , "apply" , "rollback" ,
313- Collections .singletonList (Integer .class .getName ()), legacy )).build ();
314- OverloadChild instance = new OverloadChild ();
315- assertArrayEquals (new Class <?>[]{Integer .class }, change .getApplyMethod ().getParameterTypes ());
316- assertArrayEquals (new Class <?>[]{Integer .class }, change .getRollbackMethod ().get ().getParameterTypes ());
317- change .getApplyMethod ().invoke (instance , 1 );
318- assertEquals ("integer apply" , instance .effect );
319- change .getRollbackMethod ().get ().invoke (instance , 1 );
320- assertEquals ("integer rollback" , instance .effect );
321- }
322- }
323-
324276 @ Test
325277 void shouldMatchInheritedPrimitiveAndArraySignatures () throws Exception {
326278 CodeLoadedChange change = CodeLoadedChangeBuilder .getInstanceFromPreview (
327- signaturePreview (OverloadLeaf .class , "applyArrays" , "rollbackArrays" ,
279+ signaturePreview (InheritedArrayChange .class , "applyArrays" , "rollbackArrays" ,
328280 java .util .Arrays .asList ("int" , "int[]" , "java.lang.String[]" ), false )).build ();
329- OverloadLeaf instance = new OverloadLeaf ();
281+ InheritedArrayChange instance = new InheritedArrayChange ();
330282 Class <?>[] expected = {int .class , int [].class , String [].class };
331283 assertArrayEquals (expected , change .getApplyMethod ().getParameterTypes ());
332284 assertArrayEquals (expected , change .getRollbackMethod ().get ().getParameterTypes ());
@@ -336,15 +288,9 @@ void shouldMatchInheritedPrimitiveAndArraySignatures() throws Exception {
336288 assertEquals ("rollback910" , instance .effect );
337289 }
338290
339- public static class OverloadBase {
291+ public static class ArrayBaseChange {
340292 String effect ;
341293
342- @ Apply
343- public void apply (String value ) { effect = value ; }
344-
345- @ io .flamingock .api .annotations .Rollback
346- public void rollback (String value ) { effect = value ; }
347-
348294 public void applyArrays (int value , int [] numbers , String [] text ) {
349295 effect = text [0 ] + value + numbers [0 ];
350296 }
@@ -354,14 +300,7 @@ public void rollbackArrays(int value, int[] numbers, String[] text) {
354300 }
355301 }
356302
357- public static class OverloadChild extends OverloadBase {
358- public void apply (Integer value ) { effect = "integer apply" ; }
359- public void rollback (Integer value ) { effect = "integer rollback" ; }
360- public void applyArrays (Integer value , Integer [] numbers , Object [] text ) { }
361- public void rollbackArrays (Integer value , Integer [] numbers , Object [] text ) { }
362- }
363-
364- public static class OverloadLeaf extends OverloadChild { }
303+ public static class InheritedArrayChange extends ArrayBaseChange { }
365304
366305 private CodePreviewChange signaturePreview (Class <?> source , String apply , String rollback ,
367306 java .util .List <String > parameters , boolean legacy ) {
0 commit comments