You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2006/07/19 08:54:16 UTC
svn commit: r423384 - in /myfaces/core/branches/jsf12/api: ./
src/main/java/javax/faces/component/ src/main/java/javax/faces/model/
src/test/java/javax/faces/component/
Author: matzew
Date: Tue Jul 18 23:54:15 2006
New Revision: 423384
URL: http://svn.apache.org/viewvc?rev=423384&view=rev
Log:
added Shale and its jmock support
Added:
myfaces/core/branches/jsf12/api/src/test/java/javax/faces/component/AbstractComponentTest.java (with props)
myfaces/core/branches/jsf12/api/src/test/java/javax/faces/component/InvokeOnComponentTest.java (with props)
Modified:
myfaces/core/branches/jsf12/api/pom.xml
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/ContextCallback.java
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/model/ResultDataModel.java
myfaces/core/branches/jsf12/api/src/test/java/javax/faces/component/UIComponentBaseTest.java
Modified: myfaces/core/branches/jsf12/api/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/pom.xml?rev=423384&r1=423383&r2=423384&view=diff
==============================================================================
--- myfaces/core/branches/jsf12/api/pom.xml (original)
+++ myfaces/core/branches/jsf12/api/pom.xml Tue Jul 18 23:54:15 2006
@@ -125,9 +125,22 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.struts.shale</groupId>
+ <groupId>org.apache.shale</groupId>
<artifactId>shale-test</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jmock</groupId>
+ <artifactId>jmock</artifactId>
+ <version>1.0.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>jmock</groupId>
+ <artifactId>jmock-cglib</artifactId>
+ <version>1.0.1</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/ContextCallback.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/ContextCallback.java?rev=423384&r1=423383&r2=423384&view=diff
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/ContextCallback.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/ContextCallback.java Tue Jul 18 23:54:15 2006
@@ -23,7 +23,8 @@
*
* @author Stan Silvert
*/
-public interface ContextCallback {
+public interface ContextCallback
+{
/**
*
Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/model/ResultDataModel.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/model/ResultDataModel.java?rev=423384&r1=423383&r2=423384&view=diff
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/model/ResultDataModel.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/model/ResultDataModel.java Tue Jul 18 23:54:15 2006
@@ -15,9 +15,11 @@
*/
package javax.faces.model;
-import javax.servlet.jsp.jstl.sql.Result;
import java.util.SortedMap;
+import javax.servlet.jsp.jstl.sql.Result;
+
+//import javax.servlet.jsp.
/**
* see Javadoc of <a href="http://java.sun.com/j2ee/javaserverfaces/1.1_01/docs/api/index.html">JSF Specification</a>
*
Added: myfaces/core/branches/jsf12/api/src/test/java/javax/faces/component/AbstractComponentTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/test/java/javax/faces/component/AbstractComponentTest.java?rev=423384&view=auto
==============================================================================
--- myfaces/core/branches/jsf12/api/src/test/java/javax/faces/component/AbstractComponentTest.java (added)
+++ myfaces/core/branches/jsf12/api/src/test/java/javax/faces/component/AbstractComponentTest.java Tue Jul 18 23:54:15 2006
@@ -0,0 +1,14 @@
+package javax.faces.component;
+
+import org.apache.shale.test.jmock.AbstractJsfTestCase;
+
+
+public abstract class AbstractComponentTest extends AbstractJsfTestCase
+{
+ public AbstractComponentTest(String arg0)
+ {
+ super(arg0);
+ }
+
+
+}
Propchange: myfaces/core/branches/jsf12/api/src/test/java/javax/faces/component/AbstractComponentTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/core/branches/jsf12/api/src/test/java/javax/faces/component/AbstractComponentTest.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: myfaces/core/branches/jsf12/api/src/test/java/javax/faces/component/InvokeOnComponentTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/test/java/javax/faces/component/InvokeOnComponentTest.java?rev=423384&view=auto
==============================================================================
--- myfaces/core/branches/jsf12/api/src/test/java/javax/faces/component/InvokeOnComponentTest.java (added)
+++ myfaces/core/branches/jsf12/api/src/test/java/javax/faces/component/InvokeOnComponentTest.java Tue Jul 18 23:54:15 2006
@@ -0,0 +1,57 @@
+package javax.faces.component;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.jmock.Mock;
+
+public class InvokeOnComponentTest extends AbstractComponentTest
+{
+
+ public InvokeOnComponentTest(String arg0)
+ {
+ super(arg0);
+ }
+
+ public void setUp()
+ {
+ super.setUp();
+ }
+
+ public void tearDown()
+ {
+ super.tearDown();
+ }
+
+ public void testInvokeOnComp() throws Exception
+ {
+ UIForm form = new UIForm();
+ UIInput i1 = new UIInput();
+ i1.setId("_id1");
+ UIInput i2 = new UIInput();
+ i2.setId("_id2");
+ UIInput i3 = new UIInput();
+ i3.setId("_id3");
+ UIInput i4 = new UIInput();
+ i4.setId("_id4");
+ form.getChildren().add(i1);
+ form.getChildren().add(i4);
+ form.getChildren().add(i2);
+ form.getChildren().add(i3);
+ this.facesContext.getViewRoot().getChildren().add(form);
+ Mock mock = mock(ContextCallback.class);
+ ContextCallback cc = (ContextCallback) mock.proxy();
+
+ mock.expects(once()).method("invokeContextCallback").with(eq(facesContext), eq(i2));
+
+ this.facesContext.getViewRoot().invokeOnComponent(facesContext, i2.getClientId(facesContext), cc);
+
+ mock.verify();
+ }
+
+ public static Test suite()
+ {
+ return new TestSuite(InvokeOnComponentTest.class);
+ }
+
+}
\ No newline at end of file
Propchange: myfaces/core/branches/jsf12/api/src/test/java/javax/faces/component/InvokeOnComponentTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/core/branches/jsf12/api/src/test/java/javax/faces/component/InvokeOnComponentTest.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/core/branches/jsf12/api/src/test/java/javax/faces/component/UIComponentBaseTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/test/java/javax/faces/component/UIComponentBaseTest.java?rev=423384&r1=423383&r2=423384&view=diff
==============================================================================
--- myfaces/core/branches/jsf12/api/src/test/java/javax/faces/component/UIComponentBaseTest.java (original)
+++ myfaces/core/branches/jsf12/api/src/test/java/javax/faces/component/UIComponentBaseTest.java Tue Jul 18 23:54:15 2006
@@ -24,7 +24,8 @@
import org.apache.shale.test.mock.MockRenderKitFactory;
import org.apache.shale.test.mock.MockValueBinding;
-public class UIComponentBaseTest extends AbstractJsfTestCase {
+public class UIComponentBaseTest extends AbstractJsfTestCase
+{
private UIComponentBase mock = null;
public static void main(String[] args) {