4 files changed, 20 insertions, 12 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 3a2a9b2..76cccd2 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,12 @@
+2004-07-09  Bryce McKinlay  <mckinlay@redhat.com>
+
+	Fix or remove some bogus test cases.
+	* testsuite/libjava.compile/pr10459_2.java: Removed.
+	* testsuite/libjava.compile/pr10459.java: Test using its own method,
+	not Object.clone().
+	* testsuite/libjava.compile/inner_data.java: Test against its own
+	protected field.
+
 2004-07-09  Michael Koch  <konqueror@gmx.de>
 
 	* scripts/unicode-muncher.pl: Updated to version 2.1
diff --git a/libjava/testsuite/libjava.compile/inner_data.java b/libjava/testsuite/libjava.compile/inner_data.java
index 63d4902..0bb35e89 100644
--- a/libjava/testsuite/libjava.compile/inner_data.java
+++ b/libjava/testsuite/libjava.compile/inner_data.java
@@ -4,7 +4,7 @@ import java.util.Random;
 
 public class inner_data
 {
-    private class Randomer extends Random {
+    private class Randomer extends Super {
 	public long xxx ()
 	{
 	    return seed;
@@ -12,3 +12,7 @@ public class inner_data
     }
 }
 
+class Super
+{
+  protected long seed;
+}
diff --git a/libjava/testsuite/libjava.compile/pr10459.java b/libjava/testsuite/libjava.compile/pr10459.java
index 5bcc09c..e527f34 100644
--- a/libjava/testsuite/libjava.compile/pr10459.java
+++ b/libjava/testsuite/libjava.compile/pr10459.java
@@ -4,7 +4,12 @@ public class pr10459
 
   public void aMethod() throws Throwable
   {
-    for (; ;x.clone().clone())
+    for (; ;x.foo().foo())
       ;
   }
+  
+  pr10459 foo() 
+  {
+    return null;
+  }
 }
diff --git a/libjava/testsuite/libjava.compile/pr10459_2.java b/libjava/testsuite/libjava.compile/pr10459_2.java
deleted file mode 100644
index 5b878ca..0000000
--- a/libjava/testsuite/libjava.compile/pr10459_2.java
+++ /dev/null
@@ -1,10 +0,0 @@
-public class pr10459_2
-{
-  pr10459_2 x;
-
-  public void aMethod() throws Throwable
-  {
-    for (; ;x.clone().clone())
-      break;
-  }
-}