You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by de...@apache.org on 2006/02/25 23:52:02 UTC
svn commit: r381010 - in
/myfaces/commons/trunk/src/test/java/org/apache/myfaces:
test/FacesContextHelper.java test/MockResponseWriter.java
util/MessageUtilsTest.java
Author: dennisbyrne
Date: Sat Feb 25 14:51:59 2006
New Revision: 381010
URL: http://svn.apache.org/viewcvs?rev=381010&view=rev
Log:
Refactored test
Removed:
myfaces/commons/trunk/src/test/java/org/apache/myfaces/test/FacesContextHelper.java
myfaces/commons/trunk/src/test/java/org/apache/myfaces/test/MockResponseWriter.java
Modified:
myfaces/commons/trunk/src/test/java/org/apache/myfaces/util/MessageUtilsTest.java
Modified: myfaces/commons/trunk/src/test/java/org/apache/myfaces/util/MessageUtilsTest.java
URL: http://svn.apache.org/viewcvs/myfaces/commons/trunk/src/test/java/org/apache/myfaces/util/MessageUtilsTest.java?rev=381010&r1=381009&r2=381010&view=diff
==============================================================================
--- myfaces/commons/trunk/src/test/java/org/apache/myfaces/util/MessageUtilsTest.java (original)
+++ myfaces/commons/trunk/src/test/java/org/apache/myfaces/util/MessageUtilsTest.java Sat Feb 25 14:51:59 2006
@@ -18,30 +18,35 @@
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.faces.FactoryFinder;
-import javax.faces.application.Application;
import javax.faces.application.FacesMessage;
-import javax.faces.component.UIViewRoot;
-import javax.faces.context.*;
+import junit.framework.Test;
-import junit.framework.Assert;
-import junit.framework.TestCase;
-import org.apache.myfaces.test.MockResponseWriter;
-import org.apache.myfaces.test.FacesContextHelper;
-import org.easymock.MockControl;
-import org.easymock.classextension.MockClassControl;
+import org.apache.shale.test.base.AbstractJsfTestCase;
/**
* TestCase for MessageUtils
*
* @author Stephan Strittmatter
*/
-public class MessageUtilsTest extends TestCase
+public class MessageUtilsTest extends AbstractJsfTestCase
{
- private FacesContext context;
-
+ public MessageUtilsTest(String name) {
+ super(name);
+ }
+
+ public static Test suite() {
+ return null; // keep this method or maven won't run it
+ }
+
+ public void setUp() {
+ super.setUp();
+
+ facesContext.getViewRoot().setLocale(Locale.ENGLISH);
+
+ }
+
private static final String DEFAULT_BUNDLE = "javax.faces.Messages";
/**
@@ -49,10 +54,13 @@
*/
public void testGetMessageSeverityStringObject()
{
+
FacesMessage msg = MessageUtils.getMessage(FacesMessage.SEVERITY_ERROR,
"javax.faces.component.UIInput.CONVERSION", null);
assertEquals("Conversion Error", msg.getSummary());
+ facesContext.getViewRoot().setLocale(Locale.GERMAN);
+
msg = MessageUtils.getMessage(FacesMessage.SEVERITY_ERROR,
"javax.faces.component.UIInput.CONVERSION",
"blubb");
@@ -64,10 +72,13 @@
*/
public void testGetMessageSeverityStringObjectArray()
{
+
FacesMessage msg = MessageUtils.getMessage(FacesMessage.SEVERITY_ERROR,
"javax.faces.component.UIInput.CONVERSION", null);
assertEquals("Conversion Error", msg.getSummary());
+ facesContext.getViewRoot().setLocale(Locale.GERMAN);
+
msg = MessageUtils.getMessage(FacesMessage.SEVERITY_ERROR,
"javax.faces.component.UIInput.CONVERSION", null);
assertEquals("Konvertierungsfehler", msg.getSummary());
@@ -78,13 +89,16 @@
*/
public void testGetMessageSeverityStringObjectArrayFacesContext()
{
+
FacesMessage msg = MessageUtils.getMessage(FacesMessage.SEVERITY_ERROR,
- "javax.faces.component.UIInput.CONVERSION", null, getFacesContext());
+ "javax.faces.component.UIInput.CONVERSION", null, facesContext);
assertEquals("Conversion Error", msg.getSummary());
+ facesContext.getViewRoot().setLocale(Locale.GERMAN);
+
msg = MessageUtils.getMessage(FacesMessage.SEVERITY_ERROR,
"javax.faces.component.UIInput.CONVERSION", null,
- getFacesContext());
+ facesContext);
assertEquals("Konvertierungsfehler", msg.getSummary());
}
@@ -93,10 +107,13 @@
*/
public void testGetMessageLocaleStringObjectArray()
{
+
FacesMessage msg = MessageUtils.getMessage(Locale.ENGLISH,
"javax.faces.component.UIInput.CONVERSION", null);
assertEquals("Conversion Error", msg.getSummary());
+ facesContext.getViewRoot().setLocale(Locale.GERMAN);
+
msg = MessageUtils.getMessage(Locale.GERMAN,
"javax.faces.component.UIInput.CONVERSION", null);
assertEquals("Konvertierungsfehler", msg.getSummary());
@@ -108,11 +125,14 @@
*/
public void testGetMessageFacesContextString()
{
- FacesMessage msg = MessageUtils.getMessage(this.getFacesContext(),
+
+ FacesMessage msg = MessageUtils.getMessage(facesContext,
"javax.faces.component.UIInput.CONVERSION");
assertEquals("Conversion Error", msg.getSummary());
- msg = MessageUtils.getMessage(this.getFacesContext(),
+ facesContext.getViewRoot().setLocale(Locale.GERMAN);
+
+ msg = MessageUtils.getMessage(facesContext,
"javax.faces.component.UIInput.CONVERSION");
assertEquals("Konvertierungsfehler", msg.getSummary());
}
@@ -122,11 +142,14 @@
*/
public void testGetMessageFacesContextStringObjectArray()
{
- FacesMessage msg = MessageUtils.getMessage(this.getFacesContext(),
+
+ FacesMessage msg = MessageUtils.getMessage(facesContext,
"javax.faces.component.UIInput.CONVERSION", null);
assertEquals("Conversion Error", msg.getSummary());
- msg = MessageUtils.getMessage(this.getFacesContext(),
+ facesContext.getViewRoot().setLocale(Locale.GERMAN);
+
+ msg = MessageUtils.getMessage(facesContext,
"javax.faces.component.UIInput.CONVERSION", null);
assertEquals("Konvertierungsfehler", msg.getSummary());
}
@@ -136,6 +159,7 @@
*/
public void testGetMessageWithBundle()
{
+
ResourceBundle bundle = ResourceBundle.getBundle(DEFAULT_BUNDLE,
Locale.ENGLISH);
FacesMessage msg = MessageUtils.getMessage(bundle,
@@ -149,6 +173,7 @@
*/
public void testGetMessageWithBundleName()
{
+
FacesMessage msg = MessageUtils.getMessage(DEFAULT_BUNDLE,
"javax.faces.component.UIInput.CONVERSION", null);
@@ -160,92 +185,11 @@
*/
public void testGetMessageWithBundleNameLocale()
{
+
FacesMessage msg = MessageUtils.getMessage(DEFAULT_BUNDLE,
Locale.GERMAN, "javax.faces.component.UIInput.CONVERSION", null);
assertEquals("Konvertierungsfehler", msg.getSummary());
}
- /**
- * @return FacesContext
- */
- protected FacesContext getFacesContext()
- {
- Assert.assertNotNull(
- "Please extend setUp() to create a valid FacesContext "
- + "instead of overwrite it!", this.context);
- return this.context;
- }
-
- protected void setUp() throws Exception
- {
- MockResponseWriter writer = new MockResponseWriter();
- this.context = createMockFacesContext(writer);
- FacesContextHelper.setCurrentInstance(context);
- }
-
- protected void tearDown() throws Exception
- {
- FacesContextHelper.setCurrentInstance(null);
- super.tearDown();
-
- }
-
- /**
- * create the Mock object for FacesContext and required sub objects.
- *
- * @param rWriter writer to get access to the content
- * @return the Mock of FacesContext
- */
- protected FacesContext createMockFacesContext(ResponseWriter rWriter)
- {
-
- FactoryFinder.setFactory(FactoryFinder.RENDER_KIT_FACTORY,
- "org.apache.myfaces.renderkit.RenderKitFactoryImpl");
-
- MockControl ctxControl = MockClassControl
- .createControl(FacesContext.class);
- FacesContext mockFacesCtx = (FacesContext) ctxControl.getMock();
-
- MockControl extCtxControl = MockClassControl
- .createControl(ExternalContext.class);
- ExternalContext mockExtCtx = (ExternalContext) extCtxControl.getMock();
-
- mockFacesCtx.getExternalContext();
- ctxControl.setDefaultReturnValue(mockExtCtx);
-
- MockControl appControl = MockClassControl.createControl(Application.class);
- Application mockApplication = (Application) appControl.getMock();
-
- mockApplication.getMessageBundle();
- appControl.setDefaultReturnValue(DEFAULT_BUNDLE);
-
- mockFacesCtx.getApplication();
- ctxControl.setDefaultReturnValue(mockApplication);
-
- mockFacesCtx.renderResponse();
- ctxControl.setVoidCallable();
-
- mockFacesCtx.getResponseWriter();
- ctxControl.setDefaultReturnValue(rWriter);
-
- MockControl viewRootControl = MockClassControl
- .createControl(UIViewRoot.class);
- UIViewRoot uiViewRoot = (UIViewRoot) viewRootControl.getMock();
-
- uiViewRoot.getLocale();
- //set the return values: first EN, then DE!
- viewRootControl.setReturnValue(Locale.ENGLISH);
- viewRootControl.setReturnValue(Locale.GERMAN);
-
- mockFacesCtx.getViewRoot();
- ctxControl.setDefaultReturnValue(uiViewRoot);
-
- ctxControl.replay();
- appControl.replay();
- extCtxControl.replay();
- viewRootControl.replay();
-
- return mockFacesCtx;
- }
}