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

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

diff --git a/tests/regression/resolving/test_param_loading_constraint_violated_derived.java b/tests/regression/resolving/test_param_loading_constraint_violated_derived.java
index 8ed0ec8967e778ede60d6f9ebbaaa16f940ce7a9..c98066079d58881bb736aadf39c55f204442e264 100644 (file)
--- a/tests/regression/resolving/test_param_loading_constraint_violated_derived.java
+++ b/tests/regression/resolving/test_param_loading_constraint_violated_derived.java
@@ -25,29 +25,29 @@ public class test_param_loading_constraint_violated_derived {
         ld3.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.passDerivedFoo: new DerivedFoo
-        ct.expectDelegationAndDefinition(ld2, ld3, "DerivedFoo");
+        ct.expectDelegation(ld2, ld3, "DerivedFoo");
 
         // linking (ld3, DerivedFoo)
         ct.expect("requested", ld3, "Foo");
-        ct.expect("defined", ld3, "<Foo>");
         ct.expectLoadFromSystem(ld3, "java.lang.Object");
+        ct.expect("defined", ld3, "<Foo>");
+        ct.expectDelegationDefinition(ld2, ld3, "DerivedFoo");
 
         // 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 BarUseFoo.useFoo
         // the deferred subtype check ((ld2, DerivedFoo) subtypeof (ld2, Foo)) is done