Recent changes seem to have made some messages come out in a different order !

diff --git a/tests/src/org/aspectj/systemtest/ajc150/Annotations.java b/tests/src/org/aspectj/systemtest/ajc150/Annotations.java
index 419c4e39f72f8f4fea9b6061960227692400a893..94760cc4f5c59b969fea0f959eea1f855ea1ec48 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc150/Annotations.java
+++ b/tests/src/org/aspectj/systemtest/ajc150/Annotations.java
@@ -55,13 +55,13 @@ public class Annotations extends TestUtils {
   // Deals with the cases where an explicit type is specified and it is an annotation type
   public void test002_decpOnAnnotationNotAllowed_errors() {
        CompilationResult cR = binaryWeave("testcode.jar","AnnotationAspect04.aj",3,0,true);
-       IMessage msg = (IMessage)cR.getErrorMessages().get(0);
+       IMessage msg = (IMessage)cR.getErrorMessages().get(1);
        assertTrue("Expected a message about can't use decp to alter supertype of an annotation: "+msg,
                        msg.toString().indexOf("to alter supertype of annotation type")!=-1);
-       msg = (IMessage)cR.getErrorMessages().get(1);
+       msg = (IMessage)cR.getErrorMessages().get(2);
        assertTrue("Expected a message about can't use decp to make annotation implement interface: "+msg,
                        msg.toString().indexOf("implement an interface")!=-1);
-       msg = (IMessage)cR.getErrorMessages().get(2);
+       msg = (IMessage)cR.getErrorMessages().get(0);
        assertTrue("Expected a message about can't use decp to make Annotation parent of another type: "+msg,
                        msg.toString().indexOf("the parent of type")!=-1);
        verifyWeavingMessagesOutput(cR,new String[]{});

diff --git a/tests/src/org/aspectj/systemtest/ajc150/Enums.java b/tests/src/org/aspectj/systemtest/ajc150/Enums.java
index 87927e158507e4f1dfe9f16b43b3eea648bab2c8..ff0ba416794eb4e619a024c91eb94e1d1658794c 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc150/Enums.java
+++ b/tests/src/org/aspectj/systemtest/ajc150/Enums.java
@@ -60,13 +60,15 @@ public class Enums extends TestUtils {
   // Deals with the cases where an explicit type is specified and it is an enum type
   public void test003_decpOnEnumNotAllowed_errors() {
        CompilationResult cR = binaryWeave("testcode.jar","EnumAspect03.aj",3,0,true);
-       IMessage msg = (IMessage)cR.getErrorMessages().get(0);
+       // THE ORDERING CAN BE SENSITIVE HERE... OUGHT TO FIX IT PROPERLY AND ALLOW FOR THEM
+       // IN ANY POSITION
+       IMessage msg = (IMessage)cR.getErrorMessages().get(1);
        assertTrue("Expected a message about can't use decp to alter supertype of an enum: "+msg,
                        msg.toString().indexOf("to alter supertype of enum type")!=-1);
-       msg = (IMessage)cR.getErrorMessages().get(1);
+       msg = (IMessage)cR.getErrorMessages().get(2);
        assertTrue("Expected a message about can't use decp to make enum implement interface: "+msg,
                        msg.toString().indexOf("implement an interface")!=-1);
-       msg = (IMessage)cR.getErrorMessages().get(2);
+       msg = (IMessage)cR.getErrorMessages().get(0);
        assertTrue("Expected a message about can't use decp to make Enum parent of another type: "+msg,
                        msg.toString().indexOf("the parent of type")!=-1);
        verifyWeavingMessagesOutput(cR,new String[]{});