Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/structure/ComponentPageElementImplTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/structure/ComponentPageElementImplTest.java?view=diff&rev=471565&r1=471564&r2=471565 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/structure/ComponentPageElementImplTest.java (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/structure/ComponentPageElementImplTest.java Sun Nov 5 15:15:41 2006 @@ -25,7 +25,7 @@ import org.apache.tapestry.ioc.services.TypeCoercer; import org.apache.tapestry.model.ComponentModel; import org.apache.tapestry.model.ParameterModel; -import org.apache.tapestry.runtime.ComponentLifecycle; +import org.apache.tapestry.runtime.Component; import org.easymock.EasyMock; import org.testng.annotations.Test; @@ -35,7 +35,7 @@ public void parameter_is_bound() { Page page = newPage(); - ComponentLifecycle component = newComponentLifecycle(); + Component component = newComponent(); ComponentModel model = newComponentModel(); Binding binding = newBinding(); TypeCoercer coercer = newTypeCoercer(); @@ -65,7 +65,7 @@ public void verify_required_parameters_all_are_bound() { Page page = newPage(); - ComponentLifecycle component = newComponentLifecycle(); + Component component = newComponent(); ComponentModel model = newComponentModel(); Binding binding = newBinding(); TypeCoercer coercer = newTypeCoercer(); @@ -95,7 +95,7 @@ public void verify_required_parameters_unbound_but_not_required() { Page page = newPage(); - ComponentLifecycle component = newComponentLifecycle(); + Component component = newComponent(); ComponentModel model = newComponentModel(); ParameterModel pmodel = newParameterModel(); TypeCoercer coercer = newTypeCoercer(); @@ -125,7 +125,7 @@ Log log = newLog(); Page page = newPage(); ComponentPageElement container = newComponentPageElement(); - ComponentLifecycle component = newComponentLifecycle(); + Component component = newComponent(); ComponentModel model = newComponentModel(); ParameterModel pmodel = newParameterModel(); Location l = newLocation(); @@ -175,7 +175,7 @@ { Log log = newLog(); Page page = newPage(); - ComponentLifecycle component = newComponentLifecycle(); + Component component = newComponent(); ComponentModel model = newComponentModel(); Binding binding = newBinding(); TypeCoercer coercer = newTypeCoercer(); @@ -208,7 +208,7 @@ public void read_binding() { Page page = newPage(); - ComponentLifecycle component = newComponentLifecycle(); + Component component = newComponent(); ComponentModel model = newComponentModel(); TypeCoercer coercer = newTypeCoercer(); Binding binding = newBinding(); @@ -242,7 +242,7 @@ { Log log = newLog(); Page page = newPage(); - ComponentLifecycle component = newComponentLifecycle(); + Component component = newComponent(); ComponentModel model = newComponentModel(); TypeCoercer coercer = newTypeCoercer(); Binding binding = newBinding(); @@ -275,7 +275,7 @@ public void get_embedded_does_not_exist() { Page page = newPage(); - ComponentLifecycle component = newComponentLifecycle(); + Component component = newComponent(); ComponentModel model = newComponentModel(); TypeCoercer coercer = newTypeCoercer(); @@ -306,10 +306,10 @@ { Log log = newLog(); Page page = newPage(); - ComponentLifecycle component = newComponentLifecycle(); + Component component = newComponent(); ComponentModel model = newComponentModel(); ComponentPageElement childElement = newComponentPageElement(); - ComponentLifecycle childComponent = newComponentLifecycle(); + Component childComponent = newComponent(); TypeCoercer coercer = newTypeCoercer(); Instantiator ins = newInstantiator(component, model); @@ -335,11 +335,11 @@ { Log log = newLog(); Page page = newPage(); - ComponentLifecycle component = newComponentLifecycle(); + Component component = newComponent(); ComponentModel model = newComponentModel(); TypeCoercer coercer = newTypeCoercer(); final String mixinClassName = "foo.Bar"; - ComponentLifecycle mixin = newComponentLifecycle(); + Component mixin = newComponent(); ComponentModel mixinModel = newComponentModel(); Instantiator ins = newInstantiator(component, model); @@ -365,10 +365,10 @@ { Log log = newLog(); Page page = newPage(); - ComponentLifecycle component = newComponentLifecycle(); + Component component = newComponent(); ComponentModel model = newComponentModel(); TypeCoercer coercer = newTypeCoercer(); - ComponentLifecycle mixin = newComponentLifecycle(); + Component mixin = newComponent(); ComponentModel mixinModel = newComponentModel(); Instantiator ins = newInstantiator(component, model); @@ -403,10 +403,10 @@ { Log log = newLog(); Page page = newPage(); - ComponentLifecycle component = newComponentLifecycle(); + Component component = newComponent(); ComponentModel model = newComponentModel(); ComponentModel mixinModel = newComponentModel(); - ComponentLifecycle mixin = newComponentLifecycle(); + Component mixin = newComponent(); TypeCoercer coercer = newTypeCoercer(); Binding binding = newBinding(); @@ -437,7 +437,7 @@ verify(); } - private Instantiator newInstantiator(ComponentLifecycle component, ComponentModel model) + private Instantiator newInstantiator(Component component, ComponentModel model) { Instantiator ins = newMock(Instantiator.class);
