@@ -0,0 +1,8 @@ | |||
import java.util.*; | |||
import java.io.*; | |||
public class TwoA<T extends Serializable> { | |||
public Number firstMethod(T t) { return null;} | |||
} |
@@ -0,0 +1,7 @@ | |||
import java.util.*; | |||
public class TwoB /* extends TwoA<String>*/ { | |||
public Integer firstMethod(String s) { return null;} | |||
} |
@@ -0,0 +1,3 @@ | |||
public aspect TwoX { | |||
declare parents: TwoB implements TwoA<String>; | |||
} |
@@ -2,4 +2,4 @@ Tests that if binary weaving then we create the right bridge methods. | |||
Test One: Using decp to wire together two types - a generic type that has a bunch of methods that use type variables and a second type that is told to implement a parameterization of the generic type with the decp. | |||
Test Two: Now the horrific method in the supertype is overridden by a combination of covariance and parameterization. |
@@ -4208,7 +4208,11 @@ | |||
<compile files="OneX.java" inpath="onea.jar;oneb.jar" options="-1.5"/> | |||
</ajc-test> | |||
<ajc-test dir="java5/generics/binaryBridging" title="binary bridge methods - two"> | |||
<compile files="TwoA.java" outjar="twoa.jar" options="-1.5"/> | |||
<compile files="TwoB.java" outjar="twob.jar" options="-1.5"/> | |||
<compile files="TwoX.java" inpath="twoa.jar;twob.jar" options="-1.5"/> | |||
</ajc-test> | |||
<ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="abstract intertype methods and covariant returns"> | |||
<compile files="pr91381.aj" options="-1.5"/> |