[richfaces-svn-commits] JBoss Rich Faces SVN: r15807 - in root/framework/trunk/legacy-tests/src: main/java/org/ajax4jsf/tests/org/apache/shale/test/config and 9 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Mon Nov 2 07:03:55 EST 2009
Author: Alex.Kolonitsky
Date: 2009-11-02 07:03:55 -0500 (Mon, 02 Nov 2009)
New Revision: 15807
Modified:
root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java
root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/AbstractJspTestCase.java
root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/AbstractThreadedAjax4JsfTestCase.java
root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/Condition.java
root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/ConstantlyFailingLiteralValueExpression.java
root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/DummyScriptEngine.java
root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/EnumSupportExpressionFactoryWrapper.java
root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/HtmlTestUtils.java
root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/JsfMock.java
root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/LiteralValueExpression.java
root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockAjax4JsfLifecycle.java
root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockApplication.java
root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockComponentState.java
root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockDataModel.java
root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockDataModelListener.java
root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockELContext.java
root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockELContext2.java
root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockExternalContext.java
root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockFaceletContext.java
root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockFacesResourceContext.java
root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockMethodBinding.java
root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockMethodExpression.java
root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockPageContext.java
root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockRange.java
root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockSerializableDataModel.java
root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockUIComponent.java
root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockUIInputRenderer.java
root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockValueBinding.java
root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockValueExpression.java
root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockViewHandler.java
root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockViewRoot.java
root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/org/apache/shale/test/config/ConfigParser.java
root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/xml/FacesEntityResolver.java
root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/application/AjaxStateHolderTest.java
root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/application/AjaxStateManagerTest.java
root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/application/ComponentLoaderTest.java
root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/component/AjaxViewRootTest.java
root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/context/AjaxContextImplTest.java
root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/context/AjaxContextTest.java
root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/context/MockAjaxContext.java
root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/framework/ajax/xmlfilter/AllTests.java
root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/framework/ajax/xmlfilter/CacheContentTest.java
root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/framework/ajax/xmlfilter/NekkoParserTest.java
root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/framework/renderer/BeforeRendererListenerTestCase.java
root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/framework/renderer/ChameleonRenderKitImplTestCase.java
root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/framework/renderer/RenderTests.java
root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/resource/AllResourcesTests.java
root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/resource/CSSTemplateTestCase.java
root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/resource/InternetResourceServiceTestCase.java
root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/resource/MockCacheableResource.java
root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/resource/MockFilterConfig.java
root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/resource/MockResourceRequest.java
root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/resource/ParametersEncodingTestCase.java
root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/resource/ResourceServiceThreadsTestCase.java
root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/webapp/WebXmlTest.java
root/framework/trunk/legacy-tests/src/test/java/org/richfaces/util/RenderPhaseComponentVisitorUtilsTest.java
Log:
Code style policy
https://jira.jboss.org/jira/browse/RFPL-195
Modified: root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java
===================================================================
--- root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+
package org.ajax4jsf.tests;
import java.io.ByteArrayInputStream;
@@ -28,8 +30,11 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+
import java.lang.reflect.Field;
+
import java.net.URL;
+
import java.util.Collections;
import java.util.Enumeration;
import java.util.Iterator;
@@ -41,6 +46,7 @@
import javax.el.ELContext;
import javax.el.ExpressionFactory;
+
import javax.faces.FacesException;
import javax.faces.FactoryFinder;
import javax.faces.component.UIComponent;
@@ -48,6 +54,7 @@
import javax.faces.context.FacesContext;
import javax.faces.render.RenderKitFactory;
import javax.faces.render.Renderer;
+
import javax.servlet.FilterChain;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
@@ -69,11 +76,13 @@
import org.ajax4jsf.webapp.BaseXMLFilter;
import org.ajax4jsf.webapp.HtmlParser;
import org.ajax4jsf.webapp.WebXml;
+
import org.apache.shale.test.base.AbstractJsfTestCase;
import org.apache.shale.test.mock.MockApplication;
import org.apache.shale.test.mock.MockPrintWriter;
import org.apache.shale.test.mock.MockResponseWriter;
import org.apache.shale.test.mock.MockServletOutputStream;
+
import org.richfaces.VersionBean;
import org.richfaces.skin.SkinBean;
import org.richfaces.skin.SkinFactory;
@@ -98,614 +107,664 @@
*
*/
public class AbstractAjax4JsfTestCase extends AbstractJsfTestCase {
+ private static final String HTTP_PREFIX = "http:";
+ private static final String IMAGE_NOT_FOUND_OR_UNAVAILABLE_MESSAGE = "Image not found or unavailable";
+ private static final String RESOURCE_NOT_FOUND_MESSAGE = "Resource not found";
+ @Deprecated
+ protected final static String SLASHED_RESOURCE_URI_PREFIX = "/" + WebXml.RESOURCE_URI_PREFIX;
+ protected AjaxContext ajaxContext = null;
- private static final String IMAGE_NOT_FOUND_OR_UNAVAILABLE_MESSAGE = "Image not found or unavailable";
+ // Thread context class loader saved and restored after each test
+ private ClassLoader threadContextClassLoader = null;
+ private File tmpRoot = null;
- private static final String RESOURCE_NOT_FOUND_MESSAGE = "Resource not found";
+ /**
+ * Initialised instance of VCP render kit.
+ */
+ protected ChameleonRenderKitImpl vcpRenderKit = null;
- private static final String HTTP_PREFIX = "http:";
+ /**
+ * <p>The htmlunit web client for this test case. </p>
+ *
+ */
+ protected WebClient webClient = null;
- @Deprecated
- protected final static String SLASHED_RESOURCE_URI_PREFIX = "/" + WebXml.RESOURCE_URI_PREFIX;
+ /**
+ * Mock web connection for accept stored content of JSF encoding. For testing JavaScript code, all URL's for scripts must be
+ * rregistered by {@link MockWebConnection#setResponse(java.net.URL, byte[], int, java.lang.String, java.lang.String, java.util.List)} method
+ * By default, for unregistered pages return 404 - not found.
+ */
+ protected MockWebConnection webConnection = null;
+ protected ELContext elContext;
+ protected ExpressionFactory expressionFactory;
+ protected WebXml webXml;
- private File tmpRoot = null;
+ /**
+ * Instance of Mock {@link javax.faces.context.ResponseWriter} , created by setupResponseWriter
+ */
+ protected MockResponseWriter writer;
- protected ELContext elContext;
-
- protected ExpressionFactory expressionFactory;
-
- public static final void evaluate(Condition condition) {
- String message = condition.getMessage();
- assertTrue(message, condition.isConditionTrue());
- }
- /**
- * @param name
- */
- public AbstractAjax4JsfTestCase(String name) {
- super(name);
- // TODO Auto-generated constructor stub
- }
+ /**
+ * @param name
+ */
+ public AbstractAjax4JsfTestCase(String name) {
+ super(name);
- /* (non-Javadoc)
- * @see org.apache.shale.test.base.AbstractJsfTestCase#setUp()
- */
- public void setUp() throws Exception {
- // This method MUST BE OVERRIDEN in any subclasses - since Junit see for it in class for call
- super.setUp();
+ // TODO Auto-generated constructor stub
+ }
- //Try to override default expression factory with our wrapper that supports enums (like Sun's)
- try {
- ExpressionFactory exprFact =
- new EnumSupportExpressionFactoryWrapper(application.getExpressionFactory());
-
- Class<? extends MockApplication> applicationClass = application.getClass();
- Field field = applicationClass.getDeclaredField("expressionFactory");
- field.setAccessible(true);
- field.set(application, exprFact);
- expressionFactory = application.getExpressionFactory();
- } catch(Exception e) {
- //e.printStackTrace();
- //We cannot set private field
- }
-
- // Setup FacesContext with necessary init parameters.
- this.servletContext.addInitParameter(SkinFactory.SKIN_PARAMETER, getSkinName());
-
- this.servletContext.addInitParameter("com.sun.faces.externalizeJavaScript", "true");
-
-
- // setup VCP renderKit, create renderers.
- RenderKitFactory vcpRenderKitFactory = (RenderKitFactory) FactoryFinder.getFactory(FactoryFinder.RENDER_KIT_FACTORY);
- vcpRenderKit = new ChameleonRenderKitImpl();
- vcpRenderKitFactory.addRenderKit("HTML_CHAMELEON", vcpRenderKit);
- renderKit.addRenderer(UIViewRoot.COMPONENT_FAMILY, UIViewRoot.COMPONENT_TYPE, new AjaxViewRootRenderer());
- // setup nessesary components.
- application.addComponent("javax.faces.ViewRoot", MockViewRoot.class.getName());
- // setup AjaxContext.
- ajaxContext = new AjaxContextImpl();
- request.setAttribute(AjaxContext.AJAX_CONTEXT_KEY, ajaxContext);
- // Setup ViewHandler / ViewRoot.
- application.setViewHandler(new MockViewHandler(application.getViewHandler()));
-
- UIViewRoot root = new MockViewRoot();
+ public static final void evaluate(Condition condition) {
+ String message = condition.getMessage();
+
+ assertTrue(message, condition.isConditionTrue());
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.apache.shale.test.base.AbstractJsfTestCase#setUp()
+ */
+ public void setUp() throws Exception {
+
+ // This method MUST BE OVERRIDEN in any subclasses - since Junit see for it in class for call
+ super.setUp();
+
+ // Try to override default expression factory with our wrapper that supports enums (like Sun's)
+ try {
+ ExpressionFactory exprFact = new EnumSupportExpressionFactoryWrapper(application.getExpressionFactory());
+ Class<? extends MockApplication> applicationClass = application.getClass();
+ Field field = applicationClass.getDeclaredField("expressionFactory");
+
+ field.setAccessible(true);
+ field.set(application, exprFact);
+ expressionFactory = application.getExpressionFactory();
+ } catch (Exception e) {
+
+ // e.printStackTrace();
+ // We cannot set private field
+ }
+
+ // Setup FacesContext with necessary init parameters.
+ this.servletContext.addInitParameter(SkinFactory.SKIN_PARAMETER, getSkinName());
+ this.servletContext.addInitParameter("com.sun.faces.externalizeJavaScript", "true");
+
+ // setup VCP renderKit, create renderers.
+ RenderKitFactory vcpRenderKitFactory =
+ (RenderKitFactory) FactoryFinder.getFactory(FactoryFinder.RENDER_KIT_FACTORY);
+
+ vcpRenderKit = new ChameleonRenderKitImpl();
+ vcpRenderKitFactory.addRenderKit("HTML_CHAMELEON", vcpRenderKit);
+ renderKit.addRenderer(UIViewRoot.COMPONENT_FAMILY, UIViewRoot.COMPONENT_TYPE, new AjaxViewRootRenderer());
+
+ // setup nessesary components.
+ application.addComponent("javax.faces.ViewRoot", MockViewRoot.class.getName());
+
+ // setup AjaxContext.
+ ajaxContext = new AjaxContextImpl();
+ request.setAttribute(AjaxContext.AJAX_CONTEXT_KEY, ajaxContext);
+
+ // Setup ViewHandler / ViewRoot.
+ application.setViewHandler(new MockViewHandler(application.getViewHandler()));
+
+ UIViewRoot root = new MockViewRoot();
+
root.setViewId("/viewId");
root.setRenderKitId(RenderKitFactory.HTML_BASIC_RENDER_KIT);
facesContext.setViewRoot(root);
- // Setup Skin avd version variables.
- servletContext.setAttribute("a4j", new VersionBean());
- servletContext.setAttribute("a4jSkin", new SkinBean());
- // Setup servlet context and testing web.xml
- request.setPathElements("/testContext","/faces","/vievId.jsf","");
- File webRoot = new File(getClass().getResource("/WEB-INF/web.xml").getFile()).getParentFile().getParentFile();
- if (webRoot.exists()) {
- servletContext.setDocumentRoot(webRoot);
- } else {
- // Prepare WEB-ROOT in temp folder
- tmpRoot = File.createTempFile("TmpTestRoot" + new Random().nextInt(), null);
- tmpRoot.delete();
- tmpRoot.mkdir();
- servletContext.setDocumentRoot(tmpRoot);
+ // Setup Skin avd version variables.
+ servletContext.setAttribute("a4j", new VersionBean());
+ servletContext.setAttribute("a4jSkin", new SkinBean());
- URL jarUrl = AbstractAjax4JsfTestCase.class.getProtectionDomain().getCodeSource().getLocation();
- ZipInputStream zis = new ZipInputStream(jarUrl.openStream());
- try {
- ZipEntry entry;
- byte[] buffer = new byte[8192];
- while ((entry = zis.getNextEntry()) != null) {
- String name = entry.getName();
- if (name.startsWith("WEB-INF/")) {
- File out = new File(tmpRoot, name);
- if (entry.isDirectory()) {
- out.mkdirs();
- } else {
- out.getParentFile().mkdirs();
- OutputStream os = new FileOutputStream(out);
- try {
- int count;
- while ((count = zis.read(buffer)) > 0) {
- os.write(buffer, 0, count);
- }
- } finally {
- os.close();
- }
- zis.closeEntry();
- }
- }
- }
- } catch (IOException e) {
- deleteRecursively(tmpRoot);
- throw e;
- }
- servletContext.setDocumentRoot(tmpRoot);
- }
+ // Setup servlet context and testing web.xml
+ request.setPathElements("/testContext", "/faces", "/vievId.jsf", "");
- try {
- InternetResourceBuilder.getInstance().init();
- } catch (FacesException e) {
- InternetResourceBuilder.setInstance(null);
- }
- webXml = new WebXml();
- webXml.init(servletContext, "A4J");
+ File webRoot = new File(getClass().getResource("/WEB-INF/web.xml").getFile()).getParentFile().getParentFile();
- ConfigParser parser = new ConfigParser();
- parser.parse(parser.getPlatformURLs());
+ if (webRoot.exists()) {
+ servletContext.setDocumentRoot(webRoot);
+ } else {
- Enumeration<URL> resources = getClass().getClassLoader().getResources("META-INF/faces-config.xml");
- while (resources.hasMoreElements()) {
- parser.parse((URL) resources.nextElement());
- }
-
- externalContext = new MockExternalContext(externalContext);
- facesContext.setExternalContext(externalContext);
- elContext = facesContext.getELContext();
- expressionFactory = application.getExpressionFactory();
- }
+ // Prepare WEB-ROOT in temp folder
+ tmpRoot = File.createTempFile("TmpTestRoot" + new Random().nextInt(), null);
+ tmpRoot.delete();
+ tmpRoot.mkdir();
+ servletContext.setDocumentRoot(tmpRoot);
- protected WebClient createWebClient() {
- WebClient client = new WebClient();
- // disable javascript for now as HtmlUnit doesn't treat prototype.js
- // well
- client.setJavaScriptEnabled(true);
- // Set dummy script engine to prevent NPEs from default HtmlUnit engine
- client.setJavaScriptEngine(new DummyScriptEngine(client));
- return client;
- }
+ URL jarUrl = AbstractAjax4JsfTestCase.class.getProtectionDomain().getCodeSource().getLocation();
+ ZipInputStream zis = new ZipInputStream(jarUrl.openStream());
- /**
- * This function checks is resource present. If so, resource returned in the form of InputStream, otherwise IOException throwed.
- *
- * @param path - path to specified resource
- *
- * @return InputStream of the resource, if resource present
- *
- * @throws IOException - if resource not available
- */
- protected InputStream getResourceIfPresent(String path) throws IOException {
- InternetResourceBuilder builder = ResourceBuilderImpl.getInstance();
- InternetResource resource = builder.getResource(path);
- if (resource != null) {
- String uri = HTTP_PREFIX + resource.getUri(facesContext, null);
- Page page = webClient.getPage(uri);
- if (page.getWebResponse().getStatusCode() == HttpServletResponse.SC_OK) {
- return page.getWebResponse().getContentAsStream();
- }
- }
- throw new IOException(RESOURCE_NOT_FOUND_MESSAGE + path);
- }
+ try {
+ ZipEntry entry;
+ byte[] buffer = new byte[8192];
- /**
- * This function checks is image resource present. If so, image returned, otherwise IOException throwed.
- *
- * @param path - path to specified image resource
- *
- * @return ImageInfo of the image, if image resource present or null if method ImageInfo.check() return false;
- *
- * @throws IOException - if image not available or not exist
- */
- protected ImageInfo getImageResource(String path) throws IOException {
- ImageInfo info = new ImageInfo();
- try {
- info.setInput(getResourceIfPresent(path));
- } catch(IOException e){
- throw new IOException(IMAGE_NOT_FOUND_OR_UNAVAILABLE_MESSAGE + path);
- }
- return info.check() ? info : null;
- }
-
- /**
- * This function return count of <script> elements on page and validate - if this script contains in Set of predefined attribute for this component
- *
- * @param view - page to validate
- * @param predefinedScripts - set of predefined scripts, should be presented on component
- *
- * @return count of valid <script> element
- * @throws Exception if script not available on page
- */
- protected Integer getCountValidScripts(HtmlPage view, Set<String> predefinedScripts, boolean isPageAvailabilityCheck)
- throws Exception {
- /*List<HtmlScript> scripts = view.getDocumentHtmlElement()
- .getHtmlElementsByTagName(HTML.SCRIPT_ELEM);
- int foundCount = 0;
- for (Iterator<HtmlScript> it = scripts.iterator(); it.hasNext();) {
- HtmlScript item = it.next();
- String srcAttr = item.getSrcAttribute();
+ while ((entry = zis.getNextEntry()) != null) {
+ String name = entry.getName();
- if (StringUtils.isNotBlank(srcAttr)) {
- boolean found = false;
- for (Iterator<String> srcIt = predefinedScripts.iterator(); srcIt
- .hasNext();) {
- String src = (String) srcIt.next();
+ if (name.startsWith("WEB-INF/")) {
+ File out = new File(tmpRoot, name);
- found = srcAttr.contains(src);
- if (found) {
- foundCount++;
+ if (entry.isDirectory()) {
+ out.mkdirs();
+ } else {
+ out.getParentFile().mkdirs();
- String uri = "http:" + srcAttr;
- Page page = webClient.getPage(uri);
- if (!(page != null && page.getWebResponse()
- .getStatusCode() == HttpServletResponse.SC_OK)) {
- throw new Exception("Page is not available " + uri);
+ OutputStream os = new FileOutputStream(out);
- }
- break;
- }
- }
- }
- }
- return foundCount;*/
- int foundCount = 0;
- List<String> scriptSources = HtmlTestUtils.extractScriptSources(view);
- for (String javascript : predefinedScripts) {
- for (String script : scriptSources) {
- if (script.indexOf(javascript) >= 0) {
- foundCount++;
+ try {
+ int count;
- String uri = HTTP_PREFIX + script;
- Page page = webClient.getPage(uri);
- if(isPageAvailabilityCheck){
- if (!(page != null && page.getWebResponse()
- .getStatusCode() == HttpServletResponse.SC_OK)) {
- throw new Exception("Component script " + javascript + " is not found in the response");
- }
- }
- break;
- }
- }
- }
- return foundCount;
- }
-
- /**
- *
- */
- protected void setupWebClient() {
- ajaxContext = null;
- // setup webClient for got response content.
- webClient = createWebClient();
- webConnection = new MockWebConnection(webClient) {
- public WebResponse getResponse(WebRequestSettings settings)
- throws IOException {
- String resourceKey = WebXml.getInstance(facesContext).getFacesResourceKey(settings.getURL().getFile().substring(
- request.getContextPath().length()));
- if (resourceKey != null) {
- InternetResourceBuilder resourceBuilder = InternetResourceBuilder.getInstance();
-
- InternetResource resource = resourceBuilder.getResourceForKey(resourceKey);
- Object resourceData = resourceBuilder.getResourceDataForKey(resourceKey);
+ while ((count = zis.read(buffer)) > 0) {
+ os.write(buffer, 0, count);
+ }
+ } finally {
+ os.close();
+ }
- final MockFacesResourceContext resourceContext = new MockFacesResourceContext(facesContext);
- resourceContext.setResourceData(resourceData);
+ zis.closeEntry();
+ }
+ }
+ }
+ } catch (IOException e) {
+ deleteRecursively(tmpRoot);
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- response.setOutputStream(new MockServletOutputStream(baos));
-
- resource.sendHeaders(resourceContext);
- resource.send(resourceContext);
-
- return new WebResponseImpl(
- new WebResponseData(
- new ByteArrayInputStream(baos.toByteArray()),
- HttpServletResponse.SC_OK,
- "OK",
- resourceContext.getHeaders()),
- settings.getURL(),
- settings.getSubmitMethod(),
- 0) {
+ throw e;
+ }
- public String getContentType() {
- return resourceContext.getContentType();
- }
- };
+ servletContext.setDocumentRoot(tmpRoot);
+ }
- } else {
- return super.getResponse(settings);
- }
- }
- };
- webClient.setWebConnection(webConnection);
- webConnection.setDefaultResponse("<html><body>not found</body></html>",404,"NOT FOUND","text/html");
- webClient.setThrowExceptionOnFailingStatusCode(false);
- webClient.setThrowExceptionOnScriptError(false);
- }
+ try {
+ InternetResourceBuilder.getInstance().init();
+ } catch (FacesException e) {
+ InternetResourceBuilder.setInstance(null);
+ }
- private void deleteRecursively(File file) {
- if (file != null) {
+ webXml = new WebXml();
+ webXml.init(servletContext, "A4J");
- String[] list = file.list();
- if (list != null) {
- for (int i = 0; i < list.length; i++) {
- String name = list[i];
- File f = new File(file, name);
- if (f.isDirectory()) {
- deleteRecursively(f);
- } else {
- f.delete();
- }
- }
- }
+ ConfigParser parser = new ConfigParser();
- file.delete();
- }
- }
+ parser.parse(parser.getPlatformURLs());
+ Enumeration<URL> resources = getClass().getClassLoader().getResources("META-INF/faces-config.xml");
- /* (non-Javadoc)
- * @see org.apache.shale.test.base.AbstractJsfTestCase#tearDown()
- */
- public void tearDown() throws Exception {
- // This method MUST BE OVERRIDEN in any subclasses - since Junit see for it in class for call
- expressionFactory = null;
- elContext = null;
- super.tearDown();
- vcpRenderKit = null;
-// Thread.currentThread().setContextClassLoader(threadContextClassLoader);
-// threadContextClassLoader = null;
- webClient = null;
- webConnection = null;
- writer = null;
- SkinFactory.reset();
- InternetResourceBuilder.setInstance(null);
+ while (resources.hasMoreElements()) {
+ parser.parse((URL) resources.nextElement());
+ }
- deleteRecursively(tmpRoot);
-
- }
+ externalContext = new MockExternalContext(externalContext);
+ facesContext.setExternalContext(externalContext);
+ elContext = facesContext.getELContext();
+ expressionFactory = application.getExpressionFactory();
+ }
- // Protected configurations URL's
- /**
- * Hook method for setup current VCP skin name for test. default use "classic"
- * @return
- */
- protected String getSkinName() {
- return "DEFAULT";
- }
+ protected WebClient createWebClient() {
+ WebClient client = new WebClient();
- /**
- * Hook method for load diffrernt frameworks for this test.
- * Can return URL's for jars with tested implementation.
- * @return
- */
- protected URL[] getImplementationUrls() {
- return new URL[0];
- }
+ // disable javascript for now as HtmlUnit doesn't treat prototype.js
+ // well
+ client.setJavaScriptEnabled(true);
- /**
- * Create component with given render kit and unique Id from ViewRoot.
- * @param type - component type.
- * @param clazz - class of component.
- * @param rendererType - name for renderer type ( can be null ).
- * @param rendererClazz - class of renderer in HTMP_BASIC renderkit. If not null, renderer will created and registered.
- * @param skinRendererClazz - class of renderer in Skin render-kit.
- * @return component instance.
- * @throws Exception
- */
- protected UIComponent createComponent(String type, String className, String rendererType, Class rendererClazz,Class skinRendererClazz) {
- UIComponent comp;
- try {
- comp = application.createComponent(type);
- } catch (FacesException e) {
- application.addComponent(type, className);
- comp = application.createComponent(type);
- }
- comp.setRendererType(rendererType);
- String family = comp.getFamily();
- if (null != rendererClazz) {
- Renderer renderer = renderKit.getRenderer(family, rendererType);
- if (null == renderer) {
- try {
- renderer = (Renderer) rendererClazz.newInstance();
- } catch (InstantiationException e) {
- assertTrue("Instantiation exception for create renderer "+rendererClazz.getName(),false);
- } catch (IllegalAccessException e) {
- assertTrue("ILEGAL access exception for create renderer "+rendererClazz.getName(),false);
- }
- renderKit.addRenderer(family, rendererType, renderer);
- }
- }
- if(null != skinRendererClazz) {
- Renderer renderer = renderKit.getRenderer(family, rendererType);
- if (null == renderer) {
- try {
- renderer = (Renderer) skinRendererClazz.newInstance();
- } catch (InstantiationException e) {
- assertTrue("Instantiation exception for create renderer "+skinRendererClazz.getName(),false);
- } catch (IllegalAccessException e) {
- assertTrue("ILEGAL access exception for create renderer "+skinRendererClazz.getName(),false);
- }
- vcpRenderKit.addRenderer(family, rendererType, renderer);
- }
- }
- comp.setId(facesContext.getViewRoot().createUniqueId());
- return comp;
- }
+ // Set dummy script engine to prevent NPEs from default HtmlUnit engine
+ client.setJavaScriptEngine(new DummyScriptEngine(client));
+ return client;
+ }
- /**
- * Render all children for given component.
- * @param component
- * @throws IOException
- */
- protected void renderChildren(FacesContext context,
- UIComponent component) throws IOException {
- if (component.getChildCount() > 0) {
- for (Iterator it = component.getChildren().iterator(); it.hasNext();) {
- UIComponent child = (UIComponent) it.next();
- renderChild(context,child);
- }
- }
- }
+ /**
+ * This function checks is resource present. If so, resource returned in the form of InputStream, otherwise IOException throwed.
+ *
+ * @param path - path to specified resource
+ *
+ * @return InputStream of the resource, if resource present
+ *
+ * @throws IOException - if resource not available
+ */
+ protected InputStream getResourceIfPresent(String path) throws IOException {
+ InternetResourceBuilder builder = ResourceBuilderImpl.getInstance();
+ InternetResource resource = builder.getResource(path);
+ if (resource != null) {
+ String uri = HTTP_PREFIX + resource.getUri(facesContext, null);
+ Page page = webClient.getPage(uri);
- /**
- * Render one component and it childrens
- * @param child
- * @throws IOException
- */
- protected void renderChild(FacesContext context, UIComponent child)
- throws IOException {
- if (!child.isRendered()) {
- return;
- }
+ if (page.getWebResponse().getStatusCode() == HttpServletResponse.SC_OK) {
+ return page.getWebResponse().getContentAsStream();
+ }
+ }
- child.encodeBegin(context);
- if (child.getRendersChildren()) {
- child.encodeChildren(context);
- } else {
- renderChildren(context, child);
- }
- child.encodeEnd(context);
- }
+ throw new IOException(RESOURCE_NOT_FOUND_MESSAGE + path);
+ }
- /**
- * Render test view and parse to htmlunit page structure.
- * @return
- * @throws Exception
- */
- protected HtmlPage renderView() throws Exception {
- setupResponseWriter();
-
- // Emulate A4J web filter chaining like in real web application.
- TestXMLFilter filter = new TestXMLFilter();
- try {
- filter.processFilter(new FilterChain() {
- public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException {
- response.setContentType("text/html");
- facesContext.setResponseWriter((MockResponseWriter) renderKit.createResponseWriter(response.getWriter(),"text/html",null));
-
- ViewResources viewResources = new ViewResources();
- viewResources.initialize(facesContext);
- //viewResources.setStyleStrategy(InternetResourceBuilder.LOAD_ALL);
- //viewResources.setScriptStrategy(InternetResourceBuilder.LOAD_ALL);
- viewResources.setUseStdControlsSkinning(false);
- viewResources.setUseStdControlsSkinningClasses(false);
-
- renderChild(facesContext, facesContext.getViewRoot());
-
- viewResources.processHeadResources(facesContext);
- Object[] headEvents = (Object[]) viewResources.getHeadEvents();
- request.setAttribute(AjaxContext.HEAD_EVENTS_PARAMETER, headEvents);
-
- facesContext.setResponseWriter(writer);
- }
- }, request, response);
- } catch (Exception e) {
- throw e;
- }
-
- return processResponseWriter();
- }
+ /**
+ * This function checks is image resource present. If so, image returned, otherwise IOException throwed.
+ *
+ * @param path - path to specified image resource
+ *
+ * @return ImageInfo of the image, if image resource present or null if method ImageInfo.check() return false;
+ *
+ * @throws IOException - if image not available or not exist
+ */
+ protected ImageInfo getImageResource(String path) throws IOException {
+ ImageInfo info = new ImageInfo();
- /**
- * Implements default XML filter to emulate A4J filter that invoked while
- * http request in web application.
- *
- * Needed to make sure that all processed (web page generation) like in real
- * web application. Additionally now all RF components styles and scripts generated
- * by A4J filter only, so we need the same in out unit tests.
- * Fast filter used now by default.
- * TODO: we can make it configurable like org.ajax4jsf.webapp.ConfigurableXMLFilter
- *
- * @author dmorozov
- */
- private class TestXMLFilter extends BaseXMLFilter {
- private HtmlParser parser = null;
- public TestXMLFilter() {}
+ try {
+ info.setInput(getResourceIfPresent(path));
+ } catch (IOException e) {
+ throw new IOException(IMAGE_NOT_FOUND_OR_UNAVAILABLE_MESSAGE + path);
+ }
- public void processFilter(FilterChain chain, HttpServletRequest request,
- final HttpServletResponse response) throws IOException,
- ServletException {
- super.doXmlFilter(chain, request, response);
- }
-
- @Override
- protected HtmlParser getParser(String mimetype, boolean isAjax, String viewId) {
- HtmlParser parser = this.parser;
- if (parser == null) {
- parser = new FastHtmlParser();
- }
- return parser;
- }
-
- /**
- * Peturn parser to pool
- * @param parser
- */
- @Override
- protected void reuseParser(HtmlParser parser) {
- this.parser = parser;
- }
- }
-
- /**
- * Finish response processing by call {@link javax.faces.context.ResponseWriter#endDocument()} and parse
- * result to htmlunit {@link HtmlPage}
- * @return
- * @throws IOException
- * @throws Exception
- */
- protected HtmlPage processResponseWriter() throws IOException, Exception {
- writer.endDocument();
- return (HtmlPage) processResponse();
- }
+ return info.check() ? info : null;
+ }
- /**
- * Setup Faces {@link javax.faces.context.ResponseWriter} and prepare rendering ( startDocument ).
- * after this method, any jsf rendering methods can be performed, and results can be checked by {@link #processResponseWriter()}
- * @throws IOException
- */
- protected void setupResponseWriter() throws IOException {
- writer = (MockResponseWriter) renderKit.createResponseWriter(response.getWriter(),"text/html",null);
- facesContext.setResponseWriter(writer);
- writer.startDocument();
- }
+ /**
+ * This function return count of <script> elements on page and validate - if this script contains in Set of predefined attribute for this component
+ *
+ * @param view - page to validate
+ * @param predefinedScripts - set of predefined scripts, should be presented on component
+ *
+ * @return count of valid <script> element
+ * @throws Exception if script not available on page
+ */
+ protected Integer getCountValidScripts(HtmlPage view, Set<String> predefinedScripts,
+ boolean isPageAvailabilityCheck)
+ throws Exception {
- /**
- * Parse collected content of mock response to Page instance, used for check rendered html.
- * @return
- * @throws Exception
- */
- protected Page processResponse() throws Exception {
- setupWebClient();
- URL page = new URL( HTTP_PREFIX+ facesContext.getExternalContext().getRequestContextPath() + facesContext.getViewRoot().getViewId());
- try {
- char[] content = ((MockPrintWriter) response.getWriter()).content();
- webConnection.setResponse(page,String.valueOf(content),response.getStatus(), "OK", response.getContentType(), Collections.EMPTY_LIST);
- } catch (IllegalStateException e) {
- byte[] content = ((MockServletOutputStream)response.getOutputStream()).content();
- webConnection.setResponse(page,content, response.getStatus(), "OK", response.getContentType(), Collections.EMPTY_LIST);
- }
- return webClient.getPage(page);
- }
+ /*
+ * List<HtmlScript> scripts = view.getDocumentHtmlElement()
+ * .getHtmlElementsByTagName(HTML.SCRIPT_ELEM);
+ * int foundCount = 0;
+ * for (Iterator<HtmlScript> it = scripts.iterator(); it.hasNext();) {
+ * HtmlScript item = it.next();
+ * String srcAttr = item.getSrcAttribute();
+ *
+ * if (StringUtils.isNotBlank(srcAttr)) {
+ * boolean found = false;
+ * for (Iterator<String> srcIt = predefinedScripts.iterator(); srcIt
+ * .hasNext();) {
+ * String src = (String) srcIt.next();
+ *
+ * found = srcAttr.contains(src);
+ * if (found) {
+ * foundCount++;
+ *
+ * String uri = "http:" + srcAttr;
+ * Page page = webClient.getPage(uri);
+ * if (!(page != null && page.getWebResponse()
+ * .getStatusCode() == HttpServletResponse.SC_OK)) {
+ * throw new Exception("Page is not available " + uri);
+ *
+ * }
+ * break;
+ * }
+ * }
+ * }
+ * }
+ * return foundCount;
+ */
+ int foundCount = 0;
+ List<String> scriptSources = HtmlTestUtils.extractScriptSources(view);
- protected AjaxContext ajaxContext = null;
+ for (String javascript : predefinedScripts) {
+ for (String script : scriptSources) {
+ if (script.indexOf(javascript) >= 0) {
+ foundCount++;
- /**
- * Initialised instance of VCP render kit.
- */
- protected ChameleonRenderKitImpl vcpRenderKit = null;
+ String uri = HTTP_PREFIX + script;
+ Page page = webClient.getPage(uri);
- /**
- * Instance of Mock {@link javax.faces.context.ResponseWriter} , created by setupResponseWriter
- */
- protected MockResponseWriter writer;
+ if (isPageAvailabilityCheck) {
+ if (!(page != null && page.getWebResponse().getStatusCode() == HttpServletResponse.SC_OK)) {
+ throw new Exception("Component script " + javascript + " is not found in the response");
+ }
+ }
- /**
- * <p>The htmlunit web client for this test case. </p>
- *
- */
- protected WebClient webClient = null;
+ break;
+ }
+ }
+ }
- /**
- * Mock web connection for accept stored content of JSF encoding. For testing JavaScript code, all URL's for scripts must be
- * rregistered by {@link MockWebConnection#setResponse(java.net.URL, byte[], int, java.lang.String, java.lang.String, java.util.List)} method
- * By default, for unregistered pages return 404 - not found.
- */
- protected MockWebConnection webConnection = null;
+ return foundCount;
+ }
+ /**
+ *
+ */
+ protected void setupWebClient() {
+ ajaxContext = null;
- // Thread context class loader saved and restored after each test
- private ClassLoader threadContextClassLoader = null;
+ // setup webClient for got response content.
+ webClient = createWebClient();
+ webConnection = new MockWebConnection(webClient) {
+ public WebResponse getResponse(WebRequestSettings settings) throws IOException {
+ String resourceKey = WebXml.getInstance(facesContext).getFacesResourceKey(
+ settings.getURL().getFile().substring(request.getContextPath().length()));
- protected WebXml webXml;
+ if (resourceKey != null) {
+ InternetResourceBuilder resourceBuilder = InternetResourceBuilder.getInstance();
+ InternetResource resource = resourceBuilder.getResourceForKey(resourceKey);
+ Object resourceData = resourceBuilder.getResourceDataForKey(resourceKey);
+ final MockFacesResourceContext resourceContext = new MockFacesResourceContext(facesContext);
+ resourceContext.setResourceData(resourceData);
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
+ response.setOutputStream(new MockServletOutputStream(baos));
+ resource.sendHeaders(resourceContext);
+ resource.send(resourceContext);
+
+ return new WebResponseImpl(new WebResponseData(new ByteArrayInputStream(baos.toByteArray()),
+ HttpServletResponse.SC_OK, "OK", resourceContext.getHeaders()), settings.getURL(),
+ settings.getSubmitMethod(), 0) {
+ public String getContentType() {
+ return resourceContext.getContentType();
+ }
+ };
+ } else {
+ return super.getResponse(settings);
+ }
+ }
+ };
+ webClient.setWebConnection(webConnection);
+ webConnection.setDefaultResponse("<html><body>not found</body></html>", 404, "NOT FOUND", "text/html");
+ webClient.setThrowExceptionOnFailingStatusCode(false);
+ webClient.setThrowExceptionOnScriptError(false);
+ }
+
+ private void deleteRecursively(File file) {
+ if (file != null) {
+ String[] list = file.list();
+
+ if (list != null) {
+ for (int i = 0; i < list.length; i++) {
+ String name = list[i];
+ File f = new File(file, name);
+
+ if (f.isDirectory()) {
+ deleteRecursively(f);
+ } else {
+ f.delete();
+ }
+ }
+ }
+
+ file.delete();
+ }
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.apache.shale.test.base.AbstractJsfTestCase#tearDown()
+ */
+ public void tearDown() throws Exception {
+
+ // This method MUST BE OVERRIDEN in any subclasses - since Junit see for it in class for call
+ expressionFactory = null;
+ elContext = null;
+ super.tearDown();
+ vcpRenderKit = null;
+
+// Thread.currentThread().setContextClassLoader(threadContextClassLoader);
+// threadContextClassLoader = null;
+ webClient = null;
+ webConnection = null;
+ writer = null;
+ SkinFactory.reset();
+ InternetResourceBuilder.setInstance(null);
+ deleteRecursively(tmpRoot);
+ }
+
+ // Protected configurations URL's
+
+ /**
+ * Hook method for setup current VCP skin name for test. default use "classic"
+ * @return
+ */
+ protected String getSkinName() {
+ return "DEFAULT";
+ }
+
+ /**
+ * Hook method for load diffrernt frameworks for this test.
+ * Can return URL's for jars with tested implementation.
+ * @return
+ */
+ protected URL[] getImplementationUrls() {
+ return new URL[0];
+ }
+
+ /**
+ * Create component with given render kit and unique Id from ViewRoot.
+ * @param type - component type.
+ * @param clazz - class of component.
+ * @param rendererType - name for renderer type ( can be null ).
+ * @param rendererClazz - class of renderer in HTMP_BASIC renderkit. If not null, renderer will created and registered.
+ * @param skinRendererClazz - class of renderer in Skin render-kit.
+ * @return component instance.
+ * @throws Exception
+ */
+ protected UIComponent createComponent(String type, String className, String rendererType, Class rendererClazz,
+ Class skinRendererClazz) {
+ UIComponent comp;
+
+ try {
+ comp = application.createComponent(type);
+ } catch (FacesException e) {
+ application.addComponent(type, className);
+ comp = application.createComponent(type);
+ }
+
+ comp.setRendererType(rendererType);
+
+ String family = comp.getFamily();
+
+ if (null != rendererClazz) {
+ Renderer renderer = renderKit.getRenderer(family, rendererType);
+
+ if (null == renderer) {
+ try {
+ renderer = (Renderer) rendererClazz.newInstance();
+ } catch (InstantiationException e) {
+ assertTrue("Instantiation exception for create renderer " + rendererClazz.getName(), false);
+ } catch (IllegalAccessException e) {
+ assertTrue("ILEGAL access exception for create renderer " + rendererClazz.getName(), false);
+ }
+
+ renderKit.addRenderer(family, rendererType, renderer);
+ }
+ }
+
+ if (null != skinRendererClazz) {
+ Renderer renderer = renderKit.getRenderer(family, rendererType);
+
+ if (null == renderer) {
+ try {
+ renderer = (Renderer) skinRendererClazz.newInstance();
+ } catch (InstantiationException e) {
+ assertTrue("Instantiation exception for create renderer " + skinRendererClazz.getName(), false);
+ } catch (IllegalAccessException e) {
+ assertTrue("ILEGAL access exception for create renderer " + skinRendererClazz.getName(), false);
+ }
+
+ vcpRenderKit.addRenderer(family, rendererType, renderer);
+ }
+ }
+
+ comp.setId(facesContext.getViewRoot().createUniqueId());
+
+ return comp;
+ }
+
+ /**
+ * Render all children for given component.
+ * @param component
+ * @throws IOException
+ */
+ protected void renderChildren(FacesContext context, UIComponent component) throws IOException {
+ if (component.getChildCount() > 0) {
+ for (Iterator it = component.getChildren().iterator(); it.hasNext(); ) {
+ UIComponent child = (UIComponent) it.next();
+
+ renderChild(context, child);
+ }
+ }
+ }
+
+ /**
+ * Render one component and it childrens
+ * @param child
+ * @throws IOException
+ */
+ protected void renderChild(FacesContext context, UIComponent child) throws IOException {
+ if (!child.isRendered()) {
+ return;
+ }
+
+ child.encodeBegin(context);
+
+ if (child.getRendersChildren()) {
+ child.encodeChildren(context);
+ } else {
+ renderChildren(context, child);
+ }
+
+ child.encodeEnd(context);
+ }
+
+ /**
+ * Render test view and parse to htmlunit page structure.
+ * @return
+ * @throws Exception
+ */
+ protected HtmlPage renderView() throws Exception {
+ setupResponseWriter();
+
+ // Emulate A4J web filter chaining like in real web application.
+ TestXMLFilter filter = new TestXMLFilter();
+
+ try {
+ filter.processFilter(new FilterChain() {
+ public void doFilter(ServletRequest request, ServletResponse response)
+ throws IOException, ServletException {
+ response.setContentType("text/html");
+ facesContext.setResponseWriter(
+ (MockResponseWriter) renderKit.createResponseWriter(response.getWriter(), "text/html", null));
+
+ ViewResources viewResources = new ViewResources();
+
+ viewResources.initialize(facesContext);
+
+ // viewResources.setStyleStrategy(InternetResourceBuilder.LOAD_ALL);
+ // viewResources.setScriptStrategy(InternetResourceBuilder.LOAD_ALL);
+ viewResources.setUseStdControlsSkinning(false);
+ viewResources.setUseStdControlsSkinningClasses(false);
+ renderChild(facesContext, facesContext.getViewRoot());
+ viewResources.processHeadResources(facesContext);
+
+ Object[] headEvents = (Object[]) viewResources.getHeadEvents();
+
+ request.setAttribute(AjaxContext.HEAD_EVENTS_PARAMETER, headEvents);
+ facesContext.setResponseWriter(writer);
+ }
+ }, request, response);
+ } catch (Exception e) {
+ throw e;
+ }
+
+ return processResponseWriter();
+ }
+
+ /**
+ * Finish response processing by call {@link javax.faces.context.ResponseWriter#endDocument()} and parse
+ * result to htmlunit {@link HtmlPage}
+ * @return
+ * @throws IOException
+ * @throws Exception
+ */
+ protected HtmlPage processResponseWriter() throws IOException, Exception {
+ writer.endDocument();
+
+ return (HtmlPage) processResponse();
+ }
+
+ /**
+ * Setup Faces {@link javax.faces.context.ResponseWriter} and prepare rendering ( startDocument ).
+ * after this method, any jsf rendering methods can be performed, and results can be checked by {@link #processResponseWriter()}
+ * @throws IOException
+ */
+ protected void setupResponseWriter() throws IOException {
+ writer = (MockResponseWriter) renderKit.createResponseWriter(response.getWriter(), "text/html", null);
+ facesContext.setResponseWriter(writer);
+ writer.startDocument();
+ }
+
+ /**
+ * Parse collected content of mock response to Page instance, used for check rendered html.
+ * @return
+ * @throws Exception
+ */
+ protected Page processResponse() throws Exception {
+ setupWebClient();
+
+ URL page = new URL(HTTP_PREFIX + facesContext.getExternalContext().getRequestContextPath()
+ + facesContext.getViewRoot().getViewId());
+
+ try {
+ char[] content = ((MockPrintWriter) response.getWriter()).content();
+
+ webConnection.setResponse(page, String.valueOf(content), response.getStatus(), "OK",
+ response.getContentType(), Collections.EMPTY_LIST);
+ } catch (IllegalStateException e) {
+ byte[] content = ((MockServletOutputStream) response.getOutputStream()).content();
+
+ webConnection.setResponse(page, content, response.getStatus(), "OK", response.getContentType(),
+ Collections.EMPTY_LIST);
+ }
+
+ return webClient.getPage(page);
+ }
+
+ /**
+ * Implements default XML filter to emulate A4J filter that invoked while
+ * http request in web application.
+ *
+ * Needed to make sure that all processed (web page generation) like in real
+ * web application. Additionally now all RF components styles and scripts generated
+ * by A4J filter only, so we need the same in out unit tests.
+ * Fast filter used now by default.
+ * TODO: we can make it configurable like org.ajax4jsf.webapp.ConfigurableXMLFilter
+ *
+ * @author dmorozov
+ */
+ private class TestXMLFilter extends BaseXMLFilter {
+ private HtmlParser parser = null;
+
+ public TestXMLFilter() {}
+
+ public void processFilter(FilterChain chain, HttpServletRequest request, final HttpServletResponse response)
+ throws IOException, ServletException {
+ super.doXmlFilter(chain, request, response);
+ }
+
+ @Override
+ protected HtmlParser getParser(String mimetype, boolean isAjax, String viewId) {
+ HtmlParser parser = this.parser;
+
+ if (parser == null) {
+ parser = new FastHtmlParser();
+ }
+
+ return parser;
+ }
+
+ /**
+ * Peturn parser to pool
+ * @param parser
+ */
+ @Override
+ protected void reuseParser(HtmlParser parser) {
+ this.parser = parser;
+ }
+ }
}
Modified: root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/AbstractJspTestCase.java
===================================================================
--- root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/AbstractJspTestCase.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/AbstractJspTestCase.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -1,17 +1,21 @@
+
/**
- *
+ *
*/
package org.ajax4jsf.tests;
import java.io.IOException;
+
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import javax.el.ELContext;
+
import javax.faces.component.UIOutput;
import javax.faces.webapp.UIComponentELTag;
+
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.jsp.PageContext;
@@ -21,117 +25,112 @@
*
*/
public abstract class AbstractJspTestCase extends AbstractAjax4JsfTestCase {
+ protected PageContext pageContext = null;
+ protected UIComponentELTag rootTag;
- protected PageContext pageContext = null;
-
- protected UIComponentELTag rootTag;
- /**
- * @param name
- */
- public AbstractJspTestCase(String name) {
- super(name);
- }
+ /**
+ * @param name
+ */
+ public AbstractJspTestCase(String name) {
+ super(name);
+ }
- @Override
- public void setUp() throws Exception {
- super.setUp();
- pageContext = new MockPageContext() {
-
- private final int[] SCOPE_ORDER = {PAGE_SCOPE, REQUEST_SCOPE, SESSION_SCOPE, APPLICATION_SCOPE};
-
- private Map<String, Object> attributes =
- new HashMap<String, Object>();
-
- @Override
- public ELContext getELContext() {
- return elContext;
- }
-
- @Override
- public Object findAttribute(String name) {
- Object value = null;
- for(int i = 0; i < SCOPE_ORDER.length && value == null; i++) {
- value = getScope(SCOPE_ORDER[i]).get(name);
- }
- return value;
- }
-
- @Override
- public int getAttributesScope(String name) {
- Object value = null;
- int i = 0;
- for(; i < SCOPE_ORDER.length && value == null; i++) {
- value = getScope(SCOPE_ORDER[i]).get(name);
- }
- return value == null ? 0 :SCOPE_ORDER[i];
- }
-
-
- @Override
- public Enumeration<String> getAttributeNamesInScope(int scope) {
- Map<String, Object> scopeMap = getScope(scope);
- final Iterator<String> iterator = scopeMap.keySet().iterator();
- return new Enumeration<String>() {
- public boolean hasMoreElements() {
- return iterator.hasNext();
- }
- public String nextElement() {
- // TODO Auto-generated method stub
- return iterator.next();
- }
- };
- }
-
- @Override
- public ServletRequest getRequest() {
- return request;
- }
- @Override
- public Object getAttribute(String name) {
- return getScope(PAGE_SCOPE).get(name);
- }
-
- @Override
- public Object getAttribute(String name, int scope) {
- return getScope(scope).get(name);
- }
-
- @SuppressWarnings("unchecked")
- private Map<String, Object> getScope(int scopeName) {
- switch(scopeName) {
- case APPLICATION_SCOPE: return externalContext.getApplicationMap();
- case SESSION_SCOPE: return externalContext.getSessionMap();
- case REQUEST_SCOPE: return externalContext.getRequestMap();
- default: return attributes;
- }
- }
- };
-
-
- rootTag = new UIComponentELTag() {
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ pageContext = new MockPageContext() {
+ private final int[] SCOPE_ORDER = {PAGE_SCOPE, REQUEST_SCOPE, SESSION_SCOPE, APPLICATION_SCOPE};
+ private Map<String, Object> attributes = new HashMap<String, Object>();
+ @Override
+ public ELContext getELContext() {
+ return elContext;
+ }
+ @Override
+ public Object findAttribute(String name) {
+ Object value = null;
- @Override
- public String getComponentType() {
- // TODO Auto-generated method stub
- return UIOutput.COMPONENT_TYPE;
- }
+ for (int i = 0; i < SCOPE_ORDER.length && value == null; i++) {
+ value = getScope(SCOPE_ORDER[i]).get(name);
+ }
- @Override
- public String getRendererType() {
- return null;
- }
-
- };
-
- rootTag.setPageContext(pageContext);
- rootTag.doStartTag();
- }
-
-
- @Override
- public void tearDown() throws Exception {
- pageContext = null;
- rootTag = null;
- super.tearDown();
- }
+ return value;
+ }
+ @Override
+ public int getAttributesScope(String name) {
+ Object value = null;
+ int i = 0;
+
+ for (; i < SCOPE_ORDER.length && value == null; i++) {
+ value = getScope(SCOPE_ORDER[i]).get(name);
+ }
+
+ return value == null ? 0 : SCOPE_ORDER[i];
+ }
+ @Override
+ public Enumeration<String> getAttributeNamesInScope(int scope) {
+ Map<String, Object> scopeMap = getScope(scope);
+ final Iterator<String> iterator = scopeMap.keySet().iterator();
+
+ return new Enumeration<String>() {
+ public boolean hasMoreElements() {
+ return iterator.hasNext();
+ }
+ public String nextElement() {
+
+ // TODO Auto-generated method stub
+ return iterator.next();
+ }
+ };
+ }
+ @Override
+ public ServletRequest getRequest() {
+ return request;
+ }
+ @Override
+ public Object getAttribute(String name) {
+ return getScope(PAGE_SCOPE).get(name);
+ }
+ @Override
+ public Object getAttribute(String name, int scope) {
+ return getScope(scope).get(name);
+ }
+ @SuppressWarnings("unchecked")
+ private Map<String, Object> getScope(int scopeName) {
+ switch (scopeName) {
+ case APPLICATION_SCOPE :
+ return externalContext.getApplicationMap();
+
+ case SESSION_SCOPE :
+ return externalContext.getSessionMap();
+
+ case REQUEST_SCOPE :
+ return externalContext.getRequestMap();
+
+ default :
+ return attributes;
+ }
+ }
+ };
+ rootTag = new UIComponentELTag() {
+ @Override
+ public String getComponentType() {
+
+ // TODO Auto-generated method stub
+ return UIOutput.COMPONENT_TYPE;
+ }
+ @Override
+ public String getRendererType() {
+ return null;
+ }
+ };
+ rootTag.setPageContext(pageContext);
+ rootTag.doStartTag();
+ }
+
+ @Override
+ public void tearDown() throws Exception {
+ pageContext = null;
+ rootTag = null;
+ super.tearDown();
+ }
}
Modified: root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/AbstractThreadedAjax4JsfTestCase.java
===================================================================
--- root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/AbstractThreadedAjax4JsfTestCase.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/AbstractThreadedAjax4JsfTestCase.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+
package org.ajax4jsf.tests;
import javax.faces.context.FacesContext;
@@ -28,6 +30,7 @@
import org.ajax4jsf.context.AjaxContext;
import org.ajax4jsf.context.AjaxContextImpl;
+
import org.apache.shale.test.mock.MockFacesContext;
import org.apache.shale.test.mock.MockHttpServletRequest;
import org.apache.shale.test.mock.MockHttpServletResponse;
@@ -37,8 +40,8 @@
* @author asmirnov at exadel.com (latest modification by $Author: ishabalov $)
* @version $Revision: 1.1.2.3 $ $Date: 2007/02/20 20:58:08 $
*
-/**
- * A multi-threaded JUnit test case, with setup faces environment.
+ *
+ * A multi-threaded JUnit test case, with setup faces environment.
* To perform test cases that spin off threads to do tests: <p>
* <UL>
* <LI>Extend <code>MultiThreadedTestCase</code>
@@ -76,53 +79,56 @@
* public void test1 ()
* {
* TestCaseRunnable tct [] = new TestCaseRunnable [5];
- * for (int i = 0; i < 5; i++)
+ * for (int i = 0; i < 5; i++)
* {
* tct[i] = new CounterThread ();
* }
* runTestCaseRunnables (tct);
* }
* }
- * </PRE>
+ * </PRE>
* <BR><STRONG>Category: Test</STRONG>
* <BR><STRONG>Not guaranteed to be thread safe.</STRONG>
-*/
+ */
public class AbstractThreadedAjax4JsfTestCase extends AbstractAjax4JsfTestCase {
- /**
+ /**
+ * The tests TestResult.
+ */
+ private TestResult testResult = null;
+
+ /**
* The threads that are executing.
*/
private Thread threads[] = null;
+
/**
- * The tests TestResult.*/
- private TestResult testResult = null;
- /**
- * Simple constructor.
+ * Simple constructor.
*/
-
public AbstractThreadedAjax4JsfTestCase(String s) {
super(s);
}
+
/**
* Interrupt the running threads.
*/
-
public void interruptThreads() {
- if(threads != null) {
- for(int i = 0;i < threads.length;i++) {
+ if (threads != null) {
+ for (int i = 0; i < threads.length; i++) {
threads[i].interrupt();
}
}
}
+
/**
- * Override run so we can squirrel away the test result.*/
-
+ * Override run so we can squirrel away the test result.
+ */
public void run(final TestResult result) {
testResult = result;
super.run(result);
testResult = null;
}
-
+
/**
* Create instances of classes and run threads with it.
* @param clazz - class of test thread implementation.
@@ -130,106 +136,118 @@
* @throws InstantiationException
* @throws IllegalAccessException
*/
- protected void runTestCaseThreads(Class clazz, int numThreads) {
- TestCaseRunnable[] runnables = new TestCaseRunnable[numThreads];
- for (int i = 0; i < runnables.length; i++) {
- try {
- runnables[i]= (TestCaseRunnable) clazz.newInstance();
- } catch (Exception e) {
- testResult.addError(this, e);
- return;
- }
- }
- runTestCaseRunnables(runnables);
+ protected void runTestCaseThreads(Class clazz, int numThreads) {
+ TestCaseRunnable[] runnables = new TestCaseRunnable[numThreads];
+
+ for (int i = 0; i < runnables.length; i++) {
+ try {
+ runnables[i] = (TestCaseRunnable) clazz.newInstance();
+ } catch (Exception e) {
+ testResult.addError(this, e);
+
+ return;
+ }
+ }
+
+ runTestCaseRunnables(runnables);
}
+
/**
* Run the test case threads.
* @param runnables - array with instances of {@link TestCaseRunnable} with concrete tests
*/
- protected void runTestCaseRunnables (final TestCaseRunnable[] runnables) {
- if(runnables == null) {
+ protected void runTestCaseRunnables(final TestCaseRunnable[] runnables) {
+ if (runnables == null) {
throw new IllegalArgumentException("runnables is null");
}
+
threads = new Thread[runnables.length];
- for(int i = 0;i < threads.length;i++) {
+
+ for (int i = 0; i < threads.length; i++) {
threads[i] = new Thread(runnables[i]);
}
- for(int i = 0;i < threads.length;i++) {
+
+ for (int i = 0; i < threads.length; i++) {
threads[i].start();
}
+
try {
- for(int i = 0;i < threads.length;i++) {
+ for (int i = 0; i < threads.length; i++) {
threads[i].join();
}
- }
- catch(InterruptedException ignore) {
+ } catch (InterruptedException ignore) {
System.out.println("Thread join interrupted.");
}
+
threads = null;
}
+
/**
* Handle an exception. Since multiple threads won't have their
* exceptions caught the threads must manually catch them and call
* <code>handleException ()</code>.
- * @param t Exception to handle.*/
-
+ * @param t Exception to handle.
+ */
private void handleException(final Throwable t) {
- synchronized(testResult) {
- if(t instanceof AssertionFailedError) {
- testResult.addFailure(this, (AssertionFailedError)t);
- }
- else {
+ synchronized (testResult) {
+ if (t instanceof AssertionFailedError) {
+ testResult.addFailure(this, (AssertionFailedError) t);
+ } else {
testResult.addError(this, t);
}
}
}
-
+
/**
+ * Create instance of faces context for current thread.
+ * @return
+ */
+ protected FacesContext createFacesContext() {
+ MockHttpSession tsession = new MockHttpSession();
+ MockHttpServletRequest trequest = new MockHttpServletRequest(tsession);
+
+ trequest.setAttribute(AjaxContext.AJAX_CONTEXT_KEY, new AjaxContextImpl());
+
+ MockHttpServletResponse tresponse = new MockHttpServletResponse();
+ MockFacesContext tfacesContext = (MockFacesContext) facesContextFactory.getFacesContext(servletContext,
+ trequest, tresponse, lifecycle);
+
+ tfacesContext.setApplication(application);
+ tfacesContext.setViewRoot(application.getViewHandler().createView(facesContext,
+ facesContext.getViewRoot().getViewId()));
+
+ return tfacesContext;
+ }
+
+ /**
* A test case thread. Override runTestCase () and define
- * behaviour of test in there.*/
+ * behaviour of test in there.
+ */
public abstract class TestCaseRunnable implements Runnable {
+
/**
- * Override this to define the test*/
-
- public abstract void runTestCase(FacesContext context)
- throws Throwable;
+ * Override this to define the test
+ */
+ public abstract void runTestCase(FacesContext context) throws Throwable;
+
/**
* Run the test in an environment where
- * we can handle the exceptions generated by the test method.*/
-
+ * we can handle the exceptions generated by the test method.
+ */
public void run() {
- FacesContext context = null;
+ FacesContext context = null;
+
try {
- context = createFacesContext();
+ context = createFacesContext();
runTestCase(context);
- }
- catch(Throwable t) /* Any other exception we handle and then we interrupt the other threads.*/ {
+ } catch (Throwable t) /* Any other exception we handle and then we interrupt the other threads. */ {
handleException(t);
interruptThreads();
} finally {
- if(null != context) {
- context.release();
- }
+ if (null != context) {
+ context.release();
+ }
}
}
}
-
- /**
- * Create instance of faces context for current thread.
- * @return
- */
- protected FacesContext createFacesContext() {
- MockHttpSession tsession = new MockHttpSession();
- MockHttpServletRequest trequest = new MockHttpServletRequest(tsession);
- trequest.setAttribute(AjaxContext.AJAX_CONTEXT_KEY, new AjaxContextImpl());
- MockHttpServletResponse tresponse = new MockHttpServletResponse();
- MockFacesContext tfacesContext = (MockFacesContext)
- facesContextFactory.getFacesContext(servletContext,
- trequest,
- tresponse,
- lifecycle);
- tfacesContext.setApplication(application);
- tfacesContext.setViewRoot(application.getViewHandler().createView(facesContext, facesContext.getViewRoot().getViewId()));
- return tfacesContext;
- }
}
Modified: root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/Condition.java
===================================================================
--- root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/Condition.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/Condition.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -1,5 +1,6 @@
+
/**
- *
+ *
*/
package org.ajax4jsf.tests;
@@ -8,38 +9,35 @@
*
*/
public class Condition {
- private boolean conditionTrue;
+ private boolean conditionTrue;
+ private String message;
- private String message;
-
- public Condition(String message) {
- super();
- this.message = message;
- }
+ public Condition(String message) {
+ super();
+ this.message = message;
+ }
- public String getMessage() {
- return message;
- }
+ public String getMessage() {
+ return message;
+ }
- public void setMessage(String message) {
- this.message = message;
- }
+ public void setMessage(String message) {
+ this.message = message;
+ }
- public boolean isConditionTrue() {
- return conditionTrue;
- }
+ public boolean isConditionTrue() {
+ return conditionTrue;
+ }
- public void setTrue() {
- setCondition(true);
- }
-
- public void setFalse(){
- setCondition(false);
- }
- public void setCondition(boolean conditionTrue) {
- this.conditionTrue = conditionTrue;
- }
+ public void setTrue() {
+ setCondition(true);
+ }
-
-
+ public void setFalse() {
+ setCondition(false);
+ }
+
+ public void setCondition(boolean conditionTrue) {
+ this.conditionTrue = conditionTrue;
+ }
}
Modified: root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/ConstantlyFailingLiteralValueExpression.java
===================================================================
--- root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/ConstantlyFailingLiteralValueExpression.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/ConstantlyFailingLiteralValueExpression.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -1,5 +1,6 @@
+
/**
- *
+ *
*/
package org.ajax4jsf.tests;
@@ -8,7 +9,7 @@
import javax.el.ValueExpression;
/**
- * Value expression failing when trying
+ * Value expression failing when trying
* to coerce its expression string to any type
* Needed to test tags throw FacesException in that case
* @author Maksim Kaszynski
@@ -17,76 +18,84 @@
@SuppressWarnings("serial")
public class ConstantlyFailingLiteralValueExpression extends ValueExpression {
- /* (non-Javadoc)
- * @see javax.el.ValueExpression#getExpectedType()
- */
- @Override
- public Class<?> getExpectedType() {
- throw new ELException("Everything is a stub here");
- }
+ /*
+ * (non-Javadoc)
+ * @see javax.el.ValueExpression#getExpectedType()
+ */
+ @Override
+ public Class<?> getExpectedType() {
+ throw new ELException("Everything is a stub here");
+ }
- /* (non-Javadoc)
- * @see javax.el.ValueExpression#getType(javax.el.ELContext)
- */
- @Override
- public Class<?> getType(ELContext context) {
- throw new ELException("Everything is a stub here");
- }
+ /*
+ * (non-Javadoc)
+ * @see javax.el.ValueExpression#getType(javax.el.ELContext)
+ */
+ @Override
+ public Class<?> getType(ELContext context) {
+ throw new ELException("Everything is a stub here");
+ }
- /* (non-Javadoc)
- * @see javax.el.ValueExpression#getValue(javax.el.ELContext)
- */
- @Override
- public Object getValue(ELContext context) {
- throw new ELException("Everything is a stub here");
- }
+ /*
+ * (non-Javadoc)
+ * @see javax.el.ValueExpression#getValue(javax.el.ELContext)
+ */
+ @Override
+ public Object getValue(ELContext context) {
+ throw new ELException("Everything is a stub here");
+ }
- /* (non-Javadoc)
- * @see javax.el.ValueExpression#isReadOnly(javax.el.ELContext)
- */
- @Override
- public boolean isReadOnly(ELContext context) {
- throw new ELException("Everything is a stub here");
- }
+ /*
+ * (non-Javadoc)
+ * @see javax.el.ValueExpression#isReadOnly(javax.el.ELContext)
+ */
+ @Override
+ public boolean isReadOnly(ELContext context) {
+ throw new ELException("Everything is a stub here");
+ }
- /* (non-Javadoc)
- * @see javax.el.ValueExpression#setValue(javax.el.ELContext, java.lang.Object)
- */
- @Override
- public void setValue(ELContext context, Object value) {
- throw new ELException("Everything is a stub here");
- }
+ /*
+ * (non-Javadoc)
+ * @see javax.el.ValueExpression#setValue(javax.el.ELContext, java.lang.Object)
+ */
+ @Override
+ public void setValue(ELContext context, Object value) {
+ throw new ELException("Everything is a stub here");
+ }
- /* (non-Javadoc)
- * @see javax.el.Expression#equals(java.lang.Object)
- */
- @Override
- public boolean equals(Object obj) {
- throw new ELException("Everything is a stub here");
- }
+ /*
+ * (non-Javadoc)
+ * @see javax.el.Expression#equals(java.lang.Object)
+ */
+ @Override
+ public boolean equals(Object obj) {
+ throw new ELException("Everything is a stub here");
+ }
- /* (non-Javadoc)
- * @see javax.el.Expression#getExpressionString()
- */
- @Override
- public String getExpressionString() {
- throw new ELException("Everything is a stub here");
- }
+ /*
+ * (non-Javadoc)
+ * @see javax.el.Expression#getExpressionString()
+ */
+ @Override
+ public String getExpressionString() {
+ throw new ELException("Everything is a stub here");
+ }
- /* (non-Javadoc)
- * @see javax.el.Expression#hashCode()
- */
- @Override
- public int hashCode() {
- throw new ELException("Everything is a stub here");
- }
+ /*
+ * (non-Javadoc)
+ * @see javax.el.Expression#hashCode()
+ */
+ @Override
+ public int hashCode() {
+ throw new ELException("Everything is a stub here");
+ }
- /* (non-Javadoc)
- * @see javax.el.Expression#isLiteralText()
- */
- @Override
- public boolean isLiteralText() {
- return true;
- }
-
+ /*
+ * (non-Javadoc)
+ * @see javax.el.Expression#isLiteralText()
+ */
+ @Override
+ public boolean isLiteralText() {
+ return true;
+ }
}
Modified: root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/DummyScriptEngine.java
===================================================================
--- root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/DummyScriptEngine.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/DummyScriptEngine.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -1,9 +1,11 @@
+
/**
- *
+ *
*/
package org.ajax4jsf.tests;
import org.apache.commons.logging.Log;
+
import org.mozilla.javascript.Context;
import org.mozilla.javascript.Function;
import org.mozilla.javascript.Script;
@@ -24,56 +26,47 @@
*/
@SuppressWarnings("serial")
public class DummyScriptEngine extends JavaScriptEngine {
+ public DummyScriptEngine(WebClient webClient) {
+ super(webClient);
+ }
- public DummyScriptEngine(WebClient webClient) {
- super(webClient);
- }
+ @Override
+ public Object callFunction(HtmlPage htmlPage, Function function, Context context, Scriptable scope,
+ Scriptable thisObject, Object[] args) {
+ return false;
+ }
- @Override
- public Object callFunction(HtmlPage htmlPage, Function function,
- Context context, Scriptable scope, Scriptable thisObject,
- Object[] args) {
- return false;
- }
+ @Override
+ public Script compile(HtmlPage htmlPage, String sourceCode, String sourceName, int startLine) {
+ return new Script() {
+ public Object exec(Context arg0, Scriptable arg1) {
+ return false;
+ }
+ };
+ }
- @Override
- public Script compile(HtmlPage htmlPage, String sourceCode,
- String sourceName, int startLine) {
- return new Script() {
- public Object exec(Context arg0, Scriptable arg1) {
- return false;
- }
- };
- }
+ @Override
+ public Script getCachedScript(WebResponse webResponse) {
+ return null;
+ }
-
- @Override
- public Script getCachedScript(WebResponse webResponse) {
- return null;
- }
+ @Override
+ protected Log getLog() {
+ return null;
+ }
- @Override
- protected Log getLog() {
- return null;
- }
+ @Override
+ public void initialize(WebWindow webWindow) {
+ super.initialize(webWindow);
+ }
- @Override
- public void initialize(WebWindow webWindow) {
- super.initialize(webWindow);
- }
+ @Override
+ public boolean isScriptRunning() {
+ return false;
+ }
- @Override
- public boolean isScriptRunning() {
- return false;
- }
-
- @Override
- public String preProcess(HtmlPage htmlPage, String sourceCode,
- String sourceName, HtmlElement htmlElement) {
- return "";
- }
-
-
-
-
+ @Override
+ public String preProcess(HtmlPage htmlPage, String sourceCode, String sourceName, HtmlElement htmlElement) {
+ return "";
+ }
}
Modified: root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/EnumSupportExpressionFactoryWrapper.java
===================================================================
--- root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/EnumSupportExpressionFactoryWrapper.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/EnumSupportExpressionFactoryWrapper.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -1,5 +1,6 @@
+
/**
- *
+ *
*/
package org.ajax4jsf.tests;
@@ -13,69 +14,70 @@
*
*/
public class EnumSupportExpressionFactoryWrapper extends ExpressionFactory {
+ private ExpressionFactory factory;
- private ExpressionFactory factory;
- /**
- *
- */
- public EnumSupportExpressionFactoryWrapper(ExpressionFactory factory) {
- this.factory = factory;
- }
+ /**
+ *
+ */
+ public EnumSupportExpressionFactoryWrapper(ExpressionFactory factory) {
+ this.factory = factory;
+ }
- /* (non-Javadoc)
- * @see javax.el.ExpressionFactory#coerceToType(java.lang.Object, java.lang.Class)
- */
- @Override
- public Object coerceToType(Object obj, Class<?> targetType) {
- if (targetType != null && targetType.isEnum()) {
- return coerceToEnum(obj, (Class<?>) targetType);
- }
- return factory.coerceToType(obj, targetType);
- }
-
- @SuppressWarnings("unchecked")
- private Enum<?> coerceToEnum(Object o, Class clazz) {
- if (o == null || "".equals(o)) {
- return null;
- }
-
- if (clazz.isInstance(o)) {
- return (Enum<?>) o;
- }
-
- if (o instanceof String) {
- return Enum.valueOf(clazz, (String) o);
- }
-
+ /*
+ * (non-Javadoc)
+ * @see javax.el.ExpressionFactory#coerceToType(java.lang.Object, java.lang.Class)
+ */
+ @Override
+ public Object coerceToType(Object obj, Class<?> targetType) {
+ if (targetType != null && targetType.isEnum()) {
+ return coerceToEnum(obj, (Class<?>) targetType);
+ }
+
+ return factory.coerceToType(obj, targetType);
+ }
+
+ @SuppressWarnings("unchecked")
+ private Enum<?> coerceToEnum(Object o, Class clazz) {
+ if (o == null || "".equals(o)) {
+ return null;
+ }
+
+ if (clazz.isInstance(o)) {
+ return (Enum<?>) o;
+ }
+
+ if (o instanceof String) {
+ return Enum.valueOf(clazz, (String) o);
+ }
+
throw new IllegalArgumentException("Cannot convert " + o + " of class " + o.getClass() + " to type " + clazz);
- }
+ }
- /* (non-Javadoc)
- * @see javax.el.ExpressionFactory#createMethodExpression(javax.el.ELContext, java.lang.String, java.lang.Class, java.lang.Class<?>[])
- */
- @Override
- public MethodExpression createMethodExpression(ELContext context,
- String expression, Class<?> expectedReturnType,
- Class<?>[] expectedParamTypes) {
- return factory.createMethodExpression(context, expression, expectedReturnType, expectedParamTypes);
- }
+ /*
+ * (non-Javadoc)
+ * @see javax.el.ExpressionFactory#createMethodExpression(javax.el.ELContext, java.lang.String, java.lang.Class, java.lang.Class<?>[])
+ */
+ @Override
+ public MethodExpression createMethodExpression(ELContext context, String expression, Class<?> expectedReturnType,
+ Class<?>[] expectedParamTypes) {
+ return factory.createMethodExpression(context, expression, expectedReturnType, expectedParamTypes);
+ }
- /* (non-Javadoc)
- * @see javax.el.ExpressionFactory#createValueExpression(java.lang.Object, java.lang.Class)
- */
- @Override
- public ValueExpression createValueExpression(Object instance,
- Class<?> expectedType) {
- return factory.createValueExpression(instance, expectedType);
- }
+ /*
+ * (non-Javadoc)
+ * @see javax.el.ExpressionFactory#createValueExpression(java.lang.Object, java.lang.Class)
+ */
+ @Override
+ public ValueExpression createValueExpression(Object instance, Class<?> expectedType) {
+ return factory.createValueExpression(instance, expectedType);
+ }
- /* (non-Javadoc)
- * @see javax.el.ExpressionFactory#createValueExpression(javax.el.ELContext, java.lang.String, java.lang.Class)
- */
- @Override
- public ValueExpression createValueExpression(ELContext context,
- String expression, Class<?> expectedType) {
- return factory.createValueExpression(context, expression, expectedType);
- }
-
+ /*
+ * (non-Javadoc)
+ * @see javax.el.ExpressionFactory#createValueExpression(javax.el.ELContext, java.lang.String, java.lang.Class)
+ */
+ @Override
+ public ValueExpression createValueExpression(ELContext context, String expression, Class<?> expectedType) {
+ return factory.createValueExpression(context, expression, expectedType);
+ }
}
Modified: root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/HtmlTestUtils.java
===================================================================
--- root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/HtmlTestUtils.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/HtmlTestUtils.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -1,5 +1,6 @@
+
/**
- *
+ *
*/
package org.ajax4jsf.tests;
@@ -7,6 +8,7 @@
import java.util.List;
import org.ajax4jsf.renderkit.RendererUtils.HTML;
+
import org.apache.commons.lang.StringUtils;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
@@ -17,27 +19,26 @@
*
*/
public final class HtmlTestUtils {
- private HtmlTestUtils() {
- }
-
- /**
- * Extract list of all <script> elements' src attributes
- * @param page
- * @return
- */
+ private HtmlTestUtils() {}
+
+ /**
+ * Extract list of all <script> elements' src attributes
+ * @param page
+ * @return
+ */
@SuppressWarnings("unchecked")
public static List<String> extractScriptSources(HtmlPage page) {
- List<HtmlScript> list =
- page.getDocumentHtmlElement().getHtmlElementsByTagName(HTML.SCRIPT_ELEM);
- List<String> sources = new ArrayList<String>();
- for (HtmlScript htmlScript : list) {
- String srcAttribute = htmlScript.getSrcAttribute();
- if (StringUtils.isNotBlank(srcAttribute)) {
- sources.add(srcAttribute);
- }
- }
- return sources;
- }
+ List<HtmlScript> list = page.getDocumentHtmlElement().getHtmlElementsByTagName(HTML.SCRIPT_ELEM);
+ List<String> sources = new ArrayList<String>();
+ for (HtmlScript htmlScript : list) {
+ String srcAttribute = htmlScript.getSrcAttribute();
+ if (StringUtils.isNotBlank(srcAttribute)) {
+ sources.add(srcAttribute);
+ }
+ }
+
+ return sources;
+ }
}
Modified: root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/JsfMock.java
===================================================================
--- root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/JsfMock.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/JsfMock.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -1,11 +1,13 @@
+
/**
- *
+ *
*/
package org.ajax4jsf.tests;
import javax.el.Expression;
import javax.el.MethodExpression;
import javax.el.ValueExpression;
+
import javax.faces.component.UICommand;
import javax.faces.component.UIComponent;
import javax.faces.component.UIInput;
@@ -27,146 +29,168 @@
*/
@SuppressWarnings("deprecation")
public class JsfMock {
-
- public static <T extends Expression> T expressionStringEq(T t) {
- EasyMock.reportMatcher(new ExpressionEq(t){});
- return null;
- }
-
-
- public static ValueBinding vbEqToVe(ValueExpression expression) {
- EasyMock.reportMatcher(new ExpressionEq(expression){});
- return null;
- }
+ public static <T extends Expression> T expressionStringEq(T t) {
+ EasyMock.reportMatcher(new ExpressionEq(t) {}
+ );
- public static MethodBinding mbEqToMe(MethodExpression expression) {
- EasyMock.reportMatcher(new ExpressionEq(expression){});
- return null;
- }
-
- public static MethodExpression meEqToMe(MethodExpression expression) {
- EasyMock.reportMatcher(new ExpressionEq(expression){});
- return null;
- }
-
- public static Validator meValidator(MockMethodExpression expression) {
- EasyMock.reportMatcher(new MethodValidatorMatcher(expression));
- return null;
- }
-
- public static ActionListener meActionListener(MockMethodExpression expression) {
- EasyMock.reportMatcher(new MethodActionListenerMatcher(expression));
- return null;
- }
+ return null;
+ }
- public static ValueChangeListener meValueChangeListener(MockMethodExpression expression) {
- EasyMock.reportMatcher(new MethodValueChangeListenerMatcher(expression));
- return null;
- }
+ public static ValueBinding vbEqToVe(ValueExpression expression) {
+ EasyMock.reportMatcher(new ExpressionEq(expression) {}
+ );
-// public static ValueExpression expressionStringEq(ValueExpression expression) {
-// EasyMock.reportMatcher(new ExpressionEq(expression) {});
-// return null;
-// }
-
- public abstract static class ExpressionEq implements IArgumentMatcher{
- private Expression expression;
+ return null;
+ }
- public ExpressionEq(Expression expression) {
- super();
- this.expression = expression;
- }
-
- public void appendTo(StringBuffer buffer) {
- buffer.append("Expression expected to have expression string ")
- .append(expression.getExpressionString());
- }
- public boolean matches(Object argument) {
- if (argument instanceof Expression) {
- Expression e2 = (Expression) argument;
- return e2.getExpressionString().equals(expression.getExpressionString());
- } else if (argument instanceof ValueBinding) {
- ValueBinding binding = (ValueBinding) argument;
- return binding.getExpressionString().equals(expression.getExpressionString());
- } else if (argument instanceof MethodBinding) {
- MethodBinding binding = (MethodBinding) argument;
- return binding.getExpressionString().equals(expression.getExpressionString());
- }
- return false;
- }
- }
-
-
-
- public static class MethodActionListenerMatcher implements IArgumentMatcher{
- private MockMethodExpression expression;
-
- public MethodActionListenerMatcher(MockMethodExpression expression) {
- super();
- this.expression = expression;
- }
- public void appendTo(StringBuffer buffer) {
- buffer
- .append("Action Listener is supposed to evaluate method")
- .append(expression.getExpressionString());
- }
- public boolean matches(Object argument) {
- if (argument instanceof ActionListener) {
- ActionListener listener = (ActionListener) argument;
- ActionEvent event = new ActionEvent(new UICommand());
- listener.processAction(event);
- return expression.lastInvocationMatched(event);
- }
- return false;
- }
- }
-
- public static class MethodValueChangeListenerMatcher implements IArgumentMatcher{
- private MockMethodExpression expression;
-
- public MethodValueChangeListenerMatcher(MockMethodExpression expression) {
- super();
- this.expression = expression;
- }
- public void appendTo(StringBuffer buffer) {
- buffer
- .append("ValueChangeListener Listener is supposed to evaluate method")
- .append(expression.getExpressionString());
- }
- public boolean matches(Object argument) {
- if (argument instanceof ValueChangeListener) {
- ValueChangeListener listener = (ValueChangeListener) argument;
- ValueChangeEvent event = new ValueChangeEvent(new UIInput(), new Object(), new Object());
- listener.processValueChange(event);
- return expression.lastInvocationMatched(event);
- }
- return false;
- }
- }
-
- public static class MethodValidatorMatcher implements IArgumentMatcher{
- private MockMethodExpression expression;
-
- public MethodValidatorMatcher(MockMethodExpression expression) {
- super();
- this.expression = expression;
- }
- public void appendTo(StringBuffer buffer) {
- buffer
- .append("Validator is supposed to evaluate method")
- .append(expression.getExpressionString());
- }
- public boolean matches(Object argument) {
- if (argument instanceof Validator) {
- Validator validator = (Validator) argument;
- FacesContext context = FacesContext.getCurrentInstance();
- UIComponent component = new UIInput();
- Object value = new Object();
- validator.validate(context, component, value);
- return expression.lastInvocationMatched(context, component, value);
- }
- return false;
- }
- }
-
+ public static MethodBinding mbEqToMe(MethodExpression expression) {
+ EasyMock.reportMatcher(new ExpressionEq(expression) {}
+ );
+
+ return null;
+ }
+
+ public static MethodExpression meEqToMe(MethodExpression expression) {
+ EasyMock.reportMatcher(new ExpressionEq(expression) {}
+ );
+
+ return null;
+ }
+
+ public static Validator meValidator(MockMethodExpression expression) {
+ EasyMock.reportMatcher(new MethodValidatorMatcher(expression));
+
+ return null;
+ }
+
+ public static ActionListener meActionListener(MockMethodExpression expression) {
+ EasyMock.reportMatcher(new MethodActionListenerMatcher(expression));
+
+ return null;
+ }
+
+ public static ValueChangeListener meValueChangeListener(MockMethodExpression expression) {
+ EasyMock.reportMatcher(new MethodValueChangeListenerMatcher(expression));
+
+ return null;
+ }
+
+// public static ValueExpression expressionStringEq(ValueExpression expression) {
+// EasyMock.reportMatcher(new ExpressionEq(expression) {});
+// return null;
+// }
+ public abstract static class ExpressionEq implements IArgumentMatcher {
+ private Expression expression;
+
+ public ExpressionEq(Expression expression) {
+ super();
+ this.expression = expression;
+ }
+
+ public void appendTo(StringBuffer buffer) {
+ buffer.append("Expression expected to have expression string ").append(expression.getExpressionString());
+ }
+
+ public boolean matches(Object argument) {
+ if (argument instanceof Expression) {
+ Expression e2 = (Expression) argument;
+
+ return e2.getExpressionString().equals(expression.getExpressionString());
+ } else if (argument instanceof ValueBinding) {
+ ValueBinding binding = (ValueBinding) argument;
+
+ return binding.getExpressionString().equals(expression.getExpressionString());
+ } else if (argument instanceof MethodBinding) {
+ MethodBinding binding = (MethodBinding) argument;
+
+ return binding.getExpressionString().equals(expression.getExpressionString());
+ }
+
+ return false;
+ }
+ }
+
+
+ public static class MethodActionListenerMatcher implements IArgumentMatcher {
+ private MockMethodExpression expression;
+
+ public MethodActionListenerMatcher(MockMethodExpression expression) {
+ super();
+ this.expression = expression;
+ }
+
+ public void appendTo(StringBuffer buffer) {
+ buffer.append("Action Listener is supposed to evaluate method").append(expression.getExpressionString());
+ }
+
+ public boolean matches(Object argument) {
+ if (argument instanceof ActionListener) {
+ ActionListener listener = (ActionListener) argument;
+ ActionEvent event = new ActionEvent(new UICommand());
+
+ listener.processAction(event);
+
+ return expression.lastInvocationMatched(event);
+ }
+
+ return false;
+ }
+ }
+
+
+ public static class MethodValidatorMatcher implements IArgumentMatcher {
+ private MockMethodExpression expression;
+
+ public MethodValidatorMatcher(MockMethodExpression expression) {
+ super();
+ this.expression = expression;
+ }
+
+ public void appendTo(StringBuffer buffer) {
+ buffer.append("Validator is supposed to evaluate method").append(expression.getExpressionString());
+ }
+
+ public boolean matches(Object argument) {
+ if (argument instanceof Validator) {
+ Validator validator = (Validator) argument;
+ FacesContext context = FacesContext.getCurrentInstance();
+ UIComponent component = new UIInput();
+ Object value = new Object();
+
+ validator.validate(context, component, value);
+
+ return expression.lastInvocationMatched(context, component, value);
+ }
+
+ return false;
+ }
+ }
+
+
+ public static class MethodValueChangeListenerMatcher implements IArgumentMatcher {
+ private MockMethodExpression expression;
+
+ public MethodValueChangeListenerMatcher(MockMethodExpression expression) {
+ super();
+ this.expression = expression;
+ }
+
+ public void appendTo(StringBuffer buffer) {
+ buffer.append("ValueChangeListener Listener is supposed to evaluate method").append(
+ expression.getExpressionString());
+ }
+
+ public boolean matches(Object argument) {
+ if (argument instanceof ValueChangeListener) {
+ ValueChangeListener listener = (ValueChangeListener) argument;
+ ValueChangeEvent event = new ValueChangeEvent(new UIInput(), new Object(), new Object());
+
+ listener.processValueChange(event);
+
+ return expression.lastInvocationMatched(event);
+ }
+
+ return false;
+ }
+ }
}
Modified: root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/LiteralValueExpression.java
===================================================================
--- root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/LiteralValueExpression.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/LiteralValueExpression.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -1,5 +1,6 @@
+
/**
- *
+ *
*/
package org.ajax4jsf.tests;
@@ -9,15 +10,16 @@
*/
@SuppressWarnings("serial")
public class LiteralValueExpression extends MockValueExpression {
+ public LiteralValueExpression(Object o) {
+ super(o);
- public LiteralValueExpression(Object o) {
- super(o);
- // TODO Auto-generated constructor stub
- }
-
- @Override
- public boolean isLiteralText() {
- // TODO Auto-generated method stub
- return true;
- }
+ // TODO Auto-generated constructor stub
+ }
+
+ @Override
+ public boolean isLiteralText() {
+
+ // TODO Auto-generated method stub
+ return true;
+ }
}
Modified: root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockAjax4JsfLifecycle.java
===================================================================
--- root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockAjax4JsfLifecycle.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockAjax4JsfLifecycle.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+
package org.ajax4jsf.tests;
import javax.faces.context.FacesContext;
@@ -31,9 +33,5 @@
*
*/
public class MockAjax4JsfLifecycle extends MockLifecycle {
-
- public void processAll(FacesContext context) {
-
- }
-
+ public void processAll(FacesContext context) {}
}
Modified: root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockApplication.java
===================================================================
--- root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockApplication.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockApplication.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -1,5 +1,6 @@
+
/**
- *
+ *
*/
package org.ajax4jsf.tests;
@@ -13,16 +14,14 @@
*
*/
public class MockApplication extends MockApplication12 {
+ private ExpressionFactory expressionFactory;
- private ExpressionFactory expressionFactory;
-
- public MockApplication() {
- expressionFactory =
- new EnumSupportExpressionFactoryWrapper(new MockExpressionFactory());
- }
-
- @Override
- public ExpressionFactory getExpressionFactory() {
- return expressionFactory;
- }
+ public MockApplication() {
+ expressionFactory = new EnumSupportExpressionFactoryWrapper(new MockExpressionFactory());
+ }
+
+ @Override
+ public ExpressionFactory getExpressionFactory() {
+ return expressionFactory;
+ }
}
Modified: root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockComponentState.java
===================================================================
--- root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockComponentState.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockComponentState.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+
package org.ajax4jsf.tests;
import java.io.Serializable;
@@ -32,65 +34,72 @@
* @author shura
*
*/
-public class MockComponentState implements DataComponentState,Serializable {
-
- /**
- *
- */
- private static final long serialVersionUID = -4278697745017092414L;
- private int _count = 2;
+public class MockComponentState implements DataComponentState, Serializable {
- /* (non-Javadoc)
- * @see org.ajax4jsf.ajax.repeat.DataComponentState#getRange()
- */
- public Range getRange() {
- // TODO Auto-generated method stub
- return new MockRange(_count);
- }
+ /**
+ *
+ */
+ private static final long serialVersionUID = -4278697745017092414L;
+ private int _count = 2;
- /* (non-Javadoc)
- * @see javax.faces.component.StateHolder#isTransient()
- */
- public boolean isTransient() {
- // TODO Auto-generated method stub
- return false;
- }
+ /*
+ * (non-Javadoc)
+ * @see org.ajax4jsf.ajax.repeat.DataComponentState#getRange()
+ */
+ public Range getRange() {
- /* (non-Javadoc)
- * @see javax.faces.component.StateHolder#restoreState(javax.faces.context.FacesContext, java.lang.Object)
- */
- public void restoreState(FacesContext context, Object state) {
- _count = ((Integer)state).intValue();
- }
+ // TODO Auto-generated method stub
+ return new MockRange(_count);
+ }
- /* (non-Javadoc)
- * @see javax.faces.component.StateHolder#saveState(javax.faces.context.FacesContext)
- */
- public Object saveState(FacesContext context) {
- // TODO Auto-generated method stub
- return new Integer(_count);
- }
+ /*
+ * (non-Javadoc)
+ * @see javax.faces.component.StateHolder#isTransient()
+ */
+ public boolean isTransient() {
- /* (non-Javadoc)
- * @see javax.faces.component.StateHolder#setTransient(boolean)
- */
- public void setTransient(boolean newTransientValue) {
- // TODO Auto-generated method stub
+ // TODO Auto-generated method stub
+ return false;
+ }
- }
+ /*
+ * (non-Javadoc)
+ * @see javax.faces.component.StateHolder#restoreState(javax.faces.context.FacesContext, java.lang.Object)
+ */
+ public void restoreState(FacesContext context, Object state) {
+ _count = ((Integer) state).intValue();
+ }
- /**
- * @return the count
- */
- public int getCount() {
- return _count;
- }
+ /*
+ * (non-Javadoc)
+ * @see javax.faces.component.StateHolder#saveState(javax.faces.context.FacesContext)
+ */
+ public Object saveState(FacesContext context) {
- /**
- * @param count the count to set
- */
- public void setCount(int count) {
- _count = count;
- }
+ // TODO Auto-generated method stub
+ return new Integer(_count);
+ }
+ /*
+ * (non-Javadoc)
+ * @see javax.faces.component.StateHolder#setTransient(boolean)
+ */
+ public void setTransient(boolean newTransientValue) {
+
+ // TODO Auto-generated method stub
+ }
+
+ /**
+ * @return the count
+ */
+ public int getCount() {
+ return _count;
+ }
+
+ /**
+ * @param count the count to set
+ */
+ public void setCount(int count) {
+ _count = count;
+ }
}
Modified: root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockDataModel.java
===================================================================
--- root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockDataModel.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockDataModel.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+
package org.ajax4jsf.tests;
import java.io.IOException;
@@ -35,136 +37,150 @@
*
*/
public class MockDataModel extends ExtendedDataModel {
-
- public static final int ROWS = 10;
-
- private int rowIndex = 0;
-
- private int minRow = 0;
-
- private int maxRow = ROWS;
+ public static final int ROWS = 10;
+ private int minRow = 0;
+ private int rowIndex = 0;
+ private int maxRow = ROWS;
+ private Object wrappedData;
- private Object wrappedData;
- /**
- * @return the maxRow
- */
- public int getMaxRow() {
- return maxRow;
- }
+ /**
+ * @return the maxRow
+ */
+ public int getMaxRow() {
+ return maxRow;
+ }
- /**
- * @param maxRow the maxRow to set
- */
- public void setMaxRow(int maxRow) {
- this.maxRow = maxRow;
- }
+ /**
+ * @param maxRow the maxRow to set
+ */
+ public void setMaxRow(int maxRow) {
+ this.maxRow = maxRow;
+ }
- /**
- * @return the minRow
- */
- public int getMinRow() {
- return minRow;
- }
+ /**
+ * @return the minRow
+ */
+ public int getMinRow() {
+ return minRow;
+ }
- /**
- * @param minRow the minRow to set
- */
- public void setMinRow(int minRow) {
- this.minRow = minRow;
- }
+ /**
+ * @param minRow the minRow to set
+ */
+ public void setMinRow(int minRow) {
+ this.minRow = minRow;
+ }
-
- public void walk(FacesContext context, DataVisitor visitor, Range range, Object argument) throws IOException {
- int first=0;
- int count=ROWS;
- if (range instanceof MockRange) {
- MockRange mockRange = (MockRange) range;
- count = mockRange.getCount();
- } else if (range instanceof SequenceRange) {
- SequenceRange seqRange = (SequenceRange) range;
- first = seqRange.getFirstRow();
- int rows = seqRange.getRows();
- if(rows>0){
- count = rows+first;
- }
- }
- for(int row = first; row < count && row < ROWS;row++){
- visitor.process(context, new Integer(row), argument);
- }
-
- }
+ public void walk(FacesContext context, DataVisitor visitor, Range range, Object argument) throws IOException {
+ int first = 0;
+ int count = ROWS;
- /* (non-Javadoc)
- * @see org.ajax4jsf.ajax.repeat.ExtendedDataModel#getRowKey()
- */
- public Object getRowKey() {
- // TODO Auto-generated method stub
- return rowIndex<0?null:new Integer(rowIndex);
- }
+ if (range instanceof MockRange) {
+ MockRange mockRange = (MockRange) range;
- /* (non-Javadoc)
- * @see org.ajax4jsf.ajax.repeat.ExtendedDataModel#setRowKey(java.lang.Object)
- */
- public void setRowKey(Object key) {
- if(null == key){
- rowIndex = -1;
- } else {
- rowIndex = ((Integer) key).intValue();
- }
- }
+ count = mockRange.getCount();
+ } else if (range instanceof SequenceRange) {
+ SequenceRange seqRange = (SequenceRange) range;
- /* (non-Javadoc)
- * @see javax.faces.model.DataModel#getRowCount()
- */
- public int getRowCount() {
- // TODO Auto-generated method stub
- return getMaxRow();
- }
+ first = seqRange.getFirstRow();
- /* (non-Javadoc)
- * @see javax.faces.model.DataModel#getRowData()
- */
- public Object getRowData() {
- // TODO Auto-generated method stub
- return isRowAvailable()?String.valueOf(rowIndex):null;
- }
+ int rows = seqRange.getRows();
- /* (non-Javadoc)
- * @see javax.faces.model.DataModel#getRowIndex()
- */
- public int getRowIndex() {
- // TODO Auto-generated method stub
- return rowIndex;
- }
+ if (rows > 0) {
+ count = rows + first;
+ }
+ }
- /* (non-Javadoc)
- * @see javax.faces.model.DataModel#getWrappedData()
- */
- public Object getWrappedData() {
- // TODO Auto-generated method stub
- return wrappedData;
- }
+ for (int row = first; row < count && row < ROWS; row++) {
+ visitor.process(context, new Integer(row), argument);
+ }
+ }
- /* (non-Javadoc)
- * @see javax.faces.model.DataModel#isRowAvailable()
- */
- public boolean isRowAvailable() {
- // TODO Auto-generated method stub
- return rowIndex>=getMinRow() && rowIndex<getMaxRow();
- }
+ /*
+ * (non-Javadoc)
+ * @see org.ajax4jsf.ajax.repeat.ExtendedDataModel#getRowKey()
+ */
+ public Object getRowKey() {
- /* (non-Javadoc)
- * @see javax.faces.model.DataModel#setRowIndex(int)
- */
- public void setRowIndex(int rowIndex) {
- this.rowIndex = rowIndex;
- }
+ // TODO Auto-generated method stub
+ return rowIndex < 0 ? null : new Integer(rowIndex);
+ }
- /* (non-Javadoc)
- * @see javax.faces.model.DataModel#setWrappedData(java.lang.Object)
- */
- public void setWrappedData(Object data) {
- wrappedData = data;
- }
+ /*
+ * (non-Javadoc)
+ * @see org.ajax4jsf.ajax.repeat.ExtendedDataModel#setRowKey(java.lang.Object)
+ */
+ public void setRowKey(Object key) {
+ if (null == key) {
+ rowIndex = -1;
+ } else {
+ rowIndex = ((Integer) key).intValue();
+ }
+ }
+ /*
+ * (non-Javadoc)
+ * @see javax.faces.model.DataModel#getRowCount()
+ */
+ public int getRowCount() {
+
+ // TODO Auto-generated method stub
+ return getMaxRow();
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see javax.faces.model.DataModel#getRowData()
+ */
+ public Object getRowData() {
+
+ // TODO Auto-generated method stub
+ return isRowAvailable() ? String.valueOf(rowIndex) : null;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see javax.faces.model.DataModel#getRowIndex()
+ */
+ public int getRowIndex() {
+
+ // TODO Auto-generated method stub
+ return rowIndex;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see javax.faces.model.DataModel#getWrappedData()
+ */
+ public Object getWrappedData() {
+
+ // TODO Auto-generated method stub
+ return wrappedData;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see javax.faces.model.DataModel#isRowAvailable()
+ */
+ public boolean isRowAvailable() {
+
+ // TODO Auto-generated method stub
+ return rowIndex >= getMinRow() && rowIndex < getMaxRow();
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see javax.faces.model.DataModel#setRowIndex(int)
+ */
+ public void setRowIndex(int rowIndex) {
+ this.rowIndex = rowIndex;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see javax.faces.model.DataModel#setWrappedData(java.lang.Object)
+ */
+ public void setWrappedData(Object data) {
+ wrappedData = data;
+ }
}
Modified: root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockDataModelListener.java
===================================================================
--- root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockDataModelListener.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockDataModelListener.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -1,5 +1,6 @@
+
/**
- *
+ *
*/
package org.ajax4jsf.tests;
@@ -12,12 +13,12 @@
*/
public class MockDataModelListener implements DataModelListener {
- /* (non-Javadoc)
- * @see javax.faces.model.DataModelListener#rowSelected(javax.faces.model.DataModelEvent)
- */
- public void rowSelected(DataModelEvent event) {
- // TODO Auto-generated method stub
+ /*
+ * (non-Javadoc)
+ * @see javax.faces.model.DataModelListener#rowSelected(javax.faces.model.DataModelEvent)
+ */
+ public void rowSelected(DataModelEvent event) {
- }
-
+ // TODO Auto-generated method stub
+ }
}
Modified: root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockELContext.java
===================================================================
--- root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockELContext.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockELContext.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -1,9 +1,9 @@
+
/*
- * ELContextMock.java Date created: 14.12.2007
- * Last modified by: $Author$
- * $Revision$ $Date$
+* ELContextMock.java Date created: 14.12.2007
+* Last modified by: $Author$
+* $Revision$ $Date$
*/
-
package org.ajax4jsf.tests;
import javax.el.ELContext;
@@ -18,31 +18,36 @@
*/
public class MockELContext extends ELContext {
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see javax.el.ELContext#getELResolver()
*/
@Override
public ELResolver getELResolver() {
- // TODO Auto-generated method stub
- return null;
+
+ // TODO Auto-generated method stub
+ return null;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see javax.el.ELContext#getFunctionMapper()
*/
@Override
public FunctionMapper getFunctionMapper() {
- // TODO Auto-generated method stub
- return null;
+
+ // TODO Auto-generated method stub
+ return null;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see javax.el.ELContext#getVariableMapper()
*/
@Override
public VariableMapper getVariableMapper() {
- // TODO Auto-generated method stub
- return null;
+
+ // TODO Auto-generated method stub
+ return null;
}
-
}
Modified: root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockELContext2.java
===================================================================
--- root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockELContext2.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockELContext2.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -1,5 +1,6 @@
+
/**
- *
+ *
*/
package org.ajax4jsf.tests;
@@ -7,6 +8,7 @@
import javax.el.ELResolver;
import javax.el.FunctionMapper;
import javax.el.VariableMapper;
+
import javax.faces.context.FacesContext;
import com.sun.facelets.FaceletContext;
@@ -16,40 +18,45 @@
*
*/
public class MockELContext2 extends ELContext {
+ private FacesContext faces;
- private FacesContext faces;
- /**
- *
- */
- public MockELContext2(FacesContext context) {
- faces = context;
- }
+ /**
+ *
+ */
+ public MockELContext2(FacesContext context) {
+ faces = context;
+ }
- /* (non-Javadoc)
- * @see javax.el.ELContext#getELResolver()
- */
- @Override
- public ELResolver getELResolver() {
- // TODO Auto-generated method stub
- return null;
- }
+ /*
+ * (non-Javadoc)
+ * @see javax.el.ELContext#getELResolver()
+ */
+ @Override
+ public ELResolver getELResolver() {
- /* (non-Javadoc)
- * @see javax.el.ELContext#getFunctionMapper()
- */
- @Override
- public FunctionMapper getFunctionMapper() {
- // TODO Auto-generated method stub
- return null;
- }
+ // TODO Auto-generated method stub
+ return null;
+ }
- /* (non-Javadoc)
- * @see javax.el.ELContext#getVariableMapper()
- */
- @Override
- public VariableMapper getVariableMapper() {
- // TODO Auto-generated method stub
- return null;
- }
+ /*
+ * (non-Javadoc)
+ * @see javax.el.ELContext#getFunctionMapper()
+ */
+ @Override
+ public FunctionMapper getFunctionMapper() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see javax.el.ELContext#getVariableMapper()
+ */
+ @Override
+ public VariableMapper getVariableMapper() {
+
+ // TODO Auto-generated method stub
+ return null;
+ }
}
Modified: root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockExternalContext.java
===================================================================
--- root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockExternalContext.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockExternalContext.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -19,9 +19,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+
package org.ajax4jsf.tests;
import java.io.IOException;
+
import java.util.Collections;
import java.util.Comparator;
import java.util.Enumeration;
@@ -33,6 +36,7 @@
import java.util.TreeMap;
import javax.faces.FacesException;
+
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -45,112 +49,127 @@
*
*/
public class MockExternalContext extends MockExternalContext12 {
- /*
- * Realizes methods unimplemented by org.apache.shale.test.mock.MockExternalContext operations.
- *
- */
-
- private Map requestParameterValuesMap = null;
- private Map requestHeaderMap = null;
- private Map requestHeaderValuesMap = null;
- private Iterator requestParameterNamesIterator = null;
- private Set resourcePathsSet = null;
-
- public MockExternalContext(org.apache.shale.test.mock.MockExternalContext baseContext) {
- super((ServletContext)baseContext.getContext(),
- (HttpServletRequest)baseContext.getRequest(), (HttpServletResponse)baseContext.getResponse());
- }
-
- public Map getRequestParameterValuesMap() {
- if (null == requestParameterValuesMap) {
- requestParameterValuesMap = new HashMap();
- HttpServletRequest request = (HttpServletRequest)getRequest();
- for ( Enumeration e = request.getParameterNames(); e.hasMoreElements(); ) {
- String name = (String) e.nextElement();
- requestParameterValuesMap.put(name, request.getParameterValues(name));
- }
- }
- return Collections.unmodifiableMap(requestParameterValuesMap);
- }
-
- public void dispatch(String requestURI)
- throws IOException, FacesException {
- //TODO hans, should be implemented
- super.dispatch(requestURI);
- }
-
- public Map getRequestHeaderMap() {
- if (null == requestHeaderMap) {
- requestHeaderMap = new TreeMap(CASE_INSENSITIVE_COMPARATOR);
-
- HttpServletRequest request = (HttpServletRequest)getRequest();
- for ( Enumeration e = request.getHeaderNames(); e.hasMoreElements(); ) {
- String name = (String) e.nextElement();
- requestHeaderMap.put(name, request.getHeader(name));
- }
- }
- return Collections.unmodifiableMap(requestHeaderMap);
- }
-
- public Map getRequestHeaderValuesMap() {
- if (null == requestHeaderValuesMap) {
- requestHeaderValuesMap = new TreeMap(CASE_INSENSITIVE_COMPARATOR);
-
- HttpServletRequest request = (HttpServletRequest)getRequest();
- for ( Enumeration e = request.getHeaderNames(); e.hasMoreElements(); ) {
- String name = (String) e.nextElement();
- requestHeaderValuesMap.put(name, EnumerationUtils.toList(request.getHeaders(name)).toArray());
- }
- }
- return Collections.unmodifiableMap(requestHeaderValuesMap);
- }
-
- public Iterator getRequestParameterNames() {
- if (null == requestParameterNamesIterator) {
- requestParameterNamesIterator = getRequestParameterValuesMap().keySet().iterator();
- }
- return requestParameterNamesIterator;
- }
-
- /**
- * <p>Add the specified request parameter for this request.</p>
- *
- * @param key Parameter name
- * @param value Parameter value
- */
- public void addRequestParameterMap(String key, String value) {
- super.addRequestParameterMap(key, value);
-
- String [] currentValue = (String[]) getRequestParameterValuesMap().get(key);
- if (null == currentValue) {
- requestParameterValuesMap.put(key, new String[] { value });
- } else {
- String [] newArray = new String [currentValue.length + 1];
- System.arraycopy(currentValue, 0, newArray, 0, currentValue.length);
- newArray[currentValue.length] = value;
- requestParameterValuesMap.put(key, newArray);
- }
- }
-
- public Set getResourcePaths(String path) {
- // TODO hans, should be implemented
- if (null == resourcePathsSet) {
- resourcePathsSet = new HashSet();
- }
- return resourcePathsSet;
- }
-
- public void redirect(String requestURI) throws IOException {
- // TODO hans, should be implemented
- super.redirect(requestURI);
- }
-
- protected final static Comparator CASE_INSENSITIVE_COMPARATOR = new Comparator() {
- public int compare(Object arg0, Object arg1) {
- String s0 = ( String ) arg0;
- String s1 = ( String ) arg1;
- return s0.toUpperCase().compareTo(s1.toUpperCase());
- }
- };
-
+ protected final static Comparator CASE_INSENSITIVE_COMPARATOR = new Comparator() {
+ public int compare(Object arg0, Object arg1) {
+ String s0 = (String) arg0;
+ String s1 = (String) arg1;
+
+ return s0.toUpperCase().compareTo(s1.toUpperCase());
+ }
+ };
+ private Map requestHeaderMap = null;
+ private Map requestHeaderValuesMap = null;
+ private Iterator requestParameterNamesIterator = null;
+
+ /*
+ * Realizes methods unimplemented by org.apache.shale.test.mock.MockExternalContext operations.
+ *
+ */
+ private Map requestParameterValuesMap = null;
+ private Set resourcePathsSet = null;
+
+ public MockExternalContext(org.apache.shale.test.mock.MockExternalContext baseContext) {
+ super((ServletContext) baseContext.getContext(), (HttpServletRequest) baseContext.getRequest(),
+ (HttpServletResponse) baseContext.getResponse());
+ }
+
+ public Map getRequestParameterValuesMap() {
+ if (null == requestParameterValuesMap) {
+ requestParameterValuesMap = new HashMap();
+
+ HttpServletRequest request = (HttpServletRequest) getRequest();
+
+ for (Enumeration e = request.getParameterNames(); e.hasMoreElements(); ) {
+ String name = (String) e.nextElement();
+
+ requestParameterValuesMap.put(name, request.getParameterValues(name));
+ }
+ }
+
+ return Collections.unmodifiableMap(requestParameterValuesMap);
+ }
+
+ public void dispatch(String requestURI) throws IOException, FacesException {
+
+ // TODO hans, should be implemented
+ super.dispatch(requestURI);
+ }
+
+ public Map getRequestHeaderMap() {
+ if (null == requestHeaderMap) {
+ requestHeaderMap = new TreeMap(CASE_INSENSITIVE_COMPARATOR);
+
+ HttpServletRequest request = (HttpServletRequest) getRequest();
+
+ for (Enumeration e = request.getHeaderNames(); e.hasMoreElements(); ) {
+ String name = (String) e.nextElement();
+
+ requestHeaderMap.put(name, request.getHeader(name));
+ }
+ }
+
+ return Collections.unmodifiableMap(requestHeaderMap);
+ }
+
+ public Map getRequestHeaderValuesMap() {
+ if (null == requestHeaderValuesMap) {
+ requestHeaderValuesMap = new TreeMap(CASE_INSENSITIVE_COMPARATOR);
+
+ HttpServletRequest request = (HttpServletRequest) getRequest();
+
+ for (Enumeration e = request.getHeaderNames(); e.hasMoreElements(); ) {
+ String name = (String) e.nextElement();
+
+ requestHeaderValuesMap.put(name, EnumerationUtils.toList(request.getHeaders(name)).toArray());
+ }
+ }
+
+ return Collections.unmodifiableMap(requestHeaderValuesMap);
+ }
+
+ public Iterator getRequestParameterNames() {
+ if (null == requestParameterNamesIterator) {
+ requestParameterNamesIterator = getRequestParameterValuesMap().keySet().iterator();
+ }
+
+ return requestParameterNamesIterator;
+ }
+
+ /**
+ * <p>Add the specified request parameter for this request.</p>
+ *
+ * @param key Parameter name
+ * @param value Parameter value
+ */
+ public void addRequestParameterMap(String key, String value) {
+ super.addRequestParameterMap(key, value);
+
+ String[] currentValue = (String[]) getRequestParameterValuesMap().get(key);
+
+ if (null == currentValue) {
+ requestParameterValuesMap.put(key, new String[] {value});
+ } else {
+ String[] newArray = new String[currentValue.length + 1];
+
+ System.arraycopy(currentValue, 0, newArray, 0, currentValue.length);
+ newArray[currentValue.length] = value;
+ requestParameterValuesMap.put(key, newArray);
+ }
+ }
+
+ public Set getResourcePaths(String path) {
+
+ // TODO hans, should be implemented
+ if (null == resourcePathsSet) {
+ resourcePathsSet = new HashSet();
+ }
+
+ return resourcePathsSet;
+ }
+
+ public void redirect(String requestURI) throws IOException {
+
+ // TODO hans, should be implemented
+ super.redirect(requestURI);
+ }
}
Modified: root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockFaceletContext.java
===================================================================
--- root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockFaceletContext.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockFaceletContext.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -19,10 +19,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+
package org.ajax4jsf.tests;
import java.io.IOException;
+
import java.net.URL;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -35,6 +39,7 @@
import javax.el.FunctionMapper;
import javax.el.ValueExpression;
import javax.el.VariableMapper;
+
import javax.faces.FacesException;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -47,145 +52,151 @@
* @author Nick Belaevski
* @since 3.2.2
*/
-
public class MockFaceletContext extends FaceletContext {
+ private Map<String, Integer> ids = new HashMap<String, Integer>();
+ private FacesContext context;
+ private ELResolver elResolver;
+ private FunctionMapper functionMapper;
+ private List<TemplateClient> templateClients;
+ private VariableMapper variableMapper;
- private FacesContext context;
- private FunctionMapper functionMapper;
- private VariableMapper variableMapper;
- private ELResolver elResolver;
-
- private List<TemplateClient> templateClients;
- private Map<String, Integer> ids = new HashMap<String, Integer>();
-
- public List<TemplateClient> getTemplateClients() {
- return templateClients;
- }
+ public MockFaceletContext(FacesContext context) {
+ super();
+ this.context = context;
+ this.templateClients = new ArrayList<TemplateClient>();
- public void setTemplateClients(List<TemplateClient> templateClients) {
- this.templateClients = templateClients;
- }
+ ELContext elContext = context.getELContext();
- public MockFaceletContext(FacesContext context) {
- super();
- this.context = context;
- this.templateClients = new ArrayList<TemplateClient>();
+ this.elResolver = elContext.getELResolver();
+ this.functionMapper = elContext.getFunctionMapper();
+ this.variableMapper = elContext.getVariableMapper();
+ }
- ELContext elContext = context.getELContext();
- this.elResolver = elContext.getELResolver();
- this.functionMapper = elContext.getFunctionMapper();
- this.variableMapper = elContext.getVariableMapper();
- }
+ public List<TemplateClient> getTemplateClients() {
+ return templateClients;
+ }
- @Override
- public String generateUniqueId(String base) {
- Integer cnt = (Integer) this.ids .get(base);
+ public void setTemplateClients(List<TemplateClient> templateClients) {
+ this.templateClients = templateClients;
+ }
+
+ @Override
+ public String generateUniqueId(String base) {
+ Integer cnt = (Integer) this.ids.get(base);
+
if (cnt == null) {
this.ids.put(base, new Integer(0));
+
return base;
} else {
int i = cnt.intValue() + 1;
+
this.ids.put(base, new Integer(i));
+
return base + "_" + i;
}
- }
+ }
- @Override
- public ExpressionFactory getExpressionFactory() {
- return context.getApplication().getExpressionFactory();
- }
+ @Override
+ public ExpressionFactory getExpressionFactory() {
+ return context.getApplication().getExpressionFactory();
+ }
- @Override
- public FacesContext getFacesContext() {
- return context;
- }
+ @Override
+ public FacesContext getFacesContext() {
+ return context;
+ }
- @Override
- public boolean includeDefinition(UIComponent parent, String name)
- throws IOException, FaceletException, FacesException, ELException {
- // TODO Auto-generated method stub
- throw new UnsupportedOperationException();
- }
+ @Override
+ public boolean includeDefinition(UIComponent parent, String name)
+ throws IOException, FaceletException, FacesException, ELException {
- @Override
- public void includeFacelet(UIComponent parent, String relativePath)
- throws IOException, FaceletException, FacesException, ELException {
- // TODO Auto-generated method stub
- throw new UnsupportedOperationException();
- }
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException();
+ }
- @Override
- public void includeFacelet(UIComponent parent, URL absolutePath)
- throws IOException, FaceletException, FacesException, ELException {
- // TODO Auto-generated method stub
- throw new UnsupportedOperationException();
- }
+ @Override
+ public void includeFacelet(UIComponent parent, String relativePath)
+ throws IOException, FaceletException, FacesException, ELException {
- @Override
- public void popClient(TemplateClient client) {
- if (this.templateClients.isEmpty()) {
- throw new IllegalArgumentException();
- }
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException();
+ }
- this.templateClients.remove(client);
- }
+ @Override
+ public void includeFacelet(UIComponent parent, URL absolutePath)
+ throws IOException, FaceletException, FacesException, ELException {
- @Override
- public void pushClient(TemplateClient client) {
- this.templateClients.add(0, client);
- }
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException();
+ }
- @Override
- public void extendClient(TemplateClient client) {
- this.templateClients.add(client);
- }
+ @Override
+ public void popClient(TemplateClient client) {
+ if (this.templateClients.isEmpty()) {
+ throw new IllegalArgumentException();
+ }
- @Override
- public Object getAttribute(String name) {
+ this.templateClients.remove(client);
+ }
+
+ @Override
+ public void pushClient(TemplateClient client) {
+ this.templateClients.add(0, client);
+ }
+
+ @Override
+ public void extendClient(TemplateClient client) {
+ this.templateClients.add(client);
+ }
+
+ @Override
+ public Object getAttribute(String name) {
if (this.variableMapper != null) {
ValueExpression ve = this.variableMapper.resolveVariable(name);
+
if (ve != null) {
return ve.getValue(this);
}
}
+
return null;
- }
+ }
- @Override
- public void setAttribute(String name, Object value) {
+ @Override
+ public void setAttribute(String name, Object value) {
if (this.variableMapper != null) {
if (value == null) {
this.variableMapper.setVariable(name, null);
} else {
- this.variableMapper.setVariable(name, this.getExpressionFactory()
- .createValueExpression(value, Object.class));
+ this.variableMapper.setVariable(name,
+ this.getExpressionFactory().createValueExpression(value, Object.class));
}
}
- }
+ }
- @Override
- public void setFunctionMapper(FunctionMapper fnMapper) {
- this.functionMapper = fnMapper;
- }
+ @Override
+ public void setFunctionMapper(FunctionMapper fnMapper) {
+ this.functionMapper = fnMapper;
+ }
- @Override
- public void setVariableMapper(VariableMapper varMapper) {
- this.variableMapper = varMapper;
- }
+ @Override
+ public void setVariableMapper(VariableMapper varMapper) {
+ this.variableMapper = varMapper;
+ }
- @Override
- public ELResolver getELResolver() {
- return this.elResolver;
- }
+ @Override
+ public ELResolver getELResolver() {
+ return this.elResolver;
+ }
- @Override
- public FunctionMapper getFunctionMapper() {
- return this.functionMapper;
- }
+ @Override
+ public FunctionMapper getFunctionMapper() {
+ return this.functionMapper;
+ }
- @Override
- public VariableMapper getVariableMapper() {
- return this.variableMapper;
- }
-
+ @Override
+ public VariableMapper getVariableMapper() {
+ return this.variableMapper;
+ }
}
Modified: root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockFacesResourceContext.java
===================================================================
--- root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockFacesResourceContext.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockFacesResourceContext.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -18,6 +18,9 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+
+
package org.ajax4jsf.tests;
import java.util.ArrayList;
@@ -29,6 +32,7 @@
import javax.faces.context.FacesContext;
import org.ajax4jsf.resource.FacesResourceContext;
+
import org.apache.shale.test.mock.MockHttpServletResponse;
import com.gargoylesoftware.htmlunit.KeyValuePair;
@@ -36,68 +40,67 @@
/**
* @author Nick - mailto:nbelaevski at exadel.com
* created 03.04.2007
- *
+ *
*/
public class MockFacesResourceContext extends FacesResourceContext {
- private String contentType;
- //used to encode headers properly
- private MockHttpServletResponse mockResponse = new MockHttpServletResponse();
- private Set headerSet = new LinkedHashSet();
- private Integer contentLength;
-
- public void setContentType(String contentType) {
- this.contentType = contentType;
- }
+ // used to encode headers properly
+ private MockHttpServletResponse mockResponse = new MockHttpServletResponse();
+ private Set headerSet = new LinkedHashSet();
+ private Integer contentLength;
+ private String contentType;
- public String getContentType() {
- return contentType;
- }
-
- public void setContentLength(int contentLength) {
- this.contentLength = contentLength;
- }
-
- public int getContentLength() {
- if (contentLength == null) {
- throw new IllegalStateException("Content length hasn't been set yet!");
- }
-
- return contentLength.intValue();
- }
-
- public void setDateHeader(String name, long value) {
- headerSet.add(name);
- mockResponse.setDateHeader(name, value);
- }
+ public MockFacesResourceContext(FacesContext facesContext) {
+ super(facesContext);
+ }
- public void setHeader(String name, String value) {
- headerSet.add(name);
- mockResponse.setHeader(name, value);
- }
+ public void setContentType(String contentType) {
+ this.contentType = contentType;
+ }
- public void setIntHeader(String name, int value) {
- headerSet.add(name);
- mockResponse.setIntHeader(name, value);
- }
+ public String getContentType() {
+ return contentType;
+ }
- public List getHeaders() {
- List headers = new ArrayList();
- for (Iterator iterator = headerSet.iterator(); iterator
- .hasNext();) {
- String headerName = (String) iterator.next();
-
- String headerValue = mockResponse.getHeader(headerName);
- if (headerValue != null) {
- headers.add(new KeyValuePair(headerName, headerValue));
- }
- }
+ public void setContentLength(int contentLength) {
+ this.contentLength = contentLength;
+ }
- return headers;
- }
-
- public MockFacesResourceContext(FacesContext facesContext) {
- super(facesContext);
- }
+ public int getContentLength() {
+ if (contentLength == null) {
+ throw new IllegalStateException("Content length hasn't been set yet!");
+ }
+ return contentLength.intValue();
+ }
+
+ public void setDateHeader(String name, long value) {
+ headerSet.add(name);
+ mockResponse.setDateHeader(name, value);
+ }
+
+ public void setHeader(String name, String value) {
+ headerSet.add(name);
+ mockResponse.setHeader(name, value);
+ }
+
+ public void setIntHeader(String name, int value) {
+ headerSet.add(name);
+ mockResponse.setIntHeader(name, value);
+ }
+
+ public List getHeaders() {
+ List headers = new ArrayList();
+
+ for (Iterator iterator = headerSet.iterator(); iterator.hasNext(); ) {
+ String headerName = (String) iterator.next();
+ String headerValue = mockResponse.getHeader(headerName);
+
+ if (headerValue != null) {
+ headers.add(new KeyValuePair(headerName, headerValue));
+ }
+ }
+
+ return headers;
+ }
}
Modified: root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockMethodBinding.java
===================================================================
--- root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockMethodBinding.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockMethodBinding.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+
package org.ajax4jsf.tests;
import java.util.ArrayList;
@@ -32,56 +34,54 @@
/**
* @author Nick - mailto:nbelaevski at exadel.com
* created 09.04.2007
- *
+ *
*/
public class MockMethodBinding extends MethodBinding {
+ private List invocationArgs = new ArrayList();
+ private MethodResult result;
+ private Class returnType;
- private Class returnType;
- private MethodResult result;
-
- private List invocationArgs = new ArrayList();
+ public MockMethodBinding() {
+ this(null, null);
+ }
- public static interface MethodResult {
- public Object invoke(FacesContext facesContext, Object[] args, Class returnType);
- }
-
- public MockMethodBinding() {
- this(null, null);
- }
-
- public MockMethodBinding(Class returnType, MethodResult result) {
- super();
- this.returnType = returnType;
- this.result = result;
- }
+ public MockMethodBinding(Class returnType, MethodResult result) {
+ super();
+ this.returnType = returnType;
+ this.result = result;
+ }
- public Class getType(FacesContext context) throws MethodNotFoundException {
- if (context == null) {
- throw new NullPointerException();
- }
-
- return returnType;
- }
+ public Class getType(FacesContext context) throws MethodNotFoundException {
+ if (context == null) {
+ throw new NullPointerException();
+ }
- public Object invoke(FacesContext context, Object[] params)
- throws EvaluationException, MethodNotFoundException {
- if (context == null) {
- throw new NullPointerException();
- }
-
- invocationArgs.add(params);
- if (result != null) {
- return result.invoke(context, params, returnType);
- }
-
- return null;
- }
+ return returnType;
+ }
- public void clear() {
- invocationArgs.clear();
- }
-
- public Object[][] getInvocationArgs() {
- return (Object[][]) invocationArgs.toArray(new Object[invocationArgs.size()][]);
- }
+ public Object invoke(FacesContext context, Object[] params) throws EvaluationException, MethodNotFoundException {
+ if (context == null) {
+ throw new NullPointerException();
+ }
+
+ invocationArgs.add(params);
+
+ if (result != null) {
+ return result.invoke(context, params, returnType);
+ }
+
+ return null;
+ }
+
+ public void clear() {
+ invocationArgs.clear();
+ }
+
+ public Object[][] getInvocationArgs() {
+ return (Object[][]) invocationArgs.toArray(new Object[invocationArgs.size()][]);
+ }
+
+ public static interface MethodResult {
+ public Object invoke(FacesContext facesContext, Object[] args, Class returnType);
+ }
}
Modified: root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockMethodExpression.java
===================================================================
--- root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockMethodExpression.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockMethodExpression.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -1,5 +1,6 @@
+
/**
- *
+ *
*/
package org.ajax4jsf.tests;
@@ -17,98 +18,110 @@
*/
@SuppressWarnings("serial")
public class MockMethodExpression extends MethodExpression {
+ private List<Object[]> invocationArgs = new ArrayList<Object[]>();
+ private String expressionString;
- public static interface MethodExpressionInvocationResult {
- public Object invoke(ELContext context, Object ... arguments);
- }
-
- //private Class<?> returnType;
- private MethodExpressionInvocationResult result;
- private String expressionString;
- private List<Object[]> invocationArgs = new ArrayList<Object[]>();
+ // private Class<?> returnType;
+ private MethodExpressionInvocationResult result;
-
-
-
- public MockMethodExpression(String expressionString, Class<?> returnType,
- MethodExpressionInvocationResult result) {
- super();
- this.expressionString = expressionString;
- //this.returnType = returnType;
- this.result = result;
- }
+ public MockMethodExpression(String expressionString, Class<?> returnType, MethodExpressionInvocationResult result) {
+ super();
+ this.expressionString = expressionString;
- /* (non-Javadoc)
- * @see javax.el.MethodExpression#getMethodInfo(javax.el.ELContext)
- */
- @Override
- public MethodInfo getMethodInfo(ELContext context) {
- return null;
- }
+ // this.returnType = returnType;
+ this.result = result;
+ }
- /* (non-Javadoc)
- * @see javax.el.MethodExpression#invoke(javax.el.ELContext, java.lang.Object[])
- */
- @Override
- public Object invoke(ELContext context, Object[] params) {
- invocationArgs.add(params);
- Object returnValue = null;
- if (result != null) {
- returnValue = result.invoke(context, params);
- }
- return returnValue;
- }
+ /*
+ * (non-Javadoc)
+ * @see javax.el.MethodExpression#getMethodInfo(javax.el.ELContext)
+ */
+ @Override
+ public MethodInfo getMethodInfo(ELContext context) {
+ return null;
+ }
- /* (non-Javadoc)
- * @see javax.el.Expression#equals(java.lang.Object)
- */
- @Override
- public boolean equals(Object obj) {
- if (obj instanceof MethodExpression) {
- MethodExpression expression = (MethodExpression) obj;
- return expressionString != null && expression.getExpressionString() != null && expressionString.equals(expression.getExpressionString());
- }
- return false;
- }
+ /*
+ * (non-Javadoc)
+ * @see javax.el.MethodExpression#invoke(javax.el.ELContext, java.lang.Object[])
+ */
+ @Override
+ public Object invoke(ELContext context, Object[] params) {
+ invocationArgs.add(params);
- /* (non-Javadoc)
- * @see javax.el.Expression#getExpressionString()
- */
- @Override
- public String getExpressionString() {
- return expressionString;
- }
+ Object returnValue = null;
- /* (non-Javadoc)
- * @see javax.el.Expression#hashCode()
- */
- @Override
- public int hashCode() {
- return expressionString == null ? 0 : expressionString.hashCode();
- }
+ if (result != null) {
+ returnValue = result.invoke(context, params);
+ }
- /* (non-Javadoc)
- * @see javax.el.Expression#isLiteralText()
- */
- @Override
- public boolean isLiteralText() {
- // TODO Auto-generated method stub
- return expressionString != null && !(expressionString.contains("${") || expressionString.contains("#{"));
- }
+ return returnValue;
+ }
- public List<Object[]> getInvocationArgs() {
- return invocationArgs;
- }
+ /*
+ * (non-Javadoc)
+ * @see javax.el.Expression#equals(java.lang.Object)
+ */
+ @Override
+ public boolean equals(Object obj) {
+ if (obj instanceof MethodExpression) {
+ MethodExpression expression = (MethodExpression) obj;
- public void reset() {
- invocationArgs.clear();
- }
-
- public boolean lastInvocationMatched(Object ...objects) {
- if (!invocationArgs.isEmpty()) {
- Object[] argz = invocationArgs.get(invocationArgs.size() - 1);
- return Arrays.equals(objects, argz);
- }
- return false;
- }
+ return expressionString != null && expression.getExpressionString() != null
+ && expressionString.equals(expression.getExpressionString());
+ }
+
+ return false;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see javax.el.Expression#getExpressionString()
+ */
+ @Override
+ public String getExpressionString() {
+ return expressionString;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see javax.el.Expression#hashCode()
+ */
+ @Override
+ public int hashCode() {
+ return expressionString == null ? 0 : expressionString.hashCode();
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see javax.el.Expression#isLiteralText()
+ */
+ @Override
+ public boolean isLiteralText() {
+
+ // TODO Auto-generated method stub
+ return expressionString != null && !(expressionString.contains("${") || expressionString.contains("#{"));
+ }
+
+ public List<Object[]> getInvocationArgs() {
+ return invocationArgs;
+ }
+
+ public void reset() {
+ invocationArgs.clear();
+ }
+
+ public boolean lastInvocationMatched(Object... objects) {
+ if (!invocationArgs.isEmpty()) {
+ Object[] argz = invocationArgs.get(invocationArgs.size() - 1);
+
+ return Arrays.equals(objects, argz);
+ }
+
+ return false;
+ }
+
+ public static interface MethodExpressionInvocationResult {
+ public Object invoke(ELContext context, Object... arguments);
+ }
}
Modified: root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockPageContext.java
===================================================================
--- root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockPageContext.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockPageContext.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -1,15 +1,17 @@
+
/*
- * PageContextMock.java Date created: 14.12.2007
- * Last modified by: $Author$
- * $Revision$ $Date$
+* PageContextMock.java Date created: 14.12.2007
+* Last modified by: $Author$
+* $Revision$ $Date$
*/
-
package org.ajax4jsf.tests;
import java.io.IOException;
+
import java.util.Enumeration;
import javax.el.ELContext;
+
import javax.servlet.Servlet;
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
@@ -28,428 +30,435 @@
*
*/
public class MockPageContext extends PageContext {
+ private ELContext ELContext;
-
- private ELContext ELContext;
-
-
-
/**
* TODO Description goes here.
*/
public MockPageContext() {
- super();
- ELContext = new MockELContext();
- // TODO Auto-generated constructor stub
+ super();
+ ELContext = new MockELContext();
+
+ // TODO Auto-generated constructor stub
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see javax.servlet.jsp.PageContext#forward(java.lang.String)
*/
@Override
- public void forward(String relativeUrlPath) throws ServletException,
- IOException {
- // TODO Auto-generated method stub
+ public void forward(String relativeUrlPath) throws ServletException, IOException {
+ // TODO Auto-generated method stub
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see javax.servlet.jsp.PageContext#getException()
*/
@Override
public Exception getException() {
- // TODO Auto-generated method stub
- return null;
+
+ // TODO Auto-generated method stub
+ return null;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see javax.servlet.jsp.PageContext#getPage()
*/
@Override
public Object getPage() {
- // TODO Auto-generated method stub
- return null;
+
+ // TODO Auto-generated method stub
+ return null;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see javax.servlet.jsp.PageContext#getRequest()
*/
@Override
public ServletRequest getRequest() {
- // TODO Auto-generated method stub
- return null;
+
+ // TODO Auto-generated method stub
+ return null;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see javax.servlet.jsp.PageContext#getResponse()
*/
@Override
public ServletResponse getResponse() {
- // TODO Auto-generated method stub
- return null;
+
+ // TODO Auto-generated method stub
+ return null;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see javax.servlet.jsp.PageContext#getServletConfig()
*/
@Override
public ServletConfig getServletConfig() {
- // TODO Auto-generated method stub
- return null;
+
+ // TODO Auto-generated method stub
+ return null;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see javax.servlet.jsp.PageContext#getServletContext()
*/
@Override
public ServletContext getServletContext() {
- // TODO Auto-generated method stub
- return null;
+
+ // TODO Auto-generated method stub
+ return null;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see javax.servlet.jsp.PageContext#getSession()
*/
@Override
public HttpSession getSession() {
- // TODO Auto-generated method stub
- return null;
+
+ // TODO Auto-generated method stub
+ return null;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see javax.servlet.jsp.PageContext#handlePageException(java.lang.Exception)
*/
@Override
- public void handlePageException(Exception e) throws ServletException,
- IOException {
- // TODO Auto-generated method stub
+ public void handlePageException(Exception e) throws ServletException, IOException {
+ // TODO Auto-generated method stub
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see javax.servlet.jsp.PageContext#handlePageException(java.lang.Throwable)
*/
@Override
- public void handlePageException(Throwable t) throws ServletException,
- IOException {
- // TODO Auto-generated method stub
+ public void handlePageException(Throwable t) throws ServletException, IOException {
+ // TODO Auto-generated method stub
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see javax.servlet.jsp.PageContext#include(java.lang.String)
*/
@Override
- public void include(String relativeUrlPath) throws ServletException,
- IOException {
- // TODO Auto-generated method stub
+ public void include(String relativeUrlPath) throws ServletException, IOException {
+ // TODO Auto-generated method stub
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see javax.servlet.jsp.PageContext#include(java.lang.String, boolean)
*/
@Override
- public void include(String relativeUrlPath, boolean flush)
- throws ServletException, IOException {
- // TODO Auto-generated method stub
+ public void include(String relativeUrlPath, boolean flush) throws ServletException, IOException {
+ // TODO Auto-generated method stub
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see javax.servlet.jsp.PageContext#initialize(javax.servlet.Servlet, javax.servlet.ServletRequest, javax.servlet.ServletResponse, java.lang.String, boolean, int, boolean)
*/
@Override
- public void initialize(Servlet servlet, ServletRequest request,
- ServletResponse response, String errorPageURL,
- boolean needsSession, int bufferSize, boolean autoFlush)
- throws IOException, IllegalStateException, IllegalArgumentException {
- // TODO Auto-generated method stub
+ public void initialize(Servlet servlet, ServletRequest request, ServletResponse response, String errorPageURL,
+ boolean needsSession, int bufferSize, boolean autoFlush)
+ throws IOException, IllegalStateException, IllegalArgumentException {
+ // TODO Auto-generated method stub
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see javax.servlet.jsp.PageContext#release()
*/
@Override
public void release() {
- // TODO Auto-generated method stub
+ // TODO Auto-generated method stub
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see javax.servlet.jsp.JspContext#findAttribute(java.lang.String)
*/
@Override
public Object findAttribute(String name) {
- // TODO Auto-generated method stub
- return null;
+
+ // TODO Auto-generated method stub
+ return null;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see javax.servlet.jsp.JspContext#getAttribute(java.lang.String)
*/
@Override
public Object getAttribute(String name) {
- // TODO Auto-generated method stub
- return null;
+
+ // TODO Auto-generated method stub
+ return null;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see javax.servlet.jsp.JspContext#getAttribute(java.lang.String, int)
*/
@Override
public Object getAttribute(String name, int scope) {
- // TODO Auto-generated method stub
- return null;
+
+ // TODO Auto-generated method stub
+ return null;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see javax.servlet.jsp.JspContext#getAttributeNamesInScope(int)
*/
@Override
public Enumeration<String> getAttributeNamesInScope(int scope) {
- // TODO Auto-generated method stub
- return null;
+
+ // TODO Auto-generated method stub
+ return null;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see javax.servlet.jsp.JspContext#getAttributesScope(java.lang.String)
*/
@Override
public int getAttributesScope(String name) {
- // TODO Auto-generated method stub
- return 0;
+
+ // TODO Auto-generated method stub
+ return 0;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see javax.servlet.jsp.JspContext#getELContext()
*/
@Override
public ELContext getELContext() {
- // TODO Auto-generated method stub
- return this.ELContext;
+
+ // TODO Auto-generated method stub
+ return this.ELContext;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see javax.servlet.jsp.JspContext#getExpressionEvaluator()
*/
@Override
public ExpressionEvaluator getExpressionEvaluator() {
- // TODO Auto-generated method stub
- return null;
+
+ // TODO Auto-generated method stub
+ return null;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see javax.servlet.jsp.JspContext#getOut()
*/
@Override
public JspWriter getOut() {
- // TODO Auto-generated method stub
- return new JspWriter(0, false) {
- @Override
- public void clear() throws IOException {
- // TODO Auto-generated method stub
-
- }
+ // TODO Auto-generated method stub
+ return new JspWriter(0, false) {
+ @Override
+ public void clear() throws IOException {
- @Override
- public void clearBuffer() throws IOException {
- // TODO Auto-generated method stub
-
- }
+ // TODO Auto-generated method stub
+ }
+ @Override
+ public void clearBuffer() throws IOException {
- @Override
- public void close() throws IOException {
- // TODO Auto-generated method stub
-
- }
+ // TODO Auto-generated method stub
+ }
+ @Override
+ public void close() throws IOException {
- @Override
- public void flush() throws IOException {
- // TODO Auto-generated method stub
-
- }
+ // TODO Auto-generated method stub
+ }
+ @Override
+ public void flush() throws IOException {
- @Override
- public int getRemaining() {
- // TODO Auto-generated method stub
- return 0;
- }
+ // TODO Auto-generated method stub
+ }
+ @Override
+ public int getRemaining() {
- @Override
- public void newLine() throws IOException {
- // TODO Auto-generated method stub
-
- }
+ // TODO Auto-generated method stub
+ return 0;
+ }
+ @Override
+ public void newLine() throws IOException {
- @Override
- public void print(boolean b) throws IOException {
- // TODO Auto-generated method stub
-
- }
+ // TODO Auto-generated method stub
+ }
+ @Override
+ public void print(boolean b) throws IOException {
- @Override
- public void print(char c) throws IOException {
- // TODO Auto-generated method stub
-
- }
+ // TODO Auto-generated method stub
+ }
+ @Override
+ public void print(char c) throws IOException {
- @Override
- public void print(int i) throws IOException {
- // TODO Auto-generated method stub
-
- }
+ // TODO Auto-generated method stub
+ }
+ @Override
+ public void print(int i) throws IOException {
- @Override
- public void print(long l) throws IOException {
- // TODO Auto-generated method stub
-
- }
+ // TODO Auto-generated method stub
+ }
+ @Override
+ public void print(long l) throws IOException {
- @Override
- public void print(float f) throws IOException {
- // TODO Auto-generated method stub
-
- }
+ // TODO Auto-generated method stub
+ }
+ @Override
+ public void print(float f) throws IOException {
- @Override
- public void print(double d) throws IOException {
- // TODO Auto-generated method stub
-
- }
+ // TODO Auto-generated method stub
+ }
+ @Override
+ public void print(double d) throws IOException {
- @Override
- public void print(char[] s) throws IOException {
- // TODO Auto-generated method stub
-
- }
+ // TODO Auto-generated method stub
+ }
+ @Override
+ public void print(char[] s) throws IOException {
- @Override
- public void print(String s) throws IOException {
- // TODO Auto-generated method stub
-
- }
+ // TODO Auto-generated method stub
+ }
+ @Override
+ public void print(String s) throws IOException {
- @Override
- public void print(Object obj) throws IOException {
- // TODO Auto-generated method stub
-
- }
+ // TODO Auto-generated method stub
+ }
+ @Override
+ public void print(Object obj) throws IOException {
- @Override
- public void println() throws IOException {
- // TODO Auto-generated method stub
-
- }
+ // TODO Auto-generated method stub
+ }
+ @Override
+ public void println() throws IOException {
- @Override
- public void println(boolean x) throws IOException {
- // TODO Auto-generated method stub
-
- }
+ // TODO Auto-generated method stub
+ }
+ @Override
+ public void println(boolean x) throws IOException {
- @Override
- public void println(char x) throws IOException {
- // TODO Auto-generated method stub
-
- }
+ // TODO Auto-generated method stub
+ }
+ @Override
+ public void println(char x) throws IOException {
- @Override
- public void println(int x) throws IOException {
- // TODO Auto-generated method stub
-
- }
+ // TODO Auto-generated method stub
+ }
+ @Override
+ public void println(int x) throws IOException {
- @Override
- public void println(long x) throws IOException {
- // TODO Auto-generated method stub
-
- }
+ // TODO Auto-generated method stub
+ }
+ @Override
+ public void println(long x) throws IOException {
- @Override
- public void println(float x) throws IOException {
- // TODO Auto-generated method stub
-
- }
+ // TODO Auto-generated method stub
+ }
+ @Override
+ public void println(float x) throws IOException {
- @Override
- public void println(double x) throws IOException {
- // TODO Auto-generated method stub
-
- }
+ // TODO Auto-generated method stub
+ }
+ @Override
+ public void println(double x) throws IOException {
- @Override
- public void println(char[] x) throws IOException {
- // TODO Auto-generated method stub
-
- }
+ // TODO Auto-generated method stub
+ }
+ @Override
+ public void println(char[] x) throws IOException {
- @Override
- public void println(String x) throws IOException {
- // TODO Auto-generated method stub
-
- }
+ // TODO Auto-generated method stub
+ }
+ @Override
+ public void println(String x) throws IOException {
- @Override
- public void println(Object x) throws IOException {
- // TODO Auto-generated method stub
-
- }
+ // TODO Auto-generated method stub
+ }
+ @Override
+ public void println(Object x) throws IOException {
- @Override
- public void write(char[] cbuf, int off, int len) throws IOException {
- // TODO Auto-generated method stub
-
- }
-
- };
+ // TODO Auto-generated method stub
+ }
+ @Override
+ public void write(char[] cbuf, int off, int len) throws IOException {
+
+ // TODO Auto-generated method stub
+ }
+ };
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see javax.servlet.jsp.JspContext#getVariableResolver()
*/
@Override
public VariableResolver getVariableResolver() {
- // TODO Auto-generated method stub
- return null;
+
+ // TODO Auto-generated method stub
+ return null;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see javax.servlet.jsp.JspContext#removeAttribute(java.lang.String)
*/
@Override
public void removeAttribute(String name) {
- // TODO Auto-generated method stub
+ // TODO Auto-generated method stub
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see javax.servlet.jsp.JspContext#removeAttribute(java.lang.String, int)
*/
@Override
public void removeAttribute(String name, int scope) {
- // TODO Auto-generated method stub
+ // TODO Auto-generated method stub
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see javax.servlet.jsp.JspContext#setAttribute(java.lang.String, java.lang.Object)
*/
@Override
public void setAttribute(String name, Object value) {
- // TODO Auto-generated method stub
+ // TODO Auto-generated method stub
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see javax.servlet.jsp.JspContext#setAttribute(java.lang.String, java.lang.Object, int)
*/
@Override
public void setAttribute(String name, Object value, int scope) {
- // TODO Auto-generated method stub
+ // TODO Auto-generated method stub
}
-
}
Modified: root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockRange.java
===================================================================
--- root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockRange.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockRange.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+
package org.ajax4jsf.tests;
import org.ajax4jsf.model.Range;
@@ -28,14 +30,13 @@
*
*/
public class MockRange implements Range {
-
- private int count;
+ private int count;
- public MockRange(int count) {
- this.count = count;
- }
+ public MockRange(int count) {
+ this.count = count;
+ }
- public int getCount(){
- return count;
- }
+ public int getCount() {
+ return count;
+ }
}
Modified: root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockSerializableDataModel.java
===================================================================
--- root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockSerializableDataModel.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockSerializableDataModel.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+
package org.ajax4jsf.tests;
import java.io.IOException;
@@ -34,67 +36,62 @@
*
*/
public class MockSerializableDataModel extends MockDataModel {
+ public SerializableDataModel getSerializableModel(Range range) {
+ MockRange mockRange = (MockRange) range;
+ SerializableDataModel model = new SerializableDataModel() {
+ public void update() {
- public SerializableDataModel getSerializableModel(Range range) {
- MockRange mockRange = (MockRange) range;
- SerializableDataModel model = new SerializableDataModel(){
+ // TODO Auto-generated method stub
+ }
+ public Object getRowKey() {
- public void update() {
- // TODO Auto-generated method stub
-
- }
+ // TODO Auto-generated method stub
+ return null;
+ }
+ public void setRowKey(Object key) {
- public Object getRowKey() {
- // TODO Auto-generated method stub
- return null;
- }
+ // TODO Auto-generated method stub
+ }
+ public void walk(FacesContext context, DataVisitor visitor, Range range, Object argument)
+ throws IOException {
- public void setRowKey(Object key) {
- // TODO Auto-generated method stub
-
- }
+ // TODO Auto-generated method stub
+ }
+ public int getRowCount() {
- public void walk(FacesContext context, DataVisitor visitor, Range range, Object argument) throws IOException {
- // TODO Auto-generated method stub
-
- }
+ // TODO Auto-generated method stub
+ return 0;
+ }
+ public Object getRowData() {
- public int getRowCount() {
- // TODO Auto-generated method stub
- return 0;
- }
+ // TODO Auto-generated method stub
+ return null;
+ }
+ public int getRowIndex() {
- public Object getRowData() {
- // TODO Auto-generated method stub
- return null;
- }
+ // TODO Auto-generated method stub
+ return 0;
+ }
+ public Object getWrappedData() {
- public int getRowIndex() {
- // TODO Auto-generated method stub
- return 0;
- }
+ // TODO Auto-generated method stub
+ return null;
+ }
+ public boolean isRowAvailable() {
- public Object getWrappedData() {
- // TODO Auto-generated method stub
- return null;
- }
+ // TODO Auto-generated method stub
+ return false;
+ }
+ public void setRowIndex(int arg0) {
- public boolean isRowAvailable() {
- // TODO Auto-generated method stub
- return false;
- }
+ // TODO Auto-generated method stub
+ }
+ public void setWrappedData(Object arg0) {
- public void setRowIndex(int arg0) {
- // TODO Auto-generated method stub
-
- }
+ // TODO Auto-generated method stub
+ }
+ };
- public void setWrappedData(Object arg0) {
- // TODO Auto-generated method stub
-
- }
-
- };
- return model;
- }
+ return model;
+ }
}
Modified: root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockUIComponent.java
===================================================================
--- root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockUIComponent.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockUIComponent.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -1,5 +1,6 @@
+
/**
- *
+ *
*/
package org.ajax4jsf.tests;
@@ -16,99 +17,101 @@
*
*/
public class MockUIComponent extends UIComponentBase {
+ private int runsBroadcast = 0;
+ private int runsDecode = 0;
+ private int runsInvokeOnComponent = 0;
+ private int runsProcessDecodes = 0;
+ private int runsProcessUpdates = 0;
+ private int runsProcessValidators = 0;
- private int runsProcessDecodes = 0;
- private int runsDecode = 0;
- private int runsBroadcast=0;
- private int runsInvokeOnComponent=0;
- private int runsProcessUpdates=0;
- private int runsProcessValidators=0;
-
- /**
- * @return the runsProcessDecodes
- */
- public int getRunsProcessDecodes() {
- return runsProcessDecodes;
- }
+ /**
+ * @return the runsProcessDecodes
+ */
+ public int getRunsProcessDecodes() {
+ return runsProcessDecodes;
+ }
- /**
- * @return the runsDecode
- */
- public int getRunsDecode() {
- return runsDecode;
- }
+ /**
+ * @return the runsDecode
+ */
+ public int getRunsDecode() {
+ return runsDecode;
+ }
- /**
- * @return the runsBroadcast
- */
- public int getRunsBroadcast() {
- return runsBroadcast;
- }
+ /**
+ * @return the runsBroadcast
+ */
+ public int getRunsBroadcast() {
+ return runsBroadcast;
+ }
- /**
- * @return the runsInvokeOnComponent
- */
- public int getRunsInvokeOnComponent() {
- return runsInvokeOnComponent;
- }
+ /**
+ * @return the runsInvokeOnComponent
+ */
+ public int getRunsInvokeOnComponent() {
+ return runsInvokeOnComponent;
+ }
- /**
- * @return the runsProcessUpdates
- */
- public int getRunsProcessUpdates() {
- return runsProcessUpdates;
- }
+ /**
+ * @return the runsProcessUpdates
+ */
+ public int getRunsProcessUpdates() {
+ return runsProcessUpdates;
+ }
- /**
- * @return the runsProcessValidators
- */
- public int getRunsProcessValidators() {
- return runsProcessValidators;
- }
+ /**
+ * @return the runsProcessValidators
+ */
+ public int getRunsProcessValidators() {
+ return runsProcessValidators;
+ }
- /* (non-Javadoc)
- * @see javax.faces.component.UIComponent#getFamily()
- */
- @Override
- public String getFamily() {
- // TODO Auto-generated method stub
- return "org.ajax4jsf.test";
- }
-
- @Override
- public void processDecodes(FacesContext context) {
- runsProcessDecodes++;
- super.processDecodes(context);
- }
+ /*
+ * (non-Javadoc)
+ * @see javax.faces.component.UIComponent#getFamily()
+ */
+ @Override
+ public String getFamily() {
- @Override
- public void decode(FacesContext context) {
- runsDecode++;
- super.decode(context);
- }
-
- @Override
- public void broadcast(FacesEvent event) throws AbortProcessingException {
- runsBroadcast++;
- super.broadcast(event);
- }
-
- @Override
- public boolean invokeOnComponent(FacesContext context, String clientId,
- ContextCallback callback) throws FacesException {
- runsInvokeOnComponent++;
- return super.invokeOnComponent(context, clientId, callback);
- }
-
- @Override
- public void processUpdates(FacesContext context) {
- runsProcessUpdates++;
- super.processUpdates(context);
- }
-
- @Override
- public void processValidators(FacesContext context) {
- runsProcessValidators++;
- super.processValidators(context);
- }
+ // TODO Auto-generated method stub
+ return "org.ajax4jsf.test";
+ }
+
+ @Override
+ public void processDecodes(FacesContext context) {
+ runsProcessDecodes++;
+ super.processDecodes(context);
+ }
+
+ @Override
+ public void decode(FacesContext context) {
+ runsDecode++;
+ super.decode(context);
+ }
+
+ @Override
+ public void broadcast(FacesEvent event) throws AbortProcessingException {
+ runsBroadcast++;
+ super.broadcast(event);
+ }
+
+ @Override
+ public boolean invokeOnComponent(FacesContext context, String clientId, ContextCallback callback)
+ throws FacesException {
+ runsInvokeOnComponent++;
+
+ return super.invokeOnComponent(context, clientId, callback);
+ }
+
+ @Override
+ public void processUpdates(FacesContext context) {
+ runsProcessUpdates++;
+ super.processUpdates(context);
+ }
+
+ @Override
+ public void processValidators(FacesContext context) {
+ runsProcessValidators++;
+ super.processValidators(context);
+ }
}
Modified: root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockUIInputRenderer.java
===================================================================
--- root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockUIInputRenderer.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockUIInputRenderer.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+
package org.ajax4jsf.tests;
import javax.faces.render.Renderer;
@@ -27,6 +29,4 @@
* @author shura
*
*/
-public class MockUIInputRenderer extends Renderer {
-
-}
+public class MockUIInputRenderer extends Renderer {}
Modified: root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockValueBinding.java
===================================================================
--- root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockValueBinding.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockValueBinding.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+
package org.ajax4jsf.tests;
import javax.faces.context.FacesContext;
@@ -29,46 +31,39 @@
/**
* @author Nick Belaevski - nbelaevski at exadel.com
* created 13.04.2007
- *
+ *
*/
public class MockValueBinding extends ValueBinding {
+ private Class clazz;
+ private Object value;
- private Class clazz;
- private Object value;
-
- public MockValueBinding(Object value, Class clazz) {
- super();
- this.clazz = clazz;
- this.value = value;
- }
+ public MockValueBinding(Object value, Class clazz) {
+ super();
+ this.clazz = clazz;
+ this.value = value;
+ }
- public Class getType(FacesContext context) throws EvaluationException,
- PropertyNotFoundException {
- return clazz;
- }
+ public Class getType(FacesContext context) throws EvaluationException, PropertyNotFoundException {
+ return clazz;
+ }
- public Object getValue(FacesContext context) throws EvaluationException,
- PropertyNotFoundException {
- if (context == null) {
- throw new NullPointerException();
- }
-
- return value;
- }
+ public Object getValue(FacesContext context) throws EvaluationException, PropertyNotFoundException {
+ if (context == null) {
+ throw new NullPointerException();
+ }
- public boolean isReadOnly(FacesContext context) throws EvaluationException,
- PropertyNotFoundException {
- return false;
- }
+ return value;
+ }
- public void setValue(FacesContext context, Object value)
- throws EvaluationException, PropertyNotFoundException {
+ public boolean isReadOnly(FacesContext context) throws EvaluationException, PropertyNotFoundException {
+ return false;
+ }
- if (context == null) {
- throw new NullPointerException();
- }
-
- this.value = value;
- }
+ public void setValue(FacesContext context, Object value) throws EvaluationException, PropertyNotFoundException {
+ if (context == null) {
+ throw new NullPointerException();
+ }
+ this.value = value;
+ }
}
Modified: root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockValueExpression.java
===================================================================
--- root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockValueExpression.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockValueExpression.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -1,9 +1,9 @@
+
/*
- * ValueExpressionMock.java Date created: 14.12.2007
- * Last modified by: $Author$
- * $Revision$ $Date$
+* ValueExpressionMock.java Date created: 14.12.2007
+* Last modified by: $Author$
+* $Revision$ $Date$
*/
-
package org.ajax4jsf.tests;
import javax.el.ELContext;
@@ -18,98 +18,121 @@
/** Object to returned by getValue method */
private Object o;
-
+
/**
* TODO Description goes here.
*/
public MockValueExpression(Object o) {
- this.o = o;
+ this.o = o;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see javax.el.ValueExpression#getExpectedType()
*/
@Override
public Class<?> getExpectedType() {
- // TODO Auto-generated method stub
- return Object.class;
+
+ // TODO Auto-generated method stub
+ return Object.class;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see javax.el.ValueExpression#getType(javax.el.ELContext)
*/
@Override
public Class<?> getType(ELContext context) {
- // TODO Auto-generated method stub
- return Object.class;
+
+ // TODO Auto-generated method stub
+ return Object.class;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see javax.el.ValueExpression#getValue(javax.el.ELContext)
*/
@Override
public Object getValue(ELContext context) {
- // TODO Auto-generated method stub
- return o;
+
+ // TODO Auto-generated method stub
+ return o;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see javax.el.ValueExpression#isReadOnly(javax.el.ELContext)
*/
@Override
public boolean isReadOnly(ELContext context) {
- // TODO Auto-generated method stub
- return false;
+
+ // TODO Auto-generated method stub
+ return false;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see javax.el.ValueExpression#setValue(javax.el.ELContext, java.lang.Object)
*/
@Override
public void setValue(ELContext context, Object value) {
- o = value;
-
+ o = value;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see javax.el.Expression#getExpressionString()
*/
@Override
public String getExpressionString() {
- // TODO Auto-generated method stub
- return o.toString();
+
+ // TODO Auto-generated method stub
+ return o.toString();
}
@Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((o == null) ? 0 : o.hashCode());
- return result;
- }
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- MockValueExpression other = (MockValueExpression) obj;
- if (o == null) {
- if (other.o != null)
- return false;
- } else if (!o.equals(other.o))
- return false;
- return true;
- }
+ result = prime * result + ((o == null) ? 0 : o.hashCode());
- /* (non-Javadoc)
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+
+ if (obj == null) {
+ return false;
+ }
+
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+
+ MockValueExpression other = (MockValueExpression) obj;
+
+ if (o == null) {
+ if (other.o != null) {
+ return false;
+ }
+ } else if (!o.equals(other.o)) {
+ return false;
+ }
+
+ return true;
+ }
+
+ /*
+ * (non-Javadoc)
* @see javax.el.Expression#isLiteralText()
*/
@Override
public boolean isLiteralText() {
- return false;
+ return false;
}
}
Modified: root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockViewHandler.java
===================================================================
--- root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockViewHandler.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockViewHandler.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+
package org.ajax4jsf.tests;
import java.io.IOException;
@@ -29,13 +31,12 @@
import org.ajax4jsf.application.AjaxViewHandler;
public class MockViewHandler extends AjaxViewHandler {
+ public MockViewHandler(ViewHandler parent) {
+ super(parent);
+ }
- public MockViewHandler(ViewHandler parent) {
- super(parent);
- }
-
- public void writeState(FacesContext context) throws IOException {
- //System.out.println(".writeState()");
- }
+ public void writeState(FacesContext context) throws IOException {
-}
\ No newline at end of file
+ // System.out.println(".writeState()");
+ }
+}
Modified: root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockViewRoot.java
===================================================================
--- root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockViewRoot.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/MockViewRoot.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+
package org.ajax4jsf.tests;
import javax.faces.event.PhaseId;
@@ -29,20 +31,18 @@
/**
* @author Nick - mailto:nbelaevski at exadel.com
* created 08.04.2007
- *
+ *
*/
public class MockViewRoot extends AjaxViewRoot {
+ public EventsQueue getAjaxEventsQueue() {
+ return super.getAjaxEventsQueue();
+ }
- public EventsQueue getAjaxEventsQueue() {
- return super.getAjaxEventsQueue();
- }
+ public EventsQueue[] getEvents() {
+ return super.getEvents();
+ }
- public EventsQueue[] getEvents() {
- return super.getEvents();
- }
-
- public EventsQueue getEventsQueue(PhaseId phase) {
- return super.getEventsQueue(phase);
- }
-
+ public EventsQueue getEventsQueue(PhaseId phase) {
+ return super.getEventsQueue(phase);
+ }
}
Modified: root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/org/apache/shale/test/config/ConfigParser.java
===================================================================
--- root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/org/apache/shale/test/config/ConfigParser.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/org/apache/shale/test/config/ConfigParser.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -19,27 +19,30 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to you under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
*/
-
package org.ajax4jsf.tests.org.apache.shale.test.config;
import java.io.IOException;
+
import java.net.URL;
+
import javax.faces.FactoryFinder;
import javax.faces.application.Application;
import javax.faces.application.ApplicationFactory;
@@ -48,9 +51,11 @@
import javax.faces.render.Renderer;
import org.ajax4jsf.tests.xml.FacesEntityResolver;
+
import org.apache.commons.digester.Digester;
import org.apache.commons.digester.Rule;
import org.apache.shale.test.mock.MockRenderKit;
+
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -80,47 +85,33 @@
* @since 1.1
*/
public final class ConfigParser {
-
- // ------------------------------------------------------------ Constructors
-
-
- /** Creates a new instance of ConfigParser */
- public ConfigParser() {
- }
-
-
// ------------------------------------------------------ Manifest Constants
-
/**
* <p>Configuration resource URLs for the JSF RI.</p>
*/
- private static final String[] JSFRI_RESOURCES =
- { "/com/sun/faces/jsf-ri-runtime.xml",
- };
+ private static final String[] JSFRI_RESOURCES = {"/com/sun/faces/jsf-ri-runtime.xml", };
-
/**
* <p>Configuration resource URLs for Apache MyFaces.</p>
*/
- private static final String[] MYFACES_RESOURCES =
- { "/org/apache/myfaces/resource/standard-faces-config.xml",
- };
+ private static final String[] MYFACES_RESOURCES = {"/org/apache/myfaces/resource/standard-faces-config.xml", };
-
// ------------------------------------------------------ Instance Variables
-
/**
* <p>The <code>Digester</code> instance we will use for parsing.</p>
*/
private Digester digester = null;
+ // ------------------------------------------------------------ Constructors
+ /** Creates a new instance of ConfigParser */
+ public ConfigParser() {}
+
// ------------------------------------------------------- Public Properties
-
/**
* <p>Return the URLs of the platform configuration resources for this
* application. The following platforms are currently supported:</p>
@@ -133,19 +124,17 @@
* the name of the configuration resource, it will be supported as well.</p>
*/
public URL[] getPlatformURLs() {
-
URL[] urls = translate(JSFRI_RESOURCES);
+
if (urls[0] == null) {
urls = translate(MYFACES_RESOURCES);
}
- return urls;
+ return urls;
}
-
// ---------------------------------------------------------- Public Methods
-
/**
* <p>Parse the specified JavaServer Faces configuration resource, causing
* the appropriate JSF artifacts to be registered with the mock object
@@ -160,9 +149,9 @@
// Acquire and configure the Digester instance we will use
Digester digester = digester();
- ApplicationFactory factory = (ApplicationFactory)
- FactoryFinder.getFactory(FactoryFinder.APPLICATION_FACTORY);
+ ApplicationFactory factory = (ApplicationFactory) FactoryFinder.getFactory(FactoryFinder.APPLICATION_FACTORY);
Application application = factory.getApplication();
+
digester.push(application);
// Perform the required parsing
@@ -171,10 +160,8 @@
} finally {
digester.clear();
}
-
}
-
/**
* <p>Parse the specified set of JavaServer Faces configuration resources,
* in the listed order, causing the appropriate JSF artifacts to be registered
@@ -186,100 +173,82 @@
* @exception SAXException if a parsing error occurs
*/
public void parse(URL[] urls) throws IOException, SAXException {
-
for (int i = 0; i < urls.length; i++) {
parse(urls[i]);
}
-
}
-
// --------------------------------------------------------- Private Methods
-
/**
* <p>Return the <code>Digester</code> instance we will use for parsing,
* creating and configuring a new instance if necessary.</p>
*/
private Digester digester() {
-
if (this.digester == null) {
this.digester = new Digester();
digester.addRule("faces-config/component", new ComponentRule());
- digester.addCallMethod
- ("faces-config/component/component-type", "setComponentType", 0);
- digester.addCallMethod
- ("faces-config/component/component-class", "setComponentClass", 0);
+ digester.addCallMethod("faces-config/component/component-type", "setComponentType", 0);
+ digester.addCallMethod("faces-config/component/component-class", "setComponentClass", 0);
digester.addRule("faces-config/converter", new ConverterRule());
- digester.addCallMethod
- ("faces-config/converter/converter-id", "setConverterId", 0);
- digester.addCallMethod
- ("faces-config/converter/converter-class", "setConverterClass", 0);
- digester.addCallMethod
- ("faces-config/converter/converter-for-class", "setConverterForClass", 0);
+ digester.addCallMethod("faces-config/converter/converter-id", "setConverterId", 0);
+ digester.addCallMethod("faces-config/converter/converter-class", "setConverterClass", 0);
+ digester.addCallMethod("faces-config/converter/converter-for-class", "setConverterForClass", 0);
digester.addRule("faces-config/render-kit", new RenderKitRule());
digester.addRule("faces-config/render-kit/render-kit-id", new RenderKitIdRule());
digester.addRule("faces-config/render-kit/renderer", new RendererRule());
- digester.addCallMethod
- ("faces-config/render-kit/renderer/component-family", "setComponentFamily", 0);
- digester.addCallMethod
- ("faces-config/render-kit/renderer/renderer-class", "setRendererClass", 0);
- digester.addCallMethod
- ("faces-config/render-kit/renderer/renderer-type", "setRendererType", 0);
+ digester.addCallMethod("faces-config/render-kit/renderer/component-family", "setComponentFamily", 0);
+ digester.addCallMethod("faces-config/render-kit/renderer/renderer-class", "setRendererClass", 0);
+ digester.addCallMethod("faces-config/render-kit/renderer/renderer-type", "setRendererType", 0);
digester.addRule("faces-config/validator", new ValidatorRule());
- digester.addCallMethod
- ("faces-config/validator/validator-id", "setValidatorId", 0);
- digester.addCallMethod
- ("faces-config/validator/validator-class", "setValidatorClass", 0);
+ digester.addCallMethod("faces-config/validator/validator-id", "setValidatorId", 0);
+ digester.addCallMethod("faces-config/validator/validator-class", "setValidatorClass", 0);
}
-
+
digester.setEntityResolver(new FacesEntityResolver());
-
- return this.digester;
+ return this.digester;
}
-
/**
* <p>Translate an array of resource names into an array of resource URLs.</p>
*
* @param names Resource names to translate
*/
private URL[] translate(String[] names) {
-
URL[] results = new URL[names.length];
+
for (int i = 0; i < names.length; i++) {
results[i] = this.getClass().getResource(names[i]);
}
+
return results;
-
}
-
// --------------------------------------------------------- Private Classes
-
/**
* <p>Data bean that stores information related to a component.</p>
*/
class ComponentBean {
-
private String componentClass;
+ private String componentType;
+
public String getComponentClass() {
return this.componentClass;
}
+
public void setComponentClass(String componentClass) {
this.componentClass = componentClass;
}
- private String componentType;
public String getComponentType() {
return this.componentType;
}
+
public void setComponentType(String componentType) {
this.componentType = componentType;
}
-
}
@@ -287,7 +256,6 @@
* <p>Digester <code>Rule</code> for processing components.</p>
*/
class ComponentRule extends Rule {
-
public void begin(String namespace, String name, Attributes attributes) {
getDigester().push(new ComponentBean());
}
@@ -295,9 +263,9 @@
public void end(String namespace, String name) {
ComponentBean bean = (ComponentBean) getDigester().pop();
Application application = (Application) getDigester().peek();
+
application.addComponent(bean.getComponentType(), bean.getComponentClass());
}
-
}
@@ -305,31 +273,33 @@
* <p>Data bean that stores information related to a converter.</p>
*/
class ConverterBean {
-
private String converterClass;
+ private String converterForClass;
+ private String converterId;
+
public String getConverterClass() {
return this.converterClass;
}
+
public void setConverterClass(String converterClass) {
this.converterClass = converterClass;
}
- private String converterForClass;
public String getConverterForClass() {
return this.converterForClass;
}
+
public void setConverterForClass(String converterForClass) {
this.converterForClass = converterForClass;
}
- private String converterId;
public String getConverterId() {
return this.converterId;
}
+
public void setConverterId(String converterId) {
this.converterId = converterId;
}
-
}
@@ -337,7 +307,6 @@
* <p>Digester <code>Rule</code> for processing converers.</p>
*/
class ConverterRule extends Rule {
-
public void begin(String namespace, String name, Attributes attributes) {
getDigester().push(new ConverterBean());
}
@@ -345,59 +314,58 @@
public void end(String namespace, String name) {
ConverterBean bean = (ConverterBean) getDigester().pop();
Application application = (Application) getDigester().peek();
+
if (bean.getConverterId() != null) {
application.addConverter(bean.getConverterId(), bean.getConverterClass());
} else {
Class clazz = null;
+
try {
clazz = this.getClass().getClassLoader().loadClass(bean.getConverterForClass());
} catch (ClassNotFoundException e) {
throw new IllegalArgumentException("java.lang.ClassNotFoundException: "
- + bean.getConverterForClass());
+ + bean.getConverterForClass());
}
+
application.addConverter(clazz, bean.getConverterClass());
}
}
-
}
/**
- * <p>Digester <code>Rule</code> for processing render kits.</p>
- */
- class RenderKitRule extends Rule {
-
- public void begin(String namespace, String name, Attributes attributes) {
- RenderKitFactory factory = (RenderKitFactory)
- FactoryFinder.getFactory(FactoryFinder.RENDER_KIT_FACTORY);
- getDigester().push(factory.getRenderKit(null, RenderKitFactory.HTML_BASIC_RENDER_KIT));
- }
-
- public void end(String namespace, String name) {
- getDigester().pop();
- }
-
- }
-
-
- /**
* <p>Digester <code>Rule</code> for processing render kit identifiers.</p>
*/
class RenderKitIdRule extends Rule {
-
public void body(String namespace, String name, String text) {
String renderKitId = text.trim();
- RenderKitFactory factory = (RenderKitFactory)
- FactoryFinder.getFactory(FactoryFinder.RENDER_KIT_FACTORY);
+ RenderKitFactory factory = (RenderKitFactory) FactoryFinder.getFactory(FactoryFinder.RENDER_KIT_FACTORY);
RenderKit renderKit = factory.getRenderKit(null, renderKitId);
+
if (renderKit == null) {
renderKit = new MockRenderKit();
factory.addRenderKit(renderKitId, renderKit);
}
+
digester.pop();
digester.push(renderKit);
}
+ }
+
+ /**
+ * <p>Digester <code>Rule</code> for processing render kits.</p>
+ */
+ class RenderKitRule extends Rule {
+ public void begin(String namespace, String name, Attributes attributes) {
+ RenderKitFactory factory = (RenderKitFactory) FactoryFinder.getFactory(FactoryFinder.RENDER_KIT_FACTORY);
+
+ getDigester().push(factory.getRenderKit(null, RenderKitFactory.HTML_BASIC_RENDER_KIT));
+ }
+
+ public void end(String namespace, String name) {
+ getDigester().pop();
+ }
}
@@ -405,31 +373,33 @@
* <p>Data bean that stores information related to a renderer.</p>
*/
class RendererBean {
-
private String componentFamily;
+ private String rendererClass;
+ private String rendererType;
+
public String getComponentFamily() {
return this.componentFamily;
}
+
public void setComponentFamily(String componentFamily) {
this.componentFamily = componentFamily;
}
- private String rendererClass;
public String getRendererClass() {
return this.rendererClass;
}
+
public void setRendererClass(String rendererClass) {
this.rendererClass = rendererClass;
}
- private String rendererType;
public String getRendererType() {
return this.rendererType;
}
+
public void setRendererType(String rendererType) {
this.rendererType = rendererType;
}
-
}
@@ -437,7 +407,6 @@
* <p>Digester <code>Rule</code> for processing renderers.</p>
*/
class RendererRule extends Rule {
-
public void begin(String namespace, String name, Attributes attributes) {
getDigester().push(new RendererBean());
}
@@ -447,18 +416,17 @@
RenderKit kit = (RenderKit) getDigester().peek();
Renderer renderer = null;
Class clazz = null;
+
try {
clazz = this.getClass().getClassLoader().loadClass(bean.getRendererClass());
renderer = (Renderer) clazz.newInstance();
} catch (Exception e) {
- throw new IllegalArgumentException("Exception while trying to instantiate"
- + " renderer class '" + bean.getRendererClass() + "' : "
- + e.getMessage());
+ throw new IllegalArgumentException("Exception while trying to instantiate" + " renderer class '"
+ + bean.getRendererClass() + "' : " + e.getMessage());
}
- kit.addRenderer(bean.getComponentFamily(), bean.getRendererType(),
- renderer);
- }
+ kit.addRenderer(bean.getComponentFamily(), bean.getRendererType(), renderer);
+ }
}
@@ -466,23 +434,24 @@
* <p>Data bean that stores information related to a validator.</p>
*/
class ValidatorBean {
-
private String validatorClass;
+ private String validatorId;
+
public String getValidatorClass() {
return this.validatorClass;
}
+
public void setValidatorClass(String validatorClass) {
this.validatorClass = validatorClass;
}
- private String validatorId;
public String getValidatorId() {
return this.validatorId;
}
+
public void setValidatorId(String validatorId) {
this.validatorId = validatorId;
}
-
}
@@ -490,7 +459,6 @@
* <p>Digester <code>Rule</code> for processing validators.</p>
*/
class ValidatorRule extends Rule {
-
public void begin(String namespace, String name, Attributes attributes) {
getDigester().push(new ValidatorBean());
}
@@ -498,10 +466,8 @@
public void end(String namespace, String name) {
ValidatorBean bean = (ValidatorBean) getDigester().pop();
Application application = (Application) getDigester().peek();
+
application.addValidator(bean.getValidatorId(), bean.getValidatorClass());
}
-
}
-
-
}
Modified: root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/xml/FacesEntityResolver.java
===================================================================
--- root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/xml/FacesEntityResolver.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/main/java/org/ajax4jsf/tests/xml/FacesEntityResolver.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -19,9 +19,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+
package org.ajax4jsf.tests.xml;
import java.io.IOException;
+
import java.net.URL;
import org.xml.sax.EntityResolver;
@@ -31,43 +34,38 @@
/**
* @author Nick Belaevski - nbelaevski at exadel.com
* created 09.04.2007
- *
+ *
*/
public class FacesEntityResolver implements EntityResolver {
+ private static final String[] PREFIXES = new String[] {"/com/sun/faces/", "/org/apache/myfaces/resource/"};
- private static final String[] PREFIXES = new String[] {
- "/com/sun/faces/", "/org/apache/myfaces/resource/"
- };
-
- /* (non-Javadoc)
- * @see org.xml.sax.EntityResolver#resolveEntity(java.lang.String, java.lang.String)
- */
- public InputSource resolveEntity(String publicId, String systemId)
- throws SAXException, IOException {
+ /*
+ * (non-Javadoc)
+ * @see org.xml.sax.EntityResolver#resolveEntity(java.lang.String, java.lang.String)
+ */
+ public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException {
+ if (systemId == null) {
+ return null;
+ }
- if (systemId == null) {
- return null;
- }
+ String fileName;
+ int idx = systemId.lastIndexOf('/');
- String fileName;
-
- int idx = systemId.lastIndexOf('/');
- if (idx == -1) {
- fileName = systemId;
- } else {
- fileName = systemId.substring(idx + 1);
- }
-
- for (int i = 0; i < PREFIXES.length; i++) {
- String prefix = PREFIXES[i];
-
- URL url = getClass().getResource(prefix + fileName);
- if (url != null) {
- return new InputSource(url.openStream());
- }
- }
-
- return null;
- }
+ if (idx == -1) {
+ fileName = systemId;
+ } else {
+ fileName = systemId.substring(idx + 1);
+ }
+ for (int i = 0; i < PREFIXES.length; i++) {
+ String prefix = PREFIXES[i];
+ URL url = getClass().getResource(prefix + fileName);
+
+ if (url != null) {
+ return new InputSource(url.openStream());
+ }
+ }
+
+ return null;
+ }
}
Modified: root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/application/AjaxStateHolderTest.java
===================================================================
--- root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/application/AjaxStateHolderTest.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/application/AjaxStateHolderTest.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -1,5 +1,6 @@
+
/**
- *
+ *
*/
package org.ajax4jsf.application;
@@ -11,58 +12,64 @@
*/
public class AjaxStateHolderTest extends AbstractAjax4JsfTestCase {
- /**
- * @param name
- */
- public AjaxStateHolderTest(String name) {
- super(name);
- }
+ /**
+ * @param name
+ */
+ public AjaxStateHolderTest(String name) {
+ super(name);
+ }
- /* (non-Javadoc)
- * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#setUp()
- */
- public void setUp() throws Exception {
- super.setUp();
- }
+ /*
+ * (non-Javadoc)
+ * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#setUp()
+ */
+ public void setUp() throws Exception {
+ super.setUp();
+ }
- /* (non-Javadoc)
- * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#tearDown()
- */
- public void tearDown() throws Exception {
- super.tearDown();
- }
+ /*
+ * (non-Javadoc)
+ * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#tearDown()
+ */
+ public void tearDown() throws Exception {
+ super.tearDown();
+ }
- /**
- * Test method for {@link org.ajax4jsf.application.AjaxStateHolder#getInstance(javax.faces.context.FacesContext)}.
- */
- public void testGetInstance() {
- StateHolder ajaxStateHolder = AjaxStateHolder.getInstance(facesContext);
- assertNotNull(ajaxStateHolder);
- StateHolder ajaxStateHolder2 = AjaxStateHolder.getInstance(facesContext);
- assertSame(ajaxStateHolder, ajaxStateHolder2);
- }
+ /**
+ * Test method for {@link org.ajax4jsf.application.AjaxStateHolder#getInstance(javax.faces.context.FacesContext)}.
+ */
+ public void testGetInstance() {
+ StateHolder ajaxStateHolder = AjaxStateHolder.getInstance(facesContext);
- /**
- * Test method for {@link org.ajax4jsf.application.AjaxStateHolder#getState(java.lang.String, String)}.
- */
- public void testGetState() {
- Object state = new Object();
- Object state2 = new Object();
- StateHolder ajaxStateHolder = AjaxStateHolder.getInstance(facesContext);
- assertNull(ajaxStateHolder.getState("foo", "_id1"));
- ajaxStateHolder.saveState("foo", "_id1", new Object[]{state});
- ajaxStateHolder.saveState("foo", "_id2", new Object[]{state2});
- assertNull(ajaxStateHolder.getState("bar", "_id1"));
- assertSame(state2,ajaxStateHolder.getState("foo",null));
- assertSame(state,ajaxStateHolder.getState("foo","_id1"));
- assertSame(state,ajaxStateHolder.getState("foo","_id3"));
- Object state3 = new Object();
- Object state4 = new Object();
- ajaxStateHolder.saveState("bar", "_id1", new Object[]{state3});
- ajaxStateHolder.saveState("bar", "_id2", new Object[]{state4});
- assertSame(state3,ajaxStateHolder.getState("bar","_id1"));
- assertSame(state,ajaxStateHolder.getState("foo","_id3"));
- }
+ assertNotNull(ajaxStateHolder);
+ StateHolder ajaxStateHolder2 = AjaxStateHolder.getInstance(facesContext);
+ assertSame(ajaxStateHolder, ajaxStateHolder2);
+ }
+
+ /**
+ * Test method for {@link org.ajax4jsf.application.AjaxStateHolder#getState(java.lang.String, String)}.
+ */
+ public void testGetState() {
+ Object state = new Object();
+ Object state2 = new Object();
+ StateHolder ajaxStateHolder = AjaxStateHolder.getInstance(facesContext);
+
+ assertNull(ajaxStateHolder.getState("foo", "_id1"));
+ ajaxStateHolder.saveState("foo", "_id1", new Object[] {state});
+ ajaxStateHolder.saveState("foo", "_id2", new Object[] {state2});
+ assertNull(ajaxStateHolder.getState("bar", "_id1"));
+ assertSame(state2, ajaxStateHolder.getState("foo", null));
+ assertSame(state, ajaxStateHolder.getState("foo", "_id1"));
+ assertSame(state, ajaxStateHolder.getState("foo", "_id3"));
+
+ Object state3 = new Object();
+ Object state4 = new Object();
+
+ ajaxStateHolder.saveState("bar", "_id1", new Object[] {state3});
+ ajaxStateHolder.saveState("bar", "_id2", new Object[] {state4});
+ assertSame(state3, ajaxStateHolder.getState("bar", "_id1"));
+ assertSame(state, ajaxStateHolder.getState("foo", "_id3"));
+ }
}
Modified: root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/application/AjaxStateManagerTest.java
===================================================================
--- root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/application/AjaxStateManagerTest.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/application/AjaxStateManagerTest.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -1,5 +1,6 @@
+
/**
- *
+ *
*/
package org.ajax4jsf.application;
@@ -8,6 +9,7 @@
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
+
import java.util.HashSet;
import javax.faces.FactoryFinder;
@@ -26,174 +28,192 @@
import javax.faces.render.ResponseStateManager;
import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
+
import org.apache.shale.test.mock.MockRenderKit;
-
/**
* @author asmirnov
*
*/
public class AjaxStateManagerTest extends AbstractAjax4JsfTestCase {
+ private static final String AJAX_RENDER_KIT = "AJAX";
+ private static final String FACET_A = "facetA";
+ private static final String FACET_B = "facetB";
+ private AjaxStateManager ajaxStateManager;
+ private Object state;
+ private Object treeStructure;
- private static final String FACET_B = "facetB";
- private static final String FACET_A = "facetA";
- private static final String AJAX_RENDER_KIT = "AJAX";
- private AjaxStateManager ajaxStateManager;
-
- private Object treeStructure;
+ /**
+ * @param name
+ */
+ public AjaxStateManagerTest(String name) {
+ super(name);
+ }
- private Object state;
- /**
- * @param name
- */
- public AjaxStateManagerTest(String name) {
- super(name);
- }
+ /*
+ * (non-Javadoc)
+ * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#setUp()
+ */
+ public void setUp() throws Exception {
+ super.setUp();
- /* (non-Javadoc)
- * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#setUp()
- */
- public void setUp() throws Exception {
- super.setUp();
- RenderKitFactory renderKitFactory = (RenderKitFactory)
- FactoryFinder.getFactory(FactoryFinder.RENDER_KIT_FACTORY);
- renderKit = new MockRenderKit(){
- public ResponseStateManager getResponseStateManager() {
- return new ResponseStateManager(){
+ RenderKitFactory renderKitFactory =
+ (RenderKitFactory) FactoryFinder.getFactory(FactoryFinder.RENDER_KIT_FACTORY);
- public Object getComponentStateToRestore(FacesContext arg0) {
- return state;
- }
-
- public Object getTreeStructureToRestore(FacesContext arg0,
- String arg1) {
- return treeStructure;
- }
-
- public void writeState(FacesContext context,
- SerializedView serializedView) throws IOException {
- treeStructure = serializedView.getStructure();
- state = serializedView.getState();
- }
-
- };
- }
- };
+ renderKit = new MockRenderKit() {
+ public ResponseStateManager getResponseStateManager() {
+ return new ResponseStateManager() {
+ public Object getComponentStateToRestore(FacesContext arg0) {
+ return state;
+ }
+ public Object getTreeStructureToRestore(FacesContext arg0, String arg1) {
+ return treeStructure;
+ }
+ public void writeState(FacesContext context, SerializedView serializedView) throws IOException {
+ treeStructure = serializedView.getStructure();
+ state = serializedView.getState();
+ }
+ };
+ }
+ };
renderKitFactory.addRenderKit(AJAX_RENDER_KIT, renderKit);
facesContext.getViewRoot().setRenderKitId(AJAX_RENDER_KIT);
- ajaxStateManager = new AjaxStateManager(application.getStateManager());
- application.setStateManager(ajaxStateManager);
- }
+ ajaxStateManager = new AjaxStateManager(application.getStateManager());
+ application.setStateManager(ajaxStateManager);
+ }
- /* (non-Javadoc)
- * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#tearDown()
- */
- public void tearDown() throws Exception {
- super.tearDown();
- ajaxStateManager = null;
- treeStructure = null;
- state = null;
- }
+ /*
+ * (non-Javadoc)
+ * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#tearDown()
+ */
+ public void tearDown() throws Exception {
+ super.tearDown();
+ ajaxStateManager = null;
+ treeStructure = null;
+ state = null;
+ }
- /**
- * Test method for {@link org.ajax4jsf.application.AjaxStateManager#restoreStateFromSession(javax.faces.context.FacesContext, java.lang.String, java.lang.String)}.
- */
- public void testRestoreStateFromSession() {
- Object structure = new Object();
- Object treeState = new Object();
- ajaxStateManager.saveStateInSession(facesContext, structure, treeState);
- treeStructure = UIViewRoot.UNIQUE_ID_PREFIX+"1";
- Object[] stateFromSession = ajaxStateManager.restoreStateFromSession(facesContext, facesContext.getViewRoot().getViewId(), AJAX_RENDER_KIT);
- assertSame(structure, stateFromSession[0]);
- assertSame(treeState, stateFromSession[1]);
- }
+ /**
+ * Test method for {@link org.ajax4jsf.application.AjaxStateManager#restoreStateFromSession(javax.faces.context.FacesContext, java.lang.String, java.lang.String)}.
+ */
+ public void testRestoreStateFromSession() {
+ Object structure = new Object();
+ Object treeState = new Object();
- /**
- * Test method for {@link org.ajax4jsf.application.AjaxStateManager#getLogicalViewId(javax.faces.context.FacesContext)}.
- */
- public void testGetNextViewId() {
- Object nextViewId = ajaxStateManager.getLogicalViewId(facesContext);
- Object expected = ajaxStateManager.getLogicalViewId(facesContext);
- assertTrue(expected.equals(nextViewId));
- ajaxContext.setAjaxRequest(true);
- request.setAttribute(AjaxStateManager.AJAX_VIEW_SEQUENCE, expected);
- nextViewId = ajaxStateManager.getLogicalViewId(facesContext);
- assertEquals(expected, nextViewId);
- }
+ ajaxStateManager.saveStateInSession(facesContext, structure, treeState);
+ treeStructure = UIViewRoot.UNIQUE_ID_PREFIX + "1";
+ Object[] stateFromSession = ajaxStateManager.restoreStateFromSession(facesContext,
+ facesContext.getViewRoot().getViewId(), AJAX_RENDER_KIT);
- /**
- * Test method for {@link org.ajax4jsf.application.AjaxStateManager#getRenderKit(javax.faces.context.FacesContext, java.lang.String)}.
- */
- public void testGetRenderKit() {
- AjaxStateManager stateManager = getAjaxStateManager();
- RenderKit kit = stateManager.getRenderKit(facesContext, AJAX_RENDER_KIT);
- assertSame(renderKit, kit);
- }
-
- public void testTreeNodeApply() throws Exception {
- buildTestTree();
- TreeStructureNode node = new TreeStructureNode();
- node.apply(facesContext, facesContext.getViewRoot(), new HashSet());
- assertEquals(2, node.getChildren().size());
- assertEquals(1, node.getFacets().size());
- TreeStructureNode nodeA = (TreeStructureNode) node.getFacets().get(FACET_A);
- assertNotNull(nodeA);
- assertEquals(1, nodeA.getChildren().size());
- assertEquals(1, nodeA.getFacets().size());
- }
+ assertSame(structure, stateFromSession[0]);
+ assertSame(treeState, stateFromSession[1]);
+ }
- public void testTreeNodeCheckUniqueId() throws Exception {
- buildTestTree();
- TreeStructureNode node = new TreeStructureNode();
- UIViewRoot viewRoot = facesContext.getViewRoot();
- ((UIComponent)viewRoot.getChildren().get(0)).setId(FACET_A);
- ((UIComponent)viewRoot.getChildren().get(1)).setId(FACET_A);
- try {
- node.apply(facesContext, facesContext.getViewRoot(), new HashSet());
- } catch (IllegalStateException e) {
- assertTrue(e.getMessage().startsWith("duplicate"));
- return;
- }
- assertTrue("Duplicate components Id's not detected ",false);
- }
-
-
- public void testTreeNodeSerialisation() throws Exception {
- buildTestTree();
- TreeStructureNode node = new TreeStructureNode();
- node.apply(facesContext, facesContext.getViewRoot(), new HashSet());
- ByteArrayOutputStream byteOut = new ByteArrayOutputStream();
- ObjectOutputStream out = new ObjectOutputStream(byteOut);
- out.writeObject(node);
- ByteArrayInputStream byteIn = new ByteArrayInputStream(byteOut.toByteArray());
- ObjectInputStream in = new ObjectInputStream(byteIn);
- TreeStructureNode nodeIn = (TreeStructureNode) in.readObject();
- assertEquals(2, nodeIn.getChildren().size());
- assertEquals(1, nodeIn.getFacets().size());
- TreeStructureNode nodeA = (TreeStructureNode) nodeIn.getFacets().get(FACET_A);
- assertNotNull(nodeA);
- assertEquals(1, nodeA.getChildren().size());
- assertEquals(1, nodeA.getFacets().size());
-
- }
- /**
- *
- */
- private void buildTestTree() {
- facesContext.getViewRoot().getChildren().add(new UIInput());
- facesContext.getViewRoot().getChildren().add(new UIOutput());
- UIData data = new UIData();
- facesContext.getViewRoot().getFacets().put(FACET_A, data);
- data.getChildren().add(new UIColumn());
- data.getFacets().put(FACET_B, new UIOutput());
- }
+ /**
+ * Test method for {@link org.ajax4jsf.application.AjaxStateManager#getLogicalViewId(javax.faces.context.FacesContext)}.
+ */
+ public void testGetNextViewId() {
+ Object nextViewId = ajaxStateManager.getLogicalViewId(facesContext);
+ Object expected = ajaxStateManager.getLogicalViewId(facesContext);
- /**
- * @return
- */
- private AjaxStateManager getAjaxStateManager() {
- return ajaxStateManager;
- }
+ assertTrue(expected.equals(nextViewId));
+ ajaxContext.setAjaxRequest(true);
+ request.setAttribute(AjaxStateManager.AJAX_VIEW_SEQUENCE, expected);
+ nextViewId = ajaxStateManager.getLogicalViewId(facesContext);
+ assertEquals(expected, nextViewId);
+ }
+ /**
+ * Test method for {@link org.ajax4jsf.application.AjaxStateManager#getRenderKit(javax.faces.context.FacesContext, java.lang.String)}.
+ */
+ public void testGetRenderKit() {
+ AjaxStateManager stateManager = getAjaxStateManager();
+ RenderKit kit = stateManager.getRenderKit(facesContext, AJAX_RENDER_KIT);
+
+ assertSame(renderKit, kit);
+ }
+
+ public void testTreeNodeApply() throws Exception {
+ buildTestTree();
+
+ TreeStructureNode node = new TreeStructureNode();
+
+ node.apply(facesContext, facesContext.getViewRoot(), new HashSet());
+ assertEquals(2, node.getChildren().size());
+ assertEquals(1, node.getFacets().size());
+
+ TreeStructureNode nodeA = (TreeStructureNode) node.getFacets().get(FACET_A);
+
+ assertNotNull(nodeA);
+ assertEquals(1, nodeA.getChildren().size());
+ assertEquals(1, nodeA.getFacets().size());
+ }
+
+ public void testTreeNodeCheckUniqueId() throws Exception {
+ buildTestTree();
+
+ TreeStructureNode node = new TreeStructureNode();
+ UIViewRoot viewRoot = facesContext.getViewRoot();
+
+ ((UIComponent) viewRoot.getChildren().get(0)).setId(FACET_A);
+ ((UIComponent) viewRoot.getChildren().get(1)).setId(FACET_A);
+
+ try {
+ node.apply(facesContext, facesContext.getViewRoot(), new HashSet());
+ } catch (IllegalStateException e) {
+ assertTrue(e.getMessage().startsWith("duplicate"));
+
+ return;
+ }
+
+ assertTrue("Duplicate components Id's not detected ", false);
+ }
+
+ public void testTreeNodeSerialisation() throws Exception {
+ buildTestTree();
+
+ TreeStructureNode node = new TreeStructureNode();
+
+ node.apply(facesContext, facesContext.getViewRoot(), new HashSet());
+
+ ByteArrayOutputStream byteOut = new ByteArrayOutputStream();
+ ObjectOutputStream out = new ObjectOutputStream(byteOut);
+
+ out.writeObject(node);
+
+ ByteArrayInputStream byteIn = new ByteArrayInputStream(byteOut.toByteArray());
+ ObjectInputStream in = new ObjectInputStream(byteIn);
+ TreeStructureNode nodeIn = (TreeStructureNode) in.readObject();
+
+ assertEquals(2, nodeIn.getChildren().size());
+ assertEquals(1, nodeIn.getFacets().size());
+
+ TreeStructureNode nodeA = (TreeStructureNode) nodeIn.getFacets().get(FACET_A);
+
+ assertNotNull(nodeA);
+ assertEquals(1, nodeA.getChildren().size());
+ assertEquals(1, nodeA.getFacets().size());
+ }
+
+ /**
+ *
+ */
+ private void buildTestTree() {
+ facesContext.getViewRoot().getChildren().add(new UIInput());
+ facesContext.getViewRoot().getChildren().add(new UIOutput());
+
+ UIData data = new UIData();
+
+ facesContext.getViewRoot().getFacets().put(FACET_A, data);
+ data.getChildren().add(new UIColumn());
+ data.getFacets().put(FACET_B, new UIOutput());
+ }
+
+ /**
+ * @return
+ */
+ private AjaxStateManager getAjaxStateManager() {
+ return ajaxStateManager;
+ }
}
Modified: root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/application/ComponentLoaderTest.java
===================================================================
--- root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/application/ComponentLoaderTest.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/application/ComponentLoaderTest.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -1,5 +1,6 @@
+
/**
- *
+ *
*/
package org.ajax4jsf.application;
@@ -16,52 +17,53 @@
*
*/
public class ComponentLoaderTest extends TestCase {
+ private URLClassLoader classLoader;
+ private ClassLoader contextClassLoader;
+ private ComponentsLoaderImpl loader;
- private ComponentsLoaderImpl loader;
- private ClassLoader contextClassLoader;
- private URLClassLoader classLoader;
+ /*
+ * (non-Javadoc)
+ * @see junit.framework.TestCase#setUp()
+ */
+ protected void setUp() throws Exception {
+ super.setUp();
+ contextClassLoader = Thread.currentThread().getContextClassLoader();
+ classLoader = new URLClassLoader(new URL[0], this.getClass().getClassLoader());
+ Thread.currentThread().setContextClassLoader(classLoader);
+ loader = new ComponentsLoaderImpl();
+ }
- /* (non-Javadoc)
- * @see junit.framework.TestCase#setUp()
- */
- protected void setUp() throws Exception {
- super.setUp();
- contextClassLoader = Thread.currentThread().getContextClassLoader();
- classLoader = new URLClassLoader(new URL[0],
- this.getClass().getClassLoader());
- Thread.currentThread().setContextClassLoader(classLoader);
- loader = new ComponentsLoaderImpl();
- }
+ /*
+ * (non-Javadoc)
+ * @see junit.framework.TestCase#tearDown()
+ */
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ loader = null;
+ Thread.currentThread().setContextClassLoader(contextClassLoader);
+ contextClassLoader = null;
+ }
- /* (non-Javadoc)
- * @see junit.framework.TestCase#tearDown()
- */
- protected void tearDown() throws Exception {
- super.tearDown();
- loader = null;
- Thread.currentThread().setContextClassLoader(contextClassLoader);
- contextClassLoader = null;
- }
+ /**
+ * Test method for {@link org.ajax4jsf.application.ComponentsLoaderImpl#createComponent(java.lang.String)}.
+ */
+ public void testCreateComponent() {
+ UIComponent input = loader.createComponent(UIInput.class.getName());
- /**
- * Test method for {@link org.ajax4jsf.application.ComponentsLoaderImpl#createComponent(java.lang.String)}.
- */
- public void testCreateComponent() {
- UIComponent input = loader.createComponent(UIInput.class.getName());
- assertNotNull(input);
- assertEquals(UIInput.class, input.getClass());
- }
+ assertNotNull(input);
+ assertEquals(UIInput.class, input.getClass());
+ }
- /**
- * Test method for {@link org.ajax4jsf.application.ComponentsLoaderImpl#transform(java.lang.Object)}.
- */
- public void testTransform() {
- Object componentClass = loader.transform(UIInput.class.getName());
- assertSame(UIInput.class, componentClass);
-
- }
+ /**
+ * Test method for {@link org.ajax4jsf.application.ComponentsLoaderImpl#transform(java.lang.Object)}.
+ */
+ public void testTransform() {
+ Object componentClass = loader.transform(UIInput.class.getName());
- public void testGetLoader() throws Exception {
- assertSame(classLoader,loader.getClassLoader());
- }
+ assertSame(UIInput.class, componentClass);
+ }
+
+ public void testGetLoader() throws Exception {
+ assertSame(classLoader, loader.getClassLoader());
+ }
}
Modified: root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/component/AjaxViewRootTest.java
===================================================================
--- root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/component/AjaxViewRootTest.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/component/AjaxViewRootTest.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -4,6 +4,7 @@
import java.util.List;
import javax.el.MethodExpression;
+
import javax.faces.component.UIComponent;
import javax.faces.component.UIPanel;
import javax.faces.context.FacesContext;
@@ -19,271 +20,289 @@
import org.ajax4jsf.tests.MockUIComponent;
public class AjaxViewRootTest extends AbstractAjax4JsfTestCase {
+ private AjaxViewRoot _ajaxRoot;
+ private MockUIComponent _mockComponent;
+ private MockUIComponent _panel;
+ private PhaseListenerImplementation _phaseListener;
+ private PhaseListenerImplementation _testListener;
- /**
- * @author asmirnov
- *
- */
- public static class InvokerCallbackImpl implements InvokerCallback {
-
- private int runsRoot = 0;
-
- private List<UIComponent> callbackComponents = new ArrayList<UIComponent>();
-
+ public AjaxViewRootTest(String name) {
+ super(name);
+ }
- /* (non-Javadoc)
- * @see org.ajax4jsf.context.InvokerCallback#invokeContextCallback(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
- */
- public void invokeContextCallback(FacesContext context,
- UIComponent component) {
- callbackComponents.add(component);
- }
+ public void setUp() throws Exception {
+ super.setUp();
+ _ajaxRoot = new AjaxViewRoot();
+ _ajaxRoot.setViewId("/viewId");
+ _ajaxRoot.setRenderKitId(RenderKitFactory.HTML_BASIC_RENDER_KIT);
+ _testListener = new PhaseListenerImplementation();
+ externalContext.getRequestMap().put("listener", _testListener);
+ facesContext.setViewRoot(_ajaxRoot);
+ }
- /* (non-Javadoc)
- * @see org.ajax4jsf.context.InvokerCallback#invokeRoot(javax.faces.context.FacesContext)
- */
- public void invokeRoot(FacesContext context) {
- runsRoot++;
+ public void tearDown() throws Exception {
+ _ajaxRoot = null;
+ _testListener = null;
+ super.tearDown();
+ }
- }
+ public final void testProcessPhaseListeners() {
+ MethodExpression beforeExpression = application.getExpressionFactory().createMethodExpression(elContext,
+ "#{listener.beforePhase}", null, new Class<?>[] {PhaseEvent.class});
+ MethodExpression afterExpression = application.getExpressionFactory().createMethodExpression(elContext,
+ "#{listener.afterPhase}", null, new Class<?>[] {PhaseEvent.class});
- }
+ _ajaxRoot.setBeforePhaseListener(beforeExpression);
+ _ajaxRoot.setAfterPhaseListener(afterExpression);
- public static final class PhaseListenerImplementation implements PhaseListener {
- private int runsBefore = 0;
- private int runsAfter = 0;
- private PhaseId phase = PhaseId.ANY_PHASE;
+ PhaseListenerImplementation phaseListener = new PhaseListenerImplementation();
- public void afterPhase(PhaseEvent event) {
- runsAfter++;
- }
+ _ajaxRoot.addPhaseListener(phaseListener);
+ _ajaxRoot.processPhaseListeners(facesContext, PhaseId.RESTORE_VIEW, true);
+ assertEquals(1, this._testListener.runsBefore);
+ assertEquals(0, this._testListener.runsAfter);
+ assertEquals(1, phaseListener.runsBefore);
+ assertEquals(0, phaseListener.runsAfter);
+ phaseListener.setPhaseId(PhaseId.PROCESS_VALIDATIONS);
+ _ajaxRoot.processPhaseListeners(facesContext, PhaseId.RESTORE_VIEW, false);
+ assertEquals(1, this._testListener.runsBefore);
+ assertEquals(1, this._testListener.runsAfter);
+ assertEquals(1, phaseListener.runsBefore);
+ assertEquals(0, phaseListener.runsAfter);
+ }
- public void beforePhase(PhaseEvent event) {
- runsBefore++;
-
- }
+ public final void testCreatePhaseEvent() {
+ PhaseEvent phaseEvent = _ajaxRoot.createPhaseEvent(facesContext, PhaseId.APPLY_REQUEST_VALUES);
- public PhaseId getPhaseId() {
-
- return phase;
- }
+ assertSame(facesContext, phaseEvent.getFacesContext());
+ assertSame(PhaseId.APPLY_REQUEST_VALUES, phaseEvent.getPhaseId());
+ assertSame(lifecycle, phaseEvent.getSource());
+ }
- /**
- * @return the runsBefore
- */
- int getRunsBefore() {
- return runsBefore;
- }
+ public final void testProcessPhase() {
+ prepareView(PhaseId.APPLY_REQUEST_VALUES);
- /**
- * @return the runsAfter
- */
- int getRunsAfter() {
- return runsAfter;
- }
+ InvokerCallbackImpl callback = new InvokerCallbackImpl() {
+ @Override
+ public void invokeContextCallback(FacesContext context, UIComponent component) {
+ super.invokeContextCallback(context, component);
+ component.processDecodes(context);
+ }
+ };
- /**
- * @param phase the phase to set
- */
- void setPhaseId(PhaseId phase) {
- this.phase = phase;
- }
- }
+ _ajaxRoot.processPhase(facesContext, PhaseId.APPLY_REQUEST_VALUES, callback);
- private AjaxViewRoot _ajaxRoot;
- private PhaseListenerImplementation _testListener;
- private PhaseListenerImplementation _phaseListener;
- private MockUIComponent _panel;
- private MockUIComponent _mockComponent;
+ // Check phase listeners calls.
+ assertEquals(1, this._testListener.runsBefore);
+ assertEquals(1, this._testListener.runsAfter);
+ assertEquals(1, _phaseListener.runsBefore);
+ assertEquals(1, _phaseListener.runsAfter);
- public AjaxViewRootTest(String name) {
- super(name);
- }
+ // Check callbacks runs.
+ assertEquals(1, callback.runsRoot);
+ assertEquals(1, callback.callbackComponents.size());
+ assertSame(_panel, callback.callbackComponents.get(0));
+ assertEquals(1, _mockComponent.getRunsDecode());
+ }
- public void setUp() throws Exception {
- super.setUp();
- _ajaxRoot = new AjaxViewRoot();
- _ajaxRoot.setViewId("/viewId");
- _ajaxRoot.setRenderKitId(RenderKitFactory.HTML_BASIC_RENDER_KIT);
- _testListener = new PhaseListenerImplementation();
- externalContext.getRequestMap().put("listener", _testListener);
- facesContext.setViewRoot(_ajaxRoot);
- }
+ public final void testProcessAjaxPhase() {
+ externalContext.addRequestParameterMap(AjaxContext.AJAX_CONTEXT_KEY, _ajaxRoot.getClientId(facesContext));
+ ajaxContext.decode(facesContext);
+ prepareView(PhaseId.APPLY_REQUEST_VALUES);
- public void tearDown() throws Exception {
- _ajaxRoot = null;
- _testListener = null;
- super.tearDown();
- }
+ InvokerCallbackImpl callback = new InvokerCallbackImpl() {
+ @Override
+ public void invokeContextCallback(FacesContext context, UIComponent component) {
+ super.invokeContextCallback(context, component);
+ component.processDecodes(context);
+ }
+ };
- public final void testProcessPhaseListeners() {
- MethodExpression beforeExpression = application.getExpressionFactory().createMethodExpression(elContext, "#{listener.beforePhase}", null, new Class<?>[]{PhaseEvent.class});
- MethodExpression afterExpression = application.getExpressionFactory().createMethodExpression(elContext, "#{listener.afterPhase}", null, new Class<?>[]{PhaseEvent.class});
- _ajaxRoot.setBeforePhaseListener(beforeExpression);
- _ajaxRoot.setAfterPhaseListener(afterExpression);
- PhaseListenerImplementation phaseListener = new PhaseListenerImplementation();
- _ajaxRoot.addPhaseListener(phaseListener);
- _ajaxRoot.processPhaseListeners(facesContext, PhaseId.RESTORE_VIEW, true);
- assertEquals(1, this._testListener.runsBefore);
- assertEquals(0, this._testListener.runsAfter);
- assertEquals(1, phaseListener.runsBefore);
- assertEquals(0, phaseListener.runsAfter);
- phaseListener.setPhaseId(PhaseId.PROCESS_VALIDATIONS);
- _ajaxRoot.processPhaseListeners(facesContext, PhaseId.RESTORE_VIEW, false);
- assertEquals(1, this._testListener.runsBefore);
- assertEquals(1, this._testListener.runsAfter);
- assertEquals(1, phaseListener.runsBefore);
- assertEquals(0, phaseListener.runsAfter);
- }
+ _ajaxRoot.processPhase(facesContext, PhaseId.APPLY_REQUEST_VALUES, callback);
- public final void testCreatePhaseEvent() {
- PhaseEvent phaseEvent = _ajaxRoot.createPhaseEvent(facesContext, PhaseId.APPLY_REQUEST_VALUES);
- assertSame(facesContext, phaseEvent.getFacesContext());
- assertSame(PhaseId.APPLY_REQUEST_VALUES, phaseEvent.getPhaseId());
- assertSame(lifecycle, phaseEvent.getSource());
- }
+ // Check phase listeners calls.
+ assertEquals(1, this._testListener.runsBefore);
+ assertEquals(1, this._testListener.runsAfter);
+ assertEquals(1, _phaseListener.runsBefore);
+ assertEquals(1, _phaseListener.runsAfter);
- public final void testProcessPhase() {
- prepareView(PhaseId.APPLY_REQUEST_VALUES);
- InvokerCallbackImpl callback = new InvokerCallbackImpl(){
- @Override
- public void invokeContextCallback(FacesContext context,
- UIComponent component) {
- super.invokeContextCallback(context, component);
- component.processDecodes(context);
- }
- };
- _ajaxRoot.processPhase(facesContext, PhaseId.APPLY_REQUEST_VALUES, callback);
- // Check phase listeners calls.
- assertEquals(1, this._testListener.runsBefore);
- assertEquals(1, this._testListener.runsAfter);
- assertEquals(1, _phaseListener.runsBefore);
- assertEquals(1, _phaseListener.runsAfter);
- // Check callbacks runs.
- assertEquals(1, callback.runsRoot);
- assertEquals(1, callback.callbackComponents.size());
- assertSame(_panel,callback.callbackComponents.get(0));
- assertEquals(1, _mockComponent.getRunsDecode());
+ // Check callbacks runs.
+ assertEquals(1, callback.runsRoot);
+ assertEquals(1, callback.callbackComponents.size());
+ assertSame(_panel, callback.callbackComponents.get(0));
+ assertEquals(1, _mockComponent.getRunsDecode());
+ }
- }
+ public final void testProcessAjaxRegionPhase() {
+ prepareView(PhaseId.APPLY_REQUEST_VALUES);
+ externalContext.addRequestParameterMap(AjaxContainerRenderer.AJAX_PARAMETER_NAME,
+ _mockComponent.getClientId(facesContext));
+ ajaxContext.decode(facesContext);
- public final void testProcessAjaxPhase() {
- externalContext.addRequestParameterMap(AjaxContext.AJAX_CONTEXT_KEY, _ajaxRoot.getClientId(facesContext));
- ajaxContext.decode(facesContext);
- prepareView(PhaseId.APPLY_REQUEST_VALUES);
- InvokerCallbackImpl callback = new InvokerCallbackImpl(){
- @Override
- public void invokeContextCallback(FacesContext context,
- UIComponent component) {
- super.invokeContextCallback(context, component);
- component.processDecodes(context);
- }
- };
- _ajaxRoot.processPhase(facesContext, PhaseId.APPLY_REQUEST_VALUES, callback);
- // Check phase listeners calls.
- assertEquals(1, this._testListener.runsBefore);
- assertEquals(1, this._testListener.runsAfter);
- assertEquals(1, _phaseListener.runsBefore);
- assertEquals(1, _phaseListener.runsAfter);
- // Check callbacks runs.
- assertEquals(1, callback.runsRoot);
- assertEquals(1, callback.callbackComponents.size());
- assertSame(_panel,callback.callbackComponents.get(0));
- assertEquals(1, _mockComponent.getRunsDecode());
+ InvokerCallbackImpl callback = new InvokerCallbackImpl() {
+ @Override
+ public void invokeContextCallback(FacesContext context, UIComponent component) {
+ super.invokeContextCallback(context, component);
+ component.processDecodes(context);
+ }
+ };
- }
+ _ajaxRoot.processPhase(facesContext, PhaseId.APPLY_REQUEST_VALUES, callback);
- public final void testProcessAjaxRegionPhase() {
- prepareView(PhaseId.APPLY_REQUEST_VALUES);
- externalContext.addRequestParameterMap(AjaxContainerRenderer.AJAX_PARAMETER_NAME, _mockComponent.getClientId(facesContext));
- ajaxContext.decode(facesContext);
- InvokerCallbackImpl callback = new InvokerCallbackImpl(){
- @Override
- public void invokeContextCallback(FacesContext context,
- UIComponent component) {
- super.invokeContextCallback(context, component);
- component.processDecodes(context);
- }
- };
- _ajaxRoot.processPhase(facesContext, PhaseId.APPLY_REQUEST_VALUES, callback);
- // Check phase listeners calls.
- assertEquals(1, this._testListener.runsBefore);
- assertEquals(1, this._testListener.runsAfter);
- assertEquals(1, _phaseListener.runsBefore);
- assertEquals(1, _phaseListener.runsAfter);
- // Check callbacks runs.
- assertEquals(0, callback.runsRoot);
- assertEquals(1, callback.callbackComponents.size());
- assertSame(_mockComponent,callback.callbackComponents.get(0));
- assertEquals(1, _mockComponent.getRunsDecode());
+ // Check phase listeners calls.
+ assertEquals(1, this._testListener.runsBefore);
+ assertEquals(1, this._testListener.runsAfter);
+ assertEquals(1, _phaseListener.runsBefore);
+ assertEquals(1, _phaseListener.runsAfter);
- }
- /**
- * @param phaseId TODO
- *
- */
- private void prepareView(PhaseId phaseId) {
- MethodExpression beforeExpression = application.getExpressionFactory().createMethodExpression(elContext, "#{listener.beforePhase}", null, new Class<?>[]{PhaseEvent.class});
- MethodExpression afterExpression = application.getExpressionFactory().createMethodExpression(elContext, "#{listener.afterPhase}", null, new Class<?>[]{PhaseEvent.class});
- _ajaxRoot.setBeforePhaseListener(beforeExpression);
- _ajaxRoot.setAfterPhaseListener(afterExpression);
- _phaseListener = new PhaseListenerImplementation();
- _phaseListener.setPhaseId(phaseId);
- _ajaxRoot.addPhaseListener(_phaseListener);
- _panel = new MockUIComponent();
- _panel.setId("panel");
- _mockComponent = new MockUIComponent();
- _mockComponent.setId("component");
- _panel.getChildren().add(_mockComponent);
- _ajaxRoot.getChildren().add(_panel);
- }
+ // Check callbacks runs.
+ assertEquals(0, callback.runsRoot);
+ assertEquals(1, callback.callbackComponents.size());
+ assertSame(_mockComponent, callback.callbackComponents.get(0));
+ assertEquals(1, _mockComponent.getRunsDecode());
+ }
+ /**
+ * @param phaseId TODO
+ *
+ */
+ private void prepareView(PhaseId phaseId) {
+ MethodExpression beforeExpression = application.getExpressionFactory().createMethodExpression(elContext,
+ "#{listener.beforePhase}", null, new Class<?>[] {PhaseEvent.class});
+ MethodExpression afterExpression = application.getExpressionFactory().createMethodExpression(elContext,
+ "#{listener.afterPhase}", null, new Class<?>[] {PhaseEvent.class});
-
- public final void testProcessDecodes() {
- prepareView(PhaseId.APPLY_REQUEST_VALUES);
- externalContext.addRequestParameterMap(AjaxContainerRenderer.AJAX_PARAMETER_NAME, _mockComponent.getClientId(facesContext));
- ajaxContext.decode(facesContext);
- _ajaxRoot.processDecodes(facesContext);
- // Check phase listeners calls.
- assertEquals(1, this._testListener.runsBefore);
- assertEquals(1, this._testListener.runsAfter);
- assertEquals(1, _phaseListener.runsBefore);
- assertEquals(1, _phaseListener.runsAfter);
- assertEquals(0, _panel.getRunsDecode());
- assertEquals(1, _mockComponent.getRunsDecode());
- }
-
- public final void testQueueEventFacesEvent() {
- // fail("Not yet implemented");
- }
+ _ajaxRoot.setBeforePhaseListener(beforeExpression);
+ _ajaxRoot.setAfterPhaseListener(afterExpression);
+ _phaseListener = new PhaseListenerImplementation();
+ _phaseListener.setPhaseId(phaseId);
+ _ajaxRoot.addPhaseListener(_phaseListener);
+ _panel = new MockUIComponent();
+ _panel.setId("panel");
+ _mockComponent = new MockUIComponent();
+ _mockComponent.setId("component");
+ _panel.getChildren().add(_mockComponent);
+ _ajaxRoot.getChildren().add(_panel);
+ }
- public final void testBroadcastEvents() {
- // fail("Not yet implemented");
- }
+ public final void testProcessDecodes() {
+ prepareView(PhaseId.APPLY_REQUEST_VALUES);
+ externalContext.addRequestParameterMap(AjaxContainerRenderer.AJAX_PARAMETER_NAME,
+ _mockComponent.getClientId(facesContext));
+ ajaxContext.decode(facesContext);
+ _ajaxRoot.processDecodes(facesContext);
- public final void testProcessEvents() {
- // fail("Not yet implemented");
- }
+ // Check phase listeners calls.
+ assertEquals(1, this._testListener.runsBefore);
+ assertEquals(1, this._testListener.runsAfter);
+ assertEquals(1, _phaseListener.runsBefore);
+ assertEquals(1, _phaseListener.runsAfter);
+ assertEquals(0, _panel.getRunsDecode());
+ assertEquals(1, _mockComponent.getRunsDecode());
+ }
- public final void testBroadcastAjaxEvents() {
- // fail("Not yet implemented");
- }
+ public final void testQueueEventFacesEvent() {
- public final void testGetEventsQueue() {
- // fail("Not yet implemented");
- }
+ // fail("Not yet implemented");
+ }
- public final void testGetEvents() {
- // fail("Not yet implemented");
- }
+ public final void testBroadcastEvents() {
- public final void testGetAjaxEventsQueue() {
- // fail("Not yet implemented");
- }
+ // fail("Not yet implemented");
+ }
- public final void testClearEvents() {
- // fail("Not yet implemented");
- }
+ public final void testProcessEvents() {
+ // fail("Not yet implemented");
+ }
+
+ public final void testBroadcastAjaxEvents() {
+
+ // fail("Not yet implemented");
+ }
+
+ public final void testGetEventsQueue() {
+
+ // fail("Not yet implemented");
+ }
+
+ public final void testGetEvents() {
+
+ // fail("Not yet implemented");
+ }
+
+ public final void testGetAjaxEventsQueue() {
+
+ // fail("Not yet implemented");
+ }
+
+ public final void testClearEvents() {
+
+ // fail("Not yet implemented");
+ }
+
+ /**
+ * @author asmirnov
+ *
+ */
+ public static class InvokerCallbackImpl implements InvokerCallback {
+ private int runsRoot = 0;
+ private List<UIComponent> callbackComponents = new ArrayList<UIComponent>();
+
+ /*
+ * (non-Javadoc)
+ * @see org.ajax4jsf.context.InvokerCallback#invokeContextCallback(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+ */
+ public void invokeContextCallback(FacesContext context, UIComponent component) {
+ callbackComponents.add(component);
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.ajax4jsf.context.InvokerCallback#invokeRoot(javax.faces.context.FacesContext)
+ */
+ public void invokeRoot(FacesContext context) {
+ runsRoot++;
+ }
+ }
+
+
+ public static final class PhaseListenerImplementation implements PhaseListener {
+ private int runsAfter = 0;
+ private int runsBefore = 0;
+ private PhaseId phase = PhaseId.ANY_PHASE;
+
+ public void afterPhase(PhaseEvent event) {
+ runsAfter++;
+ }
+
+ public void beforePhase(PhaseEvent event) {
+ runsBefore++;
+ }
+
+ public PhaseId getPhaseId() {
+ return phase;
+ }
+
+ /**
+ * @return the runsBefore
+ */
+ int getRunsBefore() {
+ return runsBefore;
+ }
+
+ /**
+ * @return the runsAfter
+ */
+ int getRunsAfter() {
+ return runsAfter;
+ }
+
+ /**
+ * @param phase the phase to set
+ */
+ void setPhaseId(PhaseId phase) {
+ this.phase = phase;
+ }
+ }
}
Modified: root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/context/AjaxContextImplTest.java
===================================================================
--- root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/context/AjaxContextImplTest.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/context/AjaxContextImplTest.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -1,5 +1,6 @@
+
/**
- *
+ *
*/
package org.ajax4jsf.context;
@@ -13,77 +14,76 @@
*
*/
public class AjaxContextImplTest extends AbstractAjax4JsfTestCase {
+ private static final String FOO_BAR = "foo:bar";
- private static final String FOO_BAR = "foo:bar";
+ /**
+ * @param name
+ */
+ public AjaxContextImplTest(String name) {
+ super(name);
+ }
- /**
- * @param name
- */
- public AjaxContextImplTest(String name) {
- super(name);
- }
+ /*
+ * (non-Javadoc)
+ * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#setUp()
+ */
+ public void setUp() throws Exception {
+ super.setUp();
+ }
- /* (non-Javadoc)
- * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#setUp()
- */
- public void setUp() throws Exception {
- super.setUp();
- }
+ /*
+ * (non-Javadoc)
+ * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#tearDown()
+ */
+ public void tearDown() throws Exception {
+ super.tearDown();
+ }
- /* (non-Javadoc)
- * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#tearDown()
- */
- public void tearDown() throws Exception {
- super.tearDown();
- }
+ /**
+ * Test method for {@link org.ajax4jsf.context.AjaxContextImpl#decode(javax.faces.context.FacesContext)}.
+ */
+ public void testDecode0() {
+ ajaxContext.decode(facesContext);
+ assertFalse(ajaxContext.isAjaxRequest());
+ assertNull(ajaxContext.getSubmittedRegionClientId());
+ assertNull(ajaxContext.getAjaxSingleClientId());
+ }
- /**
- * Test method for {@link org.ajax4jsf.context.AjaxContextImpl#decode(javax.faces.context.FacesContext)}.
- */
- public void testDecode0() {
- ajaxContext.decode(facesContext);
- assertFalse(ajaxContext.isAjaxRequest());
- assertNull(ajaxContext.getSubmittedRegionClientId());
- assertNull(ajaxContext.getAjaxSingleClientId());
- }
+ /**
+ * Test method for {@link org.ajax4jsf.context.AjaxContextImpl#decode(javax.faces.context.FacesContext)}.
+ */
+ public void testDecode1() {
+ request.addParameter(AjaxContainerRenderer.AJAX_PARAMETER_NAME, FOO_BAR);
+ externalContext.addRequestParameterMap(AjaxContainerRenderer.AJAX_PARAMETER_NAME, FOO_BAR);
+ ajaxContext.decode(facesContext);
+ assertTrue(ajaxContext.isAjaxRequest());
+ assertEquals(FOO_BAR, ajaxContext.getSubmittedRegionClientId());
+ assertNull(ajaxContext.getAjaxSingleClientId());
+ }
- /**
- * Test method for {@link org.ajax4jsf.context.AjaxContextImpl#decode(javax.faces.context.FacesContext)}.
- */
- public void testDecode1() {
- request.addParameter(AjaxContainerRenderer.AJAX_PARAMETER_NAME, FOO_BAR);
- externalContext.addRequestParameterMap(AjaxContainerRenderer.AJAX_PARAMETER_NAME, FOO_BAR);
- ajaxContext.decode(facesContext);
- assertTrue(ajaxContext.isAjaxRequest());
- assertEquals(FOO_BAR, ajaxContext.getSubmittedRegionClientId());
- assertNull(ajaxContext.getAjaxSingleClientId());
- }
+ /**
+ * Test method for {@link org.ajax4jsf.context.AjaxContextImpl#decode(javax.faces.context.FacesContext)}.
+ */
+ public void testDecode2() {
+ externalContext.addRequestParameterMap(AjaxContainerRenderer.AJAX_PARAMETER_NAME, FOO_BAR);
+ externalContext.addRequestParameterMap(AjaxRendererUtils.AJAX_SINGLE_PARAMETER_NAME, FOO_BAR);
+ ajaxContext.decode(facesContext);
+ assertTrue(ajaxContext.isAjaxRequest());
+ assertEquals(FOO_BAR, ajaxContext.getSubmittedRegionClientId());
+ assertEquals(FOO_BAR, ajaxContext.getAjaxSingleClientId());
+ }
- /**
- * Test method for {@link org.ajax4jsf.context.AjaxContextImpl#decode(javax.faces.context.FacesContext)}.
- */
- public void testDecode2() {
- externalContext.addRequestParameterMap(AjaxContainerRenderer.AJAX_PARAMETER_NAME, FOO_BAR);
- externalContext.addRequestParameterMap(AjaxRendererUtils.AJAX_SINGLE_PARAMETER_NAME, FOO_BAR);
- ajaxContext.decode(facesContext);
- assertTrue(ajaxContext.isAjaxRequest());
- assertEquals(FOO_BAR, ajaxContext.getSubmittedRegionClientId());
- assertEquals(FOO_BAR, ajaxContext.getAjaxSingleClientId());
- }
- /**
- * Test method for {@link org.ajax4jsf.context.AjaxContextImpl#release()}.
- */
- public void testRelease() {
-
- }
+ /**
+ * Test method for {@link org.ajax4jsf.context.AjaxContextImpl#release()}.
+ */
+ public void testRelease() {}
- public void testGetCurrentInstance() throws Exception {
- this.ajaxContext = null;
- request.removeAttribute(AjaxContext.AJAX_CONTEXT_KEY);
- externalContext.addRequestParameterMap(AjaxContainerRenderer.AJAX_PARAMETER_NAME, FOO_BAR);
- ajaxContext = AjaxContext.getCurrentInstance(facesContext);
- assertTrue(ajaxContext.isAjaxRequest());
- assertEquals(FOO_BAR, ajaxContext.getSubmittedRegionClientId());
-
- }
+ public void testGetCurrentInstance() throws Exception {
+ this.ajaxContext = null;
+ request.removeAttribute(AjaxContext.AJAX_CONTEXT_KEY);
+ externalContext.addRequestParameterMap(AjaxContainerRenderer.AJAX_PARAMETER_NAME, FOO_BAR);
+ ajaxContext = AjaxContext.getCurrentInstance(facesContext);
+ assertTrue(ajaxContext.isAjaxRequest());
+ assertEquals(FOO_BAR, ajaxContext.getSubmittedRegionClientId());
+ }
}
Modified: root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/context/AjaxContextTest.java
===================================================================
--- root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/context/AjaxContextTest.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/context/AjaxContextTest.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -5,41 +5,44 @@
import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
public class AjaxContextTest extends AbstractAjax4JsfTestCase {
+ public AjaxContextTest(String name) {
+ super(name);
+ }
- public AjaxContextTest(String name) {
- super(name);
- }
+ public void setUp() throws Exception {
+ super.setUp();
+ }
- public void setUp() throws Exception {
- super.setUp();
- }
+ public void tearDown() throws Exception {
+ super.tearDown();
+ }
- public void tearDown() throws Exception {
- super.tearDown();
- }
+ public void testGetCurrentInstance() {
+ AjaxContext ajaxContext2 = AjaxContext.getCurrentInstance();
- public void testGetCurrentInstance() {
- AjaxContext ajaxContext2 = AjaxContext.getCurrentInstance();
- assertSame(ajaxContext, ajaxContext2);
- }
+ assertSame(ajaxContext, ajaxContext2);
+ }
- public void testGetCurrentInstanceFacesContext() {
- this.ajaxContext = null;
- request.removeAttribute(AjaxContext.AJAX_CONTEXT_KEY);
- ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
- ClassLoader loader = new ClassLoader(contextClassLoader){
- @Override
- public URL getResource(String name) {
- if(AjaxContext.SERVICE_RESOURCE.equals(name)){
- return super.getResource("META-INF/ajaxContext.txt");
- } else {
- return super.getResource(name);
- }
- }
- };
- Thread.currentThread().setContextClassLoader(loader);
- AjaxContext ajaxContext2 = AjaxContext.getCurrentInstance(facesContext);
- assertSame(MockAjaxContext.class,ajaxContext2.getClass());
- }
+ public void testGetCurrentInstanceFacesContext() {
+ this.ajaxContext = null;
+ request.removeAttribute(AjaxContext.AJAX_CONTEXT_KEY);
+ ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+ ClassLoader loader = new ClassLoader(contextClassLoader) {
+ @Override
+ public URL getResource(String name) {
+ if (AjaxContext.SERVICE_RESOURCE.equals(name)) {
+ return super.getResource("META-INF/ajaxContext.txt");
+ } else {
+ return super.getResource(name);
+ }
+ }
+ };
+
+ Thread.currentThread().setContextClassLoader(loader);
+
+ AjaxContext ajaxContext2 = AjaxContext.getCurrentInstance(facesContext);
+
+ assertSame(MockAjaxContext.class, ajaxContext2.getClass());
+ }
}
Modified: root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/context/MockAjaxContext.java
===================================================================
--- root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/context/MockAjaxContext.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/context/MockAjaxContext.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -1,9 +1,11 @@
+
/**
- *
+ *
*/
package org.ajax4jsf.context;
import java.io.IOException;
+
import java.util.Map;
import java.util.Set;
@@ -16,295 +18,335 @@
*/
public class MockAjaxContext extends AjaxContext {
- /**
- *
- */
- public MockAjaxContext() {
- // TODO Auto-generated constructor stub
- }
+ /**
+ *
+ */
+ public MockAjaxContext() {
- /* (non-Javadoc)
- * @see org.ajax4jsf.context.AjaxContext#addComponentToAjaxRender(javax.faces.component.UIComponent, java.lang.String)
- */
- @Override
- public void addComponentToAjaxRender(UIComponent base, String id) {
- // TODO Auto-generated method stub
+ // TODO Auto-generated constructor stub
+ }
- }
+ /*
+ * (non-Javadoc)
+ * @see org.ajax4jsf.context.AjaxContext#addComponentToAjaxRender(javax.faces.component.UIComponent, java.lang.String)
+ */
+ @Override
+ public void addComponentToAjaxRender(UIComponent base, String id) {
- /* (non-Javadoc)
- * @see org.ajax4jsf.context.AjaxContext#addComponentToAjaxRender(javax.faces.component.UIComponent)
- */
- @Override
- public void addComponentToAjaxRender(UIComponent component) {
- // TODO Auto-generated method stub
+ // TODO Auto-generated method stub
+ }
- }
+ /*
+ * (non-Javadoc)
+ * @see org.ajax4jsf.context.AjaxContext#addComponentToAjaxRender(javax.faces.component.UIComponent)
+ */
+ @Override
+ public void addComponentToAjaxRender(UIComponent component) {
- /* (non-Javadoc)
- * @see org.ajax4jsf.context.AjaxContext#addRegionsFromComponent(javax.faces.component.UIComponent)
- */
- @Override
- public void addRegionsFromComponent(UIComponent component) {
- // TODO Auto-generated method stub
+ // TODO Auto-generated method stub
+ }
- }
+ /*
+ * (non-Javadoc)
+ * @see org.ajax4jsf.context.AjaxContext#addRegionsFromComponent(javax.faces.component.UIComponent)
+ */
+ @Override
+ public void addRegionsFromComponent(UIComponent component) {
- /* (non-Javadoc)
- * @see org.ajax4jsf.context.AjaxContext#addRenderedArea(java.lang.String)
- */
- @Override
- public void addRenderedArea(String id) {
- // TODO Auto-generated method stub
+ // TODO Auto-generated method stub
+ }
- }
+ /*
+ * (non-Javadoc)
+ * @see org.ajax4jsf.context.AjaxContext#addRenderedArea(java.lang.String)
+ */
+ @Override
+ public void addRenderedArea(String id) {
- /* (non-Javadoc)
- * @see org.ajax4jsf.context.AjaxContext#decode(javax.faces.context.FacesContext)
- */
- @Override
- public void decode(FacesContext context) {
- // TODO Auto-generated method stub
+ // TODO Auto-generated method stub
+ }
- }
+ /*
+ * (non-Javadoc)
+ * @see org.ajax4jsf.context.AjaxContext#decode(javax.faces.context.FacesContext)
+ */
+ @Override
+ public void decode(FacesContext context) {
- /* (non-Javadoc)
- * @see org.ajax4jsf.context.AjaxContext#encodeAjaxBegin(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
- */
- @Override
- public void encodeAjaxBegin(FacesContext context)
- throws IOException {
- // TODO Auto-generated method stub
+ // TODO Auto-generated method stub
+ }
- }
+ /*
+ * (non-Javadoc)
+ * @see org.ajax4jsf.context.AjaxContext#encodeAjaxBegin(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+ */
+ @Override
+ public void encodeAjaxBegin(FacesContext context) throws IOException {
- /* (non-Javadoc)
- * @see org.ajax4jsf.context.AjaxContext#encodeAjaxEnd(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
- */
- @Override
- public void encodeAjaxEnd(FacesContext context)
- throws IOException {
- // TODO Auto-generated method stub
+ // TODO Auto-generated method stub
+ }
- }
+ /*
+ * (non-Javadoc)
+ * @see org.ajax4jsf.context.AjaxContext#encodeAjaxEnd(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+ */
+ @Override
+ public void encodeAjaxEnd(FacesContext context) throws IOException {
- /* (non-Javadoc)
- * @see org.ajax4jsf.context.AjaxContext#getAjaxActionURL(javax.faces.context.FacesContext)
- */
- @Override
- public String getAjaxActionURL(FacesContext context) {
- // TODO Auto-generated method stub
- return null;
- }
+ // TODO Auto-generated method stub
+ }
- /* (non-Javadoc)
- * @see org.ajax4jsf.context.AjaxContext#getAjaxActionURL()
- */
+ /*
+ * (non-Javadoc)
+ * @see org.ajax4jsf.context.AjaxContext#getAjaxActionURL(javax.faces.context.FacesContext)
+ */
+ @Override
+ public String getAjaxActionURL(FacesContext context) {
- /* (non-Javadoc)
- * @see org.ajax4jsf.context.AjaxContext#getAjaxAreasToRender()
- */
- @Override
- public Set<String> getAjaxAreasToRender() {
- // TODO Auto-generated method stub
- return null;
- }
+ // TODO Auto-generated method stub
+ return null;
+ }
- /* (non-Javadoc)
- * @see org.ajax4jsf.context.AjaxContext#getAjaxRenderedAreas()
- */
- @Override
- public Set<String> getAjaxRenderedAreas() {
- // TODO Auto-generated method stub
- return null;
- }
+ /*
+ * (non-Javadoc)
+ * @see org.ajax4jsf.context.AjaxContext#getAjaxActionURL()
+ */
- /* (non-Javadoc)
- * @see org.ajax4jsf.context.AjaxContext#getAjaxSingleClientId()
- */
- @Override
- public String getAjaxSingleClientId() {
- // TODO Auto-generated method stub
- return null;
- }
+ /*
+ * (non-Javadoc)
+ * @see org.ajax4jsf.context.AjaxContext#getAjaxAreasToRender()
+ */
+ @Override
+ public Set<String> getAjaxAreasToRender() {
- /* (non-Javadoc)
- * @see org.ajax4jsf.context.AjaxContext#getCommonAjaxParameters()
- */
- @Override
- public Map<String, Object> getCommonAjaxParameters() {
- // TODO Auto-generated method stub
- return null;
- }
+ // TODO Auto-generated method stub
+ return null;
+ }
- /* (non-Javadoc)
- * @see org.ajax4jsf.context.AjaxContext#getOncomplete()
- */
- @Override
- public Object getOncomplete() {
- // TODO Auto-generated method stub
- return null;
- }
+ /*
+ * (non-Javadoc)
+ * @see org.ajax4jsf.context.AjaxContext#getAjaxRenderedAreas()
+ */
+ @Override
+ public Set<String> getAjaxRenderedAreas() {
- /* (non-Javadoc)
- * @see org.ajax4jsf.context.AjaxContext#getResponseData()
- */
- @Override
- public Object getResponseData() {
- // TODO Auto-generated method stub
- return null;
- }
+ // TODO Auto-generated method stub
+ return null;
+ }
- /* (non-Javadoc)
- * @see org.ajax4jsf.context.AjaxContext#getResponseDataMap()
- */
- @Override
- public Map<String, Object> getResponseDataMap() {
- // TODO Auto-generated method stub
- return null;
- }
+ /*
+ * (non-Javadoc)
+ * @see org.ajax4jsf.context.AjaxContext#getAjaxSingleClientId()
+ */
+ @Override
+ public String getAjaxSingleClientId() {
- /* (non-Javadoc)
- * @see org.ajax4jsf.context.AjaxContext#getSubmittedRegionClientId(javax.faces.context.FacesContext)
- */
- @Override
- public String getSubmittedRegionClientId() {
- // TODO Auto-generated method stub
- return null;
- }
+ // TODO Auto-generated method stub
+ return null;
+ }
- /* (non-Javadoc)
- * @see org.ajax4jsf.context.AjaxContext#getViewIdHolder()
- */
- @Override
- public ViewIdHolder getViewIdHolder() {
- // TODO Auto-generated method stub
- return null;
- }
+ /*
+ * (non-Javadoc)
+ * @see org.ajax4jsf.context.AjaxContext#getCommonAjaxParameters()
+ */
+ @Override
+ public Map<String, Object> getCommonAjaxParameters() {
- /* (non-Javadoc)
- * @see org.ajax4jsf.context.AjaxContext#isAjaxRequest(javax.faces.context.FacesContext)
- */
+ // TODO Auto-generated method stub
+ return null;
+ }
- /* (non-Javadoc)
- * @see org.ajax4jsf.context.AjaxContext#isAjaxRequest()
- */
- @Override
- public boolean isAjaxRequest() {
- // TODO Auto-generated method stub
- return false;
- }
+ /*
+ * (non-Javadoc)
+ * @see org.ajax4jsf.context.AjaxContext#getOncomplete()
+ */
+ @Override
+ public Object getOncomplete() {
- /* (non-Javadoc)
- * @see org.ajax4jsf.context.AjaxContext#isSelfRender()
- */
- @Override
- public boolean isSelfRender() {
- // TODO Auto-generated method stub
- return false;
- }
+ // TODO Auto-generated method stub
+ return null;
+ }
- /* (non-Javadoc)
- * @see org.ajax4jsf.context.AjaxContext#release()
- */
- @Override
- public void release() {
- // TODO Auto-generated method stub
+ /*
+ * (non-Javadoc)
+ * @see org.ajax4jsf.context.AjaxContext#getResponseData()
+ */
+ @Override
+ public Object getResponseData() {
- }
+ // TODO Auto-generated method stub
+ return null;
+ }
- /* (non-Javadoc)
- * @see org.ajax4jsf.context.AjaxContext#removeRenderedArea(java.lang.String)
- */
- @Override
- public boolean removeRenderedArea(String id) {
- // TODO Auto-generated method stub
- return false;
- }
+ /*
+ * (non-Javadoc)
+ * @see org.ajax4jsf.context.AjaxContext#getResponseDataMap()
+ */
+ @Override
+ public Map<String, Object> getResponseDataMap() {
+ // TODO Auto-generated method stub
+ return null;
+ }
- /* (non-Javadoc)
- * @see org.ajax4jsf.context.AjaxContext#renderSubmittedAjaxRegion(javax.faces.context.FacesContext)
- */
- @Override
- public void renderAjax(FacesContext context) {
- // TODO Auto-generated method stub
+ /*
+ * (non-Javadoc)
+ * @see org.ajax4jsf.context.AjaxContext#getSubmittedRegionClientId(javax.faces.context.FacesContext)
+ */
+ @Override
+ public String getSubmittedRegionClientId() {
- }
+ // TODO Auto-generated method stub
+ return null;
+ }
- /* (non-Javadoc)
- * @see org.ajax4jsf.context.AjaxContext#saveViewState(javax.faces.context.FacesContext)
- */
- @Override
- public void saveViewState(FacesContext context) throws IOException {
- // TODO Auto-generated method stub
+ /*
+ * (non-Javadoc)
+ * @see org.ajax4jsf.context.AjaxContext#getViewIdHolder()
+ */
+ @Override
+ public ViewIdHolder getViewIdHolder() {
- }
+ // TODO Auto-generated method stub
+ return null;
+ }
- /* (non-Javadoc)
- * @see org.ajax4jsf.context.AjaxContext#setAjaxRequest(boolean)
- */
- @Override
- public void setAjaxRequest(boolean b) {
- // TODO Auto-generated method stub
+ /*
+ * (non-Javadoc)
+ * @see org.ajax4jsf.context.AjaxContext#isAjaxRequest(javax.faces.context.FacesContext)
+ */
- }
+ /*
+ * (non-Javadoc)
+ * @see org.ajax4jsf.context.AjaxContext#isAjaxRequest()
+ */
+ @Override
+ public boolean isAjaxRequest() {
- /* (non-Javadoc)
- * @see org.ajax4jsf.context.AjaxContext#setAjaxSingleClientId(java.lang.String)
- */
- @Override
- public void setAjaxSingleClientId(String ajaxSingleClientId) {
- // TODO Auto-generated method stub
+ // TODO Auto-generated method stub
+ return false;
+ }
- }
+ /*
+ * (non-Javadoc)
+ * @see org.ajax4jsf.context.AjaxContext#isSelfRender()
+ */
+ @Override
+ public boolean isSelfRender() {
- /* (non-Javadoc)
- * @see org.ajax4jsf.context.AjaxContext#setOncomplete(java.lang.Object)
- */
- @Override
- public void setOncomplete(Object oncompleteFunction) {
- // TODO Auto-generated method stub
+ // TODO Auto-generated method stub
+ return false;
+ }
- }
+ /*
+ * (non-Javadoc)
+ * @see org.ajax4jsf.context.AjaxContext#release()
+ */
+ @Override
+ public void release() {
- /* (non-Javadoc)
- * @see org.ajax4jsf.context.AjaxContext#setResponseData(java.lang.Object)
- */
- @Override
- public void setResponseData(Object responseData) {
- // TODO Auto-generated method stub
+ // TODO Auto-generated method stub
+ }
- }
+ /*
+ * (non-Javadoc)
+ * @see org.ajax4jsf.context.AjaxContext#removeRenderedArea(java.lang.String)
+ */
+ @Override
+ public boolean removeRenderedArea(String id) {
- /* (non-Javadoc)
- * @see org.ajax4jsf.context.AjaxContext#setSelfRender(boolean)
- */
- @Override
- public void setSelfRender(boolean b) {
- // TODO Auto-generated method stub
+ // TODO Auto-generated method stub
+ return false;
+ }
- }
+ /*
+ * (non-Javadoc)
+ * @see org.ajax4jsf.context.AjaxContext#renderSubmittedAjaxRegion(javax.faces.context.FacesContext)
+ */
+ @Override
+ public void renderAjax(FacesContext context) {
- /* (non-Javadoc)
- * @see org.ajax4jsf.context.AjaxContext#setViewIdHolder(org.ajax4jsf.context.ViewIdHolder)
- */
- @Override
- public void setViewIdHolder(ViewIdHolder viewIdHolder) {
- // TODO Auto-generated method stub
+ // TODO Auto-generated method stub
+ }
- }
+ /*
+ * (non-Javadoc)
+ * @see org.ajax4jsf.context.AjaxContext#saveViewState(javax.faces.context.FacesContext)
+ */
+ @Override
+ public void saveViewState(FacesContext context) throws IOException {
- public void setAjaxAreasToProcess(Set<String> ajaxAreasToProcess) {
- }
+ // TODO Auto-generated method stub
+ }
- @Override
- public Set<String> getAjaxAreasToProcess() {
- // TODO Auto-generated method stub
- return null;
- }
+ /*
+ * (non-Javadoc)
+ * @see org.ajax4jsf.context.AjaxContext#setAjaxRequest(boolean)
+ */
+ @Override
+ public void setAjaxRequest(boolean b) {
- public void setSubmittedRegionClientId(String submittedClientId) {
- }
+ // TODO Auto-generated method stub
+ }
+ /*
+ * (non-Javadoc)
+ * @see org.ajax4jsf.context.AjaxContext#setAjaxSingleClientId(java.lang.String)
+ */
+ @Override
+ public void setAjaxSingleClientId(String ajaxSingleClientId) {
+
+ // TODO Auto-generated method stub
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.ajax4jsf.context.AjaxContext#setOncomplete(java.lang.Object)
+ */
+ @Override
+ public void setOncomplete(Object oncompleteFunction) {
+
+ // TODO Auto-generated method stub
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.ajax4jsf.context.AjaxContext#setResponseData(java.lang.Object)
+ */
+ @Override
+ public void setResponseData(Object responseData) {
+
+ // TODO Auto-generated method stub
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.ajax4jsf.context.AjaxContext#setSelfRender(boolean)
+ */
+ @Override
+ public void setSelfRender(boolean b) {
+
+ // TODO Auto-generated method stub
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.ajax4jsf.context.AjaxContext#setViewIdHolder(org.ajax4jsf.context.ViewIdHolder)
+ */
+ @Override
+ public void setViewIdHolder(ViewIdHolder viewIdHolder) {
+
+ // TODO Auto-generated method stub
+ }
+
+ public void setAjaxAreasToProcess(Set<String> ajaxAreasToProcess) {}
+
+ @Override
+ public Set<String> getAjaxAreasToProcess() {
+
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public void setSubmittedRegionClientId(String submittedClientId) {}
}
Modified: root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/framework/ajax/xmlfilter/AllTests.java
===================================================================
--- root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/framework/ajax/xmlfilter/AllTests.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/framework/ajax/xmlfilter/AllTests.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -19,21 +19,22 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+
package org.ajax4jsf.framework.ajax.xmlfilter;
import junit.framework.Test;
import junit.framework.TestSuite;
public class AllTests {
+ public static Test suite() {
+ TestSuite suite = new TestSuite("Test for org.ajax4jsf.webapp");
- public static Test suite() {
- TestSuite suite = new TestSuite(
- "Test for org.ajax4jsf.webapp");
- //$JUnit-BEGIN$
- suite.addTestSuite(CacheContentTest.class);
- suite.addTestSuite(NekkoParserTest.class);
- //$JUnit-END$
- return suite;
- }
+ // $JUnit-BEGIN$
+ suite.addTestSuite(CacheContentTest.class);
+ suite.addTestSuite(NekkoParserTest.class);
+ // $JUnit-END$
+ return suite;
+ }
}
Modified: root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/framework/ajax/xmlfilter/CacheContentTest.java
===================================================================
--- root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/framework/ajax/xmlfilter/CacheContentTest.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/framework/ajax/xmlfilter/CacheContentTest.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+
package org.ajax4jsf.framework.ajax.xmlfilter;
import java.io.ByteArrayInputStream;
@@ -31,6 +33,7 @@
import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
import org.ajax4jsf.webapp.CacheContent;
+
import org.apache.shale.test.mock.MockPrintWriter;
import org.apache.shale.test.mock.MockServletOutputStream;
@@ -39,86 +42,104 @@
*
*/
public class CacheContentTest extends AbstractAjax4JsfTestCase {
+ public CacheContentTest(String name) {
+ super(name);
- public CacheContentTest(String name) {
- super(name);
- // TODO Auto-generated constructor stub
- }
+ // TODO Auto-generated constructor stub
+ }
-
- /* (non-Javadoc)
- * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#setUp()
- */
- public void setUp() throws Exception {
- // TODO Auto-generated method stub
- super.setUp();
- }
+ /*
+ * (non-Javadoc)
+ * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#setUp()
+ */
+ public void setUp() throws Exception {
+ // TODO Auto-generated method stub
+ super.setUp();
+ }
- /* (non-Javadoc)
- * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#tearDown()
- */
- public void tearDown() throws Exception {
- // TODO Auto-generated method stub
- super.tearDown();
- }
+ /*
+ * (non-Javadoc)
+ * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#tearDown()
+ */
+ public void tearDown() throws Exception {
+ // TODO Auto-generated method stub
+ super.tearDown();
+ }
- /**
- * Test method for {@link org.ajax4jsf.webapp.CacheContent#getOutputStream(java.io.OutputStream)}.
- * @throws IOException
- */
- public void testGetOutputStream() throws IOException {
- CacheContent content = new CacheContent();
- OutputStream outputStream = content.getOutputStream();
- byte[] bytes = "Test".getBytes();
- outputStream.write(bytes);
- outputStream.flush();
- outputStream.close();
- ByteArrayOutputStream ser = new ByteArrayOutputStream(1024);
- ObjectOutputStream objStream = new ObjectOutputStream(ser);
- objStream.writeObject(content);
- objStream.flush();
- ByteArrayInputStream in = new ByteArrayInputStream(ser.toByteArray());
- ObjectInputStream objInput = new ObjectInputStream(in);
- try {
- content = (CacheContent) objInput.readObject();
- } catch (ClassNotFoundException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- content.send(this.response);
- MockServletOutputStream mockStream = (MockServletOutputStream) response.getOutputStream();
- byte[] bs = mockStream.content();
- assertEquals("Test", new String(bs));
- }
+ /**
+ * Test method for {@link org.ajax4jsf.webapp.CacheContent#getOutputStream(java.io.OutputStream)}.
+ * @throws IOException
+ */
+ public void testGetOutputStream() throws IOException {
+ CacheContent content = new CacheContent();
+ OutputStream outputStream = content.getOutputStream();
+ byte[] bytes = "Test".getBytes();
- /**
- * Test method for {@link org.ajax4jsf.webapp.CacheContent#getWriter(java.io.Writer)}.
- * @throws IOException
- */
- public void testGetWriter() throws IOException {
- CacheContent content = new CacheContent();
- PrintWriter outputStream = content.getWriter();
- outputStream.write("Test");
- outputStream.flush();
- outputStream.close();
- ByteArrayOutputStream ser = new ByteArrayOutputStream(1024);
- ObjectOutputStream objStream = new ObjectOutputStream(ser);
- objStream.writeObject(content);
- objStream.flush();
- ByteArrayInputStream in = new ByteArrayInputStream(ser.toByteArray());
- ObjectInputStream objInput = new ObjectInputStream(in);
- try {
- content = (CacheContent) objInput.readObject();
- } catch (ClassNotFoundException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- content.send(this.response);
- MockPrintWriter writer = (MockPrintWriter) response.getWriter();
- char[] cs = writer.content();
- assertEquals("Test", new String(cs));
- }
+ outputStream.write(bytes);
+ outputStream.flush();
+ outputStream.close();
+ ByteArrayOutputStream ser = new ByteArrayOutputStream(1024);
+ ObjectOutputStream objStream = new ObjectOutputStream(ser);
+
+ objStream.writeObject(content);
+ objStream.flush();
+
+ ByteArrayInputStream in = new ByteArrayInputStream(ser.toByteArray());
+ ObjectInputStream objInput = new ObjectInputStream(in);
+
+ try {
+ content = (CacheContent) objInput.readObject();
+ } catch (ClassNotFoundException e) {
+
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ content.send(this.response);
+
+ MockServletOutputStream mockStream = (MockServletOutputStream) response.getOutputStream();
+ byte[] bs = mockStream.content();
+
+ assertEquals("Test", new String(bs));
+ }
+
+ /**
+ * Test method for {@link org.ajax4jsf.webapp.CacheContent#getWriter(java.io.Writer)}.
+ * @throws IOException
+ */
+ public void testGetWriter() throws IOException {
+ CacheContent content = new CacheContent();
+ PrintWriter outputStream = content.getWriter();
+
+ outputStream.write("Test");
+ outputStream.flush();
+ outputStream.close();
+
+ ByteArrayOutputStream ser = new ByteArrayOutputStream(1024);
+ ObjectOutputStream objStream = new ObjectOutputStream(ser);
+
+ objStream.writeObject(content);
+ objStream.flush();
+
+ ByteArrayInputStream in = new ByteArrayInputStream(ser.toByteArray());
+ ObjectInputStream objInput = new ObjectInputStream(in);
+
+ try {
+ content = (CacheContent) objInput.readObject();
+ } catch (ClassNotFoundException e) {
+
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ content.send(this.response);
+
+ MockPrintWriter writer = (MockPrintWriter) response.getWriter();
+ char[] cs = writer.content();
+
+ assertEquals("Test", new String(cs));
+ }
}
Modified: root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/framework/ajax/xmlfilter/NekkoParserTest.java
===================================================================
--- root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/framework/ajax/xmlfilter/NekkoParserTest.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/framework/ajax/xmlfilter/NekkoParserTest.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+
package org.ajax4jsf.framework.ajax.xmlfilter;
import java.io.IOException;
@@ -31,62 +33,77 @@
import org.ajax4jsf.webapp.nekko.NekkoParser;
public class NekkoParserTest extends TestCase {
-
- private NekkoParser parser;
+ private NekkoParser parser;
- protected void setUp() throws Exception {
- parser = new NekkoParser();
- parser.setInputEncoding("UTF-8");
- parser.setOutputEncoding("UTF-8");
- parser.init();
- super.setUp();
- }
+ protected void setUp() throws Exception {
+ parser = new NekkoParser();
+ parser.setInputEncoding("UTF-8");
+ parser.setOutputEncoding("UTF-8");
+ parser.init();
+ super.setUp();
+ }
- protected void tearDown() throws Exception {
- parser = null;
- super.tearDown();
- }
+ protected void tearDown() throws Exception {
+ parser = null;
+ super.tearDown();
+ }
- /*
- * Test method for 'org.ajax4jsf.webapp.NekkoParser.parseHtml(Reader, Writer)'
- */
- public void testParseHtmlReaderWriter() {
- String html = "<html><body><table><tr><td>xxx</td></tr></table></body></html>";
- ParseString(html);
- }
+ /*
+ * Test method for 'org.ajax4jsf.webapp.NekkoParser.parseHtml(Reader, Writer)'
+ */
+ public void testParseHtmlReaderWriter() {
+ String html = "<html><body><table><tr><td>xxx</td></tr></table></body></html>";
- public void testParseHtmlReaderWriter1() {
- String html = "<html><body><table><tr><td>xxx</td></tr><tr><td>xxx</td></tr></table></body></html>";
- ParseString(html);
- }
- public void testParseHtmlReaderWriter2() {
- String html = "<html><body><table><tbody><tr><td>xxx</td></tr><tr><td>xxx</td></tr></tbody></table></body></html>";
- ParseString(html);
- }
- public void testParseHtmlReaderWriter3() {
- String html = "<html><body><table><thead><tr><td>xxx</td></tr></thead><tr><td>xxx</td></tr></table></body></html>";
- ParseString(html);
- }
- public void testParseHtmlReaderWriter4() {
- String html = "<html><body><table><span><tr><td>xxx</td></tr><tr><td>xxx</td></tr></span></table></body></html>";
- ParseString(html);
- }
- /**
- * @param html
- */
- private String ParseString(String html) {
- Reader in = new StringReader(html);
- StringWriter out = new StringWriter();
- try {
- parser.parseHtml(in,out);
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- assertTrue("Io error in parser ",false);
- }
- String toString = out.toString();
- System.out.println(toString);
- return toString;
- }
+ ParseString(html);
+ }
+ public void testParseHtmlReaderWriter1() {
+ String html = "<html><body><table><tr><td>xxx</td></tr><tr><td>xxx</td></tr></table></body></html>";
+
+ ParseString(html);
+ }
+
+ public void testParseHtmlReaderWriter2() {
+ String html =
+ "<html><body><table><tbody><tr><td>xxx</td></tr><tr><td>xxx</td></tr></tbody></table></body></html>";
+
+ ParseString(html);
+ }
+
+ public void testParseHtmlReaderWriter3() {
+ String html =
+ "<html><body><table><thead><tr><td>xxx</td></tr></thead><tr><td>xxx</td></tr></table></body></html>";
+
+ ParseString(html);
+ }
+
+ public void testParseHtmlReaderWriter4() {
+ String html =
+ "<html><body><table><span><tr><td>xxx</td></tr><tr><td>xxx</td></tr></span></table></body></html>";
+
+ ParseString(html);
+ }
+
+ /**
+ * @param html
+ */
+ private String ParseString(String html) {
+ Reader in = new StringReader(html);
+ StringWriter out = new StringWriter();
+
+ try {
+ parser.parseHtml(in, out);
+ } catch (IOException e) {
+
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ assertTrue("Io error in parser ", false);
+ }
+
+ String toString = out.toString();
+
+ System.out.println(toString);
+
+ return toString;
+ }
}
Modified: root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/framework/renderer/BeforeRendererListenerTestCase.java
===================================================================
--- root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/framework/renderer/BeforeRendererListenerTestCase.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/framework/renderer/BeforeRendererListenerTestCase.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+
package org.ajax4jsf.framework.renderer;
import javax.faces.event.PhaseEvent;
@@ -38,56 +40,55 @@
*/
public class BeforeRendererListenerTestCase extends AbstractAjax4JsfTestCase {
- /**
- * @param name
- */
- public BeforeRendererListenerTestCase(String name) {
- super(name);
- }
+ /**
+ * @param name
+ */
+ public BeforeRendererListenerTestCase(String name) {
+ super(name);
+ }
- /*
- * @see VcpJsfTestCase#setUp()
- */
- public void setUp() throws Exception {
- super.setUp();
- FilterServletResponseWrapper responseWrapper = new FilterServletResponseWrapper(response);
- request.setAttribute(BaseFilter.RESPONSE_WRAPPER_ATTRIBUTE, responseWrapper );
- }
+ /*
+ * @see VcpJsfTestCase#setUp()
+ */
+ public void setUp() throws Exception {
+ super.setUp();
- /*
- * @see VcpJsfTestCase#tearDown()
- */
- public void tearDown() throws Exception {
- super.tearDown();
- }
+ FilterServletResponseWrapper responseWrapper = new FilterServletResponseWrapper(response);
- /*
- * Test method for 'org.ajax4jsf.renderkit.BeforeRenderListener.afterPhase(PhaseEvent)'
- */
- public void testAfterPhase() throws Exception {
- PhaseListener listener = new AjaxPhaseListener();
- PhaseEvent event = new PhaseEvent(facesContext,PhaseId.RENDER_RESPONSE,lifecycle);
-// UIComponent ajaxButton = createComponent("org.ajax4jsf.ajax.AjaxButton", "org.ajax4jsf.ajax.html.HtmlAjaxCommandButton", "org.ajax4jsf.ajax.AjaxButton", CommandButtonRenderer.class, null);
-// facesContext.getViewRoot().getChildren().add(ajaxButton);
- AjaxContext.getCurrentInstance(facesContext).setAjaxRequest(true);
- // TODO Must be used different StateManager !
-// listener.afterPhase(event);
-// assertNotNull(externalContext.getRequestMap().get(AjaxPhaseListener.VIEW_STATE_SAVED_PARAM));
-// assertNull(externalContext.getRequestMap().get(AjaxContext.STYLES_PARAMETER));
- }
+ request.setAttribute(BaseFilter.RESPONSE_WRAPPER_ATTRIBUTE, responseWrapper);
+ }
- /*
- * Test method for 'org.ajax4jsf.renderkit.BeforeRenderListener.beforePhase(PhaseEvent)'
- */
- public void testBeforePhase() {
+ /*
+ * @see VcpJsfTestCase#tearDown()
+ */
+ public void tearDown() throws Exception {
+ super.tearDown();
+ }
- }
+ /*
+ * Test method for 'org.ajax4jsf.renderkit.BeforeRenderListener.afterPhase(PhaseEvent)'
+ */
+ public void testAfterPhase() throws Exception {
+ PhaseListener listener = new AjaxPhaseListener();
+ PhaseEvent event = new PhaseEvent(facesContext, PhaseId.RENDER_RESPONSE, lifecycle);
- /*
- * Test method for 'org.ajax4jsf.renderkit.BeforeRenderListener.isValueReference(String)'
- */
- public void testIsValueReference() {
+// UIComponent ajaxButton = createComponent("org.ajax4jsf.ajax.AjaxButton", "org.ajax4jsf.ajax.html.HtmlAjaxCommandButton", "org.ajax4jsf.ajax.AjaxButton", CommandButtonRenderer.class, null);
+// facesContext.getViewRoot().getChildren().add(ajaxButton);
+ AjaxContext.getCurrentInstance(facesContext).setAjaxRequest(true);
- }
+ // TODO Must be used different StateManager !
+// listener.afterPhase(event);
+// assertNotNull(externalContext.getRequestMap().get(AjaxPhaseListener.VIEW_STATE_SAVED_PARAM));
+// assertNull(externalContext.getRequestMap().get(AjaxContext.STYLES_PARAMETER));
+ }
+ /*
+ * Test method for 'org.ajax4jsf.renderkit.BeforeRenderListener.beforePhase(PhaseEvent)'
+ */
+ public void testBeforePhase() {}
+
+ /*
+ * Test method for 'org.ajax4jsf.renderkit.BeforeRenderListener.isValueReference(String)'
+ */
+ public void testIsValueReference() {}
}
Modified: root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/framework/renderer/ChameleonRenderKitImplTestCase.java
===================================================================
--- root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/framework/renderer/ChameleonRenderKitImplTestCase.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/framework/renderer/ChameleonRenderKitImplTestCase.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+
package org.ajax4jsf.framework.renderer;
import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
@@ -30,46 +32,39 @@
*/
public class ChameleonRenderKitImplTestCase extends AbstractAjax4JsfTestCase {
- /**
- * @param name
- */
- public ChameleonRenderKitImplTestCase(String name) {
- super(name);
- }
+ /**
+ * @param name
+ */
+ public ChameleonRenderKitImplTestCase(String name) {
+ super(name);
+ }
- /*
- * @see VcpJsfTestCase#setUp()
- */
- public void setUp() throws Exception {
- super.setUp();
- }
+ /*
+ * @see VcpJsfTestCase#setUp()
+ */
+ public void setUp() throws Exception {
+ super.setUp();
+ }
- /*
- * @see VcpJsfTestCase#tearDown()
- */
- public void tearDown() throws Exception {
- super.tearDown();
- }
+ /*
+ * @see VcpJsfTestCase#tearDown()
+ */
+ public void tearDown() throws Exception {
+ super.tearDown();
+ }
- /*
- * Test method for 'org.ajax4jsf.renderkit.ChameleonRenderKitImpl.addRenderer(String, String, Renderer)'
- */
- public void testAddRendererStringStringRenderer() {
+ /*
+ * Test method for 'org.ajax4jsf.renderkit.ChameleonRenderKitImpl.addRenderer(String, String, Renderer)'
+ */
+ public void testAddRendererStringStringRenderer() {}
- }
+ /*
+ * Test method for 'org.ajax4jsf.renderkit.ChameleonRenderKitImpl.getRenderer(String, String)'
+ */
+ public void testGetRendererStringString() {}
- /*
- * Test method for 'org.ajax4jsf.renderkit.ChameleonRenderKitImpl.getRenderer(String, String)'
- */
- public void testGetRendererStringString() {
-
- }
-
- /*
- * Test method for 'org.ajax4jsf.renderkit.ChameleonRenderKitImpl.getDefaultRenderKit()'
- */
- public void testGetDefaultRenderKit() {
-
- }
-
+ /*
+ * Test method for 'org.ajax4jsf.renderkit.ChameleonRenderKitImpl.getDefaultRenderKit()'
+ */
+ public void testGetDefaultRenderKit() {}
}
Modified: root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/framework/renderer/RenderTests.java
===================================================================
--- root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/framework/renderer/RenderTests.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/framework/renderer/RenderTests.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+
package org.ajax4jsf.framework.renderer;
import junit.framework.Test;
@@ -30,15 +32,14 @@
*
*/
public class RenderTests {
+ public static Test suite() {
+ TestSuite suite = new TestSuite("Test for org.ajax4jsf.renderkit");
- public static Test suite() {
- TestSuite suite = new TestSuite(
- "Test for org.ajax4jsf.renderkit");
- //$JUnit-BEGIN$
- suite.addTestSuite(ChameleonRenderKitImplTestCase.class);
- suite.addTestSuite(BeforeRendererListenerTestCase.class);
- //$JUnit-END$
- return suite;
- }
+ // $JUnit-BEGIN$
+ suite.addTestSuite(ChameleonRenderKitImplTestCase.class);
+ suite.addTestSuite(BeforeRendererListenerTestCase.class);
+ // $JUnit-END$
+ return suite;
+ }
}
Modified: root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/resource/AllResourcesTests.java
===================================================================
--- root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/resource/AllResourcesTests.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/resource/AllResourcesTests.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+
package org.ajax4jsf.resource;
import junit.framework.Test;
@@ -30,16 +32,15 @@
*
*/
public class AllResourcesTests {
+ public static Test suite() {
+ TestSuite suite = new TestSuite("Test for org.ajax4jsf.resource");
- public static Test suite() {
- TestSuite suite = new TestSuite(
- "Test for org.ajax4jsf.resource");
- //$JUnit-BEGIN$
- suite.addTestSuite(ResourceServiceThreadsTestCase.class);
- suite.addTestSuite(InternetResourceServiceTestCase.class);
- suite.addTestSuite(CSSTemplateTestCase.class);
- //$JUnit-END$
- return suite;
- }
+ // $JUnit-BEGIN$
+ suite.addTestSuite(ResourceServiceThreadsTestCase.class);
+ suite.addTestSuite(InternetResourceServiceTestCase.class);
+ suite.addTestSuite(CSSTemplateTestCase.class);
+ // $JUnit-END$
+ return suite;
+ }
}
Modified: root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/resource/CSSTemplateTestCase.java
===================================================================
--- root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/resource/CSSTemplateTestCase.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/resource/CSSTemplateTestCase.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+
package org.ajax4jsf.resource;
import java.io.IOException;
@@ -27,6 +29,7 @@
import org.ajax4jsf.renderkit.compiler.TemplateContext;
import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
import org.ajax4jsf.webapp.WebXml;
+
import org.apache.shale.test.mock.MockPrintWriter;
/**
@@ -35,150 +38,160 @@
*
*/
public class CSSTemplateTestCase extends AbstractAjax4JsfTestCase {
+ private static boolean methodCalled = false;
+ private static boolean methodParamOk = false;
- private static boolean methodCalled=false;
+ /**
+ * Constructor for CSSTemplateTestCase.
+ * @param name
+ */
+ public CSSTemplateTestCase(String name) {
+ super(name);
+ }
- private static boolean methodParamOk=false;
+ /*
+ * @see VcpJsfTestCase#setUp()
+ */
+ public void setUp() throws Exception {
+ super.setUp();
+ CSSTemplateTestCase.methodCalled = false;
+ CSSTemplateTestCase.methodParamOk = false;
+ }
- /**
- * Constructor for CSSTemplateTestCase.
- * @param name
- */
- public CSSTemplateTestCase(String name) {
- super(name);
- }
+ /*
+ * @see VcpJsfTestCase#tearDown()
+ */
+ public void tearDown() throws Exception {
+ super.tearDown();
+ }
- /*
- * @see VcpJsfTestCase#setUp()
- */
- public void setUp() throws Exception {
- super.setUp();
- CSSTemplateTestCase.methodCalled=false;
- CSSTemplateTestCase.methodParamOk=false;
- }
+ public void testCallWithContext() throws Exception {
+ String templatePath = "org/ajax4jsf/resource/call.xml";
+ TemplateCSSResource resource = new TemplateCSSResource(templatePath);
+ ResourceContext context = new FacesResourceContext(facesContext);
- /*
- * @see VcpJsfTestCase#tearDown()
- */
- public void tearDown() throws Exception {
- super.tearDown();
- }
+ try {
+ resource.send(context);
+ } catch (IOException e) {
+ assertTrue("error send style", false);
+ }
- public void testCallWithContext() throws Exception {
- String templatePath = "org/ajax4jsf/resource/call.xml";
- TemplateCSSResource resource = new TemplateCSSResource(templatePath);
+ assertTrue(methodCalled);
+ }
+
+ public static void contextCallWithParam(TemplateContext context, String param) {
+ methodCalled = true;
+ methodParamOk = "Test".equals(param);
+ }
+
+ public void testCallWithContextAndParam() throws Exception {
+ String templatePath = "org/ajax4jsf/resource/callWithParam.xml";
+ TemplateCSSResource resource = new TemplateCSSResource(templatePath);
ResourceContext context = new FacesResourceContext(facesContext);
+
try {
- resource.send(context);
- } catch (IOException e) {
- assertTrue("error send style",false);
- }
- assertTrue(methodCalled);
- }
-
- public static void contextCallWithParam(TemplateContext context,String param) {
- methodCalled = true;
- methodParamOk = "Test".equals(param);
- }
+ resource.send(context);
+ } catch (IOException e) {
+ assertTrue("error send style", false);
+ }
- public void testCallWithContextAndParam() throws Exception {
- String templatePath = "org/ajax4jsf/resource/callWithParam.xml";
- TemplateCSSResource resource = new TemplateCSSResource(templatePath);
+ assertTrue(methodCalled);
+ }
+
+ public static void contextCall(TemplateContext context) {
+ methodCalled = true;
+ }
+
+ /*
+ * Test method for 'org.ajax4jsf.resource.TemplateCSSResource.send(ResourceContext)'
+ */
+ public void testSend() throws IOException {
+ String templatePath = "org/ajax4jsf/resource/styles.xml";
+ TemplateCSSResource resource = new TemplateCSSResource(templatePath);
ResourceContext context = new FacesResourceContext(facesContext);
+
try {
- resource.send(context);
- } catch (IOException e) {
- assertTrue("error send style",false);
- }
- assertTrue(methodCalled);
- }
-
- public static void contextCall(TemplateContext context) {
- methodCalled = true;
- }
- /*
- * Test method for 'org.ajax4jsf.resource.TemplateCSSResource.send(ResourceContext)'
- */
- public void testSend() throws IOException {
- String templatePath = "org/ajax4jsf/resource/styles.xml";
- TemplateCSSResource resource = new TemplateCSSResource(templatePath);
- ResourceContext context = new FacesResourceContext(facesContext);
- try {
- resource.send(context);
- } catch (IOException e) {
- assertTrue("error send style",false);
- }
- MockPrintWriter printWriter = (MockPrintWriter) response.getWriter();
- String content = String.valueOf(printWriter.content());
- System.out.println(content);
- }
+ resource.send(context);
+ } catch (IOException e) {
+ assertTrue("error send style", false);
+ }
- /*
- * Test method for 'org.ajax4jsf.resource.TemplateCSSResource.TemplateCSSResource(String)'
- */
- public void testTemplateCSSResource() throws IOException {
- String templatePath = "org/ajax4jsf/resource/styles.xml";
- TemplateCSSResource resource = new TemplateCSSResource(templatePath);
- assertEquals(templatePath,resource.getKey());
- InternetResource resource2 = InternetResourceBuilder.getInstance().createResource(this,resource.getKey());
- ResourceContext ctx = new FacesResourceContext(this.facesContext);
- InputStream stream = resource.getResourceAsStream(ctx);
- byte[] resourceContent = new byte[8196];
- int length = stream.read(resourceContent);
- InputStream stream2 = resource2.getResourceAsStream(ctx);
- byte[] resource2Content = new byte[8196];
- int length2 = stream2.read(resource2Content);
- assertEquals(length, length2);
+ MockPrintWriter printWriter = (MockPrintWriter) response.getWriter();
+ String content = String.valueOf(printWriter.content());
- }
+ System.out.println(content);
+ }
- /*
- * Test method for 'org.ajax4jsf.resource.InternetResourceBase.isCacheable()'
- */
- public void testIsCacheable() {
+ /*
+ * Test method for 'org.ajax4jsf.resource.TemplateCSSResource.TemplateCSSResource(String)'
+ */
+ public void testTemplateCSSResource() throws IOException {
+ String templatePath = "org/ajax4jsf/resource/styles.xml";
+ TemplateCSSResource resource = new TemplateCSSResource(templatePath);
- }
+ assertEquals(templatePath, resource.getKey());
- /*
- * Test method for 'org.ajax4jsf.resource.InternetResourceBase.getContentType()'
- */
- public void testGetContentType() {
+ InternetResource resource2 = InternetResourceBuilder.getInstance().createResource(this, resource.getKey());
+ ResourceContext ctx = new FacesResourceContext(this.facesContext);
+ InputStream stream = resource.getResourceAsStream(ctx);
+ byte[] resourceContent = new byte[8196];
+ int length = stream.read(resourceContent);
+ InputStream stream2 = resource2.getResourceAsStream(ctx);
+ byte[] resource2Content = new byte[8196];
+ int length2 = stream2.read(resource2Content);
- String templatePath = "org/ajax4jsf/resource/styles.xml";
- TemplateCSSResource resource = new TemplateCSSResource(templatePath);
- assertEquals("text/css",resource.getContentType(null));
-}
+ assertEquals(length, length2);
+ }
- /*
- * Test method for 'org.ajax4jsf.resource.InternetResourceBase.getUri(FacesContext, Object)'
- */
- public void testGetUri() {
- String templatePath = "org/ajax4jsf/resource/styles.xml";
- TemplateCSSResource resource = new TemplateCSSResource(templatePath);
-// System.out.println(resource.getUri(facesContext,null));
-// System.out.println(expextedUri);
- String uri = resource.getUri(facesContext,null);
- assertTrue(uri.startsWith(request.getContextPath()+"/"+WebXml.RESOURCE_URI_PREFIX));
- assertTrue(uri.startsWith(request.getContextPath()+"/"+WebXml.SESSION_RESOURCE_URI_PREFIX_VERSIONED + resource.getKey()));
- }
+ /*
+ * Test method for 'org.ajax4jsf.resource.InternetResourceBase.isCacheable()'
+ */
+ public void testIsCacheable() {}
- /*
- * Test method for 'org.ajax4jsf.resource.InternetResourceBase.getResourceAsStream(ResourceContext)'
- */
- public void testGetResourceAsStream() {
+ /*
+ * Test method for 'org.ajax4jsf.resource.InternetResourceBase.getContentType()'
+ */
+ public void testGetContentType() {
+ String templatePath = "org/ajax4jsf/resource/styles.xml";
+ TemplateCSSResource resource = new TemplateCSSResource(templatePath);
- }
+ assertEquals("text/css", resource.getContentType(null));
+ }
- /*
- * Test method for 'org.ajax4jsf.resource.InternetResourceBase.sendHeaders(ResourceContext)'
- */
- public void testSendHeaders() {
- String templatePath = "org/ajax4jsf/resource/styles.xml";
- TemplateCSSResource resource = new TemplateCSSResource(templatePath);
+ /*
+ * Test method for 'org.ajax4jsf.resource.InternetResourceBase.getUri(FacesContext, Object)'
+ */
+ public void testGetUri() {
+ String templatePath = "org/ajax4jsf/resource/styles.xml";
+ TemplateCSSResource resource = new TemplateCSSResource(templatePath);
+
+// System.out.println(resource.getUri(facesContext,null));
+// System.out.println(expextedUri);
+ String uri = resource.getUri(facesContext, null);
+
+ assertTrue(uri.startsWith(request.getContextPath() + "/" + WebXml.RESOURCE_URI_PREFIX));
+ assertTrue(uri.startsWith(request.getContextPath() + "/" + WebXml.SESSION_RESOURCE_URI_PREFIX_VERSIONED
+ + resource.getKey()));
+ }
+
+ /*
+ * Test method for 'org.ajax4jsf.resource.InternetResourceBase.getResourceAsStream(ResourceContext)'
+ */
+ public void testGetResourceAsStream() {}
+
+ /*
+ * Test method for 'org.ajax4jsf.resource.InternetResourceBase.sendHeaders(ResourceContext)'
+ */
+ public void testSendHeaders() {
+ String templatePath = "org/ajax4jsf/resource/styles.xml";
+ TemplateCSSResource resource = new TemplateCSSResource(templatePath);
ResourceContext context = new FacesResourceContext(facesContext);
+
resource.sendHeaders(context);
+
String header = response.getContentType();
+
assertNotNull(header);
assertTrue(header.startsWith("text/css"));
- }
+ }
}
Modified: root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/resource/InternetResourceServiceTestCase.java
===================================================================
--- root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/resource/InternetResourceServiceTestCase.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/resource/InternetResourceServiceTestCase.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -19,11 +19,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+
package org.ajax4jsf.resource;
import java.io.IOException;
import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
+
import org.apache.shale.test.mock.MockHttpServletResponse;
import org.apache.shale.test.mock.MockServletOutputStream;
@@ -33,138 +36,158 @@
*/
public class InternetResourceServiceTestCase extends AbstractAjax4JsfTestCase {
- /**
- * @param name
- */
- public InternetResourceServiceTestCase(String name) {
- super(name);
- }
+ /**
+ * @param name
+ */
+ public InternetResourceServiceTestCase(String name) {
+ super(name);
+ }
- /* (non-Javadoc)
- * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#setUp()
- */
- public void setUp() throws Exception {
- super.setUp();
-
- //TODO fix when setContentLength in shale-test will start function
- // https://issues.apache.org/struts/browse/SHALE-495
- this.response = new MockHttpServletResponse() {
-
- public int getContentLength() {
- return Integer.parseInt(getHeader("Content-Length"));
- }
-
- public void setContentLength(int length) {
- addIntHeader("Content-Length", length);
- }
- };
- }
+ /*
+ * (non-Javadoc)
+ * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#setUp()
+ */
+ public void setUp() throws Exception {
+ super.setUp();
- /* (non-Javadoc)
- * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#tearDown()
- */
- public void tearDown() throws Exception {
- super.tearDown();
- InternetResourceBuilder.setInstance(null);
- }
+ // TODO fix when setContentLength in shale-test will start function
+ // https://issues.apache.org/struts/browse/SHALE-495
+ this.response = new MockHttpServletResponse() {
+ public int getContentLength() {
+ return Integer.parseInt(getHeader("Content-Length"));
+ }
+ public void setContentLength(int length) {
+ addIntHeader("Content-Length", length);
+ }
+ };
+ }
- /**
- * Test method for {@link org.ajax4jsf.resource.InternetResourceService#init(javax.servlet.FilterConfig)}.
- * @throws Exception
- */
- public void testInit() throws Exception {
- InternetResourceService service = new InternetResourceService();
- MockFilterConfig mockFilterConfig = new MockFilterConfig(servletContext);
- mockFilterConfig.setInitParameter(InternetResourceService.ENABLE_CACHING_PARAMETER, "true");
- service.init(mockFilterConfig);
- assertSame(servletContext, service.getServletContext());
- }
+ /*
+ * (non-Javadoc)
+ * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#tearDown()
+ */
+ public void tearDown() throws Exception {
+ super.tearDown();
+ InternetResourceBuilder.setInstance(null);
+ }
- /**
- * Test method for {@link org.ajax4jsf.resource.InternetResourceService#serviceResource(java.lang.String, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}.
- * @throws IOException
- * @throws Exception
- */
- public void testServiceResource() throws Exception, IOException {
- InternetResourceService service = new InternetResourceService();
- MockFilterConfig mockFilterConfig = new MockFilterConfig(servletContext);
- mockFilterConfig.setInitParameter(InternetResourceService.ENABLE_CACHING_PARAMETER, "true");
- service.init(mockFilterConfig);
- InternetResourceBuilder builder = InternetResourceBuilder.getInstance();
- InternetResource resource = builder.createResource(this, "test.js");
- MockResourceRequest resourceRequest = new MockResourceRequest(request);
- String key = resource.getKey();
- service.serviceResource(key,resourceRequest,response);
- byte[] content = ((MockServletOutputStream)response.getOutputStream()).content();
- String strContent = new String(content);
- assertEquals(strContent, "\nfunction Test(){};");
- response.setOutputStream(null);
- response.setWriter(null);
- }
+ /**
+ * Test method for {@link org.ajax4jsf.resource.InternetResourceService#init(javax.servlet.FilterConfig)}.
+ * @throws Exception
+ */
+ public void testInit() throws Exception {
+ InternetResourceService service = new InternetResourceService();
+ MockFilterConfig mockFilterConfig = new MockFilterConfig(servletContext);
- /**
- * Test method for {@link org.ajax4jsf.resource.InternetResourceService#serviceResource(java.lang.String, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}.
- * @throws IOException
- * @throws Exception
- */
- public void testCachedServiceResource() throws Exception, IOException {
- InternetResourceService service = new InternetResourceService();
- MockFilterConfig mockFilterConfig = new MockFilterConfig(servletContext);
- mockFilterConfig.setInitParameter(InternetResourceService.ENABLE_CACHING_PARAMETER, "true");
- service.init(mockFilterConfig);
- InternetResourceBuilder builder = InternetResourceBuilder.getInstance();
- InternetResource resource = builder.createResource(this, MockCacheableResource.class.getName());
- MockResourceRequest resourceRequest = new MockResourceRequest(request);
- String key = resource.getKey();
- for(int i=1;i<=10;i++){
- service.serviceResource(key,resourceRequest,response);
- byte[] content = ((MockServletOutputStream)response.getOutputStream()).content();
- String strContent = new String(content);
- assertEquals(strContent, "test");
- assertEquals(((MockCacheableResource) resource).getCounter(), 1);
- response.setOutputStream(null);
- response.setWriter(null);
- }
- }
+ mockFilterConfig.setInitParameter(InternetResourceService.ENABLE_CACHING_PARAMETER, "true");
+ service.init(mockFilterConfig);
+ assertSame(servletContext, service.getServletContext());
+ }
- /**
- * Test method for {@link org.ajax4jsf.resource.InternetResourceService#serviceResource(java.lang.String, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}.
- * @throws IOException
- * @throws Exception
- */
- public void testCachedServiceExpiration() throws Exception, IOException {
- InternetResourceService service = new InternetResourceService();
- MockFilterConfig mockFilterConfig = new MockFilterConfig(servletContext);
- mockFilterConfig.setInitParameter(InternetResourceService.ENABLE_CACHING_PARAMETER, "true");
- service.init(mockFilterConfig);
- InternetResourceBuilder builder = InternetResourceBuilder.getInstance();
- InternetResource resource = builder.createResource(this, MockCacheableResource.class.getName());
- MockResourceRequest resourceRequest = new MockResourceRequest(request);
- String key = resource.getKey();
- for(int j=1;j<=10;j++){
- for(int i=1;i<=10;i++){
- request.setPathElements(request.getContextPath(), request.getServletPath(), request.getPathInfo(), String.valueOf(i));
- service.serviceResource(key,resourceRequest,response);
- byte[] content = ((MockServletOutputStream)response.getOutputStream()).content();
- String strContent = new String(content);
- assertEquals(strContent, "test");
- response.setOutputStream(null);
- response.setWriter(null);
- }
- }
- int counter = ((MockCacheableResource) resource).getCounter();
- assertTrue("Resource was generated "+counter+" times", counter<= 10);
- }
-
- public void testSendResource() {
-// fail("Not yet implemented");
- }
+ /**
+ * Test method for {@link org.ajax4jsf.resource.InternetResourceService#serviceResource(java.lang.String, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}.
+ * @throws IOException
+ * @throws Exception
+ */
+ public void testServiceResource() throws Exception, IOException {
+ InternetResourceService service = new InternetResourceService();
+ MockFilterConfig mockFilterConfig = new MockFilterConfig(servletContext);
- /**
- * Test method for {@link org.ajax4jsf.resource.InternetResourceService#getProperties(java.lang.String)}.
- */
- public void testGetProperties() {
-// fail("Not yet implemented");
- }
+ mockFilterConfig.setInitParameter(InternetResourceService.ENABLE_CACHING_PARAMETER, "true");
+ service.init(mockFilterConfig);
+ InternetResourceBuilder builder = InternetResourceBuilder.getInstance();
+ InternetResource resource = builder.createResource(this, "test.js");
+ MockResourceRequest resourceRequest = new MockResourceRequest(request);
+ String key = resource.getKey();
+
+ service.serviceResource(key, resourceRequest, response);
+
+ byte[] content = ((MockServletOutputStream) response.getOutputStream()).content();
+ String strContent = new String(content);
+
+ assertEquals(strContent, "\nfunction Test(){};");
+ response.setOutputStream(null);
+ response.setWriter(null);
+ }
+
+ /**
+ * Test method for {@link org.ajax4jsf.resource.InternetResourceService#serviceResource(java.lang.String, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}.
+ * @throws IOException
+ * @throws Exception
+ */
+ public void testCachedServiceResource() throws Exception, IOException {
+ InternetResourceService service = new InternetResourceService();
+ MockFilterConfig mockFilterConfig = new MockFilterConfig(servletContext);
+
+ mockFilterConfig.setInitParameter(InternetResourceService.ENABLE_CACHING_PARAMETER, "true");
+ service.init(mockFilterConfig);
+
+ InternetResourceBuilder builder = InternetResourceBuilder.getInstance();
+ InternetResource resource = builder.createResource(this, MockCacheableResource.class.getName());
+ MockResourceRequest resourceRequest = new MockResourceRequest(request);
+ String key = resource.getKey();
+
+ for (int i = 1; i <= 10; i++) {
+ service.serviceResource(key, resourceRequest, response);
+
+ byte[] content = ((MockServletOutputStream) response.getOutputStream()).content();
+ String strContent = new String(content);
+
+ assertEquals(strContent, "test");
+ assertEquals(((MockCacheableResource) resource).getCounter(), 1);
+ response.setOutputStream(null);
+ response.setWriter(null);
+ }
+ }
+
+ /**
+ * Test method for {@link org.ajax4jsf.resource.InternetResourceService#serviceResource(java.lang.String, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}.
+ * @throws IOException
+ * @throws Exception
+ */
+ public void testCachedServiceExpiration() throws Exception, IOException {
+ InternetResourceService service = new InternetResourceService();
+ MockFilterConfig mockFilterConfig = new MockFilterConfig(servletContext);
+
+ mockFilterConfig.setInitParameter(InternetResourceService.ENABLE_CACHING_PARAMETER, "true");
+ service.init(mockFilterConfig);
+
+ InternetResourceBuilder builder = InternetResourceBuilder.getInstance();
+ InternetResource resource = builder.createResource(this, MockCacheableResource.class.getName());
+ MockResourceRequest resourceRequest = new MockResourceRequest(request);
+ String key = resource.getKey();
+
+ for (int j = 1; j <= 10; j++) {
+ for (int i = 1; i <= 10; i++) {
+ request.setPathElements(request.getContextPath(), request.getServletPath(), request.getPathInfo(),
+ String.valueOf(i));
+ service.serviceResource(key, resourceRequest, response);
+
+ byte[] content = ((MockServletOutputStream) response.getOutputStream()).content();
+ String strContent = new String(content);
+
+ assertEquals(strContent, "test");
+ response.setOutputStream(null);
+ response.setWriter(null);
+ }
+ }
+
+ int counter = ((MockCacheableResource) resource).getCounter();
+
+ assertTrue("Resource was generated " + counter + " times", counter <= 10);
+ }
+
+ public void testSendResource() {
+
+// fail("Not yet implemented");
+ }
+
+ /**
+ * Test method for {@link org.ajax4jsf.resource.InternetResourceService#getProperties(java.lang.String)}.
+ */
+ public void testGetProperties() {
+
+// fail("Not yet implemented");
+ }
}
Modified: root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/resource/MockCacheableResource.java
===================================================================
--- root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/resource/MockCacheableResource.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/resource/MockCacheableResource.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+
package org.ajax4jsf.resource;
import java.io.ByteArrayInputStream;
@@ -29,31 +31,32 @@
*
*/
public class MockCacheableResource extends InternetResourceBase {
-
- private int counter = 0;
+ private int counter = 0;
- public int getCounter() {
- return counter;
- }
+ /**
+ *
+ */
+ public MockCacheableResource() {
+ super();
+ setRenderer(new LogfileRenderer());
+ setCacheable(true);
+ }
- /**
- *
- */
- public MockCacheableResource() {
- super();
- setRenderer(new LogfileRenderer());
- setCacheable(true);
- }
+ public int getCounter() {
+ return counter;
+ }
- public InputStream getResourceAsStream(ResourceContext context) {
- counter++;
- try {
- Thread.sleep(3000);
- } catch (InterruptedException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- return new ByteArrayInputStream("test".getBytes());
- }
-
+ public InputStream getResourceAsStream(ResourceContext context) {
+ counter++;
+
+ try {
+ Thread.sleep(3000);
+ } catch (InterruptedException e) {
+
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ return new ByteArrayInputStream("test".getBytes());
+ }
}
Modified: root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/resource/MockFilterConfig.java
===================================================================
--- root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/resource/MockFilterConfig.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/resource/MockFilterConfig.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+
package org.ajax4jsf.resource;
import java.util.Enumeration;
@@ -34,65 +36,69 @@
*
*/
public class MockFilterConfig implements FilterConfig {
-
- private ServletContext servletContext;
-
- private Map initParameters = new HashMap();
+ private Map initParameters = new HashMap();
+ private ServletContext servletContext;
- /**
- * @param servletContext
- */
- public MockFilterConfig(ServletContext servletContext) {
- super();
- this.servletContext = servletContext;
- }
+ /**
+ * @param servletContext
+ */
+ public MockFilterConfig(ServletContext servletContext) {
+ super();
+ this.servletContext = servletContext;
+ }
- /* (non-Javadoc)
- * @see javax.servlet.FilterConfig#getFilterName()
- */
- public String getFilterName() {
- // TODO Auto-generated method stub
- return "A4J";
- }
+ /*
+ * (non-Javadoc)
+ * @see javax.servlet.FilterConfig#getFilterName()
+ */
+ public String getFilterName() {
- /* (non-Javadoc)
- * @see javax.servlet.FilterConfig#getInitParameter(java.lang.String)
- */
- public String getInitParameter(String arg0) {
- // TODO Auto-generated method stub
- return (String) initParameters.get(arg0);
- }
+ // TODO Auto-generated method stub
+ return "A4J";
+ }
- public void setInitParameter(String name, String value) {
- initParameters.put(name, value);
- }
-
- /* (non-Javadoc)
- * @see javax.servlet.FilterConfig#getInitParameterNames()
- */
- public Enumeration getInitParameterNames() {
- final Iterator parametersIterator = initParameters.keySet().iterator();
- return new Enumeration(){
+ /*
+ * (non-Javadoc)
+ * @see javax.servlet.FilterConfig#getInitParameter(java.lang.String)
+ */
+ public String getInitParameter(String arg0) {
- public boolean hasMoreElements() {
- // TODO Auto-generated method stub
- return parametersIterator.hasNext();
- }
+ // TODO Auto-generated method stub
+ return (String) initParameters.get(arg0);
+ }
- public Object nextElement() {
- // TODO Auto-generated method stub
- return parametersIterator.next();
- }
-
- };
- }
+ public void setInitParameter(String name, String value) {
+ initParameters.put(name, value);
+ }
- /* (non-Javadoc)
- * @see javax.servlet.FilterConfig#getServletContext()
- */
- public ServletContext getServletContext() {
- // TODO Auto-generated method stub
- return servletContext;
- }
+ /*
+ * (non-Javadoc)
+ * @see javax.servlet.FilterConfig#getInitParameterNames()
+ */
+ public Enumeration getInitParameterNames() {
+ final Iterator parametersIterator = initParameters.keySet().iterator();
+ return new Enumeration() {
+ public boolean hasMoreElements() {
+
+ // TODO Auto-generated method stub
+ return parametersIterator.hasNext();
+ }
+ public Object nextElement() {
+
+ // TODO Auto-generated method stub
+ return parametersIterator.next();
+ }
+ };
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see javax.servlet.FilterConfig#getServletContext()
+ */
+ public ServletContext getServletContext() {
+
+ // TODO Auto-generated method stub
+ return servletContext;
+ }
}
Modified: root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/resource/MockResourceRequest.java
===================================================================
--- root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/resource/MockResourceRequest.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/resource/MockResourceRequest.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+
package org.ajax4jsf.resource;
import javax.servlet.http.HttpServletRequest;
@@ -29,20 +31,18 @@
*
*/
public class MockResourceRequest extends HttpServletRequestWrapper {
-
- private String method;
+ private String method;
- public MockResourceRequest(HttpServletRequest mockRequest) {
- super(mockRequest);
- method = "GET";
- }
+ public MockResourceRequest(HttpServletRequest mockRequest) {
+ super(mockRequest);
+ method = "GET";
+ }
- public String getMethod() {
- return method;
- }
+ public String getMethod() {
+ return method;
+ }
- public void setMethod(String method) {
- this.method = method;
- }
-
+ public void setMethod(String method) {
+ this.method = method;
+ }
}
Modified: root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/resource/ParametersEncodingTestCase.java
===================================================================
--- root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/resource/ParametersEncodingTestCase.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/resource/ParametersEncodingTestCase.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -5,43 +5,45 @@
import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
public class ParametersEncodingTestCase extends AbstractAjax4JsfTestCase {
-
+ private byte[] data = {
+ 1, 2, 3, 4, 5, 6, 7, 8, 9, 0
+ };
private ResourceBuilderImpl builder;
- private byte[] data = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 };
-
public ParametersEncodingTestCase(String arg0) {
- super(arg0);
+ super(arg0);
}
public void setUp() throws Exception {
- super.setUp();
- builder = new ResourceBuilderImpl();
+ super.setUp();
+ builder = new ResourceBuilderImpl();
}
public void tearDown() throws Exception {
- builder = null;
- super.tearDown();
+ builder = null;
+ super.tearDown();
}
public final void testEncrypt() {
- byte[] bs = builder.encrypt(data);
- byte[] bs2 = builder.decrypt(bs);
- assertTrue(Arrays.equals(data, bs2));
+ byte[] bs = builder.encrypt(data);
+ byte[] bs2 = builder.decrypt(bs);
+
+ assertTrue(Arrays.equals(data, bs2));
}
public final void testDecryptLeak() {
- byte[] bs = {};
- for (int i = 0; i < 10000; i++) {
- bs = builder.encrypt(data);
+ byte[] bs = {};
- }
- byte[] bs2={};
- for (int i = 0; i < 10000; i++) {
- bs2 = builder.decrypt(bs);
+ for (int i = 0; i < 10000; i++) {
+ bs = builder.encrypt(data);
+ }
- }
- assertTrue(Arrays.equals(data, bs2));
+ byte[] bs2 = {};
+
+ for (int i = 0; i < 10000; i++) {
+ bs2 = builder.decrypt(bs);
+ }
+
+ assertTrue(Arrays.equals(data, bs2));
}
-
}
Modified: root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/resource/ResourceServiceThreadsTestCase.java
===================================================================
--- root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/resource/ResourceServiceThreadsTestCase.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/resource/ResourceServiceThreadsTestCase.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -19,120 +19,126 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+
package org.ajax4jsf.resource;
import java.text.SimpleDateFormat;
+
import java.util.Date;
import java.util.TimeZone;
import javax.faces.context.FacesContext;
import org.ajax4jsf.tests.AbstractThreadedAjax4JsfTestCase;
+
import org.apache.shale.test.mock.MockHttpServletRequest;
import org.apache.shale.test.mock.MockHttpServletResponse;
import org.apache.shale.test.mock.MockServletOutputStream;
/**
* @author shura
- *
+ *
*/
-public class ResourceServiceThreadsTestCase extends
- AbstractThreadedAjax4JsfTestCase {
+public class ResourceServiceThreadsTestCase extends AbstractThreadedAjax4JsfTestCase {
+ String key;
+ InternetResource resource;
+ InternetResourceService service;
- /**
- * @param s
- */
- public ResourceServiceThreadsTestCase(String s) {
- super(s);
- // TODO Auto-generated constructor stub
- }
+ /**
+ * @param s
+ */
+ public ResourceServiceThreadsTestCase(String s) {
+ super(s);
- InternetResourceService service;
- String key;
- InternetResource resource;
+ // TODO Auto-generated constructor stub
+ }
- public void setUp() throws Exception {
- super.setUp();
- service = new InternetResourceService();
- MockFilterConfig mockFilterConfig = new MockFilterConfig(servletContext);
- mockFilterConfig.setInitParameter(
- InternetResourceService.ENABLE_CACHING_PARAMETER, "true");
- service.init(mockFilterConfig);
- InternetResourceBuilder builder = InternetResourceBuilder.getInstance();
- resource = builder.createResource(this, MockCacheableResource.class
- .getName());
- key = resource.getKey();
- }
+ public void setUp() throws Exception {
+ super.setUp();
+ service = new InternetResourceService();
- public void tearDown() throws Exception {
- super.tearDown();
- InternetResourceBuilder.setInstance(null);
- resource = null;
- service = null;
- key = null;
- }
+ MockFilterConfig mockFilterConfig = new MockFilterConfig(servletContext);
- public class ResourceRunner extends TestCaseRunnable {
+ mockFilterConfig.setInitParameter(InternetResourceService.ENABLE_CACHING_PARAMETER, "true");
+ service.init(mockFilterConfig);
- private String data;
+ InternetResourceBuilder builder = InternetResourceBuilder.getInstance();
- /**
- * @param data
- */
- public ResourceRunner(String data) {
- super();
- this.data = data;
- }
+ resource = builder.createResource(this, MockCacheableResource.class.getName());
+ key = resource.getKey();
+ }
- public void runTestCase(FacesContext context) throws Throwable {
- MockHttpServletResponse response = new MockHttpServletResponse() {
- /* (non-Javadoc)
- * @see org.apache.shale.test.mock.MockHttpServletResponse#addDateHeader(java.lang.String, long)
- * Default shale implementation is not thread-safe.
- */
- public void addDateHeader(String name, long value) {
- SimpleDateFormat format = new SimpleDateFormat(
- "EEE, dd MMM yyyy HH:mm:ss zzz");
- format.setTimeZone(TimeZone.getTimeZone("GMT"));
- addHeader(name, format.format(new Date(value)));
- }
-
- //TODO fix when setContentLength in shale-test will start function
- // https://issues.apache.org/struts/browse/SHALE-495
- public int getContentLength() {
- return Integer.parseInt(getHeader("Content-Length"));
- }
-
- public void setContentLength(int length) {
- addIntHeader("Content-Length", length);
- }
+ public void tearDown() throws Exception {
+ super.tearDown();
+ InternetResourceBuilder.setInstance(null);
+ resource = null;
+ service = null;
+ key = null;
+ }
- };
- MockHttpServletRequest req = new MockHttpServletRequest(session);
- req.setServletContext(servletContext);
- req.setPathElements(request.getContextPath(), request
- .getServletPath(), request.getPathInfo(), data);
- MockResourceRequest resourceRequest = new MockResourceRequest(req);
- service.serviceResource(key, resourceRequest, response);
- byte[] content = ((MockServletOutputStream) response
- .getOutputStream()).content();
- String strContent = new String(content);
- assertEquals(strContent, "test");
+ public void testTreadServiceResource() {
+ TestCaseRunnable[] runnables = new TestCaseRunnable[1000];
- }
+ for (int i = 0; i < runnables.length; i++) {
+ runnables[i] = new ResourceRunner(String.valueOf(i % 10));
+ }
- }
+ this.runTestCaseRunnables(runnables);
- public void testTreadServiceResource() {
- TestCaseRunnable[] runnables = new TestCaseRunnable[1000];
- for (int i = 0; i < runnables.length; i++) {
- runnables[i] = new ResourceRunner(String.valueOf(i % 10));
+ int counter = ((MockCacheableResource) resource).getCounter();
- }
- this.runTestCaseRunnables(runnables);
- int counter = ((MockCacheableResource) resource).getCounter();
- assertTrue("Resource was generated " + counter + " times",
- counter <= 10);
+ assertTrue("Resource was generated " + counter + " times", counter <= 10);
+ }
- }
+ public class ResourceRunner extends TestCaseRunnable {
+ private String data;
+
+ /**
+ * @param data
+ */
+ public ResourceRunner(String data) {
+ super();
+ this.data = data;
+ }
+
+ public void runTestCase(FacesContext context) throws Throwable {
+ MockHttpServletResponse response = new MockHttpServletResponse() {
+
+ /*
+ * (non-Javadoc)
+ * @see org.apache.shale.test.mock.MockHttpServletResponse#addDateHeader(java.lang.String, long)
+ * Default shale implementation is not thread-safe.
+ */
+ public void addDateHeader(String name, long value) {
+ SimpleDateFormat format = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz");
+
+ format.setTimeZone(TimeZone.getTimeZone("GMT"));
+ addHeader(name, format.format(new Date(value)));
+ }
+
+ // TODO fix when setContentLength in shale-test will start function
+ // https://issues.apache.org/struts/browse/SHALE-495
+ public int getContentLength() {
+ return Integer.parseInt(getHeader("Content-Length"));
+ }
+ public void setContentLength(int length) {
+ addIntHeader("Content-Length", length);
+ }
+ };
+ MockHttpServletRequest req = new MockHttpServletRequest(session);
+
+ req.setServletContext(servletContext);
+ req.setPathElements(request.getContextPath(), request.getServletPath(), request.getPathInfo(), data);
+
+ MockResourceRequest resourceRequest = new MockResourceRequest(req);
+
+ service.serviceResource(key, resourceRequest, response);
+
+ byte[] content = ((MockServletOutputStream) response.getOutputStream()).content();
+ String strContent = new String(content);
+
+ assertEquals(strContent, "test");
+ }
+ }
}
Modified: root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/webapp/WebXmlTest.java
===================================================================
--- root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/webapp/WebXmlTest.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/test/java/org/ajax4jsf/webapp/WebXmlTest.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+
package org.ajax4jsf.webapp;
import java.io.InputStream;
@@ -26,187 +28,188 @@
import javax.servlet.ServletException;
import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
+
import org.apache.shale.test.mock.MockServletContext;
public class WebXmlTest extends AbstractAjax4JsfTestCase {
+ MockServletContext context;
- MockServletContext context;
+ public WebXmlTest(String arg0) {
+ super(arg0);
+ }
- public WebXmlTest(String arg0) {
- super(arg0);
- }
+ public void setUp() throws Exception {
+ super.setUp();
+ context = new MockServletContext() {
- public void setUp() throws Exception {
- super.setUp();
- context = new MockServletContext(){
+ /*
+ * (non-Javadoc)
+ * @see org.apache.shale.test.mock.MockServletContext#getResourceAsStream(java.lang.String)
+ */
+ public InputStream getResourceAsStream(String uri) {
+ if (uri.equals(WebXml.WEB_XML)) {
+ return this.getClass().getResourceAsStream("/WEB-INF/complex-web.xml");
+ } else {
+ return super.getResourceAsStream(uri);
+ }
+ }
+ };
+ }
- /* (non-Javadoc)
- * @see org.apache.shale.test.mock.MockServletContext#getResourceAsStream(java.lang.String)
- */
- public InputStream getResourceAsStream(String uri) {
- if(uri.equals(WebXml.WEB_XML)){
- return this.getClass().getResourceAsStream("/WEB-INF/complex-web.xml");
- } else {
- return super.getResourceAsStream(uri);
- }
- }
-
- };
- }
+ public void tearDown() throws Exception {
+ super.tearDown();
+ }
- public void tearDown() throws Exception {
- super.tearDown();
- }
+ /*
+ * Test method for 'org.ajax4jsf.webapp.WebXml.reset()'
+ */
+ public void testReset() {}
- /*
- * Test method for 'org.ajax4jsf.webapp.WebXml.reset()'
- */
- public void testReset() {
+ /*
+ * Test method for 'org.ajax4jsf.webapp.WebXml.init(ServletContext, String)'
+ */
+ public void testInit() throws ServletException {
+ WebXml webXml = new WebXml();
- }
+ webXml.init(context, "ajax4jsf");
+ assertFalse(webXml.isPrefixMapping());
+ assertNull(webXml.getFacesFilterPrefix());
+ assertNotNull(webXml.getFacesFilterSuffix());
+ assertEquals(".jsf", webXml.getFacesFilterSuffix());
+ }
- /*
- * Test method for 'org.ajax4jsf.webapp.WebXml.init(ServletContext, String)'
- */
- public void testInit() throws ServletException {
- WebXml webXml = new WebXml();
- webXml.init(context,"ajax4jsf");
- assertFalse(webXml.isPrefixMapping());
- assertNull(webXml.getFacesFilterPrefix());
- assertNotNull(webXml.getFacesFilterSuffix());
- assertEquals(".jsf",webXml.getFacesFilterSuffix());
- }
+ /*
+ * Test method for 'org.ajax4jsf.webapp.WebXml.getInstance()'
+ */
+ public void testGetInstance() {}
- /*
- * Test method for 'org.ajax4jsf.webapp.WebXml.getInstance()'
- */
- public void testGetInstance() {
+ public void testDefaultResourcePrefix() throws Exception {
+ WebXml webXml = new WebXml();
- }
-
- public void testDefaultResourcePrefix() throws Exception {
- WebXml webXml = new WebXml();
- webXml.init(context,"ajax4jsf");
+ webXml.init(context, "ajax4jsf");
+ assertEquals('/' + WebXml.RESOURCE_URI_PREFIX_VERSIONED, webXml.getResourcePrefix());
+ assertEquals('/' + WebXml.GLOBAL_RESOURCE_URI_PREFIX_VERSIONED, webXml.getGlobalResourcePrefix());
+ assertEquals('/' + WebXml.SESSION_RESOURCE_URI_PREFIX_VERSIONED, webXml.getSessionResourcePrefix());
+ }
- assertEquals('/' + WebXml.RESOURCE_URI_PREFIX_VERSIONED, webXml.getResourcePrefix());
- assertEquals('/' + WebXml.GLOBAL_RESOURCE_URI_PREFIX_VERSIONED, webXml.getGlobalResourcePrefix());
- assertEquals('/' + WebXml.SESSION_RESOURCE_URI_PREFIX_VERSIONED, webXml.getSessionResourcePrefix());
- }
-
- public void testOverrideResourcePrefix() throws Exception {
- context.addInitParameter(WebXml.RESOURCE_URI_PREFIX_PARAM, "rich-rsrc/");
- WebXml webXml = new WebXml();
- webXml.init(context,"ajax4jsf");
+ public void testOverrideResourcePrefix() throws Exception {
+ context.addInitParameter(WebXml.RESOURCE_URI_PREFIX_PARAM, "rich-rsrc/");
- assertEquals("/rich-rsrc/", webXml.getResourcePrefix());
- assertEquals(webXml.getResourcePrefix(), webXml.getGlobalResourcePrefix());
- assertEquals(webXml.getResourcePrefix(), webXml.getSessionResourcePrefix());
- }
+ WebXml webXml = new WebXml();
- public void testCustomizedResourcePrefixes() throws Exception {
- context.addInitParameter(WebXml.SESSION_RESOURCE_URI_PREFIX_PARAM, "sess/");
- context.addInitParameter(WebXml.GLOBAL_RESOURCE_URI_PREFIX_PARAM, "glb/");
- WebXml webXml = new WebXml();
- webXml.init(context,"ajax4jsf");
+ webXml.init(context, "ajax4jsf");
+ assertEquals("/rich-rsrc/", webXml.getResourcePrefix());
+ assertEquals(webXml.getResourcePrefix(), webXml.getGlobalResourcePrefix());
+ assertEquals(webXml.getResourcePrefix(), webXml.getSessionResourcePrefix());
+ }
- assertTrue(webXml.getResourcePrefix().startsWith("/a4j/"));
- assertTrue(webXml.getGlobalResourcePrefix().startsWith("/glb/"));
- assertTrue(webXml.getSessionResourcePrefix().startsWith("/sess/"));
- }
-
- public void testOverrideGlobalResourcePrefix() throws Exception {
- context.addInitParameter(WebXml.RESOURCE_URI_PREFIX_PARAM, "j4a/");
- context.addInitParameter(WebXml.GLOBAL_RESOURCE_URI_PREFIX_PARAM, "glb/");
- WebXml webXml = new WebXml();
- webXml.init(context,"ajax4jsf");
-
- assertTrue(webXml.getResourcePrefix().startsWith("/j4a/"));
- assertTrue(webXml.getGlobalResourcePrefix().startsWith("/glb/"));
- assertEquals(webXml.getResourcePrefix(), webXml.getSessionResourcePrefix());
- }
-
- public void testOverrideSessionResourcePrefix() throws Exception {
- context.addInitParameter(WebXml.RESOURCE_URI_PREFIX_PARAM, "j4a/");
- context.addInitParameter(WebXml.SESSION_RESOURCE_URI_PREFIX_PARAM, "ssn/");
- WebXml webXml = new WebXml();
- webXml.init(context,"ajax4jsf");
-
- assertTrue(webXml.getResourcePrefix().startsWith("/j4a/"));
- assertTrue(webXml.getSessionResourcePrefix().startsWith("/ssn/"));
- assertEquals(webXml.getResourcePrefix(), webXml.getGlobalResourcePrefix());
- }
+ public void testCustomizedResourcePrefixes() throws Exception {
+ context.addInitParameter(WebXml.SESSION_RESOURCE_URI_PREFIX_PARAM, "sess/");
+ context.addInitParameter(WebXml.GLOBAL_RESOURCE_URI_PREFIX_PARAM, "glb/");
- public void testOverrideAll() throws Exception {
- context.addInitParameter(WebXml.RESOURCE_URI_PREFIX_PARAM, "j4a/");
- context.addInitParameter(WebXml.GLOBAL_RESOURCE_URI_PREFIX_PARAM, "glb/");
- context.addInitParameter(WebXml.SESSION_RESOURCE_URI_PREFIX_PARAM, "ssn/");
- WebXml webXml = new WebXml();
- webXml.init(context,"ajax4jsf");
-
- assertTrue(webXml.getResourcePrefix().startsWith("/j4a/"));
- assertTrue(webXml.getSessionResourcePrefix().startsWith("/ssn/"));
- assertTrue(webXml.getGlobalResourcePrefix().startsWith("/glb/"));
- }
-
- /*
- * Test method for 'org.ajax4jsf.webapp.WebXml.getFacesResourceURL(FacesContext, String)'
- */
- public void testGetFacesResourceURL() throws ServletException {
- WebXml webXml = new WebXml();
- webXml.init(context,"ajax4jsf");
- String resourceURL = webXml.getFacesResourceURL(facesContext,"foo.Bar", false);
- System.out.println(resourceURL);
- assertEquals("/testContext/"+WebXml.SESSION_RESOURCE_URI_PREFIX_VERSIONED+"foo.Bar.jsf",resourceURL);
-
- resourceURL = webXml.getFacesResourceURL(facesContext,"rich.Tree", true);
- System.out.println(resourceURL);
- assertEquals("/testContext/"+WebXml.GLOBAL_RESOURCE_URI_PREFIX_VERSIONED+"rich.Tree.jsf",resourceURL);
- }
+ WebXml webXml = new WebXml();
- public void testOverridenLegacyGetFacesResourceURL() throws ServletException {
- context.addInitParameter(WebXml.RESOURCE_URI_PREFIX_PARAM, "j4a/");
-
- WebXml webXml = new WebXml();
- webXml.init(context,"ajax4jsf");
- String resourceURL = webXml.getFacesResourceURL(facesContext,"foo.Bar", false);
- assertEquals("/testContext/j4a/foo.Bar.jsf",resourceURL);
-
- resourceURL = webXml.getFacesResourceURL(facesContext,"rich.Tree", true);
- assertEquals("/testContext/j4a/rich.Tree.jsf",resourceURL);
- }
-
- public void testOverridenGetFacesResourceURL() throws ServletException {
- context.addInitParameter(WebXml.GLOBAL_RESOURCE_URI_PREFIX_PARAM, "glb/");
- context.addInitParameter(WebXml.SESSION_RESOURCE_URI_PREFIX_PARAM, "ssn/");
-
- WebXml webXml = new WebXml();
- webXml.init(context,"ajax4jsf");
- String resourceURL = webXml.getFacesResourceURL(facesContext,"foo.Bar", false);
- assertEquals("/testContext/ssn/foo.Bar.jsf",resourceURL);
-
- resourceURL = webXml.getFacesResourceURL(facesContext,"rich.Tree", true);
- assertEquals("/testContext/glb/rich.Tree.jsf",resourceURL);
- }
-
- /*
- * Test method for 'org.ajax4jsf.webapp.WebXml.getFacesResourceKey(HttpServletRequest)'
- */
- public void testGetFacesResourceKey() {
+ webXml.init(context, "ajax4jsf");
+ assertTrue(webXml.getResourcePrefix().startsWith("/a4j/"));
+ assertTrue(webXml.getGlobalResourcePrefix().startsWith("/glb/"));
+ assertTrue(webXml.getSessionResourcePrefix().startsWith("/sess/"));
+ }
- }
+ public void testOverrideGlobalResourcePrefix() throws Exception {
+ context.addInitParameter(WebXml.RESOURCE_URI_PREFIX_PARAM, "j4a/");
+ context.addInitParameter(WebXml.GLOBAL_RESOURCE_URI_PREFIX_PARAM, "glb/");
- /*
- * Test method for 'org.ajax4jsf.webapp.WebXml.isFacesRequest(HttpServletRequest)'
- */
- public void testIsFacesRequest() {
+ WebXml webXml = new WebXml();
- }
+ webXml.init(context, "ajax4jsf");
+ assertTrue(webXml.getResourcePrefix().startsWith("/j4a/"));
+ assertTrue(webXml.getGlobalResourcePrefix().startsWith("/glb/"));
+ assertEquals(webXml.getResourcePrefix(), webXml.getSessionResourcePrefix());
+ }
- /*
- * Test method for 'org.ajax4jsf.webapp.WebXml.setFilterName(String)'
- */
- public void testSetFilterName() {
+ public void testOverrideSessionResourcePrefix() throws Exception {
+ context.addInitParameter(WebXml.RESOURCE_URI_PREFIX_PARAM, "j4a/");
+ context.addInitParameter(WebXml.SESSION_RESOURCE_URI_PREFIX_PARAM, "ssn/");
- }
+ WebXml webXml = new WebXml();
+ webXml.init(context, "ajax4jsf");
+ assertTrue(webXml.getResourcePrefix().startsWith("/j4a/"));
+ assertTrue(webXml.getSessionResourcePrefix().startsWith("/ssn/"));
+ assertEquals(webXml.getResourcePrefix(), webXml.getGlobalResourcePrefix());
+ }
+
+ public void testOverrideAll() throws Exception {
+ context.addInitParameter(WebXml.RESOURCE_URI_PREFIX_PARAM, "j4a/");
+ context.addInitParameter(WebXml.GLOBAL_RESOURCE_URI_PREFIX_PARAM, "glb/");
+ context.addInitParameter(WebXml.SESSION_RESOURCE_URI_PREFIX_PARAM, "ssn/");
+
+ WebXml webXml = new WebXml();
+
+ webXml.init(context, "ajax4jsf");
+ assertTrue(webXml.getResourcePrefix().startsWith("/j4a/"));
+ assertTrue(webXml.getSessionResourcePrefix().startsWith("/ssn/"));
+ assertTrue(webXml.getGlobalResourcePrefix().startsWith("/glb/"));
+ }
+
+ /*
+ * Test method for 'org.ajax4jsf.webapp.WebXml.getFacesResourceURL(FacesContext, String)'
+ */
+ public void testGetFacesResourceURL() throws ServletException {
+ WebXml webXml = new WebXml();
+
+ webXml.init(context, "ajax4jsf");
+
+ String resourceURL = webXml.getFacesResourceURL(facesContext, "foo.Bar", false);
+
+ System.out.println(resourceURL);
+ assertEquals("/testContext/" + WebXml.SESSION_RESOURCE_URI_PREFIX_VERSIONED + "foo.Bar.jsf", resourceURL);
+ resourceURL = webXml.getFacesResourceURL(facesContext, "rich.Tree", true);
+ System.out.println(resourceURL);
+ assertEquals("/testContext/" + WebXml.GLOBAL_RESOURCE_URI_PREFIX_VERSIONED + "rich.Tree.jsf", resourceURL);
+ }
+
+ public void testOverridenLegacyGetFacesResourceURL() throws ServletException {
+ context.addInitParameter(WebXml.RESOURCE_URI_PREFIX_PARAM, "j4a/");
+
+ WebXml webXml = new WebXml();
+
+ webXml.init(context, "ajax4jsf");
+
+ String resourceURL = webXml.getFacesResourceURL(facesContext, "foo.Bar", false);
+
+ assertEquals("/testContext/j4a/foo.Bar.jsf", resourceURL);
+ resourceURL = webXml.getFacesResourceURL(facesContext, "rich.Tree", true);
+ assertEquals("/testContext/j4a/rich.Tree.jsf", resourceURL);
+ }
+
+ public void testOverridenGetFacesResourceURL() throws ServletException {
+ context.addInitParameter(WebXml.GLOBAL_RESOURCE_URI_PREFIX_PARAM, "glb/");
+ context.addInitParameter(WebXml.SESSION_RESOURCE_URI_PREFIX_PARAM, "ssn/");
+
+ WebXml webXml = new WebXml();
+
+ webXml.init(context, "ajax4jsf");
+
+ String resourceURL = webXml.getFacesResourceURL(facesContext, "foo.Bar", false);
+
+ assertEquals("/testContext/ssn/foo.Bar.jsf", resourceURL);
+ resourceURL = webXml.getFacesResourceURL(facesContext, "rich.Tree", true);
+ assertEquals("/testContext/glb/rich.Tree.jsf", resourceURL);
+ }
+
+ /*
+ * Test method for 'org.ajax4jsf.webapp.WebXml.getFacesResourceKey(HttpServletRequest)'
+ */
+ public void testGetFacesResourceKey() {}
+
+ /*
+ * Test method for 'org.ajax4jsf.webapp.WebXml.isFacesRequest(HttpServletRequest)'
+ */
+ public void testIsFacesRequest() {}
+
+ /*
+ * Test method for 'org.ajax4jsf.webapp.WebXml.setFilterName(String)'
+ */
+ public void testSetFilterName() {}
}
Modified: root/framework/trunk/legacy-tests/src/test/java/org/richfaces/util/RenderPhaseComponentVisitorUtilsTest.java
===================================================================
--- root/framework/trunk/legacy-tests/src/test/java/org/richfaces/util/RenderPhaseComponentVisitorUtilsTest.java 2009-11-02 11:33:49 UTC (rev 15806)
+++ root/framework/trunk/legacy-tests/src/test/java/org/richfaces/util/RenderPhaseComponentVisitorUtilsTest.java 2009-11-02 12:03:55 UTC (rev 15807)
@@ -1,24 +1,25 @@
+
/**
- *
+ *
*/
package org.richfaces.util;
import org.apache.shale.test.base.AbstractJsfTestCase;
+
import org.richfaces.event.RenderPhaseComponentVisitor;
public class RenderPhaseComponentVisitorUtilsTest extends AbstractJsfTestCase {
+ public RenderPhaseComponentVisitorUtilsTest(String name) {
+ super(name);
+ }
- public RenderPhaseComponentVisitorUtilsTest(String name) {
- super(name);
- }
+ /**
+ * Test method for {@link org.richfaces.util.ComponentPhaseEventHandlerUtils#getHandlers()}.
+ */
+ public void testGetHandlers() {
+ RenderPhaseComponentVisitor[] handlers = RenderPhaseComponentVisitorUtils.getVisitors(facesContext);
- /**
- * Test method for {@link org.richfaces.util.ComponentPhaseEventHandlerUtils#getHandlers()}.
- */
- public void testGetHandlers() {
- RenderPhaseComponentVisitor[] handlers = RenderPhaseComponentVisitorUtils.getVisitors(facesContext);
- assertNotNull(handlers);
- assertTrue(handlers.length > 0);
- }
-
+ assertNotNull(handlers);
+ assertTrue(handlers.length > 0);
+ }
}
More information about the richfaces-svn-commits
mailing list