diff options
| author | avasseur <avasseur> | 2005-04-26 08:54:13 +0000 |
|---|---|---|
| committer | avasseur <avasseur> | 2005-04-26 08:54:13 +0000 |
| commit | 3e1783bc03e372ad8957e5e24e41b5c7d0e7dd26 (patch) | |
| tree | 14f5f5886349aee66c1cf6ffafa22088de277844 | |
| parent | d00224721f28759cee41f2759979248ddb69858d (diff) | |
| download | aspectj-3e1783bc03e372ad8957e5e24e41b5c7d0e7dd26.tar.gz aspectj-3e1783bc03e372ad8957e5e24e41b5c7d0e7dd26.zip | |
fix local build so that test run with 1.5
fix Adrian test that were having some assumption on ordering which happens to fail with my 1.5 compiler
| -rw-r--r-- | aspectj5rt/build.xml | 8 | ||||
| -rw-r--r-- | aspectj5rt/testsrc/org/aspectj/internal/lang/reflect/AjTypeTests.java | 6 |
2 files changed, 10 insertions, 4 deletions
diff --git a/aspectj5rt/build.xml b/aspectj5rt/build.xml index 24d8cf7ad..f4a718ff5 100644 --- a/aspectj5rt/build.xml +++ b/aspectj5rt/build.xml @@ -26,8 +26,12 @@ </target> <target name="test:compile" depends="compile" if="jdk15"> - <!-- TODO: if test relies on 1.5 source, then needs to override below --> - <testcompile project="aspectj5rt" path="aspectj5rt.test.src.path"/> + <mkdir dir="../aspectj5rt/bintest"/> + <javac debug="on" destdir="../aspectj5rt/bintest" source="1.5" target="1.5"> + <src path="../aspectj5rt/testsrc"/> + <classpath refid="aspectj5rt.test.src.path"/> + <classpath path="../aspectj5rt/bin"/> + </javac> </target> <target name="test" depends="test:compile" if="jdk15"> diff --git a/aspectj5rt/testsrc/org/aspectj/internal/lang/reflect/AjTypeTests.java b/aspectj5rt/testsrc/org/aspectj/internal/lang/reflect/AjTypeTests.java index bae481e72..04a987bf4 100644 --- a/aspectj5rt/testsrc/org/aspectj/internal/lang/reflect/AjTypeTests.java +++ b/aspectj5rt/testsrc/org/aspectj/internal/lang/reflect/AjTypeTests.java @@ -116,8 +116,10 @@ public class AjTypeTests extends TestCase { AjType<Foo> foo = AjTypeSystem.getAjType(Foo.class); AjType[] fooTypes = foo.getDeclaredAjTypes(); assertEquals(2,fooTypes.length); - assertEquals("org.aspectj.internal.lang.reflect.Foo$Z",fooTypes[0].getName()); - assertEquals("org.aspectj.internal.lang.reflect.Foo$XX",fooTypes[1].getName()); + // Alex -> Adrian: looks like you can not make assumption on the ordering + String s = " " + fooTypes[0].getName() + " " + fooTypes[1].getName(); + assertTrue(s.indexOf(" org.aspectj.internal.lang.reflect.Foo$Z") >= 0); + assertTrue(s.indexOf(" org.aspectj.internal.lang.reflect.Foo$XX") >= 0); } public void testGetConstructor() throws Exception { |