You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mm...@apache.org on 2006/01/27 19:07:55 UTC
svn commit: r372933 - in /myfaces/core/trunk/api/src/test/java: javax/faces/
javax/faces/application/ javax/faces/component/ org/apache/myfaces/
org/apache/myfaces/mock/ org/apache/myfaces/mock/api/
Author: mmarinschek
Date: Fri Jan 27 10:07:26 2006
New Revision: 372933
URL: http://svn.apache.org/viewcvs?rev=372933&view=rev
Log:
implementing findComponent for extended dataTable
Added:
myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/
myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/Mock2ApplicationFactory.java
- copied, changed from r372806, myfaces/core/trunk/api/src/test/java/javax/faces/Mock2ApplicationFactory.java
myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockApplication.java
- copied, changed from r372806, myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/MockApplication.java
myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockApplicationFactory.java
- copied, changed from r372806, myfaces/core/trunk/api/src/test/java/javax/faces/MockApplicationFactory.java
myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockExternalContext.java
- copied, changed from r372806, myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/MockExternalContext.java
myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockFacesContext.java
- copied, changed from r372806, myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/MockFacesContext.java
myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockFacesContextHelper.java (contents, props changed)
- copied, changed from r372806, myfaces/core/trunk/api/src/test/java/org/apache/myfaces/FacesContextHelper.java
myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockRenderKit.java
- copied, changed from r372806, myfaces/core/trunk/api/src/test/java/javax/faces/MockRenderKit.java
myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockRenderKitFactory.java
- copied, changed from r372806, myfaces/core/trunk/api/src/test/java/javax/faces/MockRenderKitFactory.java
myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockStateManager.java
- copied, changed from r372806, myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/MockStateManager.java
Removed:
myfaces/core/trunk/api/src/test/java/javax/faces/Mock2ApplicationFactory.java
myfaces/core/trunk/api/src/test/java/javax/faces/MockApplicationFactory.java
myfaces/core/trunk/api/src/test/java/javax/faces/MockRenderKit.java
myfaces/core/trunk/api/src/test/java/javax/faces/MockRenderKitFactory.java
myfaces/core/trunk/api/src/test/java/org/apache/myfaces/FacesContextHelper.java
myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/MockApplication.java
myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/MockExternalContext.java
myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/MockFacesContext.java
myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/MockStateManager.java
Modified:
myfaces/core/trunk/api/src/test/java/javax/faces/FactoryFinderTest.java
myfaces/core/trunk/api/src/test/java/javax/faces/application/StateManagerTest.java
myfaces/core/trunk/api/src/test/java/javax/faces/component/UIComponentBaseTest.java
myfaces/core/trunk/api/src/test/java/javax/faces/component/UISelectManyTest.java
myfaces/core/trunk/api/src/test/java/org/apache/myfaces/AbstractTestCase.java
Modified: myfaces/core/trunk/api/src/test/java/javax/faces/FactoryFinderTest.java
URL: http://svn.apache.org/viewcvs/myfaces/core/trunk/api/src/test/java/javax/faces/FactoryFinderTest.java?rev=372933&r1=372932&r2=372933&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/test/java/javax/faces/FactoryFinderTest.java (original)
+++ myfaces/core/trunk/api/src/test/java/javax/faces/FactoryFinderTest.java Fri Jan 27 10:07:26 2006
@@ -21,6 +21,8 @@
import java.util.Map;
import junit.framework.TestCase;
+import org.apache.myfaces.mock.api.Mock2ApplicationFactory;
+import org.apache.myfaces.mock.api.MockApplicationFactory;
public class FactoryFinderTest extends TestCase {
Modified: myfaces/core/trunk/api/src/test/java/javax/faces/application/StateManagerTest.java
URL: http://svn.apache.org/viewcvs/myfaces/core/trunk/api/src/test/java/javax/faces/application/StateManagerTest.java?rev=372933&r1=372932&r2=372933&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/test/java/javax/faces/application/StateManagerTest.java (original)
+++ myfaces/core/trunk/api/src/test/java/javax/faces/application/StateManagerTest.java Fri Jan 27 10:07:26 2006
@@ -22,123 +22,123 @@
import junit.framework.TestCase;
import org.easymock.MockControl;
-import org.easymock.classextension.MockClassControl;
-import org.apache.myfaces.mock.*;
+import org.easymock.classextension.MockClassControl;
+import org.apache.myfaces.mock.api.MockStateManager;
public class StateManagerTest extends TestCase {
- public static void main(String[] args) {
- junit.textui.TestRunner.run(StateManagerTest.class);
- }
-
- public StateManagerTest(String name) {
- super(name);
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
- /*
- * Test method for 'javax.faces.application.StateManager.isSavingStateInClient(FacesContext)'
- */
- public void testNullThrowsIsSavingStateInClient() {
- MockStateManager subject = new MockStateManager();
- try {
- subject.isSavingStateInClient(null);
- fail("should have thrown an exception");
- } catch (RuntimeException e) {
- }
- }
-
- /*
- * Test method for 'javax.faces.application.StateManager.isSavingStateInClient(FacesContext)'
- */
- public void testIsSavingStateInClientTrue() {
- MockControl contextControl = MockClassControl.createControl(FacesContext.class);
- MockControl externalControl = MockClassControl.createControl(ExternalContext.class);
- FacesContext context = (FacesContext)contextControl.getMock();
- ExternalContext external = (ExternalContext)externalControl.getMock();
- context.getExternalContext();
- contextControl.setReturnValue(external);
- contextControl.replay();
- external.getInitParameter(StateManager.STATE_SAVING_METHOD_PARAM_NAME);
- externalControl.setReturnValue("client");
- externalControl.replay();
-
- MockStateManager subject = new MockStateManager();
- assertEquals(true, subject.isSavingStateInClient(context));
- }
-
- /*
- * Test method for 'javax.faces.application.StateManager.isSavingStateInClient(FacesContext)'
- */
- public void testIsSavingStateInClientFalse() {
- MockControl contextControl = MockClassControl.createControl(FacesContext.class);
- MockControl externalControl = MockClassControl.createControl(ExternalContext.class);
- FacesContext context = (FacesContext)contextControl.getMock();
- ExternalContext external = (ExternalContext)externalControl.getMock();
- context.getExternalContext();
- contextControl.setReturnValue(external);
- contextControl.replay();
- external.getInitParameter(StateManager.STATE_SAVING_METHOD_PARAM_NAME);
- externalControl.setReturnValue("server");
- externalControl.replay();
-
- MockStateManager subject = new MockStateManager();
- assertEquals(false, subject.isSavingStateInClient(context));
- // calling a second time asserts that the code is caching the value correctly
- assertEquals(false, subject.isSavingStateInClient(context));
- }
-
- /*
- * Test method for 'javax.faces.application.StateManager.isSavingStateInClient(FacesContext)'
- */
- public void testIsSavingStateInClientBogus() {
- MockControl contextControl = MockClassControl.createControl(FacesContext.class);
- MockControl externalControl = MockClassControl.createControl(ExternalContext.class);
- FacesContext context = (FacesContext)contextControl.getMock();
- ExternalContext external = (ExternalContext)externalControl.getMock();
- context.getExternalContext();
- contextControl.setReturnValue(external);
- context.getExternalContext();
- contextControl.setReturnValue(external);
- contextControl.replay();
- external.getInitParameter(StateManager.STATE_SAVING_METHOD_PARAM_NAME);
- externalControl.setReturnValue("blorf");
- external.log("Illegal state saving method 'blorf', default server state saving will be used");
- externalControl.setVoidCallable();
- externalControl.replay();
-
- MockStateManager subject = new MockStateManager();
- assertEquals(false, subject.isSavingStateInClient(context));
- }
-
- /*
- * Test method for 'javax.faces.application.StateManager.isSavingStateInClient(FacesContext)'
- */
- public void testIsSavingStateInClientNull() {
- MockControl contextControl = MockClassControl.createControl(FacesContext.class);
- MockControl externalControl = MockClassControl.createControl(ExternalContext.class);
- FacesContext context = (FacesContext)contextControl.getMock();
- ExternalContext external = (ExternalContext)externalControl.getMock();
- context.getExternalContext();
- contextControl.setReturnValue(external);
- context.getExternalContext();
- contextControl.setReturnValue(external);
- contextControl.replay();
- external.getInitParameter(StateManager.STATE_SAVING_METHOD_PARAM_NAME);
- externalControl.setReturnValue(null);
- external.log("No state saving method defined, assuming default server state saving");
- externalControl.setVoidCallable();
- externalControl.replay();
-
- MockStateManager subject = new MockStateManager();
- assertEquals(false, subject.isSavingStateInClient(context));
- }
+ public static void main(String[] args) {
+ junit.textui.TestRunner.run(StateManagerTest.class);
+ }
+
+ public StateManagerTest(String name) {
+ super(name);
+ }
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ }
+
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+ /*
+ * Test method for 'javax.faces.application.StateManager.isSavingStateInClient(FacesContext)'
+ */
+ public void testNullThrowsIsSavingStateInClient() {
+ MockStateManager subject = new MockStateManager();
+ try {
+ subject.isSavingStateInClient(null);
+ fail("should have thrown an exception");
+ } catch (RuntimeException e) {
+ }
+ }
+
+ /*
+ * Test method for 'javax.faces.application.StateManager.isSavingStateInClient(FacesContext)'
+ */
+ public void testIsSavingStateInClientTrue() {
+ MockControl contextControl = MockClassControl.createControl(FacesContext.class);
+ MockControl externalControl = MockClassControl.createControl(ExternalContext.class);
+ FacesContext context = (FacesContext)contextControl.getMock();
+ ExternalContext external = (ExternalContext)externalControl.getMock();
+ context.getExternalContext();
+ contextControl.setReturnValue(external);
+ contextControl.replay();
+ external.getInitParameter(StateManager.STATE_SAVING_METHOD_PARAM_NAME);
+ externalControl.setReturnValue("client");
+ externalControl.replay();
+
+ MockStateManager subject = new MockStateManager();
+ assertEquals(true, subject.isSavingStateInClient(context));
+ }
+
+ /*
+ * Test method for 'javax.faces.application.StateManager.isSavingStateInClient(FacesContext)'
+ */
+ public void testIsSavingStateInClientFalse() {
+ MockControl contextControl = MockClassControl.createControl(FacesContext.class);
+ MockControl externalControl = MockClassControl.createControl(ExternalContext.class);
+ FacesContext context = (FacesContext)contextControl.getMock();
+ ExternalContext external = (ExternalContext)externalControl.getMock();
+ context.getExternalContext();
+ contextControl.setReturnValue(external);
+ contextControl.replay();
+ external.getInitParameter(StateManager.STATE_SAVING_METHOD_PARAM_NAME);
+ externalControl.setReturnValue("server");
+ externalControl.replay();
+
+ MockStateManager subject = new MockStateManager();
+ assertEquals(false, subject.isSavingStateInClient(context));
+ // calling a second time asserts that the code is caching the value correctly
+ assertEquals(false, subject.isSavingStateInClient(context));
+ }
+
+ /*
+ * Test method for 'javax.faces.application.StateManager.isSavingStateInClient(FacesContext)'
+ */
+ public void testIsSavingStateInClientBogus() {
+ MockControl contextControl = MockClassControl.createControl(FacesContext.class);
+ MockControl externalControl = MockClassControl.createControl(ExternalContext.class);
+ FacesContext context = (FacesContext)contextControl.getMock();
+ ExternalContext external = (ExternalContext)externalControl.getMock();
+ context.getExternalContext();
+ contextControl.setReturnValue(external);
+ context.getExternalContext();
+ contextControl.setReturnValue(external);
+ contextControl.replay();
+ external.getInitParameter(StateManager.STATE_SAVING_METHOD_PARAM_NAME);
+ externalControl.setReturnValue("blorf");
+ external.log("Illegal state saving method 'blorf', default server state saving will be used");
+ externalControl.setVoidCallable();
+ externalControl.replay();
+
+ MockStateManager subject = new MockStateManager();
+ assertEquals(false, subject.isSavingStateInClient(context));
+ }
+
+ /*
+ * Test method for 'javax.faces.application.StateManager.isSavingStateInClient(FacesContext)'
+ */
+ public void testIsSavingStateInClientNull() {
+ MockControl contextControl = MockClassControl.createControl(FacesContext.class);
+ MockControl externalControl = MockClassControl.createControl(ExternalContext.class);
+ FacesContext context = (FacesContext)contextControl.getMock();
+ ExternalContext external = (ExternalContext)externalControl.getMock();
+ context.getExternalContext();
+ contextControl.setReturnValue(external);
+ context.getExternalContext();
+ contextControl.setReturnValue(external);
+ contextControl.replay();
+ external.getInitParameter(StateManager.STATE_SAVING_METHOD_PARAM_NAME);
+ externalControl.setReturnValue(null);
+ external.log("No state saving method defined, assuming default server state saving");
+ externalControl.setVoidCallable();
+ externalControl.replay();
+
+ MockStateManager subject = new MockStateManager();
+ assertEquals(false, subject.isSavingStateInClient(context));
+ }
}
Modified: myfaces/core/trunk/api/src/test/java/javax/faces/component/UIComponentBaseTest.java
URL: http://svn.apache.org/viewcvs/myfaces/core/trunk/api/src/test/java/javax/faces/component/UIComponentBaseTest.java?rev=372933&r1=372932&r2=372933&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/test/java/javax/faces/component/UIComponentBaseTest.java (original)
+++ myfaces/core/trunk/api/src/test/java/javax/faces/component/UIComponentBaseTest.java Fri Jan 27 10:07:26 2006
@@ -19,11 +19,12 @@
import javax.faces.context.FacesContext;
import javax.faces.el.ValueBinding;
import javax.faces.FactoryFinder;
-import javax.faces.MockApplicationFactory;
-import javax.faces.MockRenderKitFactory;
+import org.apache.myfaces.mock.api.MockApplicationFactory;
+import org.apache.myfaces.mock.api.MockRenderKitFactory;
import org.apache.myfaces.AbstractTestCase;
-import org.apache.myfaces.FacesContextHelper;
+import org.apache.myfaces.mock.api.MockFacesContextHelper;
+import org.apache.myfaces.mock.api.MockFacesContext;
import org.easymock.MockControl;
import org.easymock.classextension.MockClassControl;
@@ -120,7 +121,7 @@
*/
public void testGetClientIdFacesContext() {
- FacesContext context = new FacesContextHelper();
+ FacesContext context = new MockFacesContext();
UIInput input = createInputInTree(context);
@@ -162,7 +163,7 @@
context.setViewRoot(viewRoot);
- FacesContextHelper.setCurrentInstance(context);
+ MockFacesContextHelper.setCurrentInstance(context);
return input;
}
@@ -205,7 +206,7 @@
* Test method for 'javax.faces.component.UIComponentBase.findComponent(String)'
*/
public void testFindComponentString() {
- FacesContext context = new FacesContextHelper();
+ FacesContext context = new MockFacesContext();
UIInput input = createInputInTree(context);
Modified: myfaces/core/trunk/api/src/test/java/javax/faces/component/UISelectManyTest.java
URL: http://svn.apache.org/viewcvs/myfaces/core/trunk/api/src/test/java/javax/faces/component/UISelectManyTest.java?rev=372933&r1=372932&r2=372933&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/test/java/javax/faces/component/UISelectManyTest.java (original)
+++ myfaces/core/trunk/api/src/test/java/javax/faces/component/UISelectManyTest.java Fri Jan 27 10:07:26 2006
@@ -21,8 +21,9 @@
import java.util.Locale;
import org.apache.myfaces.AbstractTestCase;
-import org.apache.myfaces.mock.MockApplication;
-import org.apache.myfaces.mock.MockFacesContext;
+import org.apache.myfaces.mock.api.MockApplication;
+import org.apache.myfaces.mock.api.MockFacesContext;
+
import javax.faces.component.UIViewRoot;
public class UISelectManyTest extends AbstractTestCase {
Modified: myfaces/core/trunk/api/src/test/java/org/apache/myfaces/AbstractTestCase.java
URL: http://svn.apache.org/viewcvs/myfaces/core/trunk/api/src/test/java/org/apache/myfaces/AbstractTestCase.java?rev=372933&r1=372932&r2=372933&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/test/java/org/apache/myfaces/AbstractTestCase.java (original)
+++ myfaces/core/trunk/api/src/test/java/org/apache/myfaces/AbstractTestCase.java Fri Jan 27 10:07:26 2006
@@ -19,6 +19,7 @@
import javax.faces.context.FacesContext;
import junit.framework.TestCase;
+import org.apache.myfaces.mock.api.MockFacesContextHelper;
/**
* Base class that unit tests can extend to ensure the current FacesContext
@@ -38,14 +39,14 @@
protected void setUp() throws Exception {
if (FacesContext.getCurrentInstance() != null) {
- throw new IllegalStateException("faces context not null");
+ throw new IllegalStateException("faces context not null");
}
-
+
super.setUp();
}
protected void tearDown() throws Exception {
super.tearDown();
- FacesContextHelper.setCurrentInstance(null);
+ MockFacesContextHelper.setCurrentInstance(null);
}
}
Copied: myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/Mock2ApplicationFactory.java (from r372806, myfaces/core/trunk/api/src/test/java/javax/faces/Mock2ApplicationFactory.java)
URL: http://svn.apache.org/viewcvs/myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/Mock2ApplicationFactory.java?p2=myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/Mock2ApplicationFactory.java&p1=myfaces/core/trunk/api/src/test/java/javax/faces/Mock2ApplicationFactory.java&r1=372806&r2=372933&rev=372933&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/test/java/javax/faces/Mock2ApplicationFactory.java (original)
+++ myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/Mock2ApplicationFactory.java Fri Jan 27 10:07:26 2006
@@ -14,11 +14,14 @@
* limitations under the License.
*/
-package javax.faces;
+package org.apache.myfaces.mock.api;
import javax.faces.application.Application;
import javax.faces.application.ApplicationFactory;
+/**
+ * Necessary for testing application-factory-setup with to application-factories;
+ */
public class Mock2ApplicationFactory extends ApplicationFactory {
private Application app = null;
private ApplicationFactory factory = null;
Copied: myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockApplication.java (from r372806, myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/MockApplication.java)
URL: http://svn.apache.org/viewcvs/myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockApplication.java?p2=myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockApplication.java&p1=myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/MockApplication.java&r1=372806&r2=372933&rev=372933&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/MockApplication.java (original)
+++ myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockApplication.java Fri Jan 27 10:07:26 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.myfaces.mock;
+package org.apache.myfaces.mock.api;
import javax.faces.application.*;
Copied: myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockApplicationFactory.java (from r372806, myfaces/core/trunk/api/src/test/java/javax/faces/MockApplicationFactory.java)
URL: http://svn.apache.org/viewcvs/myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockApplicationFactory.java?p2=myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockApplicationFactory.java&p1=myfaces/core/trunk/api/src/test/java/javax/faces/MockApplicationFactory.java&r1=372806&r2=372933&rev=372933&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/test/java/javax/faces/MockApplicationFactory.java (original)
+++ myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockApplicationFactory.java Fri Jan 27 10:07:26 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package javax.faces;
+package org.apache.myfaces.mock.api;
import javax.faces.application.Application;
import javax.faces.application.ApplicationFactory;
Copied: myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockExternalContext.java (from r372806, myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/MockExternalContext.java)
URL: http://svn.apache.org/viewcvs/myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockExternalContext.java?p2=myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockExternalContext.java&p1=myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/MockExternalContext.java&r1=372806&r2=372933&rev=372933&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/MockExternalContext.java (original)
+++ myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockExternalContext.java Fri Jan 27 10:07:26 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.mock;
+package org.apache.myfaces.mock.api;
import javax.faces.context.ExternalContext;
import java.io.IOException;
Copied: myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockFacesContext.java (from r372806, myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/MockFacesContext.java)
URL: http://svn.apache.org/viewcvs/myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockFacesContext.java?p2=myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockFacesContext.java&p1=myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/MockFacesContext.java&r1=372806&r2=372933&rev=372933&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/MockFacesContext.java (original)
+++ myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockFacesContext.java Fri Jan 27 10:07:26 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.myfaces.mock;
+package org.apache.myfaces.mock.api;
import javax.faces.application.Application;
import javax.faces.component.UIViewRoot;
Copied: myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockFacesContextHelper.java (from r372806, myfaces/core/trunk/api/src/test/java/org/apache/myfaces/FacesContextHelper.java)
URL: http://svn.apache.org/viewcvs/myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockFacesContextHelper.java?p2=myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockFacesContextHelper.java&p1=myfaces/core/trunk/api/src/test/java/org/apache/myfaces/FacesContextHelper.java&r1=372806&r2=372933&rev=372933&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/test/java/org/apache/myfaces/FacesContextHelper.java (original)
+++ myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockFacesContextHelper.java Fri Jan 27 10:07:26 2006
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces;
+package org.apache.myfaces.mock.api;
-import org.apache.myfaces.mock.MockExternalContext;
+import org.apache.myfaces.mock.api.MockExternalContext;
import javax.faces.context.FacesContext;
import javax.faces.context.ExternalContext;
@@ -37,122 +37,117 @@
* FacesContext.getCurrentInstance().
*/
-public class FacesContextHelper extends FacesContext
+public class MockFacesContextHelper extends FacesContext
{
- private Application application;
- private ExternalContext externalContext;
- private UIViewRoot viewRoot;
+ private MockFacesContextHelper()
+ {
+
+ }
public Application getApplication()
{
- return application;
+ throw new UnsupportedOperationException("this class is for setting the current faces-context only");
}
public void setApplication(Application application)
{
- this.application = application;
+ throw new UnsupportedOperationException("this class is for setting the current faces-context only");
}
public ExternalContext getExternalContext()
{
- if(externalContext==null)
- {
- externalContext = new MockExternalContext();
- }
-
- return externalContext;
+ throw new UnsupportedOperationException("this class is for setting the current faces-context only");
}
public void setExternalContext(ExternalContext externalContext)
{
- this.externalContext = externalContext;
+ throw new UnsupportedOperationException("this class is for setting the current faces-context only");
}
public UIViewRoot getViewRoot()
{
- return viewRoot;
+ throw new UnsupportedOperationException("this class is for setting the current faces-context only");
}
public void setViewRoot(UIViewRoot viewRoot)
{
- this.viewRoot = viewRoot;
+ throw new UnsupportedOperationException("this class is for setting the current faces-context only");
}
-
public Iterator getClientIdsWithMessages()
{
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ throw new UnsupportedOperationException("this class is for setting the current faces-context only");
}
public FacesMessage.Severity getMaximumSeverity()
{
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ throw new UnsupportedOperationException("this class is for setting the current faces-context only");
}
public Iterator getMessages()
{
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ throw new UnsupportedOperationException("this class is for setting the current faces-context only");
}
public Iterator getMessages(String clientId)
{
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ throw new UnsupportedOperationException("this class is for setting the current faces-context only");
}
public RenderKit getRenderKit()
{
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ throw new UnsupportedOperationException("this class is for setting the current faces-context only");
}
public boolean getRenderResponse()
{
- return false; //To change body of implemented methods use File | Settings | File Templates.
+ throw new UnsupportedOperationException("this class is for setting the current faces-context only");
}
public boolean getResponseComplete()
{
- return false; //To change body of implemented methods use File | Settings | File Templates.
+ throw new UnsupportedOperationException("this class is for setting the current faces-context only");
}
public ResponseStream getResponseStream()
{
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ throw new UnsupportedOperationException("this class is for setting the current faces-context only");
}
public void setResponseStream(ResponseStream responseStream)
{
- //To change body of implemented methods use File | Settings | File Templates.
+ throw new UnsupportedOperationException("this class is for setting the current faces-context only");
}
public ResponseWriter getResponseWriter()
{
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ throw new UnsupportedOperationException("this class is for setting the current faces-context only");
}
public void setResponseWriter(ResponseWriter responseWriter)
{
- //To change body of implemented methods use File | Settings | File Templates.
+ throw new UnsupportedOperationException("this class is for setting the current faces-context only");
}
public void addMessage(String clientId, FacesMessage message)
{
- //To change body of implemented methods use File | Settings | File Templates.
+ throw new UnsupportedOperationException("this class is for setting the current faces-context only");
}
public void release()
{
- //To change body of implemented methods use File | Settings | File Templates.
+ throw new UnsupportedOperationException("this class is for setting the current faces-context only");
}
public void renderResponse()
{
- //To change body of implemented methods use File | Settings | File Templates.
+ throw new UnsupportedOperationException("this class is for setting the current faces-context only");
}
public void responseComplete()
{
- //To change body of implemented methods use File | Settings | File Templates.
+ throw new UnsupportedOperationException("this class is for setting the current faces-context only");
}
public static void setCurrentInstance(FacesContext other)
Propchange: myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockFacesContextHelper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockFacesContextHelper.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockRenderKit.java (from r372806, myfaces/core/trunk/api/src/test/java/javax/faces/MockRenderKit.java)
URL: http://svn.apache.org/viewcvs/myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockRenderKit.java?p2=myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockRenderKit.java&p1=myfaces/core/trunk/api/src/test/java/javax/faces/MockRenderKit.java&r1=372806&r2=372933&rev=372933&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/test/java/javax/faces/MockRenderKit.java (original)
+++ myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockRenderKit.java Fri Jan 27 10:07:26 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.faces;
+package org.apache.myfaces.mock.api;
import javax.faces.render.RenderKit;
import javax.faces.render.Renderer;
Copied: myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockRenderKitFactory.java (from r372806, myfaces/core/trunk/api/src/test/java/javax/faces/MockRenderKitFactory.java)
URL: http://svn.apache.org/viewcvs/myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockRenderKitFactory.java?p2=myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockRenderKitFactory.java&p1=myfaces/core/trunk/api/src/test/java/javax/faces/MockRenderKitFactory.java&r1=372806&r2=372933&rev=372933&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/test/java/javax/faces/MockRenderKitFactory.java (original)
+++ myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockRenderKitFactory.java Fri Jan 27 10:07:26 2006
@@ -13,7 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.faces;
+package org.apache.myfaces.mock.api;
+
+import org.apache.myfaces.mock.api.MockRenderKit;
import javax.faces.render.RenderKitFactory;
import javax.faces.render.RenderKit;
@@ -58,5 +60,6 @@
{
return delegate.getRenderKitIds();
}
- return null; }
+ return null;
+ }
}
Copied: myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockStateManager.java (from r372806, myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/MockStateManager.java)
URL: http://svn.apache.org/viewcvs/myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockStateManager.java?p2=myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockStateManager.java&p1=myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/MockStateManager.java&r1=372806&r2=372933&rev=372933&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/MockStateManager.java (original)
+++ myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockStateManager.java Fri Jan 27 10:07:26 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.myfaces.mock;
+package org.apache.myfaces.mock.api;
import java.io.IOException;