From: aclement Date: Wed, 5 Jan 2005 14:42:34 +0000 (+0000) Subject: Binary Weaving Decp: test code X-Git-Tag: Root_AspectJ5_Development~119 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9536453a52beafee86fa8785df103352f1823b4e;p=aspectj.git Binary Weaving Decp: test code --- diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestA/AspectAB.aj b/org.aspectj.ajdt.core/testdata/binaryParents/TestA/AspectAB.aj new file mode 100644 index 000000000..23172ba1e --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestA/AspectAB.aj @@ -0,0 +1,3 @@ +public aspect AspectAB { + declare parents: Z+ implements java.io.Serializable; +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestA/AspectX1.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestA/AspectX1.java new file mode 100644 index 000000000..34a976f5f --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestA/AspectX1.java @@ -0,0 +1,3 @@ +public aspect AspectX1 { + declare parents: Bottom1 extends Middle1; +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestA/AspectX2.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestA/AspectX2.java new file mode 100644 index 000000000..f4cae95db --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestA/AspectX2.java @@ -0,0 +1,3 @@ +public aspect AspectX2 { + declare parents: Bottom2 extends Middle2; +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestA/AspectX3.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestA/AspectX3.java new file mode 100644 index 000000000..87bf1e980 --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestA/AspectX3.java @@ -0,0 +1,3 @@ +public aspect AspectX3 { + declare parents: Bottom3 extends Middle3; +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestA/AspectX4.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestA/AspectX4.java new file mode 100644 index 000000000..2c573eb5b --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestA/AspectX4.java @@ -0,0 +1,3 @@ +public aspect AspectX4 { + declare parents: Bottom4 extends Middle4; +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestA/B.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestA/B.java new file mode 100644 index 000000000..51211051e --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestA/B.java @@ -0,0 +1,12 @@ +public class B extends Z { + + public static void main(String[] args) { + B b = new B(); + if (b.getClass().getInterfaces().length>0) { + throw new RuntimeException("B should not implement any interfaces: "+b.getClass().getInterfaces()[0].toString()); + } + if (!(b instanceof java.io.Serializable)) { + throw new RuntimeException("B should be serializable! Inherited from A"); + } + } +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestA/Bottom1.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestA/Bottom1.java new file mode 100644 index 000000000..6aebb2722 --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestA/Bottom1.java @@ -0,0 +1,3 @@ +public class Bottom1 extends Top1 { +public static void main(String[]argv) {} +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestA/Bottom2.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestA/Bottom2.java new file mode 100644 index 000000000..da60fa05a --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestA/Bottom2.java @@ -0,0 +1,9 @@ +public class Bottom2 extends Top2 { + public Bottom2() { + super(); + } + + public static void main(String[]argv) { + new Bottom2(); + } +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestA/Bottom3.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestA/Bottom3.java new file mode 100644 index 000000000..ee16a765b --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestA/Bottom3.java @@ -0,0 +1,14 @@ +public class Bottom3 extends Top3 { + public Bottom3() { + super(); + } + + public static void main(String[]argv) { + Bottom3 b = new Bottom3(); + b.runit(); + } + + public void runit() { + super.m("x"); + } +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestA/Bottom4.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestA/Bottom4.java new file mode 100644 index 000000000..967ffe309 --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestA/Bottom4.java @@ -0,0 +1,10 @@ +public class Bottom4 extends Top4 { + public Bottom4() { + super("hello"); + } + + public static void main(String[]argv) { + Bottom4 b = new Bottom4(); + } + +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestA/Middle1.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestA/Middle1.java new file mode 100644 index 000000000..646f9c82a --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestA/Middle1.java @@ -0,0 +1,2 @@ +public class Middle1 extends Top1 { +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestA/Middle2.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestA/Middle2.java new file mode 100644 index 000000000..48e06f6f0 --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestA/Middle2.java @@ -0,0 +1,2 @@ +public class Middle2 extends Top2 { +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestA/Middle3.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestA/Middle3.java new file mode 100644 index 000000000..676e12ece --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestA/Middle3.java @@ -0,0 +1,5 @@ +public class Middle3 extends Top3 { + public void m(String s) { + System.err.println("Middle3.m(String)"); + } +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestA/Middle4.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestA/Middle4.java new file mode 100644 index 000000000..eef813923 --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestA/Middle4.java @@ -0,0 +1,5 @@ +public class Middle4 extends Top4 { + + public Middle4() { + } +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestA/Top1.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestA/Top1.java new file mode 100644 index 000000000..8ee3a2f23 --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestA/Top1.java @@ -0,0 +1,2 @@ +public class Top1 { +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestA/Top2.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestA/Top2.java new file mode 100644 index 000000000..38050197c --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestA/Top2.java @@ -0,0 +1,2 @@ +public class Top2 { +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestA/Top3.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestA/Top3.java new file mode 100644 index 000000000..181ab6d80 --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestA/Top3.java @@ -0,0 +1,5 @@ +public class Top3 { + public void m(String s) { + System.err.println("Top3.m(String)"); + } +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestA/Top4.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestA/Top4.java new file mode 100644 index 000000000..3fde28d57 --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestA/Top4.java @@ -0,0 +1,5 @@ +public class Top4 { + public Top4() {} + public Top4(String s) { + } +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestA/Z.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestA/Z.java new file mode 100644 index 000000000..9e622e198 --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestA/Z.java @@ -0,0 +1,2 @@ +public class Z { +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Aspect1.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Aspect1.java new file mode 100644 index 000000000..b822f8a6b --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Aspect1.java @@ -0,0 +1,3 @@ +public aspect Aspect1 { + declare parents: Middle1 extends Top1; +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Aspect2.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Aspect2.java new file mode 100644 index 000000000..c75056246 --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Aspect2.java @@ -0,0 +1,3 @@ +public aspect Aspect2 { + declare parents: Middle2 extends Top2; +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Aspect3.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Aspect3.java new file mode 100644 index 000000000..4d2d9dab4 --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Aspect3.java @@ -0,0 +1,3 @@ +public aspect Aspect3 { + declare parents: Middle3 extends Top3; +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Aspect4.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Aspect4.java new file mode 100644 index 000000000..f1d9ac6f7 --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Aspect4.java @@ -0,0 +1,3 @@ +public aspect Aspect4 { + declare parents: Middle4 extends Top4; +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Aspect5.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Aspect5.java new file mode 100644 index 000000000..c33ea4af3 --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Aspect5.java @@ -0,0 +1,6 @@ +public aspect Aspect5 { + declare parents: Middle4 extends Top4; + + public void Middle4.absMethod0() { } + public void Middle4.absMethod2() { } +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Aspect6.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Aspect6.java new file mode 100644 index 000000000..87e49ca9a --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Aspect6.java @@ -0,0 +1,3 @@ +public aspect Aspect6 { + declare parents: Middle6 extends Top6; +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Bottom1.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Bottom1.java new file mode 100644 index 000000000..9ad72c4e8 --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Bottom1.java @@ -0,0 +1,21 @@ +public class Bottom1 extends Top1 { + public void publicMethod() { + } + + protected void protectedMethod() { + } + + void defaultMethod() { + } + + private void privateMethod() { + } + + public static void main(String[]argv) { + Bottom1 b = new Bottom1(); + b.publicMethod(); + b.protectedMethod(); + b.defaultMethod(); + b.privateMethod(); + } +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Bottom2.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Bottom2.java new file mode 100644 index 000000000..72eafa15d --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Bottom2.java @@ -0,0 +1,10 @@ +public class Bottom2 extends Top2 { + public void publicMethod_voidReturn() { } + + public String publicMethod_StringReturn() { return "";} + + public Integer publicMethod_IntegerReturn() { return new Integer(2);} + +// public Super publicMethod_SuperReturn() { return null;} + +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Middle1.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Middle1.java new file mode 100644 index 000000000..2af541806 --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Middle1.java @@ -0,0 +1,22 @@ +public class Middle1 { + protected void publicMethod() { + } + + void protectedMethod() { + } + + private void defaultMethod() { + } + + private void privateMethod() { + } + + public static void main(String[] argv) { + Middle1 m = new Middle1(); + + m.publicMethod(); + m.protectedMethod(); + m.defaultMethod(); + m.privateMethod(); + } +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Middle2.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Middle2.java new file mode 100644 index 000000000..4a2c93d26 --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Middle2.java @@ -0,0 +1,10 @@ +public class Middle2 { + public int publicMethod_voidReturn() { return 2;} + + public String publicMethod_StringReturn() { return "";} + + public int publicMethod_IntegerReturn() { return 3;} + +// public Sub publicMethod_SuperReturn() { return null;} + +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Middle3.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Middle3.java new file mode 100644 index 000000000..2a4457a7b --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Middle3.java @@ -0,0 +1,4 @@ +public class Middle3 { + public void absMethod1() {} + +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Middle4.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Middle4.java new file mode 100644 index 000000000..221ccca8a --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Middle4.java @@ -0,0 +1,4 @@ +public class Middle4 { + public void absMethod1() {} + +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Middle6.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Middle6.java new file mode 100644 index 000000000..9a89f71e0 --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Middle6.java @@ -0,0 +1,26 @@ +public class Middle6 { + protected void publicMethod() { + } + + void protectedMethod() { + } + + private void defaultMethod() { + } + + private void privateMethod() { + } + + + private void anotherPublicMethod() { } + private void anotherProtectedMethod() {} + + public static void main(String[] argv) { + Middle6 m = new Middle6(); + + m.publicMethod(); + m.protectedMethod(); + m.defaultMethod(); + m.privateMethod(); + } +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Sub.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Sub.java new file mode 100644 index 000000000..d4f22d925 --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Sub.java @@ -0,0 +1 @@ +public class Sub extends Super {} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Super.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Super.java new file mode 100644 index 000000000..3cf1600fc --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Super.java @@ -0,0 +1 @@ +public class Super {} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Top1.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Top1.java new file mode 100644 index 000000000..cceab8f06 --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Top1.java @@ -0,0 +1,13 @@ +public class Top1 { + public void publicMethod() { + } + + protected void protectedMethod() { + } + + void defaultMethod() { + } + + private void privateMethod() { + } +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Top2.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Top2.java new file mode 100644 index 000000000..6d61e497c --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Top2.java @@ -0,0 +1,10 @@ +public class Top2 { + public void publicMethod_voidReturn() { } + + public String publicMethod_StringReturn() { return "";} + + public Integer publicMethod_IntegerReturn() { return new Integer(3);} + +// public Super publicMethod_SuperReturn() { return null;} + +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Top3.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Top3.java new file mode 100644 index 000000000..a324d4665 --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Top3.java @@ -0,0 +1,6 @@ +public abstract class Top3 { + public abstract void absMethod1(); + public abstract void absMethod2(); + public void absMethod3() {}; + +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Top4.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Top4.java new file mode 100644 index 000000000..4200d0373 --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Top4.java @@ -0,0 +1,6 @@ +public abstract class Top4 extends TopTop4 { + public abstract void absMethod1(); + public abstract void absMethod2(); + public void absMethod3() {}; + +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Top6.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Top6.java new file mode 100644 index 000000000..59e5111ad --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestB/Top6.java @@ -0,0 +1,13 @@ +public class Top6 extends TopTop6 { + public void publicMethod() { + } + + protected void protectedMethod() { + } + + void defaultMethod() { + } + + private void privateMethod() { + } +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestB/TopTop4.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestB/TopTop4.java new file mode 100644 index 000000000..acb82a6ef --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestB/TopTop4.java @@ -0,0 +1,3 @@ +public abstract class TopTop4 { + public abstract void absMethod0(); +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestB/TopTop6.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestB/TopTop6.java new file mode 100644 index 000000000..9cf027a0b --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestB/TopTop6.java @@ -0,0 +1,6 @@ +public abstract class TopTop6 { + public void anotherPublicMethod() {} + + protected void anotherProtectedMethod() {} + +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestC/A1.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestC/A1.java new file mode 100644 index 000000000..95a8d29bd --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestC/A1.java @@ -0,0 +1,7 @@ +public class A1 { + public static void staticMethod() { + } + + public void instanceMethod() { + } +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestC/A2.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestC/A2.java new file mode 100644 index 000000000..cfc6a4dfb --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestC/A2.java @@ -0,0 +1,2 @@ +public final class A2 { +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestC/A3.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestC/A3.java new file mode 100644 index 000000000..a719a61d1 --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestC/A3.java @@ -0,0 +1,2 @@ +public class A3 { +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestC/B1.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestC/B1.java new file mode 100644 index 000000000..e4e598e00 --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestC/B1.java @@ -0,0 +1,10 @@ +public class B1 { + + // inherited via decp + public void staticMethod() { + } + + // inherited via decp + public static void instanceMethod() { + } +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestC/B2.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestC/B2.java new file mode 100644 index 000000000..b5a15cd97 --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestC/B2.java @@ -0,0 +1,6 @@ +public class B2 { + + public static void main(String[] argv) { + B2 b = new B2(); + } +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestC/X1.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestC/X1.java new file mode 100644 index 000000000..7f0456e6b --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestC/X1.java @@ -0,0 +1,3 @@ +public aspect X1 { + declare parents: B1 extends A1; +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestC/X2.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestC/X2.java new file mode 100644 index 000000000..614bb57ac --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestC/X2.java @@ -0,0 +1,3 @@ +public aspect X2 { + declare parents: B2 extends A2; +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestC/X3.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestC/X3.java new file mode 100644 index 000000000..5053b216c --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestC/X3.java @@ -0,0 +1,3 @@ +public aspect X3 { + declare parents: java.lang.Obj* extends A3; +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestD/SimpleAspect1.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestD/SimpleAspect1.java new file mode 100644 index 000000000..bba6e97ae --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestD/SimpleAspect1.java @@ -0,0 +1,3 @@ +public aspect SimpleAspect1 { + declare parents: SimpleClass1 implements SimpleIntf1; +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestD/SimpleAspect2.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestD/SimpleAspect2.java new file mode 100644 index 000000000..ee4c63998 --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestD/SimpleAspect2.java @@ -0,0 +1,5 @@ +public aspect SimpleAspect2 { + declare parents: SimpleClass2 implements Runnable; + public void SimpleClass2.run() {} + +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestD/SimpleClass1.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestD/SimpleClass1.java new file mode 100644 index 000000000..a3da1f419 --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestD/SimpleClass1.java @@ -0,0 +1,3 @@ +public class SimpleClass1 { + public Integer getInteger() { return new Integer(42);} +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestD/SimpleClass2.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestD/SimpleClass2.java new file mode 100644 index 000000000..799940a95 --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestD/SimpleClass2.java @@ -0,0 +1 @@ +public class SimpleClass2 {} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestD/SimpleIntf1.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestD/SimpleIntf1.java new file mode 100644 index 000000000..fc881458e --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestD/SimpleIntf1.java @@ -0,0 +1,4 @@ +public interface SimpleIntf1 { + public String getString(); + public Integer getInteger(); +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestE/A.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestE/A.java new file mode 100644 index 000000000..a182099d3 --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestE/A.java @@ -0,0 +1,6 @@ +public class A { + public A() { + } + public A(int i) { + } +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestE/B.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestE/B.java new file mode 100644 index 000000000..b9f87d43b --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestE/B.java @@ -0,0 +1,3 @@ +public class B extends A { +} + diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestE/C.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestE/C.java new file mode 100644 index 000000000..9ae80cf06 --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestE/C.java @@ -0,0 +1,24 @@ +public class C extends A{ + + public void helper0() { + } + + public C() { + super(3); + } + public static void main(String[] argv) { + new C(); + } + + public C(String s) { + super(5); + } + + public void helper1() { + } + + public C(float f) { + } + + public void helper2() { } +} diff --git a/org.aspectj.ajdt.core/testdata/binaryParents/TestE/X.java b/org.aspectj.ajdt.core/testdata/binaryParents/TestE/X.java new file mode 100644 index 000000000..fb1bf310f --- /dev/null +++ b/org.aspectj.ajdt.core/testdata/binaryParents/TestE/X.java @@ -0,0 +1,7 @@ +public aspect X { + declare parents: C extends B; + + public B.new(int i) { + super(i); + } +}