You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ar...@apache.org on 2007/12/05 02:32:24 UTC
svn commit: r601183 -
/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafUtilsTest.java
Author: arobinson74
Date: Tue Dec 4 17:32:23 2007
New Revision: 601183
URL: http://svn.apache.org/viewvc?rev=601183&view=rev
Log:
Fix for XhtmlLafUtilsTest setup
Modified:
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafUtilsTest.java
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafUtilsTest.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafUtilsTest.java?rev=601183&r1=601182&r2=601183&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafUtilsTest.java (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafUtilsTest.java Tue Dec 4 17:32:23 2007
@@ -18,8 +18,23 @@
*/
package org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml;
+import java.util.Locale;
+
+import javax.faces.component.UIViewRoot;
+import javax.faces.context.ResponseWriter;
+
import junit.framework.TestCase;
+import org.apache.myfaces.trinidad.context.RenderingContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
+import org.apache.myfaces.trinidadinternal.io.XhtmlResponseWriter;
+import org.apache.myfaces.trinidadinternal.renderkit.FacesConfigInfo;
+import org.apache.myfaces.trinidadinternal.renderkit.MFacesContext;
+import org.apache.myfaces.trinidadinternal.renderkit.MRequestContext;
+import org.apache.myfaces.trinidadinternal.renderkit.NullWriter;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderKitBootstrap;
+import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRenderingContext;
+
/**
* Unit tests for XhtmlLafUtils.
*
@@ -33,6 +48,50 @@
super(testName);
}
+ protected void setUp() throws Exception
+ {
+ RequestContext rc = RequestContext.getCurrentInstance();
+ if (rc != null)
+ {
+ rc.release();
+ }
+
+ _bootstrap = new RenderKitBootstrap();
+ _bootstrap.init();
+
+ RenderKitBootstrap.clearFactories();
+ RenderKitBootstrap.setFactories(_bootstrap.getFacesConfigInfo());
+ _facesContext = new MFacesContext(false);
+
+ _facesContext = new MFacesContext(true);
+ _requestContext = new MRequestContext();
+ _requestContext.setSkinFamily("minimal");
+ _requestContext.setAgent(RenderKitBootstrap.getGeckoAgent());
+ _requestContext.setRightToLeft(false);
+ _requestContext.setAccessibilityMode(null);
+
+ UIViewRoot root = RenderKitBootstrap.createUIViewRoot(_facesContext);
+ root.setRenderKitId("org.apache.myfaces.trinidad.core");
+ root.setLocale(Locale.getDefault());
+ _facesContext.setViewRoot(root);
+
+ try
+ {
+ new CoreRenderingContext();
+ }
+ catch (IllegalStateException ex)
+ {
+ return;
+ }
+ }
+
+ protected void tearDown() throws Exception
+ {
+ MFacesContext.clearContext();
+ _requestContext.release();
+ RenderKitBootstrap.clearFactories();
+ }
+
/**
* Tests JavaScript strings are escaped inside single quotation marks.
*/
@@ -54,4 +113,9 @@
XhtmlLafUtils.escapeJS(escaped, raw, true, 2);
assertEquals("a\\\\\\\'b", escaped.toString());
}
+
+ private MFacesContext _facesContext;
+ private MRequestContext _requestContext;
+
+ private RenderKitBootstrap _bootstrap;
}