Author: hlship
Date: Sat Oct 22 15:51:42 2005
New Revision: 327711
URL: http://svn.apache.org/viewcvs?rev=327711&view=rev
Log:
TAPESTRY-718: Asset injection makes assets appear as null inside finishLoad()
Added:
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/enhance/InjectAssetWorkerTest.java
- copied, changed from r327692,
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectAssetWorker.java
Removed:
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectAssetWorker.java
Modified:
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/enhance/BaseEnhancementTestCase.java
Modified:
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/enhance/BaseEnhancementTestCase.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/enhance/BaseEnhancementTestCase.java?rev=327711&r1=327710&r2=327711&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/enhance/BaseEnhancementTestCase.java
(original)
+++
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/enhance/BaseEnhancementTestCase.java
Sat Oct 22 15:51:42 2005
@@ -30,11 +30,10 @@
{
public IComponentSpecification newSpec(Location location)
{
- MockControl control = newControl(IComponentSpecification.class);
- IComponentSpecification spec = (IComponentSpecification)
control.getMock();
+ IComponentSpecification spec = newSpec();
spec.getLocation();
- control.setReturnValue(location);
+ setReturnValue(spec, location);
return spec;
}
@@ -49,18 +48,12 @@
return (EnhancementOperation) newMock(EnhancementOperation.class);
}
- protected void trainGetAccessorMethodName(EnhancementOperation op, String
propertyName, String methodName)
- {
- op.getAccessorMethodName(propertyName);
- setReturnValue(op, methodName);
-
- }
-
- protected void trainAddInjectedField(EnhancementOperation op, String
fieldName, Class fieldType, Object injectedValue, String injectedFieldName)
+ protected void trainAddInjectedField(EnhancementOperation op, String
fieldName,
+ Class fieldType, Object injectedValue, String injectedFieldName)
{
op.addInjectedField(fieldName, fieldType, injectedValue);
setReturnValue(op, injectedFieldName);
-
+
}
protected ApplicationStateManager newApplicationStateManager()
@@ -68,9 +61,28 @@
return (ApplicationStateManager)
newMock(ApplicationStateManager.class);
}
- protected void trainGetPropertyType(EnhancementOperation op, String
propertyName, Class propertyType)
+ protected EnhancementOperation newEnhancementOp()
+ {
+ return (EnhancementOperation) newMock(EnhancementOperation.class);
+ }
+
+ protected void trainGetAccessorMethodName(EnhancementOperation op, String
propertyName,
+ String methodName)
+ {
+ op.getAccessorMethodName(propertyName);
+ setReturnValue(op, methodName);
+ }
+
+ protected void trainGetPropertyType(EnhancementOperation op, String
propertyName,
+ Class propertyType)
{
op.getPropertyType(propertyName);
setReturnValue(op, propertyType);
+ }
+
+ protected void trainGetBaseClass(EnhancementOperation op, Class baseClass)
+ {
+ op.getBaseClass();
+ setReturnValue(op, baseClass);
}
}
Copied:
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/enhance/InjectAssetWorkerTest.java
(from r327692,
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectAssetWorker.java)
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/enhance/InjectAssetWorkerTest.java?p2=jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/enhance/InjectAssetWorkerTest.java&p1=jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectAssetWorker.java&r1=327692&r2=327711&rev=327711&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectAssetWorker.java
(original)
+++
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/enhance/InjectAssetWorkerTest.java
Sat Oct 22 15:51:42 2005
@@ -21,14 +21,12 @@
import org.apache.hivemind.ErrorLog;
import org.apache.hivemind.Location;
import org.apache.hivemind.service.MethodSignature;
-import org.apache.hivemind.test.HiveMindTestCase;
import org.apache.tapestry.BaseComponent;
import org.apache.tapestry.IAsset;
import org.apache.tapestry.IComponent;
import org.apache.tapestry.spec.AssetSpecification;
import org.apache.tapestry.spec.IAssetSpecification;
import org.apache.tapestry.spec.IComponentSpecification;
-import org.easymock.MockControl;
/**
* Tests for [EMAIL PROTECTED] org.apache.tapestry.enhance.InjectAssetWorker}.
@@ -36,7 +34,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-public class TestInjectAssetWorker extends HiveMindTestCase
+public class InjectAssetWorkerTest extends BaseEnhancementTestCase
{
private IComponentSpecification newSpec(String assetName, String
propertyName, Location location)
{
@@ -55,11 +53,6 @@
return spec;
}
- protected IComponentSpecification newSpec()
- {
- return (IComponentSpecification)
newMock(IComponentSpecification.class);
- }
-
public void testNoWork()
{
IComponentSpecification spec = newSpec("fred", null, null);
@@ -72,11 +65,6 @@
verifyControls();
}
- protected EnhancementOperation newEnhancementOp()
- {
- return (EnhancementOperation) newMock(EnhancementOperation.class);
- }
-
public void testSuccess()
{
Location l = newLocation();
@@ -102,20 +90,6 @@
verifyControls();
}
- protected void trainGetAccessorMethodName(EnhancementOperation op, String
propertyName,
- String methodName)
- {
- op.getAccessorMethodName(propertyName);
- setReturnValue(op, methodName);
- }
-
- protected void trainGetPropertyType(EnhancementOperation op, String
propertyName,
- Class propertyType)
- {
- op.getPropertyType(propertyName);
- setReturnValue(op, propertyType);
- }
-
public void testFailure()
{
Location l = newLocation();
@@ -144,12 +118,6 @@
w.performEnhancement(op, spec);
verifyControls();
- }
-
- private void trainGetBaseClass(EnhancementOperation op, Class baseClass)
- {
- op.getBaseClass();
- setReturnValue(op, baseClass);
}
public void testWrongPropertyType()
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
