Author: craigmcc
Date: Wed Jan 25 12:07:20 2006
New Revision: 372302
URL: http://svn.apache.org/viewcvs?rev=372302&view=rev
Log:
Ensure that the instance returned by RenderKitFactory.getRenderKit() is the
same as the instance in the renderKit variable.
Improve the exception messages on component lookups that fail.
Modified:
struts/shale/trunk/test-framework/src/java/org/apache/shale/test/base/AbstractJsfTestCase.java
struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockApplication.java
Modified:
struts/shale/trunk/test-framework/src/java/org/apache/shale/test/base/AbstractJsfTestCase.java
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/test-framework/src/java/org/apache/shale/test/base/AbstractJsfTestCase.java?rev=372302&r1=372301&r2=372302&view=diff
==============================================================================
---
struts/shale/trunk/test-framework/src/java/org/apache/shale/test/base/AbstractJsfTestCase.java
(original)
+++
struts/shale/trunk/test-framework/src/java/org/apache/shale/test/base/AbstractJsfTestCase.java
Wed Jan 25 12:07:20 2006
@@ -128,13 +128,8 @@
facesContext.setApplication(application);
RenderKitFactory renderKitFactory = (RenderKitFactory)
FactoryFinder.getFactory(FactoryFinder.RENDER_KIT_FACTORY);
- renderKit = new MockRenderKit();
- try {
-
renderKitFactory.addRenderKit(RenderKitFactory.HTML_BASIC_RENDER_KIT,
- renderKit);
- } catch (IllegalArgumentException e) {
- ;
- }
+ renderKit = (MockRenderKit)
+ renderKitFactory.getRenderKit(null,
RenderKitFactory.HTML_BASIC_RENDER_KIT);
}
Modified:
struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockApplication.java
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockApplication.java?rev=372302&r1=372301&r2=372302&view=diff
==============================================================================
---
struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockApplication.java
(original)
+++
struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockApplication.java
Wed Jan 25 12:07:20 2006
@@ -272,7 +272,14 @@
public UIComponent createComponent(String componentType) {
+ if (componentType == null) {
+ throw new NullPointerException("Requested component type is null");
+ }
String componentClass = (String) components.get(componentType);
+ if (componentClass == null) {
+ throw new FacesException("No component class registered for
component type '" +
+ componentType + "'");
+ }
try {
Class clazz = Class.forName(componentClass);
return ((UIComponent) clazz.newInstance());
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
