diff options
| author | aclement <aclement> | 2005-11-10 12:19:07 +0000 |
|---|---|---|
| committer | aclement <aclement> | 2005-11-10 12:19:07 +0000 |
| commit | f8fea133e17dd468f37792bf8aae3829f7130da9 (patch) | |
| tree | da48e53da230c3c9a9a9f8aa2cc589404c8d8a18 /tests | |
| parent | e433d6704633b9c3293f1b4c8507592ad987f2b8 (diff) | |
| download | aspectj-f8fea133e17dd468f37792bf8aae3829f7130da9.tar.gz aspectj-f8fea133e17dd468f37792bf8aae3829f7130da9.zip | |
more bridge method testcode.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/java5/generics/binaryBridging/TwoA.java | 8 | ||||
| -rw-r--r-- | tests/java5/generics/binaryBridging/TwoB.java | 7 | ||||
| -rw-r--r-- | tests/java5/generics/binaryBridging/TwoX.java | 3 | ||||
| -rw-r--r-- | tests/java5/generics/binaryBridging/readme.txt | 2 | ||||
| -rw-r--r-- | tests/src/org/aspectj/systemtest/ajc150/ajc150.xml | 6 |
5 files changed, 24 insertions, 2 deletions
diff --git a/tests/java5/generics/binaryBridging/TwoA.java b/tests/java5/generics/binaryBridging/TwoA.java new file mode 100644 index 000000000..f375b3833 --- /dev/null +++ b/tests/java5/generics/binaryBridging/TwoA.java @@ -0,0 +1,8 @@ +import java.util.*; +import java.io.*; + +public class TwoA<T extends Serializable> { + + public Number firstMethod(T t) { return null;} + +} diff --git a/tests/java5/generics/binaryBridging/TwoB.java b/tests/java5/generics/binaryBridging/TwoB.java new file mode 100644 index 000000000..6f22f1df1 --- /dev/null +++ b/tests/java5/generics/binaryBridging/TwoB.java @@ -0,0 +1,7 @@ +import java.util.*; + +public class TwoB /* extends TwoA<String>*/ { + + public Integer firstMethod(String s) { return null;} + +} diff --git a/tests/java5/generics/binaryBridging/TwoX.java b/tests/java5/generics/binaryBridging/TwoX.java new file mode 100644 index 000000000..bf375d309 --- /dev/null +++ b/tests/java5/generics/binaryBridging/TwoX.java @@ -0,0 +1,3 @@ +public aspect TwoX { + declare parents: TwoB implements TwoA<String>; +} diff --git a/tests/java5/generics/binaryBridging/readme.txt b/tests/java5/generics/binaryBridging/readme.txt index bd84553ed..b5a28756e 100644 --- a/tests/java5/generics/binaryBridging/readme.txt +++ b/tests/java5/generics/binaryBridging/readme.txt @@ -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. diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml index 2047ebc4c..80492b878 100644 --- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml +++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml @@ -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"/> |