pipeline changes: activated PipeliningTests, some adviceDidNotMatch changes in the test xml

4 files changed, 11 insertions, 6 deletions

diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
index 57efbdf93..c8f86b2f5 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
@@ -895,7 +895,7 @@
     </ajc-test>
 
     <ajc-test dir="bugs150/pr108425" pr="108245" title="wildcard annotation matching - pr108245">
-        <compile files="package1/Bean.java,package2/Bean.java,package2/propertyChanger.java,package3/pr108425.aj" options="-1.5">
+        <compile files="package1/Bean.java,package2/Bean.java,package2/propertyChanger.java,package3/pr108425.aj" options="-1.5 -Xlint:ignore">
         </compile>
     </ajc-test>
            
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ltw/ltw-tests.xml b/tests/src/org/aspectj/systemtest/ajc150/ltw/ltw-tests.xml
index f56e49925..82fe498e0 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ltw/ltw-tests.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ltw/ltw-tests.xml
@@ -288,7 +288,8 @@
                 <line text="info using"/>
 	        	<line text="info register aspect Aspect3"/>
 	        	<line text="info weaving 'Main'"/>
-        		<line text="advice defined in Aspect3 has not been applied [Xlint:adviceDidNotMatch]"/>
+	        	<!-- will never come out for LTW, due to pipelining change pr146781 -->
+        		<!--line text="advice defined in Aspect3 has not been applied [Xlint:adviceDidNotMatch]"/-->
         	</stderr>
         </run>
     </ajc-test>
@@ -311,7 +312,8 @@
                 <line text="info using"/>
 	        	<line text="info register aspect Aspect3"/>
 	        	<line text="info weaving 'Main'"/>
-        		<line text="advice defined in Aspect3 has not been applied [Xlint:adviceDidNotMatch]"/>
+	        	<!-- will never come out for LTW, due to pipelining change pr146781 -->
+        		<!--line text="advice defined in Aspect3 has not been applied [Xlint:adviceDidNotMatch]"/-->
         	</stderr>
         </run>
     </ajc-test>
@@ -334,7 +336,8 @@
                 <line text="info using"/>
 	        	<line text="info register aspect Aspect3"/>
 	        	<line text="info weaving 'Main'"/>
-        		<line text="advice defined in Aspect3 has not been applied [Xlint:adviceDidNotMatch]"/>
+	        	<!-- will never come out for LTW, due to pipelining change pr146781 -->
+        		<!--line text="advice defined in Aspect3 has not been applied [Xlint:adviceDidNotMatch]"/-->
         	</stderr>
         </run>
     </ajc-test>
diff --git a/tests/src/org/aspectj/systemtest/ajc153/AllTestsAspectJ153.java b/tests/src/org/aspectj/systemtest/ajc153/AllTestsAspectJ153.java
index 8bc30d5d2..ae1e9a7e9 100644
--- a/tests/src/org/aspectj/systemtest/ajc153/AllTestsAspectJ153.java
+++ b/tests/src/org/aspectj/systemtest/ajc153/AllTestsAspectJ153.java
@@ -20,6 +20,7 @@ public class AllTestsAspectJ153 {
 		//$JUnit-BEGIN$
 		suite.addTest(Ajc153Tests.suite());
 		suite.addTest(JDTLikeHandleProviderTests.suite());
+		suite.addTest(PipeliningTests.suite());
         //$JUnit-END$
 		return suite;
 	}
diff --git a/tests/src/org/aspectj/systemtest/ajc153/PipeliningTests.java b/tests/src/org/aspectj/systemtest/ajc153/PipeliningTests.java
index 123db5c6b..01e9430bc 100644
--- a/tests/src/org/aspectj/systemtest/ajc153/PipeliningTests.java
+++ b/tests/src/org/aspectj/systemtest/ajc153/PipeliningTests.java
@@ -15,6 +15,7 @@ import java.io.File;
 import junit.framework.Test;
 
 //import org.aspectj.ajdt.internal.compiler.AjPipeliningCompilerAdapter;
+import org.aspectj.ajdt.internal.compiler.AjPipeliningCompilerAdapter;
 import org.aspectj.testing.XMLBasedAjcTestCase;
 
 /**
@@ -47,7 +48,7 @@ public class PipeliningTests extends org.aspectj.testing.XMLBasedAjcTestCase {
 	public void testAspectExtendsClass() { runTest("aspect extends class"); }
 	
 	// verifying the type sorting
-	/*public void testRecognizingAnnotationStyleAspects1() { 
+	public void testRecognizingAnnotationStyleAspects1() { 
 		AjPipeliningCompilerAdapter.pipelineTesting=true;
 		runTest("recognizing annotation style aspects - 1");
 		
@@ -68,7 +69,7 @@ public class PipeliningTests extends org.aspectj.testing.XMLBasedAjcTestCase {
 		String weaveOrder = AjPipeliningCompilerAdapter.getPipelineDebugOutput("weaveOrder");
 		String expectedOrder="[AtInnerAJAspect.java,ClassOne.java]";
 		assertTrue("Expected weaving order to be "+expectedOrder+" but was "+weaveOrder,weaveOrder.equals(expectedOrder));
-	}*/
+	}
 	
 	// verifying the new code for transforming Eclipse Annotations into AspectJ ones
 	public void testAnnotationTransformation() { runTest("annotation transformation"); }