* tests/regression/resolving/TestController.java: Better error messages and

[cacao.git] / tests / regression / resolving / test_return_subtype_violated.java

diff --git a/tests/regression/resolving/test_return_subtype_violated.java b/tests/regression/resolving/test_return_subtype_violated.java
index f2dfb9c13fa08b8bb5c478219a0d4411f6a1150d..7b0f9a228333ce8cfa882a9a94bda8f47ef5a9d2 100644 (file)
--- a/tests/regression/resolving/test_return_subtype_violated.java
+++ b/tests/regression/resolving/test_return_subtype_violated.java
@@ -17,22 +17,21 @@ public class test_return_subtype_violated {
         ld2.addParentDelegation("java.lang.Object");
         ld2.addParentDelegation("java.lang.String");
 
-        // loading BarPassFoo
+        // loading & linking BarPassFoo
         ct.expect("requested", ld2, "BarPassFoo");
+        ct.expectLoadFromSystem(ld2, "java.lang.Object");
         ct.expect("defined", ld2, "<BarPassFoo>");
         ct.expect("loaded", ld2, "<BarPassFoo>");
 
         Class cls = ct.loadClass(ld2, "BarPassFoo");
 
-        // linking BarPassFoo
-        ct.expectLoadFromSystem(ld2, "java.lang.Object");
-
         // executing createDerivedFoo
-        ct.expectDelegationAndDefinition(ld2, ld1, "DerivedFoo");
+        ct.expectDelegation(ld2, ld1, "DerivedFoo");
         // ...linking (ld2, DerivedFoo)
         ct.expect("requested", ld1, "Foo");
-        ct.expect("defined", ld1, "<Foo>");
         ct.expectLoadFromSystem(ld1, "java.lang.Object");
+        ct.expect("defined", ld1, "<Foo>");
+        ct.expectDelegationDefinition(ld2, ld1, "DerivedFoo");
 
         ct.checkStringGetter(cls, "getDerivedFoo", "no exception");
         ct.expectEnd();