pr105479: reorganized testcases.

diff --git a/tests/bugs150/pr105479/Driver.java b/tests/bugs150/pr105479/Driver.java
deleted file mode 100644 (file)
index 6bc4b1b..0000000
--- a/tests/bugs150/pr105479/Driver.java
+++ /dev/null
@@ -1,10 +0,0 @@
-public class Driver {
-       
-       public static void main(String[] args) {
-               ReturnTypeTester rtt = new ReturnTypeTester();
-               rtt.hashCode();
-               System.out.println(rtt.getId());
-               if (rtt.hashCode() != "id".hashCode()) throw new RuntimeException("dispatch failure");
-       }
-       
-}
\ No newline at end of file

diff --git a/tests/bugs150/pr105479/ReturnTypeTest.aj b/tests/bugs150/pr105479/ReturnTypeTest.aj
deleted file mode 100644 (file)
index 108c531..0000000
--- a/tests/bugs150/pr105479/ReturnTypeTest.aj
+++ /dev/null
@@ -1,13 +0,0 @@
-public aspect ReturnTypeTest {
-  private interface Test {
-    Object getId();
-    int hashCode();
-  }
- 
-  public int Test.hashCode() {
-       System.out.println("in Test.hashCode()");
-    return getId().hashCode();
-  }
- 
-  declare parents : ReturnTypeTester implements Test;
-}
\ No newline at end of file

diff --git a/tests/bugs150/pr105479/ReturnTypeTester.java b/tests/bugs150/pr105479/ReturnTypeTester.java
deleted file mode 100644 (file)
index b26445e..0000000
--- a/tests/bugs150/pr105479/ReturnTypeTester.java
+++ /dev/null
@@ -1,14 +0,0 @@
-import java.util.HashSet;
-import java.util.Set;
-
-public class ReturnTypeTester {
-  static Set<ReturnTypeTester> set = new HashSet<ReturnTypeTester>();
-  static {
-    ReturnTypeTester tester = new ReturnTypeTester();
-    set.add(tester);
-  }
- 
-  public String getId() {
-    return "id";
-  }
-}
\ No newline at end of file

diff --git a/tests/bugs150/pr105479/case1/Driver.java b/tests/bugs150/pr105479/case1/Driver.java
new file mode 100644 (file)
index 0000000..6bc4b1b
--- /dev/null
+++ b/tests/bugs150/pr105479/case1/Driver.java
@@ -0,0 +1,10 @@
+public class Driver {
+       
+       public static void main(String[] args) {
+               ReturnTypeTester rtt = new ReturnTypeTester();
+               rtt.hashCode();
+               System.out.println(rtt.getId());
+               if (rtt.hashCode() != "id".hashCode()) throw new RuntimeException("dispatch failure");
+       }
+       
+}
\ No newline at end of file

diff --git a/tests/bugs150/pr105479/case1/ReturnTypeTest.aj b/tests/bugs150/pr105479/case1/ReturnTypeTest.aj
new file mode 100644 (file)
index 0000000..108c531
--- /dev/null
+++ b/tests/bugs150/pr105479/case1/ReturnTypeTest.aj
@@ -0,0 +1,13 @@
+public aspect ReturnTypeTest {
+  private interface Test {
+    Object getId();
+    int hashCode();
+  }
+ 
+  public int Test.hashCode() {
+       System.out.println("in Test.hashCode()");
+    return getId().hashCode();
+  }
+ 
+  declare parents : ReturnTypeTester implements Test;
+}
\ No newline at end of file

diff --git a/tests/bugs150/pr105479/case1/ReturnTypeTester.java b/tests/bugs150/pr105479/case1/ReturnTypeTester.java
new file mode 100644 (file)
index 0000000..b26445e
--- /dev/null
+++ b/tests/bugs150/pr105479/case1/ReturnTypeTester.java
@@ -0,0 +1,14 @@
+import java.util.HashSet;
+import java.util.Set;
+
+public class ReturnTypeTester {
+  static Set<ReturnTypeTester> set = new HashSet<ReturnTypeTester>();
+  static {
+    ReturnTypeTester tester = new ReturnTypeTester();
+    set.add(tester);
+  }
+ 
+  public String getId() {
+    return "id";
+  }
+}
\ No newline at end of file

diff --git a/tests/bugs150/pr105479/case2/ReturnTypeTest.java b/tests/bugs150/pr105479/case2/ReturnTypeTest.java
new file mode 100644 (file)
index 0000000..113f3a6
--- /dev/null
+++ b/tests/bugs150/pr105479/case2/ReturnTypeTest.java
@@ -0,0 +1,12 @@
+public aspect ReturnTypeTest {
+  private interface Test {
+    Object getId();
+    int hashCode();
+  }
+ 
+  public int Test.hashCode() {
+    return getId().hashCode();
+  }
+ 
+  declare parents : ReturnTypeTester implements Test;
+}

diff --git a/tests/bugs150/pr105479/case2/ReturnTypeTester.java b/tests/bugs150/pr105479/case2/ReturnTypeTester.java
new file mode 100644 (file)
index 0000000..bdd9612
--- /dev/null
+++ b/tests/bugs150/pr105479/case2/ReturnTypeTester.java
@@ -0,0 +1,23 @@
+import java.util.HashSet;
+import java.util.Set;
+
+public class ReturnTypeTester {
+  static Set<ReturnTypeTester> set = new HashSet<ReturnTypeTester>();
+  static {
+    ReturnTypeTester tester = new ReturnTypeTester();
+    set.add(tester);
+  }
+ 
+  public String getId() {
+    return "id";
+  }
+
+  public static void main(String []argv) {
+    ReturnTypeTester rtt = new ReturnTypeTester();
+    System.err.println("xxx");
+    rtt.hashCode();
+    System.err.println("yyy");
+    rtt.getId();
+    System.err.println("zzz");
+  }
+}