From d841cd4fb1a39d2e5963b35b05cf86d03ef94461 Mon Sep 17 00:00:00 2001 From: Arjen Poutsma Date: Mon, 3 Nov 2008 10:53:34 +0000 Subject: [PATCH] Moved tests from testsuite to web.servlet git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@260 50f2f4bb-b051-0410-bef5-90022cba6387 --- .../web/jsf/MockFacesContext.java | 125 ------------------ .../web/jsf/MockLifecycle.java | 46 ------- .../ByteArrayMultipartFileEditorTests.java | 92 ------------- 3 files changed, 263 deletions(-) delete mode 100644 org.springframework.testsuite/src/test/java/org/springframework/web/jsf/MockFacesContext.java delete mode 100644 org.springframework.testsuite/src/test/java/org/springframework/web/jsf/MockLifecycle.java delete mode 100644 org.springframework.testsuite/src/test/java/org/springframework/web/multipart/support/ByteArrayMultipartFileEditorTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/web/jsf/MockFacesContext.java b/org.springframework.testsuite/src/test/java/org/springframework/web/jsf/MockFacesContext.java deleted file mode 100644 index 91c775c6a32..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/web/jsf/MockFacesContext.java +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Copyright 2002-2006 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.web.jsf; - -import java.util.Iterator; - -import javax.faces.application.Application; -import javax.faces.application.FacesMessage; -import javax.faces.application.FacesMessage.Severity; -import javax.faces.component.UIViewRoot; -import javax.faces.context.ExternalContext; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseStream; -import javax.faces.context.ResponseWriter; -import javax.faces.render.RenderKit; - -/** - * Mock implementation of the FacesContext class to facilitate - * standalone Action unit tests. - * - * @author Ulrik Sandberg - * @see javax.faces.context.FacesContext - */ -public class MockFacesContext extends FacesContext { - - private ExternalContext externalContext; - - private Application application; - - private UIViewRoot viewRoot; - - - public Application getApplication() { - return application; - } - - public void setApplication(Application application) { - this.application = application; - } - - public Iterator getClientIdsWithMessages() { - return null; - } - - public ExternalContext getExternalContext() { - return externalContext; - } - - public void setExternalContext(ExternalContext externalContext) { - this.externalContext = externalContext; - } - - public Severity getMaximumSeverity() { - return null; - } - - public Iterator getMessages() { - return null; - } - - public Iterator getMessages(String arg0) { - return null; - } - - public RenderKit getRenderKit() { - return null; - } - - public boolean getRenderResponse() { - return false; - } - - public boolean getResponseComplete() { - return false; - } - - public ResponseStream getResponseStream() { - return null; - } - - public void setResponseStream(ResponseStream arg0) { - } - - public ResponseWriter getResponseWriter() { - return null; - } - - public void setResponseWriter(ResponseWriter arg0) { - } - - public UIViewRoot getViewRoot() { - return viewRoot; - } - - public void setViewRoot(UIViewRoot viewRoot) { - this.viewRoot = viewRoot; - } - - public void addMessage(String arg0, FacesMessage arg1) { - } - - public void release() { - } - - public void renderResponse() { - } - - public void responseComplete() { - } - -} diff --git a/org.springframework.testsuite/src/test/java/org/springframework/web/jsf/MockLifecycle.java b/org.springframework.testsuite/src/test/java/org/springframework/web/jsf/MockLifecycle.java deleted file mode 100644 index 29a22aa6fcf..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/web/jsf/MockLifecycle.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright 2002-2006 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.web.jsf; - -import javax.faces.FacesException; -import javax.faces.context.FacesContext; -import javax.faces.event.PhaseListener; -import javax.faces.lifecycle.Lifecycle; - -/** - * @author Juergen Hoeller - * @since 29.01.2006 - */ -public class MockLifecycle extends Lifecycle { - - public void addPhaseListener(PhaseListener phaseListener) { - } - - public void execute(FacesContext facesContext) throws FacesException { - } - - public PhaseListener[] getPhaseListeners() { - return null; - } - - public void removePhaseListener(PhaseListener phaseListener) { - } - - public void render(FacesContext facesContext) throws FacesException { - } - -} diff --git a/org.springframework.testsuite/src/test/java/org/springframework/web/multipart/support/ByteArrayMultipartFileEditorTests.java b/org.springframework.testsuite/src/test/java/org/springframework/web/multipart/support/ByteArrayMultipartFileEditorTests.java deleted file mode 100644 index 169f2477e01..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/web/multipart/support/ByteArrayMultipartFileEditorTests.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Copyright 2002-2006 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.web.multipart.support; - -import java.io.IOException; - -import junit.framework.TestCase; -import org.easymock.MockControl; - -import org.springframework.web.multipart.MultipartFile; - -/** - * @author Rick Evans - */ -public final class ByteArrayMultipartFileEditorTests extends TestCase { - - public void testSetValueAsByteArray() throws Exception { - ByteArrayMultipartFileEditor editor = new ByteArrayMultipartFileEditor(); - String expectedValue = "Shumwere, shumhow, a shuck ish washing you. - Drunken Far Side"; - editor.setValue(expectedValue.getBytes()); - assertEquals(expectedValue, editor.getAsText()); - } - - public void testSetValueAsString() throws Exception { - ByteArrayMultipartFileEditor editor = new ByteArrayMultipartFileEditor(); - String expectedValue = "'Green Wing' - classic British comedy"; - editor.setValue(expectedValue); - assertEquals(expectedValue, editor.getAsText()); - } - - public void testSetValueAsCustomObjectInvokesToString() throws Exception { - ByteArrayMultipartFileEditor editor = new ByteArrayMultipartFileEditor(); - final String expectedValue = "'Green Wing' - classic British comedy"; - Object object = new Object() { - public String toString() { - return expectedValue; - } - }; - editor.setValue(object); - assertEquals(expectedValue, editor.getAsText()); - } - - public void testSetValueAsNullGetsBackEmptyString() throws Exception { - ByteArrayMultipartFileEditor editor = new ByteArrayMultipartFileEditor(); - editor.setValue(null); - assertEquals("", editor.getAsText()); - } - - public void testSetValueAsMultipartFile() throws Exception { - String expectedValue = "That is comforting to know"; - ByteArrayMultipartFileEditor editor = new ByteArrayMultipartFileEditor(); - MockControl mock = MockControl.createControl(MultipartFile.class); - MultipartFile file = (MultipartFile) mock.getMock(); - file.getBytes(); - mock.setReturnValue(expectedValue.getBytes()); - mock.replay(); - editor.setValue(file); - assertEquals(expectedValue, editor.getAsText()); - mock.verify(); - } - - public void testSetValueAsMultipartFileWithBadBytes() throws Exception { - ByteArrayMultipartFileEditor editor = new ByteArrayMultipartFileEditor(); - MockControl mock = MockControl.createControl(MultipartFile.class); - MultipartFile file = (MultipartFile) mock.getMock(); - file.getBytes(); - mock.setThrowable(new IOException()); - mock.replay(); - try { - editor.setValue(file); - fail("Must have thrown an IllegalArgumentException: IOException thrown when reading MultipartFile bytes"); - } - catch (IllegalArgumentException expected) { - } - mock.verify(); - } - -}