refactored tests for 154552 - use new model testing structure

6 files changed, 56 insertions, 0 deletions

diff --git a/tests/model/pr141730_4/MyAnnotation.java b/tests/model/pr141730_4/MyAnnotation.java
new file mode 100644
index 000000000..16a690ce2
--- /dev/null
+++ b/tests/model/pr141730_4/MyAnnotation.java
@@ -0,0 +1,5 @@
+package bar;
+
+public @interface MyAnnotation {
+
+}
diff --git a/tests/model/pr141730_4/MyBar.aj b/tests/model/pr141730_4/MyBar.aj
new file mode 100644
index 000000000..50ea6efd0
--- /dev/null
+++ b/tests/model/pr141730_4/MyBar.aj
@@ -0,0 +1,18 @@
+package bar;
+
+import foo.*;
+
+public aspect MyBar {
+
+	before() : call(* main(..)) {}
+
+	declare warning: get( * System.out ) : "System.out should not be called";
+	
+	declare parents : *Foo extends NewClass;
+	
+	declare @type : *Foo* : @MyAnnotation;
+	declare @method : public * *Foo.anotMethod(..) : @MyAnnotation;
+	declare @constructor : *Foo.new(String) : @MyAnnotation;
+	declare @field : int *Foo.* : @MyAnnotation ;
+	
+}
diff --git a/tests/model/pr141730_4/MyFoo.java b/tests/model/pr141730_4/MyFoo.java
new file mode 100644
index 000000000..d9aba23f4
--- /dev/null
+++ b/tests/model/pr141730_4/MyFoo.java
@@ -0,0 +1,25 @@
+package foo;
+
+public class MyFoo {
+
+	public int i;
+	
+	public MyFoo() {
+		super();
+	}
+	
+	public MyFoo(String s) {
+		super();
+	}
+	
+	public void callMain() {
+		new MyFoo().main();
+	}
+	
+	public void main() {
+		System.out.println("blah");
+	}
+	
+	public void anotMethod() {	
+	}
+}
diff --git a/tests/model/pr141730_4/NewClass.java b/tests/model/pr141730_4/NewClass.java
new file mode 100644
index 000000000..cdbce29e5
--- /dev/null
+++ b/tests/model/pr141730_4/NewClass.java
@@ -0,0 +1,5 @@
+package bar;
+
+public class NewClass {
+
+}
diff --git a/tests/model/pr141730_4/README.txt b/tests/model/pr141730_4/README.txt
new file mode 100644
index 000000000..7cb52fcea
--- /dev/null
+++ b/tests/model/pr141730_4/README.txt
@@ -0,0 +1,3 @@
+To recreate the jar files:
+
+ajc MyFoo.java -outjar inpath.jar
diff --git a/tests/model/pr141730_4/inpath.jar b/tests/model/pr141730_4/inpath.jar
new file mode 100644
index 000000000..ba262c555
--- /dev/null
+++ b/tests/model/pr141730_4/inpath.jar