You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2010/08/28 20:48:09 UTC
svn commit: r990406 [1/2] - in /myfaces/test/trunk:
test12/src/main/java/org/apache/myfaces/test/base/
test12/src/main/java/org/apache/myfaces/test/base/junit4/
test12/src/main/java/org/apache/myfaces/test/cargo/
test12/src/main/java/org/apache/myfaces...
Author: lu4242
Date: Sat Aug 28 18:48:06 2010
New Revision: 990406
URL: http://svn.apache.org/viewvc?rev=990406&view=rev
Log:
enhance documentation an small fixes
Modified:
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/base/AbstractJsfTestCase.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/base/AbstractViewControllerTestCase.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/base/junit4/AbstractJsfConfigurableMockTestCase.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/base/junit4/AbstractJsfTestCase.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/base/junit4/AbstractViewControllerTestCase.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/cargo/CargoTestSetup.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/config/ConfigParser.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/AbstractELResolver.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/FacesImplicitObjectELResolver.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/FacesPropertyResolverChainWrapper.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/FacesResourceBundleELResolver.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/FacesScopedAttributeELResolver.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/FacesVariableResolverChainWrapper.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockCompositeValueExpression.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockELContext.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockExpressionFactory.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockFunctionMapper.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockMethodExpression.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockValueExpression.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockVariableMapper.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockVariableValueExpression.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/htmlunit/AbstractHtmlUnitTestCase.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/htmlunit/junit4/AbstractHtmlUnitTestCase.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/jmock/AbstractJmockJsfTestCase.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockActionListener.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockApplication.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockApplication12.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockApplicationFactory.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockEnumeration.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockExternalContext.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockExternalContext12.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockFacesContext.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockFacesContext12.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockFacesContextFactory.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockHttpServletRequest.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockHttpServletResponse.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockHttpSession.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockMethodBinding.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockNavigationHandler.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockPortletContext.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockPortletRequest.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockPortletResponse.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockPortletSession.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockPrincipal.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockPrintWriter.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockPropertyResolver.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockRenderKit.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockRenderKitFactory.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockRequestDispatcher.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockResponseStateManager.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockResponseWriter.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockServlet.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockServletConfig.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockServletContext.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockServletInputStream.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockServletOutputStream.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockStateManager.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockValueBinding.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockVariableResolver.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockViewHandler.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/_AbstractAttributeMap.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/_ApplicationMap.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/_CookieMap.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/_Hex.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/_InitParameterMap.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/_NullEnumeration.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/_RequestHeaderMap.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/_RequestHeaderValuesMap.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/_RequestMap.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/_RequestParameterMap.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/_RequestParameterValuesMap.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/_SessionMap.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/ApplyRequestValuesExecutor.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/DefaultRestoreViewSupport.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/InvokeApplicationExecutor.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/MockLifecycle.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/MockLifecycleFactory.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/PhaseExecutor.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/PhaseListenerManager.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/ProcessValidationsExecutor.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/RenderResponseExecutor.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/RestoreViewExecutor.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/RestoreViewSupport.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/lifecycle/UpdateModelValuesExecutor.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/runners/NamedRunner.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/runners/TestClassLoader.java
myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/runners/TestPerClassLoaderRunner.java
myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/base/AbstractJsfTestCase.java
myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/base/junit4/AbstractJsfConfigurableMockTestCase.java
myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/base/junit4/AbstractJsfTestCase.java
myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/config/ConfigParser.java
myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/jmock/AbstractJmockJsfTestCase.java
myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/MockApplication20.java
myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/MockApplicationFactory.java
myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/MockExceptionHandler.java
myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/MockExceptionHandlerFactory.java
myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/MockExternalContext20.java
myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/MockFacesContext20.java
myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/MockFacesContextFactory.java
myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/MockFlash.java
myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/MockPartialViewContext.java
myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/MockPartialViewContextFactory.java
myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/MockResponseStateManager.java
myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/MockSubKeyMap.java
myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/MockViewHandler20.java
myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/resource/MockClassLoaderResourceLoader.java
myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/resource/MockExternalContextResourceLoader.java
myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/resource/MockResource.java
myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/resource/MockResourceHandler.java
myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/resource/MockResourceHandlerSupport.java
myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/resource/MockResourceLoader.java
myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/resource/MockResourceMeta.java
myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/resource/MockSimpleResource.java
myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/resource/MockSimpleResourceHandler.java
myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/visit/FullVisitContext.java
myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/visit/MockVisitCallback.java
myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/visit/MockVisitContext.java
myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/visit/MockVisitContextFactory.java
myfaces/test/trunk/test20/src/main/java/org/apache/myfaces/test/mock/visit/PartialVisitContext.java
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/base/AbstractJsfTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/base/AbstractJsfTestCase.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/base/AbstractJsfTestCase.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/base/AbstractJsfTestCase.java Sat Aug 28 18:48:06 2010
@@ -61,7 +61,7 @@ import org.apache.myfaces.test.mock.life
* <p>In addition, appropriate factory classes will have been registered with
* <code>javax.faces.FactoryFinder</code> for <code>Application</code> and
* <code>RenderKit</code> instances. The created <code>FacesContext</code>
- * instance will also have been registered in the apppriate thread local
+ * instance will also have been registered in the proper thread local
* variable, to simulate what a servlet container would do.</p>
*
* <p><strong>WARNING</strong> - If you choose to subclass this class, be sure
@@ -69,6 +69,8 @@ import org.apache.myfaces.test.mock.life
* <code>super.setUp()</code> and <code>super.tearDown()</code> respectively,
* and that you implement your own <code>suite()</code> method that exposes
* the test methods for your test case.</p>
+ *
+ * @since 1.0.0
*/
public abstract class AbstractJsfTestCase extends TestCase {
@@ -111,6 +113,21 @@ public abstract class AbstractJsfTestCas
setUpJSFObjects();
}
+ /**
+ * <p>Setup JSF object used for the test. By default it calls to the following
+ * methods in this order:</p>
+ *
+ * <ul>
+ * <li><code>setUpExternalContext();</code></li>
+ * <li><code>setUpLifecycle();</code></li>
+ * <li><code>setUpFacesContext();</code></li>
+ * <li><code>setUpView();</code></li>
+ * <li><code>setUpApplication();</code></li>
+ * <li><code>setUpRenderKit();</code></li>
+ * </ul>
+ *
+ * @throws Exception
+ */
protected void setUpJSFObjects() throws Exception
{
setUpExternalContext();
@@ -121,6 +138,19 @@ public abstract class AbstractJsfTestCas
setUpRenderKit();
}
+ /**
+ * <p>Setup servlet objects that will be used for the test:</p>
+ *
+ * <ul>
+ * <li><code>config</code> (<code>MockServletConfig</code>)</li>
+ * <li><code>servletContext</code> (<code>MockServletContext</code>)</li>
+ * <li><code>request</code> (<code>MockHttpServletRequest</code></li>
+ * <li><code>response</code> (<code>MockHttpServletResponse</code>)</li>
+ * <li><code>session</code> (<code>MockHttpSession</code>)</li>
+ * </ul>
+ *
+ * @throws Exception
+ */
protected void setUpServletObjects() throws Exception
{
servletContext = new MockServletContext();
@@ -132,6 +162,11 @@ public abstract class AbstractJsfTestCas
response = new MockHttpServletResponse();
}
+ /**
+ * <p>Set JSF factories using FactoryFinder method setFactory.</p>
+ *
+ * @throws Exception
+ */
protected void setFactories() throws Exception
{
FactoryFinder.setFactory(FactoryFinder.APPLICATION_FACTORY,
@@ -143,13 +178,25 @@ public abstract class AbstractJsfTestCas
FactoryFinder.setFactory(FactoryFinder.RENDER_KIT_FACTORY,
"org.apache.myfaces.test.mock.MockRenderKitFactory");
}
-
+
+ /**
+ * Setup the <code>externalContext</code> variable, using the
+ * servlet variables already initialized.
+ *
+ * @throws Exception
+ */
protected void setUpExternalContext() throws Exception
{
externalContext =
new MockExternalContext(servletContext, request, response);
}
-
+
+ /**
+ * Setup the <code>lifecycle</code> and <code>lifecycleFactory</code>
+ * variables.
+ *
+ * @throws Exception
+ */
protected void setUpLifecycle() throws Exception
{
lifecycleFactory = (MockLifecycleFactory)
@@ -158,6 +205,15 @@ public abstract class AbstractJsfTestCas
lifecycleFactory.getLifecycle(LifecycleFactory.DEFAULT_LIFECYCLE);
}
+ /**
+ * Setup the <code>facesContextFactory</code> and <code>facesContext</code>
+ * variable. Before end, by default it override <code>externalContext</code>
+ * variable from the value retrieved from facesContext.getExternalContext(),
+ * because sometimes it is possible facesContext overrides externalContext
+ * internally.
+ *
+ * @throws Exception
+ */
protected void setUpFacesContext() throws Exception
{
facesContextFactory = (MockFacesContextFactory)
@@ -167,9 +223,18 @@ public abstract class AbstractJsfTestCas
request,
response,
lifecycle);
- externalContext = (MockExternalContext) facesContext.getExternalContext();
+ if (facesContext.getExternalContext() != null)
+ {
+ externalContext = (MockExternalContext) facesContext.getExternalContext();
+ }
}
+ /**
+ * By default, create an instance of UIViewRoot, set its viewId as "/viewId"
+ * and assign it to the current facesContext.
+ *
+ * @throws Exception
+ */
protected void setUpView() throws Exception
{
UIViewRoot root = new UIViewRoot();
@@ -178,6 +243,13 @@ public abstract class AbstractJsfTestCas
facesContext.setViewRoot(root);
}
+ /**
+ * Setup the <code>application</code> variable and before
+ * the end by default it is assigned to the <code>facesContext</code>
+ * variable, calling <code>facesContext.setApplication(application)</code>
+ *
+ * @throws Exception
+ */
protected void setUpApplication() throws Exception
{
ApplicationFactory applicationFactory = (ApplicationFactory)
@@ -186,6 +258,13 @@ public abstract class AbstractJsfTestCas
facesContext.setApplication(application);
}
+ /**
+ * Setup the <code>renderKit</code> variable. This is a good place to use
+ * <code>ConfigParser</code> to register converters, validators, components
+ * or renderkits.
+ *
+ * @throws Exception
+ */
protected void setUpRenderKit() throws Exception
{
RenderKitFactory renderKitFactory = (RenderKitFactory)
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/base/AbstractViewControllerTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/base/AbstractViewControllerTestCase.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/base/AbstractViewControllerTestCase.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/base/AbstractViewControllerTestCase.java Sat Aug 28 18:48:06 2010
@@ -28,6 +28,8 @@ import java.util.Iterator;
* <code>super.setUp()</code> and <code>super.tearDown()</code> respectively,
* and that you implement your own <code>suite()</code> method that exposes
* the test methods for your test case.</p>
+ *
+ * @since 1.0.0
*/
public abstract class AbstractViewControllerTestCase extends AbstractJsfTestCase {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/base/junit4/AbstractJsfConfigurableMockTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/base/junit4/AbstractJsfConfigurableMockTestCase.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/base/junit4/AbstractJsfConfigurableMockTestCase.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/base/junit4/AbstractJsfConfigurableMockTestCase.java Sat Aug 28 18:48:06 2010
@@ -63,7 +63,7 @@ import org.junit.Before;
* <p>In addition, appropriate factory classes will have been registered with
* <code>javax.faces.FactoryFinder</code> for <code>Application</code> and
* <code>RenderKit</code> instances. The created <code>FacesContext</code>
- * instance will also have been registered in the apppriate thread local
+ * instance will also have been registered in the proper thread local
* variable, to simulate what a servlet container would do.</p>
*
* <p><strong>WARNING</strong> - If you choose to subclass this class, be sure
@@ -71,6 +71,8 @@ import org.junit.Before;
* <code>super.setUp()</code> and <code>super.tearDown()</code> respectively,
* and that you implement your own <code>suite()</code> method that exposes
* the test methods for your test case.</p>
+ *
+ * @since 1.0.0
*/
public abstract class AbstractJsfConfigurableMockTestCase {
@@ -114,6 +116,21 @@ public abstract class AbstractJsfConfigu
setUpJSFObjects();
}
+ /**
+ * <p>Setup JSF object used for the test. By default it calls to the following
+ * methods in this order:</p>
+ *
+ * <ul>
+ * <li><code>setUpExternalContext();</code></li>
+ * <li><code>setUpLifecycle();</code></li>
+ * <li><code>setUpFacesContext();</code></li>
+ * <li><code>setUpView();</code></li>
+ * <li><code>setUpApplication();</code></li>
+ * <li><code>setUpRenderKit();</code></li>
+ * </ul>
+ *
+ * @throws Exception
+ */
protected void setUpJSFObjects() throws Exception
{
setUpExternalContext();
@@ -124,6 +141,19 @@ public abstract class AbstractJsfConfigu
setUpRenderKit();
}
+ /**
+ * <p>Setup servlet objects that will be used for the test:</p>
+ *
+ * <ul>
+ * <li><code>config</code> (<code>MockServletConfig</code>)</li>
+ * <li><code>servletContext</code> (<code>MockServletContext</code>)</li>
+ * <li><code>request</code> (<code>MockHttpServletRequest</code></li>
+ * <li><code>response</code> (<code>MockHttpServletResponse</code>)</li>
+ * <li><code>session</code> (<code>MockHttpSession</code>)</li>
+ * </ul>
+ *
+ * @throws Exception
+ */
protected void setUpServletObjects() throws Exception
{
servletContext = new MockServletContext();
@@ -135,6 +165,11 @@ public abstract class AbstractJsfConfigu
response = new MockHttpServletResponse();
}
+ /**
+ * <p>Set JSF factories using FactoryFinder method setFactory.</p>
+ *
+ * @throws Exception
+ */
protected void setFactories() throws Exception
{
FactoryFinder.setFactory(FactoryFinder.APPLICATION_FACTORY,
@@ -146,13 +181,25 @@ public abstract class AbstractJsfConfigu
FactoryFinder.setFactory(FactoryFinder.RENDER_KIT_FACTORY,
"org.apache.myfaces.test.mock.MockRenderKitFactory");
}
-
+
+ /**
+ * Setup the <code>externalContext</code> variable, using the
+ * servlet variables already initialized.
+ *
+ * @throws Exception
+ */
protected void setUpExternalContext() throws Exception
{
externalContext =
new MockExternalContext(servletContext, request, response);
}
-
+
+ /**
+ * Setup the <code>lifecycle</code> and <code>lifecycleFactory</code>
+ * variables.
+ *
+ * @throws Exception
+ */
protected void setUpLifecycle() throws Exception
{
lifecycleFactory = (LifecycleFactory)
@@ -161,6 +208,15 @@ public abstract class AbstractJsfConfigu
lifecycleFactory.getLifecycle(LifecycleFactory.DEFAULT_LIFECYCLE);
}
+ /**
+ * Setup the <code>facesContextFactory</code> and <code>facesContext</code>
+ * variable. Before end, by default it override <code>externalContext</code>
+ * variable from the value retrieved from facesContext.getExternalContext(),
+ * because sometimes it is possible facesContext overrides externalContext
+ * internally.
+ *
+ * @throws Exception
+ */
protected void setUpFacesContext() throws Exception
{
facesContextFactory = (FacesContextFactory)
@@ -170,9 +226,18 @@ public abstract class AbstractJsfConfigu
request,
response,
lifecycle);
- externalContext = (ExternalContext) facesContext.getExternalContext();
+ if (facesContext.getExternalContext() != null)
+ {
+ externalContext = facesContext.getExternalContext();
+ }
}
+ /**
+ * By default, create an instance of UIViewRoot, set its viewId as "/viewId"
+ * and assign it to the current facesContext.
+ *
+ * @throws Exception
+ */
protected void setUpView() throws Exception
{
UIViewRoot root = new UIViewRoot();
@@ -181,6 +246,13 @@ public abstract class AbstractJsfConfigu
facesContext.setViewRoot(root);
}
+ /**
+ * Setup the <code>application</code> variable and before
+ * the end by default it is assigned to the <code>facesContext</code>
+ * variable, calling <code>facesContext.setApplication(application)</code>
+ *
+ * @throws Exception
+ */
protected void setUpApplication() throws Exception
{
ApplicationFactory applicationFactory = (ApplicationFactory)
@@ -189,6 +261,13 @@ public abstract class AbstractJsfConfigu
((MockFacesContext)facesContext).setApplication(application);
}
+ /**
+ * Setup the <code>renderKit</code> variable. This is a good place to use
+ * <code>ConfigParser</code> to register converters, validators, components
+ * or renderkits.
+ *
+ * @throws Exception
+ */
protected void setUpRenderKit() throws Exception
{
RenderKitFactory renderKitFactory = (RenderKitFactory)
@@ -206,7 +285,9 @@ public abstract class AbstractJsfConfigu
application = null;
config = null;
externalContext = null;
- facesContext.release();
+ if (facesContext != null) {
+ facesContext.release();
+ }
facesContext = null;
lifecycle = null;
lifecycleFactory = null;
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/base/junit4/AbstractJsfTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/base/junit4/AbstractJsfTestCase.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/base/junit4/AbstractJsfTestCase.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/base/junit4/AbstractJsfTestCase.java Sat Aug 28 18:48:06 2010
@@ -61,7 +61,7 @@ import org.junit.Before;
* <p>In addition, appropriate factory classes will have been registered with
* <code>javax.faces.FactoryFinder</code> for <code>Application</code> and
* <code>RenderKit</code> instances. The created <code>FacesContext</code>
- * instance will also have been registered in the apppriate thread local
+ * instance will also have been registered in the proper thread local
* variable, to simulate what a servlet container would do.</p>
*
* <p><strong>WARNING</strong> - If you choose to subclass this class, be sure
@@ -69,6 +69,8 @@ import org.junit.Before;
* <code>super.setUp()</code> and <code>super.tearDown()</code> respectively,
* and that you implement your own <code>suite()</code> method that exposes
* the test methods for your test case.</p>
+ *
+ * @since 1.0.0
*/
public abstract class AbstractJsfTestCase {
@@ -112,6 +114,21 @@ public abstract class AbstractJsfTestCas
setUpJSFObjects();
}
+ /**
+ * <p>Setup JSF object used for the test. By default it calls to the following
+ * methods in this order:</p>
+ *
+ * <ul>
+ * <li><code>setUpExternalContext();</code></li>
+ * <li><code>setUpLifecycle();</code></li>
+ * <li><code>setUpFacesContext();</code></li>
+ * <li><code>setUpView();</code></li>
+ * <li><code>setUpApplication();</code></li>
+ * <li><code>setUpRenderKit();</code></li>
+ * </ul>
+ *
+ * @throws Exception
+ */
protected void setUpJSFObjects() throws Exception
{
setUpExternalContext();
@@ -122,6 +139,19 @@ public abstract class AbstractJsfTestCas
setUpRenderKit();
}
+ /**
+ * <p>Setup servlet objects that will be used for the test:</p>
+ *
+ * <ul>
+ * <li><code>config</code> (<code>MockServletConfig</code>)</li>
+ * <li><code>servletContext</code> (<code>MockServletContext</code>)</li>
+ * <li><code>request</code> (<code>MockHttpServletRequest</code></li>
+ * <li><code>response</code> (<code>MockHttpServletResponse</code>)</li>
+ * <li><code>session</code> (<code>MockHttpSession</code>)</li>
+ * </ul>
+ *
+ * @throws Exception
+ */
protected void setUpServletObjects() throws Exception
{
servletContext = new MockServletContext();
@@ -133,6 +163,11 @@ public abstract class AbstractJsfTestCas
response = new MockHttpServletResponse();
}
+ /**
+ * <p>Set JSF factories using FactoryFinder method setFactory.</p>
+ *
+ * @throws Exception
+ */
protected void setFactories() throws Exception
{
FactoryFinder.setFactory(FactoryFinder.APPLICATION_FACTORY,
@@ -144,13 +179,25 @@ public abstract class AbstractJsfTestCas
FactoryFinder.setFactory(FactoryFinder.RENDER_KIT_FACTORY,
"org.apache.myfaces.test.mock.MockRenderKitFactory");
}
-
+
+ /**
+ * Setup the <code>externalContext</code> variable, using the
+ * servlet variables already initialized.
+ *
+ * @throws Exception
+ */
protected void setUpExternalContext() throws Exception
{
externalContext =
new MockExternalContext(servletContext, request, response);
}
-
+
+ /**
+ * Setup the <code>lifecycle</code> and <code>lifecycleFactory</code>
+ * variables.
+ *
+ * @throws Exception
+ */
protected void setUpLifecycle() throws Exception
{
lifecycleFactory = (MockLifecycleFactory)
@@ -159,6 +206,15 @@ public abstract class AbstractJsfTestCas
lifecycleFactory.getLifecycle(LifecycleFactory.DEFAULT_LIFECYCLE);
}
+ /**
+ * Setup the <code>facesContextFactory</code> and <code>facesContext</code>
+ * variable. Before end, by default it override <code>externalContext</code>
+ * variable from the value retrieved from facesContext.getExternalContext(),
+ * because sometimes it is possible facesContext overrides externalContext
+ * internally.
+ *
+ * @throws Exception
+ */
protected void setUpFacesContext() throws Exception
{
facesContextFactory = (MockFacesContextFactory)
@@ -168,9 +224,18 @@ public abstract class AbstractJsfTestCas
request,
response,
lifecycle);
- externalContext = (MockExternalContext) facesContext.getExternalContext();
+ if (facesContext.getExternalContext() != null)
+ {
+ externalContext = (MockExternalContext) facesContext.getExternalContext();
+ }
}
+ /**
+ * By default, create an instance of UIViewRoot, set its viewId as "/viewId"
+ * and assign it to the current facesContext.
+ *
+ * @throws Exception
+ */
protected void setUpView() throws Exception
{
UIViewRoot root = new UIViewRoot();
@@ -179,6 +244,13 @@ public abstract class AbstractJsfTestCas
facesContext.setViewRoot(root);
}
+ /**
+ * Setup the <code>application</code> variable and before
+ * the end by default it is assigned to the <code>facesContext</code>
+ * variable, calling <code>facesContext.setApplication(application)</code>
+ *
+ * @throws Exception
+ */
protected void setUpApplication() throws Exception
{
ApplicationFactory applicationFactory = (ApplicationFactory)
@@ -187,6 +259,13 @@ public abstract class AbstractJsfTestCas
facesContext.setApplication(application);
}
+ /**
+ * Setup the <code>renderKit</code> variable. This is a good place to use
+ * <code>ConfigParser</code> to register converters, validators, components
+ * or renderkits.
+ *
+ * @throws Exception
+ */
protected void setUpRenderKit() throws Exception
{
RenderKitFactory renderKitFactory = (RenderKitFactory)
@@ -204,7 +283,9 @@ public abstract class AbstractJsfTestCas
application = null;
config = null;
externalContext = null;
- facesContext.release();
+ if (facesContext != null) {
+ facesContext.release();
+ }
facesContext = null;
lifecycle = null;
lifecycleFactory = null;
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/base/junit4/AbstractViewControllerTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/base/junit4/AbstractViewControllerTestCase.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/base/junit4/AbstractViewControllerTestCase.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/base/junit4/AbstractViewControllerTestCase.java Sat Aug 28 18:48:06 2010
@@ -30,6 +30,8 @@ import org.junit.Assert;
* <code>super.setUp()</code> and <code>super.tearDown()</code> respectively,
* and that you implement your own <code>suite()</code> method that exposes
* the test methods for your test case.</p>
+ *
+ * @since 1.0.0
*/
public abstract class AbstractViewControllerTestCase extends AbstractJsfTestCase {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/cargo/CargoTestSetup.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/cargo/CargoTestSetup.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/cargo/CargoTestSetup.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/cargo/CargoTestSetup.java Sat Aug 28 18:48:06 2010
@@ -38,6 +38,8 @@ import org.codehaus.cargo.util.log.FileL
/**
* <p>Convenience <code>TestSetup</code> class which uses Cargo to start
* and stop a Servlet container.</p>
+ *
+ * @since 1.0.0
*/
public class CargoTestSetup extends TestSetup {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/config/ConfigParser.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/config/ConfigParser.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/config/ConfigParser.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/config/ConfigParser.java Sat Aug 28 18:48:06 2010
@@ -54,7 +54,7 @@ import java.net.URL;
* <code>setUp()</code> processing in this base class before calling one
* of the <code>parse()</code> methods.</p>
*
- * @since 1.1
+ * @since 1.0.0
*/
public class ConfigParser {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/AbstractELResolver.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/AbstractELResolver.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/AbstractELResolver.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/AbstractELResolver.java Sat Aug 28 18:48:06 2010
@@ -22,6 +22,8 @@ import javax.el.ELResolver;
/**
* <p>Convenience base class for EL resolvers.</p>
+ *
+ * @since 1.0.0
*/
abstract class AbstractELResolver extends ELResolver {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/FacesImplicitObjectELResolver.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/FacesImplicitObjectELResolver.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/FacesImplicitObjectELResolver.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/FacesImplicitObjectELResolver.java Sat Aug 28 18:48:06 2010
@@ -34,7 +34,7 @@ import javax.faces.context.FacesContext;
* in the current request context. See the JSF 1.2 Specification, section
* 5.6.2.1, for requirements implemented by this class.</p>
*
- * @since 1.0.4
+ * @since 1.0.0
*/
public class FacesImplicitObjectELResolver extends AbstractELResolver {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/FacesPropertyResolverChainWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/FacesPropertyResolverChainWrapper.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/FacesPropertyResolverChainWrapper.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/FacesPropertyResolverChainWrapper.java Sat Aug 28 18:48:06 2010
@@ -31,7 +31,7 @@ import javax.faces.el.PropertyResolver;
* <code>PropertyResolver</code> chain. See the JSF 1.2 Specification, section
* 5.6.1.6, for requirements implemented by this class.</p>
*
- * @since 1.0.4
+ * @since 1.0.0
*/
public class FacesPropertyResolverChainWrapper extends AbstractELResolver {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/FacesResourceBundleELResolver.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/FacesResourceBundleELResolver.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/FacesResourceBundleELResolver.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/FacesResourceBundleELResolver.java Sat Aug 28 18:48:06 2010
@@ -35,7 +35,7 @@ import org.apache.myfaces.test.mock.Mock
* in the current application. See the JSF 1.2 Specification, section
* 5.6.1.3, for requirements implemented by this class.</p>
*
- * @since 1.0.4
+ * @since 1.0.0
*/
public class FacesResourceBundleELResolver extends AbstractELResolver {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/FacesScopedAttributeELResolver.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/FacesScopedAttributeELResolver.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/FacesScopedAttributeELResolver.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/FacesScopedAttributeELResolver.java Sat Aug 28 18:48:06 2010
@@ -34,7 +34,7 @@ import javax.faces.context.FacesContext;
* in the current request context. See the JSF 1.2 Specification, section
* 5.6.2.7, for requirements implemented by this class.</p>
*
- * @since 1.0.4
+ * @since 1.0.0
*/
public class FacesScopedAttributeELResolver extends AbstractELResolver {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/FacesVariableResolverChainWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/FacesVariableResolverChainWrapper.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/FacesVariableResolverChainWrapper.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/FacesVariableResolverChainWrapper.java Sat Aug 28 18:48:06 2010
@@ -31,7 +31,7 @@ import javax.faces.el.VariableResolver;
* <code>VariableResolver</code> chain. See the JSF 1.2 Specification, section
* 5.6.1.5, for requirements implemented by this class.</p>
*
- * @since 1.0.4
+ * @since 1.0.0
*/
public class FacesVariableResolverChainWrapper extends AbstractELResolver {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockCompositeValueExpression.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockCompositeValueExpression.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockCompositeValueExpression.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockCompositeValueExpression.java Sat Aug 28 18:48:06 2010
@@ -26,7 +26,9 @@ import javax.el.ValueExpression;
/**
* A value expression implementation that is capable of handling composite expressions.
* It handles composites expressions but creating a list of 'simple' expressions which are 'pure', only literal text or only references like #{}
+ *
* @author Rudy De Busscher
+ * @since 1.0.0
*/
public class MockCompositeValueExpression extends MockValueExpression
{
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockELContext.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockELContext.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockELContext.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockELContext.java Sat Aug 28 18:48:06 2010
@@ -29,7 +29,7 @@ import javax.faces.context.FacesContext;
/**
* <p>Mock implementation of <code>ELContext</code>.</p>
*
- * @since 1.0.4
+ * @since 1.0.0
*/
public class MockELContext extends ELContext {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockExpressionFactory.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockExpressionFactory.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockExpressionFactory.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockExpressionFactory.java Sat Aug 28 18:48:06 2010
@@ -27,7 +27,7 @@ import javax.el.ValueExpression;
/**
* <p>Mock implementation of <code>ExpressionFactory</code>.</p>
*
- * @since 1.0.4
+ * @since 1.0.0
*/
public class MockExpressionFactory extends ExpressionFactory {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockFunctionMapper.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockFunctionMapper.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockFunctionMapper.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockFunctionMapper.java Sat Aug 28 18:48:06 2010
@@ -25,7 +25,7 @@ import javax.el.FunctionMapper;
/**
* <p>Mock implementation of <code>FunctionMapper</code>.</p>
*
- * @since 1.0.4
+ * @since 1.0.0
*/
public class MockFunctionMapper extends FunctionMapper {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockMethodExpression.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockMethodExpression.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockMethodExpression.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockMethodExpression.java Sat Aug 28 18:48:06 2010
@@ -29,6 +29,8 @@ import javax.faces.context.FacesContext;
/**
* <p>Mock implementation of <code>MethodExpression</code>.</p>
+ *
+ * @since 1.0.0
*/
public class MockMethodExpression extends MethodExpression {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockValueExpression.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockValueExpression.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockValueExpression.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockValueExpression.java Sat Aug 28 18:48:06 2010
@@ -32,6 +32,8 @@ import javax.faces.context.FacesContext;
* <li>A literal string that contains no expression delimiters.</li>
* <li>An expression that starts with "#{" or "${", and ends with "}".</li>
* </ul>
+ *
+ * @since 1.0.0
*/
public class MockValueExpression extends ValueExpression {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockVariableMapper.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockVariableMapper.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockVariableMapper.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockVariableMapper.java Sat Aug 28 18:48:06 2010
@@ -25,7 +25,7 @@ import javax.el.VariableMapper;
/**
* <p>Mock implementation of <code>VariableMapper</code>.</p>
*
- * @since 1.0.4
+ * @since 1.0.0
*/
public class MockVariableMapper extends VariableMapper {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockVariableValueExpression.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockVariableValueExpression.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockVariableValueExpression.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/el/MockVariableValueExpression.java Sat Aug 28 18:48:06 2010
@@ -24,6 +24,8 @@ import javax.faces.context.FacesContext;
/**
* <p>Mock implementation of <code>ValueExpression</code> that wraps a variable.</p>
+ *
+ * @since 1.0.0
*/
public class MockVariableValueExpression extends ValueExpression {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/htmlunit/AbstractHtmlUnitTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/htmlunit/AbstractHtmlUnitTestCase.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/htmlunit/AbstractHtmlUnitTestCase.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/htmlunit/AbstractHtmlUnitTestCase.java Sat Aug 28 18:48:06 2010
@@ -40,8 +40,9 @@ import junit.framework.TestSuite;
* These tests will expect a system property named <code>url</code> to be
* present, which will define the URL (including the context path, but
* without a trailing slash) of the application to be tested.</p>
+ *
+ * @since 1.0.0
*/
-
public abstract class AbstractHtmlUnitTestCase extends TestCase {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/htmlunit/junit4/AbstractHtmlUnitTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/htmlunit/junit4/AbstractHtmlUnitTestCase.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/htmlunit/junit4/AbstractHtmlUnitTestCase.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/htmlunit/junit4/AbstractHtmlUnitTestCase.java Sat Aug 28 18:48:06 2010
@@ -41,8 +41,9 @@ import com.gargoylesoftware.htmlunit.htm
* These tests will expect a system property named <code>url</code> to be
* present, which will define the URL (including the context path, but
* without a trailing slash) of the application to be tested.</p>
+ *
+ * @since 1.0.0
*/
-
public abstract class AbstractHtmlUnitTestCase {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/jmock/AbstractJmockJsfTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/jmock/AbstractJmockJsfTestCase.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/jmock/AbstractJmockJsfTestCase.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/jmock/AbstractJmockJsfTestCase.java Sat Aug 28 18:48:06 2010
@@ -68,15 +68,20 @@ import org.jmock.cglib.MockObjectTestCas
* <code>super.setUp()</code> and <code>super.tearDown()</code> respectively,
* and that you implement your own <code>suite()</code> method that exposes
* the test methods for your test case.</p>
+ *
+ * @since 1.0.0
*/
-
public abstract class AbstractJmockJsfTestCase extends MockObjectTestCase {
// ------------------------------------------------------------ Constructors
- // Construct a new instance of this test case.
+ /**
+ * <p>Construct a new instance of this test case.</p>
+ *
+ * @param name Name of this test case
+ */
public AbstractJmockJsfTestCase(String name) {
setName(name);
}
@@ -85,24 +90,44 @@ public abstract class AbstractJmockJsfTe
// ---------------------------------------------------- Overall Test Methods
- // Set up instance variables required by this test case.
+ /**
+ * <p>Set up instance variables required by this test case.</p>
+ */
protected void setUp() throws Exception {
-
+
// Set up a new thread context class loader
threadContextClassLoader = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader(new URLClassLoader(new URL[0],
this.getClass().getClassLoader()));
-
+
// Set up Servlet API Objects
setUpServletObjects();
-
+
// Set up JSF API Objects
FactoryFinder.releaseFactories();
-
- setFactories();
-
+
setFactories();
+ setUpJSFObjects();
+ }
+
+ /**
+ * <p>Setup JSF object used for the test. By default it calls to the following
+ * methods in this order:</p>
+ *
+ * <ul>
+ * <li><code>setUpExternalContext();</code></li>
+ * <li><code>setUpLifecycle();</code></li>
+ * <li><code>setUpFacesContext();</code></li>
+ * <li><code>setUpView();</code></li>
+ * <li><code>setUpApplication();</code></li>
+ * <li><code>setUpRenderKit();</code></li>
+ * </ul>
+ *
+ * @throws Exception
+ */
+ protected void setUpJSFObjects() throws Exception
+ {
setUpExternalContext();
setUpLifecycle();
setUpFacesContext();
@@ -111,6 +136,19 @@ public abstract class AbstractJmockJsfTe
setUpRenderKit();
}
+ /**
+ * <p>Setup servlet objects that will be used for the test:</p>
+ *
+ * <ul>
+ * <li><code>config</code> (<code>MockServletConfig</code>)</li>
+ * <li><code>servletContext</code> (<code>MockServletContext</code>)</li>
+ * <li><code>request</code> (<code>MockHttpServletRequest</code></li>
+ * <li><code>response</code> (<code>MockHttpServletResponse</code>)</li>
+ * <li><code>session</code> (<code>MockHttpSession</code>)</li>
+ * </ul>
+ *
+ * @throws Exception
+ */
protected void setUpServletObjects() throws Exception
{
servletContext = new MockServletContext();
@@ -122,6 +160,11 @@ public abstract class AbstractJmockJsfTe
response = new MockHttpServletResponse();
}
+ /**
+ * <p>Set JSF factories using FactoryFinder method setFactory.</p>
+ *
+ * @throws Exception
+ */
protected void setFactories() throws Exception
{
FactoryFinder.setFactory(FactoryFinder.APPLICATION_FACTORY,
@@ -133,13 +176,25 @@ public abstract class AbstractJmockJsfTe
FactoryFinder.setFactory(FactoryFinder.RENDER_KIT_FACTORY,
"org.apache.myfaces.test.mock.MockRenderKitFactory");
}
-
+
+ /**
+ * Setup the <code>externalContext</code> variable, using the
+ * servlet variables already initialized.
+ *
+ * @throws Exception
+ */
protected void setUpExternalContext() throws Exception
{
externalContext =
new MockExternalContext(servletContext, request, response);
}
-
+
+ /**
+ * Setup the <code>lifecycle</code> and <code>lifecycleFactory</code>
+ * variables.
+ *
+ * @throws Exception
+ */
protected void setUpLifecycle() throws Exception
{
lifecycleFactory = (MockLifecycleFactory)
@@ -148,6 +203,15 @@ public abstract class AbstractJmockJsfTe
lifecycleFactory.getLifecycle(LifecycleFactory.DEFAULT_LIFECYCLE);
}
+ /**
+ * Setup the <code>facesContextFactory</code> and <code>facesContext</code>
+ * variable. Before end, by default it override <code>externalContext</code>
+ * variable from the value retrieved from facesContext.getExternalContext(),
+ * because sometimes it is possible facesContext overrides externalContext
+ * internally.
+ *
+ * @throws Exception
+ */
protected void setUpFacesContext() throws Exception
{
facesContextFactory = (MockFacesContextFactory)
@@ -157,9 +221,18 @@ public abstract class AbstractJmockJsfTe
request,
response,
lifecycle);
- externalContext = (MockExternalContext) facesContext.getExternalContext();
+ if (facesContext.getExternalContext() != null)
+ {
+ externalContext = (MockExternalContext) facesContext.getExternalContext();
+ }
}
+ /**
+ * By default, create an instance of UIViewRoot, set its viewId as "/viewId"
+ * and assign it to the current facesContext.
+ *
+ * @throws Exception
+ */
protected void setUpView() throws Exception
{
UIViewRoot root = new UIViewRoot();
@@ -168,6 +241,13 @@ public abstract class AbstractJmockJsfTe
facesContext.setViewRoot(root);
}
+ /**
+ * Setup the <code>application</code> variable and before
+ * the end by default it is assigned to the <code>facesContext</code>
+ * variable, calling <code>facesContext.setApplication(application)</code>
+ *
+ * @throws Exception
+ */
protected void setUpApplication() throws Exception
{
ApplicationFactory applicationFactory = (ApplicationFactory)
@@ -176,6 +256,13 @@ public abstract class AbstractJmockJsfTe
facesContext.setApplication(application);
}
+ /**
+ * Setup the <code>renderKit</code> variable. This is a good place to use
+ * <code>ConfigParser</code> to register converters, validators, components
+ * or renderkits.
+ *
+ * @throws Exception
+ */
protected void setUpRenderKit() throws Exception
{
RenderKitFactory renderKitFactory = (RenderKitFactory)
@@ -184,13 +271,17 @@ public abstract class AbstractJmockJsfTe
renderKitFactory.addRenderKit(RenderKitFactory.HTML_BASIC_RENDER_KIT, renderKit);
}
- // Tear down instance variables required by this test case.
+ /**
+ * <p>Tear down instance variables required by this test case.</p>
+ */
protected void tearDown() throws Exception {
application = null;
config = null;
externalContext = null;
- facesContext.release();
+ if (facesContext != null) {
+ facesContext.release();
+ }
facesContext = null;
lifecycle = null;
lifecycleFactory = null;
@@ -227,4 +318,4 @@ public abstract class AbstractJmockJsfTe
// Thread context class loader saved and restored after each test
private ClassLoader threadContextClassLoader = null;
-}
\ No newline at end of file
+}
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockActionListener.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockActionListener.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockActionListener.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockActionListener.java Sat Aug 28 18:48:06 2010
@@ -25,6 +25,7 @@ import javax.faces.event.ActionListener;
* <p>Mock implementation of the default <code>ActionListener</code>.</p>
*
* $Id$
+ * @since 1.0.0
*/
public class MockActionListener implements ActionListener {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockApplication.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockApplication.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockApplication.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockApplication.java Sat Aug 28 18:48:06 2010
@@ -44,6 +44,7 @@ import javax.faces.validator.Validator;
* <p>Mock implementation of <code>Application</code>.</p>
*
* $Id$
+ * @since 1.0.0
*/
public class MockApplication extends Application {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockApplication12.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockApplication12.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockApplication12.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockApplication12.java Sat Aug 28 18:48:06 2010
@@ -49,12 +49,12 @@ import org.apache.myfaces.test.el.FacesV
import org.apache.myfaces.test.el.MockExpressionFactory;
/**
- * <p>Mock implementation of <code>ExternalContext</code> that includes the semantics
+ * <p>Mock implementation of <code>Application</code> that includes the semantics
* added by JavaServer Faces 1.2.</p>
*
* $Id$
*
- * @since 1.0.4
+ * @since 1.0.0
*/
public class MockApplication12 extends MockApplication {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockApplicationFactory.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockApplicationFactory.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockApplicationFactory.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockApplicationFactory.java Sat Aug 28 18:48:06 2010
@@ -25,6 +25,7 @@ import javax.faces.application.Applicati
* <p>Mock implementation of <code>ApplicationFactory</code>.</p>
*
* $Id$
+ * @since 1.0.0
*/
public class MockApplicationFactory extends ApplicationFactory {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockEnumeration.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockEnumeration.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockEnumeration.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockEnumeration.java Sat Aug 28 18:48:06 2010
@@ -25,6 +25,7 @@ import java.util.Iterator;
* an <code>Iterator</code>.</p>
*
* $Id$
+ * @since 1.0.0
*/
class MockEnumeration implements Enumeration {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockExternalContext.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockExternalContext.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockExternalContext.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockExternalContext.java Sat Aug 28 18:48:06 2010
@@ -36,14 +36,13 @@ import javax.servlet.ServletException;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
/**
* <p>Mock implementation of <code>ExternalContext</code>.</p>
*
* $Id$
+ * @since 1.0.0
*/
-
public class MockExternalContext extends ExternalContext
{
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockExternalContext12.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockExternalContext12.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockExternalContext12.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockExternalContext12.java Sat Aug 28 18:48:06 2010
@@ -28,9 +28,8 @@ import javax.servlet.http.HttpServletRes
*
* $Id$
*
- * @since 1.0.4
+ * @since 1.0.0
*/
-
public class MockExternalContext12 extends MockExternalContext {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockFacesContext.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockFacesContext.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockFacesContext.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockFacesContext.java Sat Aug 28 18:48:06 2010
@@ -41,8 +41,8 @@ import javax.faces.render.RenderKitFacto
* <p>Mock implementation of <code>FacesContext</code>.</p>
*
* $Id$
+ * @since 1.0.0
*/
-
public class MockFacesContext extends FacesContext {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockFacesContext12.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockFacesContext12.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockFacesContext12.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockFacesContext12.java Sat Aug 28 18:48:06 2010
@@ -32,9 +32,8 @@ import org.apache.myfaces.test.el.MockEL
*
* $Id$
*
- * @since 1.0.4
+ * @since 1.0.0
*/
-
public class MockFacesContext12 extends MockFacesContext {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockFacesContextFactory.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockFacesContextFactory.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockFacesContextFactory.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockFacesContextFactory.java Sat Aug 28 18:48:06 2010
@@ -31,8 +31,8 @@ import javax.servlet.http.HttpServletRes
* <p>Mock implementation of <code>FacesContextFactory</code>.</p>
*
* $Id$
+ * @since 1.0.0
*/
-
public class MockFacesContextFactory extends FacesContextFactory {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockHttpServletRequest.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockHttpServletRequest.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockHttpServletRequest.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockHttpServletRequest.java Sat Aug 28 18:48:06 2010
@@ -51,8 +51,8 @@ import javax.servlet.http.HttpSession;
* <p>Mock implementation of <code>HttpServletContext</code>.</p>
*
* $Id$
+ * @since 1.0.0
*/
-
public class MockHttpServletRequest implements HttpServletRequest {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockHttpServletResponse.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockHttpServletResponse.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockHttpServletResponse.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockHttpServletResponse.java Sat Aug 28 18:48:06 2010
@@ -23,7 +23,6 @@ import java.io.IOException;
import java.io.PrintWriter;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
@@ -40,8 +39,8 @@ import javax.servlet.http.HttpServletRes
* <p>Mock implementation of <code>HttpServletResponse</code>.</p>
*
* $Id$
+ * @since 1.0.0
*/
-
public class MockHttpServletResponse implements HttpServletResponse {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockHttpSession.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockHttpSession.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockHttpSession.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockHttpSession.java Sat Aug 28 18:48:06 2010
@@ -33,8 +33,8 @@ import javax.servlet.http.HttpSessionCon
* <p>Mock implementation of <code>HttpSession</code>.</p>
*
* $Id$
+ * @since 1.0.0
*/
-
public class MockHttpSession implements HttpSession {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockMethodBinding.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockMethodBinding.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockMethodBinding.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockMethodBinding.java Sat Aug 28 18:48:06 2010
@@ -39,6 +39,8 @@ import javax.faces.el.ValueBinding;
* "." must conform to the limitations of {@link MockValueBinding}.</li>
* <li>The name of the method to be executed cannot be delimited by "[]".</li>
* </ul>
+ *
+ * @since 1.0.0
*/
public class MockMethodBinding extends MethodBinding implements StateHolder {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockNavigationHandler.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockNavigationHandler.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockNavigationHandler.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockNavigationHandler.java Sat Aug 28 18:48:06 2010
@@ -29,6 +29,7 @@ import javax.faces.context.FacesContext;
* <p>Mock implementation of <code>NavigationHandler</code>.</p>
*
* $Id$
+ * @since 1.0.0
*/
public class MockNavigationHandler extends NavigationHandler {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockPortletContext.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockPortletContext.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockPortletContext.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockPortletContext.java Sat Aug 28 18:48:06 2010
@@ -34,6 +34,7 @@ import javax.portlet.PortletRequestDispa
* <p>Mock implementation of <code>PortletContext</code>.</p>
*
* $Id$
+ * @since 1.0.0
*/
public class MockPortletContext implements PortletContext {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockPortletRequest.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockPortletRequest.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockPortletRequest.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockPortletRequest.java Sat Aug 28 18:48:06 2010
@@ -34,6 +34,7 @@ import javax.portlet.WindowState;
* <p> Mock implementation of <code>PortletRequest</code>. </p>
*
* $Id$
+ * @since 1.0.0
*/
public class MockPortletRequest implements PortletRequest {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockPortletResponse.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockPortletResponse.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockPortletResponse.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockPortletResponse.java Sat Aug 28 18:48:06 2010
@@ -23,6 +23,7 @@ import javax.portlet.PortletResponse;
* <p>Mock implementation of <code>PortletResponse</code>.</p>
*
* $Id$
+ * @since 1.0.0
*/
public class MockPortletResponse implements PortletResponse {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockPortletSession.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockPortletSession.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockPortletSession.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockPortletSession.java Sat Aug 28 18:48:06 2010
@@ -28,6 +28,7 @@ import javax.portlet.PortletSession;
* <p> Mock implementation of <code>PortletSession</code>. </p>
*
* $Id$
+ * @since 1.0.0
*/
public class MockPortletSession implements PortletSession {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockPrincipal.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockPrincipal.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockPrincipal.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockPrincipal.java Sat Aug 28 18:48:06 2010
@@ -21,6 +21,8 @@ import java.security.Principal;
/**
* <p>Mock implementation of <code>Principal</code>.</p>
+ *
+ * @since 1.0.0
*/
public class MockPrincipal implements Principal {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockPrintWriter.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockPrintWriter.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockPrintWriter.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockPrintWriter.java Sat Aug 28 18:48:06 2010
@@ -25,6 +25,7 @@ import java.io.PrintWriter;
* <p>Mock implementation of <code>PrintWriter</code>.</p>
*
* $Id$
+ * @since 1.0.0
*/
public class MockPrintWriter extends PrintWriter {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockPropertyResolver.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockPropertyResolver.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockPropertyResolver.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockPropertyResolver.java Sat Aug 28 18:48:06 2010
@@ -31,6 +31,7 @@ import javax.faces.el.PropertyResolver;
* <p>Mock implementation of <code>PropertyResolver</code>.</p>
*
* $Id$
+ * @since 1.0.0
*/
public class MockPropertyResolver extends PropertyResolver {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockRenderKit.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockRenderKit.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockRenderKit.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockRenderKit.java Sat Aug 28 18:48:06 2010
@@ -33,6 +33,7 @@ import javax.faces.render.ResponseStateM
* <p>Mock implementation of <code>RenderKit</code>.</p>
*
* $Id$
+ * @since 1.0.0
*/
public class MockRenderKit extends RenderKit
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockRenderKitFactory.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockRenderKitFactory.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockRenderKitFactory.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockRenderKitFactory.java Sat Aug 28 18:48:06 2010
@@ -29,6 +29,7 @@ import javax.faces.render.RenderKitFacto
* <p>Mock implementation of <code>RenderKitFactory</code>.</p>
*
* $Id$
+ * @since 1.0.0
*/
public class MockRenderKitFactory extends RenderKitFactory {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockRequestDispatcher.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockRequestDispatcher.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockRequestDispatcher.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockRequestDispatcher.java Sat Aug 28 18:48:06 2010
@@ -29,6 +29,7 @@ import javax.servlet.ServletResponse;
/**
*
+ * @since 1.0.0
* @author Jacob Hookom
* @version $Id: MockRequestDispatcher.java 804043 2009-08-13 22:08:44Z lu4242 $
*/
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockResponseStateManager.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockResponseStateManager.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockResponseStateManager.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockResponseStateManager.java Sat Aug 28 18:48:06 2010
@@ -15,6 +15,7 @@ import javax.faces.render.ResponseStateM
/**
* Mock class that encode view state in hex format
*
+ * @since 1.0.0
* @author Leonardo Uribe (latest modification by $Author: lu4242 $)
* @version $Revision: 951803 $ $Date: 2010-06-05 21:13:20 -0500 (Sáb, 05 Jun 2010) $
*/
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockResponseWriter.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockResponseWriter.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockResponseWriter.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockResponseWriter.java Sat Aug 28 18:48:06 2010
@@ -24,6 +24,8 @@ import javax.faces.context.ResponseWrite
/**
* <p>Mock implementation of <code>javax.faces.context.ResponseWriter</code>.</p>
+ *
+ * @since 1.0.0
*/
public class MockResponseWriter extends ResponseWriter {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockServlet.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockServlet.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockServlet.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockServlet.java Sat Aug 28 18:48:06 2010
@@ -29,6 +29,7 @@ import javax.servlet.ServletResponse;
* <p>Mock implementation of <code>Servlet</code>.</p>
*
* $Id$
+ * @since 1.0.0
*/
public class MockServlet implements Servlet {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockServletConfig.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockServletConfig.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockServletConfig.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockServletConfig.java Sat Aug 28 18:48:06 2010
@@ -27,6 +27,7 @@ import javax.servlet.ServletContext;
* <p>Mock implementation of <code>ServletConfig</code>.</p>
*
* $Id$
+ * @since 1.0.0
*/
public class MockServletConfig implements ServletConfig {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockServletContext.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockServletContext.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockServletContext.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockServletContext.java Sat Aug 28 18:48:06 2010
@@ -49,6 +49,7 @@ import javax.servlet.ServletException;
* web application structure.</p>
*
* $Id$
+ * @since 1.0.0
*/
public class MockServletContext implements ServletContext
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockServletInputStream.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockServletInputStream.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockServletInputStream.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockServletInputStream.java Sat Aug 28 18:48:06 2010
@@ -29,6 +29,7 @@ import javax.servlet.ServletInputStream;
*
* @author Jacob Hookom
* @version $Id: MockServletInputStream.java 804043 2009-08-13 22:08:44Z lu4242 $
+ * @since 1.0.0
*/
public class MockServletInputStream extends ServletInputStream
{
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockServletOutputStream.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockServletOutputStream.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockServletOutputStream.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockServletOutputStream.java Sat Aug 28 18:48:06 2010
@@ -24,6 +24,7 @@ import javax.servlet.ServletOutputStream
* <p>Mock implementation of <code>ServletOutputStream</code>.</p>
*
* $Id$
+ * @since 1.0.0
*/
public class MockServletOutputStream extends ServletOutputStream {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockStateManager.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockStateManager.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockStateManager.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockStateManager.java Sat Aug 28 18:48:06 2010
@@ -27,6 +27,7 @@ import javax.faces.context.FacesContext;
* <p>Mock implementation of <code>StateManager</code>.</p>
*
* $Id$
+ * @since 1.0.0
*/
public class MockStateManager extends StateManager {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockValueBinding.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockValueBinding.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockValueBinding.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockValueBinding.java Sat Aug 28 18:48:06 2010
@@ -35,8 +35,9 @@ import javax.faces.el.VariableResolver;
/**
* <p>Mock implementation of <code>ValueBinding</code>.</p>
+ *
+ * @since 1.0.0
*/
-
public class MockValueBinding extends ValueBinding implements StateHolder {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockVariableResolver.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockVariableResolver.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockVariableResolver.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockVariableResolver.java Sat Aug 28 18:48:06 2010
@@ -33,6 +33,7 @@ import javax.faces.el.VariableResolver;
* scopes for non-reserved names.</p>
*
* $Id$
+ * @since 1.0.0
*/
public class MockVariableResolver extends VariableResolver {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockViewHandler.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockViewHandler.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockViewHandler.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/MockViewHandler.java Sat Aug 28 18:48:06 2010
@@ -28,6 +28,7 @@ import javax.faces.render.RenderKitFacto
* <p>Mock implementation of <code>ViewHandler</code>.</p>
*
* $Id$
+ * @since 1.0.0
*/
public class MockViewHandler extends ViewHandler {
Modified: myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/_AbstractAttributeMap.java
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/_AbstractAttributeMap.java?rev=990406&r1=990405&r2=990406&view=diff
==============================================================================
--- myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/_AbstractAttributeMap.java (original)
+++ myfaces/test/trunk/test12/src/main/java/org/apache/myfaces/test/mock/_AbstractAttributeMap.java Sat Aug 28 18:48:06 2010
@@ -34,8 +34,9 @@ import java.util.Set;
*
* @author Anton Koinov (latest modification by $Author: jakobk $)
* @version $Revision: 979229 $ $Date: 2010-07-26 12:26:53 +0200 (Mo, 26 Jul 2010) $
+ * @since 1.0.0
*/
-public abstract class _AbstractAttributeMap<V> extends AbstractMap<String, V>
+abstract class _AbstractAttributeMap<V> extends AbstractMap<String, V>
{
private Set<String> _keySet;
private Collection<V> _values;