148190#32

33 files changed, 0 insertions, 271 deletions

diff --git a/ajde/testdata/WeaveInfoMessagesTest/AspectAdvice.aj b/ajde/testdata/WeaveInfoMessagesTest/AspectAdvice.aj
deleted file mode 100644
index 7ced0baf7..000000000
--- a/ajde/testdata/WeaveInfoMessagesTest/AspectAdvice.aj
+++ /dev/null
@@ -1,32 +0,0 @@
-// Simple aspect that tramples all over Simple.java

-

-public aspect AspectAdvice {

-

-  // Go through all the kinds of things that might affect a type:

-  pointcut methodRunning(): execution(* *(..)) && !execution(* main(..));

-  

-  before(): methodRunning() {

-  	System.err.println("BEFORE ADVICE");

-  }

-  

-  after(): methodRunning() {

-  	System.err.println("AFTER ADVICE");

-  }

-

-  after() returning: methodRunning() {

-	System.err.println("AFTER RETURNING ADVICE");

-  }

-

-  after() throwing : methodRunning() {

-	System.err.println("AFTER THROWING ADVICE");

-  }

-  

-  void around(): execution(* main(..)) && !cflow(adviceexecution()){

-	System.err.println("AROUND ADVICE");

-  	proceed();

-  }

- 

- 

-  interface markerInterface {	

-  }	

-}

diff --git a/ajde/testdata/WeaveInfoMessagesTest/AspectDeclare.aj b/ajde/testdata/WeaveInfoMessagesTest/AspectDeclare.aj
deleted file mode 100644
index e62661231..000000000
--- a/ajde/testdata/WeaveInfoMessagesTest/AspectDeclare.aj
+++ /dev/null
@@ -1,24 +0,0 @@
-// Simple aspect that tramples all over Simple.java

-

-public aspect AspectDeclare {

-	

-  pointcut methodRunning(): execution(* *(..));

-  

-  declare parents: Simple implements MarkerInterface;

-  

-//  declare parents: Simple extends InTheWay;

-  

-//  declare soft: 

-//  

-//  declare precedence:

-//  

-//  declare warning:

-//  

-//  declare error:

-//  

-}

-

-  

-interface MarkerInterface {}

-

-class InTheWay {}
\ No newline at end of file
diff --git a/ajde/testdata/WeaveInfoMessagesTest/AspectDeclareAnnotations.aj b/ajde/testdata/WeaveInfoMessagesTest/AspectDeclareAnnotations.aj
deleted file mode 100644
index 46bda48f8..000000000
--- a/ajde/testdata/WeaveInfoMessagesTest/AspectDeclareAnnotations.aj
+++ /dev/null
@@ -1,25 +0,0 @@
-// little aspect and class for testing declaration of annotations
-
-@interface anInterface {}
-
-public aspect AspectDeclareAnnotations{
-
-  declare @type : Test : @anInterface;
-  declare @constructor : Test.new(String,int) : @anInterface;
-  declare @method : int Test.fac(int) : @anInterface;
-  declare @field : int Test.a : @anInterface;
-
-}
-
-class Test{
-
-  public Test(String say, int something){
-    System.out.println(say + something);
-  }
-
-  public int fac(int n){
-   return (n == 0)? 1 : n * fac(n-1);
-  }
-
-  public int a = 1;
-}
diff --git a/ajde/testdata/WeaveInfoMessagesTest/AspectDeclareExtends.aj b/ajde/testdata/WeaveInfoMessagesTest/AspectDeclareExtends.aj
deleted file mode 100644
index f250515a1..000000000
--- a/ajde/testdata/WeaveInfoMessagesTest/AspectDeclareExtends.aj
+++ /dev/null
@@ -1,22 +0,0 @@
-// Simple aspect that tramples all over Simple.java

-

-public aspect AspectDeclareExtends {

-	

-  pointcut methodRunning(): execution(* *(..));

-  

-  declare parents: Simple extends InTheWay;

-  

-//  declare soft: 

-//  

-//  declare precedence:

-//  

-//  declare warning:

-//  

-//  declare error:

-//  

-}

-

-  

-interface MarkerInterface {}

-

-class InTheWay {}

diff --git a/ajde/testdata/WeaveInfoMessagesTest/AspectDeclareSoft.aj b/ajde/testdata/WeaveInfoMessagesTest/AspectDeclareSoft.aj
deleted file mode 100644
index f7255675f..000000000
--- a/ajde/testdata/WeaveInfoMessagesTest/AspectDeclareSoft.aj
+++ /dev/null
@@ -1,9 +0,0 @@
-

-public aspect AspectDeclareSoft {

-	

-  declare soft: MyException: execution(* main(..));

-

-  declare soft: Exception+: execution(* main(..));

-

-}

-class MyException extends Exception {}

diff --git a/ajde/testdata/WeaveInfoMessagesTest/AspectITD.aj b/ajde/testdata/WeaveInfoMessagesTest/AspectITD.aj
deleted file mode 100644
index 1f47b33e0..000000000
--- a/ajde/testdata/WeaveInfoMessagesTest/AspectITD.aj
+++ /dev/null
@@ -1,17 +0,0 @@
-// Simple aspect that tramples all over Simple.java

-

-public aspect AspectITD {

-	

-  int Simple.fieldint = 5;

-  

-  String Simple.fieldstring = "hello";

-  

-  public int Simple.returnint() {

-  	return 5;

-  }

-  

-  public String Simple.returnstring() {

-  	return "abc";

-  }

- 

-}
\ No newline at end of file
diff --git a/ajde/testdata/WeaveInfoMessagesTest/AspectInPackage.aj b/ajde/testdata/WeaveInfoMessagesTest/AspectInPackage.aj
deleted file mode 100644
index 74ff94b1a..000000000
--- a/ajde/testdata/WeaveInfoMessagesTest/AspectInPackage.aj
+++ /dev/null
@@ -1,10 +0,0 @@
-package pkg;
-
-public aspect AspectInPackage {
-
-	pointcut p() : execution(* *.*(..));
-
-	before() : p() {
-	}
-
-}
diff --git a/ajde/testdata/WeaveInfoMessagesTest/Empty.lst b/ajde/testdata/WeaveInfoMessagesTest/Empty.lst
deleted file mode 100644
index 2e3d99c2b..000000000
--- a/ajde/testdata/WeaveInfoMessagesTest/Empty.lst
+++ /dev/null
@@ -1 +0,0 @@
--showWeaveInfo

diff --git a/ajde/testdata/WeaveInfoMessagesTest/Five.lst b/ajde/testdata/WeaveInfoMessagesTest/Five.lst
deleted file mode 100644
index 34b752fd2..000000000
--- a/ajde/testdata/WeaveInfoMessagesTest/Five.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-Simple.java

--showWeaveInfo

-AspectDeclareSoft.aj

diff --git a/ajde/testdata/WeaveInfoMessagesTest/Four.lst b/ajde/testdata/WeaveInfoMessagesTest/Four.lst
deleted file mode 100644
index 3f30efbcd..000000000
--- a/ajde/testdata/WeaveInfoMessagesTest/Four.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-AspectDeclareExtends.aj

-Simple.java

--showWeaveInfo

diff --git a/ajde/testdata/WeaveInfoMessagesTest/One.lst b/ajde/testdata/WeaveInfoMessagesTest/One.lst
deleted file mode 100644
index e85b4af93..000000000
--- a/ajde/testdata/WeaveInfoMessagesTest/One.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-AspectAdvice.aj

-Simple.java

--showWeaveInfo

diff --git a/ajde/testdata/WeaveInfoMessagesTest/Seven.lst b/ajde/testdata/WeaveInfoMessagesTest/Seven.lst
deleted file mode 100644
index b75e472ad..000000000
--- a/ajde/testdata/WeaveInfoMessagesTest/Seven.lst
+++ /dev/null
@@ -1,2 +0,0 @@
--1.5
-AspectDeclareAnnotations.aj
diff --git a/ajde/testdata/WeaveInfoMessagesTest/Simple.java b/ajde/testdata/WeaveInfoMessagesTest/Simple.java
deleted file mode 100644
index 934087546..000000000
--- a/ajde/testdata/WeaveInfoMessagesTest/Simple.java
+++ /dev/null
@@ -1,21 +0,0 @@
-// A simple class, interfered with by all sorts of advice !
-
-public class Simple {
-	
-	public void m1() {
-		
-	}
-	
-	public String m2() {
-		return "a";
-	}
-	
-	public static void main(String[] argv) {
-		
-	}
-	
-	private void mSecret() {
-		
-	}
-	
-}
\ No newline at end of file
diff --git a/ajde/testdata/WeaveInfoMessagesTest/Six.lst b/ajde/testdata/WeaveInfoMessagesTest/Six.lst
deleted file mode 100644
index 51eaf0703..000000000
--- a/ajde/testdata/WeaveInfoMessagesTest/Six.lst
+++ /dev/null
@@ -1,3 +0,0 @@
--showWeaveInfo
--1.5
-AspectDeclareAnnotations.aj
diff --git a/ajde/testdata/WeaveInfoMessagesTest/Three.lst b/ajde/testdata/WeaveInfoMessagesTest/Three.lst
deleted file mode 100644
index 141c6c9d7..000000000
--- a/ajde/testdata/WeaveInfoMessagesTest/Three.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-AspectDeclare.aj

-Simple.java

--showWeaveInfo

diff --git a/ajde/testdata/WeaveInfoMessagesTest/Two.lst b/ajde/testdata/WeaveInfoMessagesTest/Two.lst
deleted file mode 100644
index cb891a8a5..000000000
--- a/ajde/testdata/WeaveInfoMessagesTest/Two.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-AspectITD.aj

-Simple.java

--showWeaveInfo

diff --git a/ajde/testdata/WeaveInfoMessagesTest/a.lst b/ajde/testdata/WeaveInfoMessagesTest/a.lst
deleted file mode 100644
index 5df12713c..000000000
--- a/ajde/testdata/WeaveInfoMessagesTest/a.lst
+++ /dev/null
@@ -1,2 +0,0 @@
-Simple.jar

--showWeaveInfo

diff --git a/ajde/testdata/WeaveInfoMessagesTest/build.xml b/ajde/testdata/WeaveInfoMessagesTest/build.xml
deleted file mode 100644
index 774291d74..000000000
--- a/ajde/testdata/WeaveInfoMessagesTest/build.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<project name="aspectj-examples" default="spacewar" basedir=".">
-
-    <!--target name="init.taskdefs"-->
-      <taskdef resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties">
-          <classpath> 
-            <pathelement path="c:\aspectj1.2\lib\aspectjtools.jar"/>
-          </classpath>
-      </taskdef>
-    <!--/target-->
-
-    <target name="spacewar">
-       <iajc destdir="." argfiles="Two.lst" debug="off"
-       	fork="true" forkclasspath="c:\aspectj1.2\lib\aspectjtools.jar"
-        classpath="c:\aspectj1.2\lib\aspectjrt.jar"/>
-
-    </target>
-
-</project>
diff --git a/ajde/testdata/WeaveInfoMessagesTest/expected/advice.binary.nodebug.txt b/ajde/testdata/WeaveInfoMessagesTest/expected/advice.binary.nodebug.txt
deleted file mode 100644
index eab1c861a..000000000
--- a/ajde/testdata/WeaveInfoMessagesTest/expected/advice.binary.nodebug.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Join point 'method-execution(void Simple.m1())' in Type 'Simple' (no debug info available) advised by before advice from 'AspectAdvice' (AspectAdvice_nodebug.jar!AspectAdvice.class:8(from AspectAdvice.aj))
-Join point 'method-execution(void Simple.m1())' in Type 'Simple' (no debug info available) advised by after advice from 'AspectAdvice' (AspectAdvice_nodebug.jar!AspectAdvice.class:12(from AspectAdvice.aj))
-Join point 'method-execution(void Simple.m1())' in Type 'Simple' (no debug info available) advised by afterReturning advice from 'AspectAdvice' (AspectAdvice_nodebug.jar!AspectAdvice.class:16(from AspectAdvice.aj))
-Join point 'method-execution(void Simple.m1())' in Type 'Simple' (no debug info available) advised by afterThrowing advice from 'AspectAdvice' (AspectAdvice_nodebug.jar!AspectAdvice.class:20(from AspectAdvice.aj))
-Join point 'method-execution(java.lang.String Simple.m2())' in Type 'Simple' (no debug info available) advised by before advice from 'AspectAdvice' (AspectAdvice_nodebug.jar!AspectAdvice.class:8(from AspectAdvice.aj))
-Join point 'method-execution(java.lang.String Simple.m2())' in Type 'Simple' (no debug info available) advised by after advice from 'AspectAdvice' (AspectAdvice_nodebug.jar!AspectAdvice.class:12(from AspectAdvice.aj))
-Join point 'method-execution(java.lang.String Simple.m2())' in Type 'Simple' (no debug info available) advised by afterReturning advice from 'AspectAdvice' (AspectAdvice_nodebug.jar!AspectAdvice.class:16(from AspectAdvice.aj))
-Join point 'method-execution(java.lang.String Simple.m2())' in Type 'Simple' (no debug info available) advised by afterThrowing advice from 'AspectAdvice' (AspectAdvice_nodebug.jar!AspectAdvice.class:20(from AspectAdvice.aj))
-Join point 'method-execution(void Simple.main(java.lang.String[]))' in Type 'Simple' (no debug info available) advised by around advice from 'AspectAdvice' (AspectAdvice_nodebug.jar!AspectAdvice.class:24(from AspectAdvice.aj)) [with runtime test]
-Join point 'method-execution(void Simple.mSecret())' in Type 'Simple' (no debug info available) advised by before advice from 'AspectAdvice' (AspectAdvice_nodebug.jar!AspectAdvice.class:8(from AspectAdvice.aj))
-Join point 'method-execution(void Simple.mSecret())' in Type 'Simple' (no debug info available) advised by after advice from 'AspectAdvice' (AspectAdvice_nodebug.jar!AspectAdvice.class:12(from AspectAdvice.aj))
-Join point 'method-execution(void Simple.mSecret())' in Type 'Simple' (no debug info available) advised by afterReturning advice from 'AspectAdvice' (AspectAdvice_nodebug.jar!AspectAdvice.class:16(from AspectAdvice.aj))
-Join point 'method-execution(void Simple.mSecret())' in Type 'Simple' (no debug info available) advised by afterThrowing advice from 'AspectAdvice' (AspectAdvice_nodebug.jar!AspectAdvice.class:20(from AspectAdvice.aj))
diff --git a/ajde/testdata/WeaveInfoMessagesTest/expected/advice.binary.package.jar.txt b/ajde/testdata/WeaveInfoMessagesTest/expected/advice.binary.package.jar.txt
deleted file mode 100644
index 1c9e788bb..000000000
--- a/ajde/testdata/WeaveInfoMessagesTest/expected/advice.binary.package.jar.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Join point 'method-execution(void Simple.m1())' in Type 'Simple' (Simple.java:5) advised by before advice from 'pkg.AspectInPackage' (AspectInPackage.jar!AspectInPackage.class:7(from AspectInPackage.aj))
-Join point 'method-execution(java.lang.String Simple.m2())' in Type 'Simple' (Simple.java:9) advised by before advice from 'pkg.AspectInPackage' (AspectInPackage.jar!AspectInPackage.class:7(from AspectInPackage.aj))
-Join point 'method-execution(void Simple.main(java.lang.String[]))' in Type 'Simple' (Simple.java:13) advised by before advice from 'pkg.AspectInPackage' (AspectInPackage.jar!AspectInPackage.class:7(from AspectInPackage.aj))
-Join point 'method-execution(void Simple.mSecret())' in Type 'Simple' (Simple.java:17) advised by before advice from 'pkg.AspectInPackage' (AspectInPackage.jar!AspectInPackage.class:7(from AspectInPackage.aj))
diff --git a/ajde/testdata/WeaveInfoMessagesTest/expected/advice.binary.package.txt b/ajde/testdata/WeaveInfoMessagesTest/expected/advice.binary.package.txt
deleted file mode 100644
index d86780069..000000000
--- a/ajde/testdata/WeaveInfoMessagesTest/expected/advice.binary.package.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Join point 'method-execution(void Simple.m1())' in Type 'Simple' (Simple.java:5) advised by before advice from 'pkg.AspectInPackage' (AspectInPackage.class:7(from AspectInPackage.aj))
-Join point 'method-execution(java.lang.String Simple.m2())' in Type 'Simple' (Simple.java:9) advised by before advice from 'pkg.AspectInPackage' (AspectInPackage.class:7(from AspectInPackage.aj))
-Join point 'method-execution(void Simple.main(java.lang.String[]))' in Type 'Simple' (Simple.java:13) advised by before advice from 'pkg.AspectInPackage' (AspectInPackage.class:7(from AspectInPackage.aj))
-Join point 'method-execution(void Simple.mSecret())' in Type 'Simple' (Simple.java:17) advised by before advice from 'pkg.AspectInPackage' (AspectInPackage.class:7(from AspectInPackage.aj))
diff --git a/ajde/testdata/WeaveInfoMessagesTest/expected/advice.binary.txt b/ajde/testdata/WeaveInfoMessagesTest/expected/advice.binary.txt
deleted file mode 100644
index 9ed2ca073..000000000
--- a/ajde/testdata/WeaveInfoMessagesTest/expected/advice.binary.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Join point 'method-execution(void Simple.m1())' in Type 'Simple' (Simple.java:5) advised by before advice from 'AspectAdvice' (AspectAdvice.jar!AspectAdvice.class:8(from AspectAdvice.aj))
-Join point 'method-execution(void Simple.m1())' in Type 'Simple' (Simple.java:5) advised by after advice from 'AspectAdvice' (AspectAdvice.jar!AspectAdvice.class:12(from AspectAdvice.aj))
-Join point 'method-execution(void Simple.m1())' in Type 'Simple' (Simple.java:5) advised by afterReturning advice from 'AspectAdvice' (AspectAdvice.jar!AspectAdvice.class:16(from AspectAdvice.aj))
-Join point 'method-execution(void Simple.m1())' in Type 'Simple' (Simple.java:5) advised by afterThrowing advice from 'AspectAdvice' (AspectAdvice.jar!AspectAdvice.class:20(from AspectAdvice.aj))
-Join point 'method-execution(java.lang.String Simple.m2())' in Type 'Simple' (Simple.java:9) advised by before advice from 'AspectAdvice' (AspectAdvice.jar!AspectAdvice.class:8(from AspectAdvice.aj))
-Join point 'method-execution(java.lang.String Simple.m2())' in Type 'Simple' (Simple.java:9) advised by after advice from 'AspectAdvice' (AspectAdvice.jar!AspectAdvice.class:12(from AspectAdvice.aj))
-Join point 'method-execution(java.lang.String Simple.m2())' in Type 'Simple' (Simple.java:9) advised by afterReturning advice from 'AspectAdvice' (AspectAdvice.jar!AspectAdvice.class:16(from AspectAdvice.aj))
-Join point 'method-execution(java.lang.String Simple.m2())' in Type 'Simple' (Simple.java:9) advised by afterThrowing advice from 'AspectAdvice' (AspectAdvice.jar!AspectAdvice.class:20(from AspectAdvice.aj))
-Join point 'method-execution(void Simple.main(java.lang.String[]))' in Type 'Simple' (Simple.java:13) advised by around advice from 'AspectAdvice' (AspectAdvice.jar!AspectAdvice.class:24(from AspectAdvice.aj)) [with runtime test]
-Join point 'method-execution(void Simple.mSecret())' in Type 'Simple' (Simple.java:17) advised by before advice from 'AspectAdvice' (AspectAdvice.jar!AspectAdvice.class:8(from AspectAdvice.aj))
-Join point 'method-execution(void Simple.mSecret())' in Type 'Simple' (Simple.java:17) advised by after advice from 'AspectAdvice' (AspectAdvice.jar!AspectAdvice.class:12(from AspectAdvice.aj))
-Join point 'method-execution(void Simple.mSecret())' in Type 'Simple' (Simple.java:17) advised by afterReturning advice from 'AspectAdvice' (AspectAdvice.jar!AspectAdvice.class:16(from AspectAdvice.aj))
-Join point 'method-execution(void Simple.mSecret())' in Type 'Simple' (Simple.java:17) advised by afterThrowing advice from 'AspectAdvice' (AspectAdvice.jar!AspectAdvice.class:20(from AspectAdvice.aj))
diff --git a/ajde/testdata/WeaveInfoMessagesTest/expected/advice.txt b/ajde/testdata/WeaveInfoMessagesTest/expected/advice.txt
deleted file mode 100644
index 03d6c4574..000000000
--- a/ajde/testdata/WeaveInfoMessagesTest/expected/advice.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Join point 'method-execution(void Simple.m1())' in Type 'Simple' (Simple.java:5) advised by before advice from 'AspectAdvice' (AspectAdvice.aj:8)
-Join point 'method-execution(void Simple.m1())' in Type 'Simple' (Simple.java:5) advised by after advice from 'AspectAdvice' (AspectAdvice.aj:12)
-Join point 'method-execution(void Simple.m1())' in Type 'Simple' (Simple.java:5) advised by afterReturning advice from 'AspectAdvice' (AspectAdvice.aj:16)
-Join point 'method-execution(void Simple.m1())' in Type 'Simple' (Simple.java:5) advised by afterThrowing advice from 'AspectAdvice' (AspectAdvice.aj:20)
-Join point 'method-execution(java.lang.String Simple.m2())' in Type 'Simple' (Simple.java:9) advised by before advice from 'AspectAdvice' (AspectAdvice.aj:8)
-Join point 'method-execution(java.lang.String Simple.m2())' in Type 'Simple' (Simple.java:9) advised by after advice from 'AspectAdvice' (AspectAdvice.aj:12)
-Join point 'method-execution(java.lang.String Simple.m2())' in Type 'Simple' (Simple.java:9) advised by afterReturning advice from 'AspectAdvice' (AspectAdvice.aj:16)
-Join point 'method-execution(java.lang.String Simple.m2())' in Type 'Simple' (Simple.java:9) advised by afterThrowing advice from 'AspectAdvice' (AspectAdvice.aj:20)
-Join point 'method-execution(void Simple.main(java.lang.String[]))' in Type 'Simple' (Simple.java:13) advised by around advice from 'AspectAdvice' (AspectAdvice.aj:24) [with runtime test]
-Join point 'method-execution(void Simple.mSecret())' in Type 'Simple' (Simple.java:17) advised by before advice from 'AspectAdvice' (AspectAdvice.aj:8)
-Join point 'method-execution(void Simple.mSecret())' in Type 'Simple' (Simple.java:17) advised by after advice from 'AspectAdvice' (AspectAdvice.aj:12)
-Join point 'method-execution(void Simple.mSecret())' in Type 'Simple' (Simple.java:17) advised by afterReturning advice from 'AspectAdvice' (AspectAdvice.aj:16)
-Join point 'method-execution(void Simple.mSecret())' in Type 'Simple' (Simple.java:17) advised by afterThrowing advice from 'AspectAdvice' (AspectAdvice.aj:20)
diff --git a/ajde/testdata/WeaveInfoMessagesTest/expected/declare.annotation.txt b/ajde/testdata/WeaveInfoMessagesTest/expected/declare.annotation.txt
deleted file mode 100644
index 7daacb75d..000000000
--- a/ajde/testdata/WeaveInfoMessagesTest/expected/declare.annotation.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-'Test' (AspectDeclareAnnotations.aj:14) is annotated with @anInterface type annotation from 'AspectDeclareAnnotations' (AspectDeclareAnnotations.aj:7)
-'public void Test.new(String,int)' (AspectDeclareAnnotations.aj:16) is annotated with @anInterface constructor annotation from 'AspectDeclareAnnotations' (AspectDeclareAnnotations.aj:8)
-'public int Test.fac(int)' (AspectDeclareAnnotations.aj:20) is annotated with @anInterface method annotation from 'AspectDeclareAnnotations' (AspectDeclareAnnotations.aj:9)
-'public int a' of type 'Test' (AspectDeclareAnnotations.aj) is annotated with @anInterface field annotation from 'AspectDeclareAnnotations' (AspectDeclareAnnotations.aj:10)
diff --git a/ajde/testdata/WeaveInfoMessagesTest/expected/declare.extends.txt b/ajde/testdata/WeaveInfoMessagesTest/expected/declare.extends.txt
deleted file mode 100644
index 29fb45592..000000000
--- a/ajde/testdata/WeaveInfoMessagesTest/expected/declare.extends.txt
+++ /dev/null
@@ -1 +0,0 @@
-Setting superclass of type 'Simple' (Simple.java) to 'InTheWay' (AspectDeclareExtends.aj)
diff --git a/ajde/testdata/WeaveInfoMessagesTest/expected/declare.soft.binary.nodebug.txt b/ajde/testdata/WeaveInfoMessagesTest/expected/declare.soft.binary.nodebug.txt
deleted file mode 100644
index 2a326c0e3..000000000
--- a/ajde/testdata/WeaveInfoMessagesTest/expected/declare.soft.binary.nodebug.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Softening exceptions in type 'Simple' (no debug info available) as defined by aspect 'AspectDeclareSoft' (AspectDeclareSoft_nodebug.jar!AspectDeclareSoft.class:4(from AspectDeclareSoft.aj))
-Softening exceptions in type 'Simple' (no debug info available) as defined by aspect 'AspectDeclareSoft' (AspectDeclareSoft_nodebug.jar!AspectDeclareSoft.class:6(from AspectDeclareSoft.aj))
diff --git a/ajde/testdata/WeaveInfoMessagesTest/expected/declare.soft.binary.txt b/ajde/testdata/WeaveInfoMessagesTest/expected/declare.soft.binary.txt
deleted file mode 100644
index e1f3522dc..000000000
--- a/ajde/testdata/WeaveInfoMessagesTest/expected/declare.soft.binary.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Softening exceptions in type 'Simple' (Simple.java:13) as defined by aspect 'AspectDeclareSoft' (AspectDeclareSoft.jar!AspectDeclareSoft.class:4(from AspectDeclareSoft.aj))
-Softening exceptions in type 'Simple' (Simple.java:13) as defined by aspect 'AspectDeclareSoft' (AspectDeclareSoft.jar!AspectDeclareSoft.class:6(from AspectDeclareSoft.aj))
diff --git a/ajde/testdata/WeaveInfoMessagesTest/expected/declare.soft.nodebug.txt b/ajde/testdata/WeaveInfoMessagesTest/expected/declare.soft.nodebug.txt
deleted file mode 100644
index d64a942e3..000000000
--- a/ajde/testdata/WeaveInfoMessagesTest/expected/declare.soft.nodebug.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Softening exceptions in type 'Simple' (no debug info available) as defined by aspect 'AspectDeclareSoft' (AspectDeclareSoft.aj:4)
-Softening exceptions in type 'Simple' (no debug info available) as defined by aspect 'AspectDeclareSoft' (AspectDeclareSoft.aj:6)
diff --git a/ajde/testdata/WeaveInfoMessagesTest/expected/declare.soft.txt b/ajde/testdata/WeaveInfoMessagesTest/expected/declare.soft.txt
deleted file mode 100644
index 234d3228b..000000000
--- a/ajde/testdata/WeaveInfoMessagesTest/expected/declare.soft.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Softening exceptions in type 'Simple' (Simple.java:13) as defined by aspect 'AspectDeclareSoft' (AspectDeclareSoft.aj:6)
-Softening exceptions in type 'Simple' (Simple.java:13) as defined by aspect 'AspectDeclareSoft' (AspectDeclareSoft.aj:4)
diff --git a/ajde/testdata/WeaveInfoMessagesTest/expected/declare1.nodebug.txt b/ajde/testdata/WeaveInfoMessagesTest/expected/declare1.nodebug.txt
deleted file mode 100644
index 1da4b502c..000000000
--- a/ajde/testdata/WeaveInfoMessagesTest/expected/declare1.nodebug.txt
+++ /dev/null
@@ -1 +0,0 @@
-Extending interface set for type 'Simple' (no debug info available) to include 'MarkerInterface' (AspectDeclare.aj)
diff --git a/ajde/testdata/WeaveInfoMessagesTest/expected/declare1.txt b/ajde/testdata/WeaveInfoMessagesTest/expected/declare1.txt
deleted file mode 100644
index b05cdfb86..000000000
--- a/ajde/testdata/WeaveInfoMessagesTest/expected/declare1.txt
+++ /dev/null
@@ -1 +0,0 @@
-Extending interface set for type 'Simple' (Simple.java) to include 'MarkerInterface' (AspectDeclare.aj)
diff --git a/ajde/testdata/WeaveInfoMessagesTest/expected/itd.nodebug.txt b/ajde/testdata/WeaveInfoMessagesTest/expected/itd.nodebug.txt
deleted file mode 100644
index 0664ed4e0..000000000
--- a/ajde/testdata/WeaveInfoMessagesTest/expected/itd.nodebug.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Type 'Simple' (no debug info available) has intertyped field from 'AspectITD' (AspectITD.aj:'int Simple.fieldint')
-Type 'Simple' (no debug info available) has intertyped field from 'AspectITD' (AspectITD.aj:'java.lang.String Simple.fieldstring')
-Type 'Simple' (no debug info available) has intertyped method from 'AspectITD' (AspectITD.aj:'int Simple.returnint()')
-Type 'Simple' (no debug info available) has intertyped method from 'AspectITD' (AspectITD.aj:'java.lang.String Simple.returnstring()')
diff --git a/ajde/testdata/WeaveInfoMessagesTest/expected/itd.txt b/ajde/testdata/WeaveInfoMessagesTest/expected/itd.txt
deleted file mode 100644
index eeb84247e..000000000
--- a/ajde/testdata/WeaveInfoMessagesTest/expected/itd.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Type 'Simple' (Simple.java) has intertyped field from 'AspectITD' (AspectITD.aj:'int Simple.fieldint')
-Type 'Simple' (Simple.java) has intertyped field from 'AspectITD' (AspectITD.aj:'java.lang.String Simple.fieldstring')
-Type 'Simple' (Simple.java) has intertyped method from 'AspectITD' (AspectITD.aj:'int Simple.returnint()')
-Type 'Simple' (Simple.java) has intertyped method from 'AspectITD' (AspectITD.aj:'java.lang.String Simple.returnstring()')