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

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

diff --git a/tests/regression/resolving/test_param_loading_constraint_violated.java b/tests/regression/resolving/test_param_loading_constraint_violated.java
index e4c734be4accab7ad379b894a4d42c0822aab95a..7d9c184d3d0d0f8e5998301167b5d5e6ca98ac84 100644 (file)
--- a/tests/regression/resolving/test_param_loading_constraint_violated.java
+++ b/tests/regression/resolving/test_param_loading_constraint_violated.java
@@ -18,24 +18,23 @@ public class test_param_loading_constraint_violated {
         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 BarPassFoo.passit: new Foo
         ct.expect("requested", ld2, "Foo");
         ct.expect("defined", ld2, "<Foo>");
 
         // executing BarPassFoo.passit: new BarUseFoo
-        ct.expectDelegationAndDefinition(ld2, ld1, "BarUseFoo");
+        ct.expectDelegation(ld2, ld1, "BarUseFoo");
         // ...linking BarUseFoo
         ct.expectLoadFromSystem(ld1, "java.lang.Object");
+        ct.expectDelegationDefinition(ld2, ld1, "BarUseFoo");
 
         // resolving Foo.virtualId() from BarUseFoo
         ct.expect("requested", ld1, "Foo");