From a7483038e86dd39894d9b347f227eb6c3a33e09e Mon Sep 17 00:00:00 2001 From: Andy Clement Date: Fri, 15 Jun 2012 17:42:25 -0700 Subject: 382189 and 382435 --- tests/bugs170/pr382189/covbug/A.java | 2 ++ tests/bugs170/pr382189/covbug/A_ITD.aj | 12 ++++++++++ tests/bugs170/pr382189/covbug/B.java | 3 +++ tests/bugs170/pr382189/covbug/SuperA.java | 6 +++++ tests/bugs170/pr382189/covbug/SuperB.java | 3 +++ tests/bugs170/pr382189/covbug/cc/covbug/A.class | Bin 0 -> 466 bytes tests/bugs170/pr382189/covbug/cc/covbug/A.java | 10 ++++++++ tests/bugs170/pr382189/covbug/cc/covbug/A_ITD.aj | 12 ++++++++++ tests/bugs170/pr382189/covbug/cc/covbug/B.class | Bin 0 -> 238 bytes tests/bugs170/pr382189/covbug/cc/covbug/B.java | 8 +++++++ .../bugs170/pr382189/covbug/cc/covbug/SuperA.class | Bin 0 -> 363 bytes .../bugs170/pr382189/covbug/cc/covbug/SuperA.java | 7 ++++++ .../bugs170/pr382189/covbug/cc/covbug/SuperB.class | Bin 0 -> 256 bytes .../bugs170/pr382189/covbug/cc/covbug/SuperB.java | 5 ++++ tests/bugs170/pr382189/covbug/pj/A.class | Bin 0 -> 639 bytes tests/bugs170/pr382189/covbug/pj/B.class | Bin 0 -> 219 bytes tests/bugs170/pr382189/covbug/pj/Foo.java | 26 +++++++++++++++++++++ tests/bugs170/pr382189/covbug/pj/SuperA.class | Bin 0 -> 325 bytes tests/bugs170/pr382189/covbug/pj/SuperB.class | Bin 0 -> 246 bytes tests/bugs170/pr382189/one/A.java | 1 + tests/bugs170/pr382189/one/A_ITD.aj | 6 +++++ tests/bugs170/pr382189/one/B.java | 1 + tests/bugs170/pr382189/one/SuperA.java | 5 ++++ tests/bugs170/pr382189/one/SuperB.java | 2 ++ tests/bugs170/pr382189/three/A.java | 6 +++++ tests/bugs170/pr382189/three/A_ITD.aj | 7 ++++++ tests/bugs170/pr382189/three/B.java | 2 ++ tests/bugs170/pr382189/three/SuperA.java | 5 ++++ tests/bugs170/pr382189/three/SuperB.java | 2 ++ tests/bugs170/pr382189/two/A.java | 1 + tests/bugs170/pr382189/two/A_ITD.aj | 7 ++++++ tests/bugs170/pr382189/two/B.java | 1 + tests/bugs170/pr382189/two/SuperA.java | 5 ++++ tests/bugs170/pr382189/two/SuperB.java | 2 ++ tests/bugs170/pr382435/one/bug/A.java | 17 ++++++++++++++ tests/bugs170/pr382435/two/bug/A.java | 21 +++++++++++++++++ 36 files changed, 185 insertions(+) create mode 100644 tests/bugs170/pr382189/covbug/A.java create mode 100644 tests/bugs170/pr382189/covbug/A_ITD.aj create mode 100644 tests/bugs170/pr382189/covbug/B.java create mode 100644 tests/bugs170/pr382189/covbug/SuperA.java create mode 100644 tests/bugs170/pr382189/covbug/SuperB.java create mode 100644 tests/bugs170/pr382189/covbug/cc/covbug/A.class create mode 100644 tests/bugs170/pr382189/covbug/cc/covbug/A.java create mode 100644 tests/bugs170/pr382189/covbug/cc/covbug/A_ITD.aj create mode 100644 tests/bugs170/pr382189/covbug/cc/covbug/B.class create mode 100644 tests/bugs170/pr382189/covbug/cc/covbug/B.java create mode 100644 tests/bugs170/pr382189/covbug/cc/covbug/SuperA.class create mode 100644 tests/bugs170/pr382189/covbug/cc/covbug/SuperA.java create mode 100644 tests/bugs170/pr382189/covbug/cc/covbug/SuperB.class create mode 100644 tests/bugs170/pr382189/covbug/cc/covbug/SuperB.java create mode 100644 tests/bugs170/pr382189/covbug/pj/A.class create mode 100644 tests/bugs170/pr382189/covbug/pj/B.class create mode 100644 tests/bugs170/pr382189/covbug/pj/Foo.java create mode 100644 tests/bugs170/pr382189/covbug/pj/SuperA.class create mode 100644 tests/bugs170/pr382189/covbug/pj/SuperB.class create mode 100644 tests/bugs170/pr382189/one/A.java create mode 100644 tests/bugs170/pr382189/one/A_ITD.aj create mode 100644 tests/bugs170/pr382189/one/B.java create mode 100644 tests/bugs170/pr382189/one/SuperA.java create mode 100644 tests/bugs170/pr382189/one/SuperB.java create mode 100644 tests/bugs170/pr382189/three/A.java create mode 100644 tests/bugs170/pr382189/three/A_ITD.aj create mode 100644 tests/bugs170/pr382189/three/B.java create mode 100644 tests/bugs170/pr382189/three/SuperA.java create mode 100644 tests/bugs170/pr382189/three/SuperB.java create mode 100644 tests/bugs170/pr382189/two/A.java create mode 100644 tests/bugs170/pr382189/two/A_ITD.aj create mode 100644 tests/bugs170/pr382189/two/B.java create mode 100644 tests/bugs170/pr382189/two/SuperA.java create mode 100644 tests/bugs170/pr382189/two/SuperB.java create mode 100644 tests/bugs170/pr382435/one/bug/A.java create mode 100644 tests/bugs170/pr382435/two/bug/A.java (limited to 'tests/bugs170') diff --git a/tests/bugs170/pr382189/covbug/A.java b/tests/bugs170/pr382189/covbug/A.java new file mode 100644 index 000000000..1bf20c5b6 --- /dev/null +++ b/tests/bugs170/pr382189/covbug/A.java @@ -0,0 +1,2 @@ +package covbug; +public class A { } diff --git a/tests/bugs170/pr382189/covbug/A_ITD.aj b/tests/bugs170/pr382189/covbug/A_ITD.aj new file mode 100644 index 000000000..5cf1a73fa --- /dev/null +++ b/tests/bugs170/pr382189/covbug/A_ITD.aj @@ -0,0 +1,12 @@ +package covbug; + + +public privileged aspect A_ITD { + declare parents: A extends SuperA; + + + public B A.getSomeB(SuperB b){ + return null; + } + +} diff --git a/tests/bugs170/pr382189/covbug/B.java b/tests/bugs170/pr382189/covbug/B.java new file mode 100644 index 000000000..1184552ef --- /dev/null +++ b/tests/bugs170/pr382189/covbug/B.java @@ -0,0 +1,3 @@ +package covbug; + +public class B extends SuperB { } diff --git a/tests/bugs170/pr382189/covbug/SuperA.java b/tests/bugs170/pr382189/covbug/SuperA.java new file mode 100644 index 000000000..288b9f9a3 --- /dev/null +++ b/tests/bugs170/pr382189/covbug/SuperA.java @@ -0,0 +1,6 @@ +package covbug; +import java.util.List; + +public abstract class SuperA { + public abstract SuperB getSomeB(SuperB b); +} diff --git a/tests/bugs170/pr382189/covbug/SuperB.java b/tests/bugs170/pr382189/covbug/SuperB.java new file mode 100644 index 000000000..8a6c2c2dd --- /dev/null +++ b/tests/bugs170/pr382189/covbug/SuperB.java @@ -0,0 +1,3 @@ +package covbug; + +public class SuperB { } diff --git a/tests/bugs170/pr382189/covbug/cc/covbug/A.class b/tests/bugs170/pr382189/covbug/cc/covbug/A.class new file mode 100644 index 000000000..59a59b710 Binary files /dev/null and b/tests/bugs170/pr382189/covbug/cc/covbug/A.class differ diff --git a/tests/bugs170/pr382189/covbug/cc/covbug/A.java b/tests/bugs170/pr382189/covbug/cc/covbug/A.java new file mode 100644 index 000000000..1c0499f94 --- /dev/null +++ b/tests/bugs170/pr382189/covbug/cc/covbug/A.java @@ -0,0 +1,10 @@ +package covbug; + + +public class A extends SuperA { + public B getSomeB(SuperB b){ + return null; + } + + +} diff --git a/tests/bugs170/pr382189/covbug/cc/covbug/A_ITD.aj b/tests/bugs170/pr382189/covbug/cc/covbug/A_ITD.aj new file mode 100644 index 000000000..5cf1a73fa --- /dev/null +++ b/tests/bugs170/pr382189/covbug/cc/covbug/A_ITD.aj @@ -0,0 +1,12 @@ +package covbug; + + +public privileged aspect A_ITD { + declare parents: A extends SuperA; + + + public B A.getSomeB(SuperB b){ + return null; + } + +} diff --git a/tests/bugs170/pr382189/covbug/cc/covbug/B.class b/tests/bugs170/pr382189/covbug/cc/covbug/B.class new file mode 100644 index 000000000..91debf8f1 Binary files /dev/null and b/tests/bugs170/pr382189/covbug/cc/covbug/B.class differ diff --git a/tests/bugs170/pr382189/covbug/cc/covbug/B.java b/tests/bugs170/pr382189/covbug/cc/covbug/B.java new file mode 100644 index 000000000..cdfd1f70b --- /dev/null +++ b/tests/bugs170/pr382189/covbug/cc/covbug/B.java @@ -0,0 +1,8 @@ +package covbug; + + +public class B extends SuperB { + + + +} diff --git a/tests/bugs170/pr382189/covbug/cc/covbug/SuperA.class b/tests/bugs170/pr382189/covbug/cc/covbug/SuperA.class new file mode 100644 index 000000000..d5ba823f3 Binary files /dev/null and b/tests/bugs170/pr382189/covbug/cc/covbug/SuperA.class differ diff --git a/tests/bugs170/pr382189/covbug/cc/covbug/SuperA.java b/tests/bugs170/pr382189/covbug/cc/covbug/SuperA.java new file mode 100644 index 000000000..dfb721b71 --- /dev/null +++ b/tests/bugs170/pr382189/covbug/cc/covbug/SuperA.java @@ -0,0 +1,7 @@ +package covbug; + +import java.util.List; + +public abstract class SuperA { + public abstract SuperB getSomeB(SuperB b); +} diff --git a/tests/bugs170/pr382189/covbug/cc/covbug/SuperB.class b/tests/bugs170/pr382189/covbug/cc/covbug/SuperB.class new file mode 100644 index 000000000..cd3b522ad Binary files /dev/null and b/tests/bugs170/pr382189/covbug/cc/covbug/SuperB.class differ diff --git a/tests/bugs170/pr382189/covbug/cc/covbug/SuperB.java b/tests/bugs170/pr382189/covbug/cc/covbug/SuperB.java new file mode 100644 index 000000000..2f5167d3e --- /dev/null +++ b/tests/bugs170/pr382189/covbug/cc/covbug/SuperB.java @@ -0,0 +1,5 @@ +package covbug; + +public class SuperB { + +} diff --git a/tests/bugs170/pr382189/covbug/pj/A.class b/tests/bugs170/pr382189/covbug/pj/A.class new file mode 100644 index 000000000..4f315b411 Binary files /dev/null and b/tests/bugs170/pr382189/covbug/pj/A.class differ diff --git a/tests/bugs170/pr382189/covbug/pj/B.class b/tests/bugs170/pr382189/covbug/pj/B.class new file mode 100644 index 000000000..11e52e8db Binary files /dev/null and b/tests/bugs170/pr382189/covbug/pj/B.class differ diff --git a/tests/bugs170/pr382189/covbug/pj/Foo.java b/tests/bugs170/pr382189/covbug/pj/Foo.java new file mode 100644 index 000000000..d8e1721b2 --- /dev/null +++ b/tests/bugs170/pr382189/covbug/pj/Foo.java @@ -0,0 +1,26 @@ +import java.util.List; + +class A extends SuperA { + public B getSomeB(SuperB b) { return null; } + public static void main(String []argv) { + A a = new A(); + System.out.println(a.getSomeB(null)); + } +} + +class B extends SuperB { +} + +abstract class SuperA { + public abstract SuperB getSomeB(SuperB b); +} + +class SuperB { } + +/* +public privileged aspect A_ITD { + declare parents: A extends SuperA; + + public B A.getSomeB(SuperB b) { return null; } +} +*/ diff --git a/tests/bugs170/pr382189/covbug/pj/SuperA.class b/tests/bugs170/pr382189/covbug/pj/SuperA.class new file mode 100644 index 000000000..93153a47c Binary files /dev/null and b/tests/bugs170/pr382189/covbug/pj/SuperA.class differ diff --git a/tests/bugs170/pr382189/covbug/pj/SuperB.class b/tests/bugs170/pr382189/covbug/pj/SuperB.class new file mode 100644 index 000000000..7f4c4e51b Binary files /dev/null and b/tests/bugs170/pr382189/covbug/pj/SuperB.class differ diff --git a/tests/bugs170/pr382189/one/A.java b/tests/bugs170/pr382189/one/A.java new file mode 100644 index 000000000..edd16a531 --- /dev/null +++ b/tests/bugs170/pr382189/one/A.java @@ -0,0 +1 @@ +public class A extends SuperA { } diff --git a/tests/bugs170/pr382189/one/A_ITD.aj b/tests/bugs170/pr382189/one/A_ITD.aj new file mode 100644 index 000000000..7c5be5c9f --- /dev/null +++ b/tests/bugs170/pr382189/one/A_ITD.aj @@ -0,0 +1,6 @@ + +public privileged aspect A_ITD { + public B A.getSomeB(SuperB b){ + return null; + } +} diff --git a/tests/bugs170/pr382189/one/B.java b/tests/bugs170/pr382189/one/B.java new file mode 100644 index 000000000..b32fa4ef7 --- /dev/null +++ b/tests/bugs170/pr382189/one/B.java @@ -0,0 +1 @@ +public class B extends SuperB { } diff --git a/tests/bugs170/pr382189/one/SuperA.java b/tests/bugs170/pr382189/one/SuperA.java new file mode 100644 index 000000000..09755a197 --- /dev/null +++ b/tests/bugs170/pr382189/one/SuperA.java @@ -0,0 +1,5 @@ +import java.util.List; + +public abstract class SuperA { + public abstract SuperB getSomeB(SuperB b); +} diff --git a/tests/bugs170/pr382189/one/SuperB.java b/tests/bugs170/pr382189/one/SuperB.java new file mode 100644 index 000000000..a5098aa84 --- /dev/null +++ b/tests/bugs170/pr382189/one/SuperB.java @@ -0,0 +1,2 @@ + +public class SuperB { } diff --git a/tests/bugs170/pr382189/three/A.java b/tests/bugs170/pr382189/three/A.java new file mode 100644 index 000000000..c24a6f65d --- /dev/null +++ b/tests/bugs170/pr382189/three/A.java @@ -0,0 +1,6 @@ +public class A { + public static void main(String []argv) { + A a = new A(); + System.out.println(a.getSomeB(null)); + } +} diff --git a/tests/bugs170/pr382189/three/A_ITD.aj b/tests/bugs170/pr382189/three/A_ITD.aj new file mode 100644 index 000000000..39b55978f --- /dev/null +++ b/tests/bugs170/pr382189/three/A_ITD.aj @@ -0,0 +1,7 @@ + +public privileged aspect A_ITD { + declare parents: A extends SuperA; + public B A.getSomeB(SuperB b){ + return null; + } +} diff --git a/tests/bugs170/pr382189/three/B.java b/tests/bugs170/pr382189/three/B.java new file mode 100644 index 000000000..db22693a2 --- /dev/null +++ b/tests/bugs170/pr382189/three/B.java @@ -0,0 +1,2 @@ +public class B extends SuperB { +} diff --git a/tests/bugs170/pr382189/three/SuperA.java b/tests/bugs170/pr382189/three/SuperA.java new file mode 100644 index 000000000..09755a197 --- /dev/null +++ b/tests/bugs170/pr382189/three/SuperA.java @@ -0,0 +1,5 @@ +import java.util.List; + +public abstract class SuperA { + public abstract SuperB getSomeB(SuperB b); +} diff --git a/tests/bugs170/pr382189/three/SuperB.java b/tests/bugs170/pr382189/three/SuperB.java new file mode 100644 index 000000000..a5098aa84 --- /dev/null +++ b/tests/bugs170/pr382189/three/SuperB.java @@ -0,0 +1,2 @@ + +public class SuperB { } diff --git a/tests/bugs170/pr382189/two/A.java b/tests/bugs170/pr382189/two/A.java new file mode 100644 index 000000000..9f4b93d84 --- /dev/null +++ b/tests/bugs170/pr382189/two/A.java @@ -0,0 +1 @@ +public class A {} diff --git a/tests/bugs170/pr382189/two/A_ITD.aj b/tests/bugs170/pr382189/two/A_ITD.aj new file mode 100644 index 000000000..39b55978f --- /dev/null +++ b/tests/bugs170/pr382189/two/A_ITD.aj @@ -0,0 +1,7 @@ + +public privileged aspect A_ITD { + declare parents: A extends SuperA; + public B A.getSomeB(SuperB b){ + return null; + } +} diff --git a/tests/bugs170/pr382189/two/B.java b/tests/bugs170/pr382189/two/B.java new file mode 100644 index 000000000..b32fa4ef7 --- /dev/null +++ b/tests/bugs170/pr382189/two/B.java @@ -0,0 +1 @@ +public class B extends SuperB { } diff --git a/tests/bugs170/pr382189/two/SuperA.java b/tests/bugs170/pr382189/two/SuperA.java new file mode 100644 index 000000000..09755a197 --- /dev/null +++ b/tests/bugs170/pr382189/two/SuperA.java @@ -0,0 +1,5 @@ +import java.util.List; + +public abstract class SuperA { + public abstract SuperB getSomeB(SuperB b); +} diff --git a/tests/bugs170/pr382189/two/SuperB.java b/tests/bugs170/pr382189/two/SuperB.java new file mode 100644 index 000000000..a5098aa84 --- /dev/null +++ b/tests/bugs170/pr382189/two/SuperB.java @@ -0,0 +1,2 @@ + +public class SuperB { } diff --git a/tests/bugs170/pr382435/one/bug/A.java b/tests/bugs170/pr382435/one/bug/A.java new file mode 100644 index 000000000..a331bcc47 --- /dev/null +++ b/tests/bugs170/pr382435/one/bug/A.java @@ -0,0 +1,17 @@ +package bug; + +import java.util.List; + +public class A {}//extends B { } + +abstract class B { + public abstract List> getList(); +} + +privileged aspect A_ITD { + declare parents: A extends B; + + public List> A.getList(){ + return null; + } +} diff --git a/tests/bugs170/pr382435/two/bug/A.java b/tests/bugs170/pr382435/two/bug/A.java new file mode 100644 index 000000000..f4d08be5c --- /dev/null +++ b/tests/bugs170/pr382435/two/bug/A.java @@ -0,0 +1,21 @@ +package bug; + +import java.util.List; + +public class A { + public static void main(String[] argv) { + new A().getList(); + } +}//extends B { } + +abstract class B { + public abstract List> getList(); +} + +privileged aspect A_ITD { + declare parents: A extends B; + + public List> A.getList(){ + return null; + } +} -- cgit v1.2.3