diff options
| author | acolyer <acolyer> | 2005-07-21 13:25:36 +0000 |
|---|---|---|
| committer | acolyer <acolyer> | 2005-07-21 13:25:36 +0000 |
| commit | 651f729a3e4e1bdb46c3ca9603c97dad3327b41f (patch) | |
| tree | 5fceb1c68ea1f35a26c9be95e96fb00aebe3a9d9 /tests/src/org | |
| parent | 80e82171541d54ac2f1b4b5abfc0cd2284709e03 (diff) | |
| download | aspectj-651f729a3e4e1bdb46c3ca9603c97dad3327b41f.tar.gz aspectj-651f729a3e4e1bdb46c3ca9603c97dad3327b41f.zip | |
more tests and refinement of existing tests
Diffstat (limited to 'tests/src/org')
| -rw-r--r-- | tests/src/org/aspectj/systemtest/ajc150/GenericsTests.java | 8 | ||||
| -rw-r--r-- | tests/src/org/aspectj/systemtest/ajc150/ajc150.xml | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/tests/src/org/aspectj/systemtest/ajc150/GenericsTests.java b/tests/src/org/aspectj/systemtest/ajc150/GenericsTests.java index 24b027b7e..df50661c9 100644 --- a/tests/src/org/aspectj/systemtest/ajc150/GenericsTests.java +++ b/tests/src/org/aspectj/systemtest/ajc150/GenericsTests.java @@ -281,7 +281,7 @@ public class GenericsTests extends XMLBasedAjcTestCase { // public void testStaticInitializationWithGenericTypes() { // runTest("staticinitialization with generic types"); // } -// + // public void testStaticInitializationWithGenericTypesAdvanced() { // runTest("staticinitialization with generic types - advanced"); // } @@ -294,9 +294,9 @@ public class GenericsTests extends XMLBasedAjcTestCase { runTest("execution pcd with raw signature matching"); } - public void testExecutionWithGenericDeclaringTypeAndErasedParameterTypes() { - runTest("execution pcd with generic declaring type and erased parameter types"); - } +// public void testExecutionWithGenericDeclaringTypeAndErasedParameterTypes() { +// runTest("execution pcd with generic declaring type and erased parameter types"); +// } // not passing yet... // public void testExecutionWithGenericSignature() { diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml index 109c05a0f..ad3fb70e8 100644 --- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml +++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml @@ -2536,6 +2536,8 @@ <message kind="warning" line="1" text="clinit(GenericInterface<Double>+)"/> <message kind="warning" line="3" text="clinit(GenericInterface<Double>+)"/> <message kind="warning" line="3" text="clinit(GenericImplementingClass<Double>+)"/> + <message kind="warning" line="15" text="Type java.lang.String does not meet the specification for type parameter 1 (N extends java.lang.Number) in generic type GenericInterface"/> + <message kind="warning" line="19" text="Type pattern does not match because the wrong number of type parameters are specified: Type GenericInterface requires 1 parameter(s)"/> </compile> </ajc-test> @@ -2544,6 +2546,9 @@ <message kind="warning" line="1" text="one generic param, correct bounds"/> <message kind="warning" line="1" text="doesn't matter what type variable name you use"/> <message kind="warning" line="1" text="works with classes too"/> + <message kind="warning" line="4" text="Type T does not meet the specification for type parameter 1 (N extends java.lang.Number) in generic type GenericInterface"/> + <message kind="warning" line="20" text="Type pattern does not match because the wrong number of type parameters are specified: Type GenericImplementingClass requires 1 parameter(s)"/> + <message kind="warning" line="24" text="Type N extends java.lang.Name & java.lang.Comparable does not meet the specification for type parameter 1 (N extends java.lang.Number) in generic type GenericImplementingClass"/> </compile> </ajc-test> |