[richfaces-svn-commits] JBoss Rich Faces SVN: r16424 - in root/framework/trunk: impl/src/test/java/org/richfaces/renderkit and 1 other directory.
Author: nbelaevski
Date: 2010-02-07 18:16:26 -0500 (Sun, 07 Feb 2010)
New Revision: 16424
Modified:
root/framework/trunk/commons/src/test/java/org/richfaces/renderkit/MockClientBehaviorHolder.java
root/framework/trunk/impl/src/test/java/org/richfaces/renderkit/CompositeRendererTest.java
Log:
Small fixes:
- Reverted changes in MockClientBehaviorHolder
- Added generic type for CompositeRendererTest
Modified:
root/framework/trunk/commons/src/test/java/org/richfaces/renderkit/MockClientBehaviorHolder.java
===================================================================
---
root/framework/trunk/commons/src/test/java/org/richfaces/renderkit/MockClientBehaviorHolder.java 2010-02-07
23:14:28 UTC (rev 16423)
+++
root/framework/trunk/commons/src/test/java/org/richfaces/renderkit/MockClientBehaviorHolder.java 2010-02-07
23:16:26 UTC (rev 16424)
@@ -21,7 +21,7 @@
*/
package org.richfaces.renderkit;
-//import static org.jboss.test.faces.mock.FacesMockController.invokeMethod;
+import static org.jboss.test.faces.mock.FacesMockController.invokeCurrent;
import java.util.Collection;
import java.util.List;
@@ -33,32 +33,26 @@
import org.easymock.IMocksControl;
import org.jboss.test.faces.mock.component.MockUIComponent;
-/**
- * TODO review this class
- * */
public class MockClientBehaviorHolder extends MockUIComponent implements
ClientBehaviorHolder {
public MockClientBehaviorHolder(IMocksControl control, String name) {
- super(control/*, name*/);
+ super(control, name);
}
public void addClientBehavior(String eventName, ClientBehavior behavior) {
-// invokeCurrent(this, eventName, behavior);
+ invokeCurrent(this, eventName, behavior);
}
public Map<String, List<ClientBehavior>> getClientBehaviors() {
-// return invokeCurrent(this);
- return null;
+ return invokeCurrent(this);
}
public String getDefaultEventName() {
-// return invokeCurrent(this);
- return null;
+ return invokeCurrent(this);
}
public Collection<String> getEventNames() {
-// return invokeCurrent(this);
- return null;
+ return invokeCurrent(this);
}
}
Modified:
root/framework/trunk/impl/src/test/java/org/richfaces/renderkit/CompositeRendererTest.java
===================================================================
---
root/framework/trunk/impl/src/test/java/org/richfaces/renderkit/CompositeRendererTest.java 2010-02-07
23:14:28 UTC (rev 16423)
+++
root/framework/trunk/impl/src/test/java/org/richfaces/renderkit/CompositeRendererTest.java 2010-02-07
23:16:26 UTC (rev 16424)
@@ -21,7 +21,7 @@
super.setUp();
setupFacesRequest();
this.compositeRenderer = new CompositeRenderer() {
- protected Class getComponentClass() {
+ protected Class<? extends UIComponent> getComponentClass() {
return UIComponent.class;
}
};