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

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

diff --git a/tests/regression/resolving/test_retval_loading_constraint_violated.java b/tests/regression/resolving/test_retval_loading_constraint_violated.java
index 8893a7f5484a15a5e4d468157d814f1f189a0433..9371090633c09e45f86b8de4a0648c1763da2670 100644 (file)
--- a/tests/regression/resolving/test_retval_loading_constraint_violated.java
+++ b/tests/regression/resolving/test_retval_loading_constraint_violated.java
@@ -18,20 +18,19 @@ public class test_retval_loading_constraint_violated {
         ld2.addParentDelegation("java.lang.String");
 
 
-        // loading BarUseFoo
+        // loading & linking BarUseFoo
         ct.expect("requested", ld1, "BarUseFoo");
+        ct.expectLoadFromSystem(ld1, "java.lang.Object");
         ct.expect("defined", ld1, "<BarUseFoo>");
         ct.expect("loaded", ld1, "<BarUseFoo>");
 
         Class cls = ct.loadClass(ld1, "BarUseFoo");
 
-        // linking BarUseFoo
-        ct.expectLoadFromSystem(ld1, "java.lang.Object");
-
         // executing BarUseFoo.useReturnedFoo: new BarPassFoo
-        ct.expectDelegationAndDefinition(ld1, ld2, "BarPassFoo");
+        ct.expectDelegation(ld1, ld2, "BarPassFoo");
         // ...linking BarPassFoo
         ct.expectLoadFromSystem(ld2, "java.lang.Object");
+        ct.expectDelegationDefinition(ld1, ld2, "BarPassFoo");
 
         // resolving BarPassFoo.createFoo
         ct.expect("requested", ld2, "Foo");