You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2011/09/13 21:30:39 UTC
svn commit: r1170312 - in
/myfaces/html5/trunk/myfaces-html5-core/src/test/java/org/apache/myfaces:
html5.test/ html5/test/
Author: lu4242
Date: Tue Sep 13 19:30:38 2011
New Revision: 1170312
URL: http://svn.apache.org/viewvc?rev=1170312&view=rev
Log:
fix folder name
Added:
myfaces/html5/trunk/myfaces-html5-core/src/test/java/org/apache/myfaces/html5/test/ (with props)
myfaces/html5/trunk/myfaces-html5-core/src/test/java/org/apache/myfaces/html5/test/AbstractHtml5ViewControllerTestCase.java
myfaces/html5/trunk/myfaces-html5-core/src/test/java/org/apache/myfaces/html5/test/HtmlCheckAttributesUtil.java
myfaces/html5/trunk/myfaces-html5-core/src/test/java/org/apache/myfaces/html5/test/HtmlRenderedAttr.java
myfaces/html5/trunk/myfaces-html5-core/src/test/java/org/apache/myfaces/html5/test/TestUtils.java
Modified:
myfaces/html5/trunk/myfaces-html5-core/src/test/java/org/apache/myfaces/html5.test/
Propchange: myfaces/html5/trunk/myfaces-html5-core/src/test/java/org/apache/myfaces/html5/test/
------------------------------------------------------------------------------
bugtraq:number = true
Added: myfaces/html5/trunk/myfaces-html5-core/src/test/java/org/apache/myfaces/html5/test/AbstractHtml5ViewControllerTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/html5/trunk/myfaces-html5-core/src/test/java/org/apache/myfaces/html5/test/AbstractHtml5ViewControllerTestCase.java?rev=1170312&view=auto
==============================================================================
--- myfaces/html5/trunk/myfaces-html5-core/src/test/java/org/apache/myfaces/html5/test/AbstractHtml5ViewControllerTestCase.java (added)
+++ myfaces/html5/trunk/myfaces-html5-core/src/test/java/org/apache/myfaces/html5/test/AbstractHtml5ViewControllerTestCase.java Tue Sep 13 19:30:38 2011
@@ -0,0 +1,52 @@
+/*
+ * 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.apache.myfaces.html5.test;
+
+import org.apache.myfaces.test.mock.MockResponseWriter;
+
+import java.io.StringWriter;
+
+public abstract class AbstractHtml5ViewControllerTestCase extends org.apache.myfaces.test.base.AbstractViewControllerTestCase
+{
+ protected MockResponseWriter writer;
+
+ public AbstractHtml5ViewControllerTestCase(String name)
+ {
+ super(name);
+ }
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ writer = new MockResponseWriter(new StringWriter(), null, null);
+ facesContext.setResponseWriter(writer);
+
+ TestUtils.addDefaultRenderers(facesContext);
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ writer = null;
+ super.tearDown();
+ }
+
+}
Added: myfaces/html5/trunk/myfaces-html5-core/src/test/java/org/apache/myfaces/html5/test/HtmlCheckAttributesUtil.java
URL: http://svn.apache.org/viewvc/myfaces/html5/trunk/myfaces-html5-core/src/test/java/org/apache/myfaces/html5/test/HtmlCheckAttributesUtil.java?rev=1170312&view=auto
==============================================================================
--- myfaces/html5/trunk/myfaces-html5-core/src/test/java/org/apache/myfaces/html5/test/HtmlCheckAttributesUtil.java (added)
+++ myfaces/html5/trunk/myfaces-html5-core/src/test/java/org/apache/myfaces/html5/test/HtmlCheckAttributesUtil.java Tue Sep 13 19:30:38 2011
@@ -0,0 +1,149 @@
+/*
+ * 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.apache.myfaces.html5.test;
+
+import java.util.Map;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+
+import org.apache.myfaces.test.mock.MockResponseWriter;
+
+public class HtmlCheckAttributesUtil
+{
+ private static void addBaseAttributes(UIComponent component, HtmlRenderedAttr[] attrs)
+ {
+ Map map = component.getAttributes();
+ for(int i = 0; i < attrs.length; i++)
+ {
+ HtmlRenderedAttr attr = attrs[i];
+ map.put(attr.getName(), attr.getValue());
+ }
+ }
+
+ private static void checkRenderedAttributes(HtmlRenderedAttr[] attrs, String output) throws Exception
+ {
+ for(int i = 0; i < attrs.length; i++)
+ {
+ //assertContainsOnlyOnce(attrs[i], output);
+ checkAttributeOccurrences(attrs[i], output);
+ }
+ }
+
+ /**
+ * This method adds all attributes from attrs into the component. After adding the attributes,
+ * it calls the encodeAll() method of the component. The html generated from the component's
+ * renderer will be checked to see if the attributes have been rendered correctly.
+ * @param component The component whose attributes will be tested.
+ * @param context
+ * @param writer The ResponseWriter used by the renderer to output the html generated.
+ * @param attrs An array of attributes which will be tested.
+ * @throws Exception
+ */
+ public static void checkRenderedAttributes(
+ UIComponent component,
+ FacesContext context,
+ MockResponseWriter writer,
+ HtmlRenderedAttr[] attrs) throws Exception
+ {
+
+ addBaseAttributes(component, attrs);
+ component.encodeBegin(context);
+ component.encodeChildren(context);
+ component.encodeEnd(context);
+ context.renderResponse();
+ checkRenderedAttributes(attrs, writer.getWriter().toString());
+ }
+
+ /**
+ * Checks the attrs array if it has elements which were rendered incorrectly.
+ * @param attrs The attributes to be checked.
+ * @return True if there are attributes not rendered correctly.
+ */
+ public static boolean hasFailedAttrRender(HtmlRenderedAttr[] attrs)
+ {
+ for(int i = 0; i < attrs.length; i++)
+ {
+ if(!attrs[i].isRenderSuccessful()) return true;
+ }
+ return false;
+ }
+
+ /**
+ * Constructs an error message string detailing which attributes were not rendered
+ * and which attributes were rendered more than once.
+ * @param attrs The attributes to be tested.
+ * @param actual The html generated by the renderer.
+ * @return The error message.
+ */
+ public static String constructErrorMessage(HtmlRenderedAttr[] attrs, String actual)
+ {
+ StringBuffer messgBuffer = new StringBuffer();
+ for(int i = 0; i < attrs.length; i++)
+ {
+ if(attrs[i].getErrorCode() == HtmlRenderedAttr.RENDERED_MORE_TIMES_THAN_EXPECTED)
+ {
+ messgBuffer.append(attrs[i].getName()).append(" (");
+ messgBuffer.append(attrs[i].getExpectedHtml()).append(") was rendered more times (");
+ messgBuffer.append(attrs[i].getActualOccurrences()).append(") than expected (");
+ messgBuffer.append(attrs[i].getExpectedOccurrences()).append(").");
+ messgBuffer.append(System.getProperty("line.separator"));
+ }
+ else if(attrs[i].getErrorCode() == HtmlRenderedAttr.RENDERED_LESS_TIMES_THAN_EXPECTED)
+ {
+ messgBuffer.append(attrs[i].getName()).append(" (");
+ messgBuffer.append(attrs[i].getExpectedHtml()).append(") was rendered less times (");
+ messgBuffer.append(attrs[i].getActualOccurrences()).append(") than expected (");
+ messgBuffer.append(attrs[i].getExpectedOccurrences()).append(").");
+ messgBuffer.append(System.getProperty("line.separator"));
+ }
+ }
+ messgBuffer.append("Actual HTML: ").append(actual);
+ return messgBuffer.toString();
+ }
+
+ private static void checkAttributeOccurrences(HtmlRenderedAttr attr, String actual)
+ {
+ String expectedHtml = attr.getExpectedHtml();
+
+ int index;
+ int offset = 0;
+ while((index=actual.indexOf(expectedHtml,offset)) != -1)
+ {
+ attr.increaseActualOccurrences();
+ if(attr.getActualOccurrences() > attr.getExpectedOccurrences())
+ {
+ attr.setErrorCode(HtmlRenderedAttr.RENDERED_MORE_TIMES_THAN_EXPECTED);
+ return;
+ }
+
+ offset += index + expectedHtml.length();
+ }
+
+ if(attr.getActualOccurrences() < attr.getExpectedOccurrences())
+ {
+ attr.setErrorCode(HtmlRenderedAttr.RENDERED_LESS_TIMES_THAN_EXPECTED);
+ }
+ else
+ {
+ attr.setRenderSuccessful(true);
+ }
+ }
+
+}
Added: myfaces/html5/trunk/myfaces-html5-core/src/test/java/org/apache/myfaces/html5/test/HtmlRenderedAttr.java
URL: http://svn.apache.org/viewvc/myfaces/html5/trunk/myfaces-html5-core/src/test/java/org/apache/myfaces/html5/test/HtmlRenderedAttr.java?rev=1170312&view=auto
==============================================================================
--- myfaces/html5/trunk/myfaces-html5-core/src/test/java/org/apache/myfaces/html5/test/HtmlRenderedAttr.java (added)
+++ myfaces/html5/trunk/myfaces-html5-core/src/test/java/org/apache/myfaces/html5/test/HtmlRenderedAttr.java Tue Sep 13 19:30:38 2011
@@ -0,0 +1,135 @@
+/*
+ * 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.apache.myfaces.html5.test;
+
+public class HtmlRenderedAttr
+{
+ public static final int RENDERED_MORE_TIMES_THAN_EXPECTED = 1;
+ public static final int RENDERED_LESS_TIMES_THAN_EXPECTED = 2;
+
+ private String name;
+ private Object value;
+ private String expectedHtml;
+ private boolean renderSuccessful;
+ private int errorCode;
+ private int expectedOccurrences;
+ private int actualOccurrences;
+
+ public HtmlRenderedAttr(String name) {
+ this(name, name, name + "=\"" + name + "\"");
+ expectedOccurrences = 1;
+ }
+
+ public HtmlRenderedAttr(String name, int expectedOccurences) {
+ this(name);
+ this.expectedOccurrences = expectedOccurences;
+ }
+
+ /**
+ * Represents an attribute of a component that is expected to be
+ * rendered into html
+ * @param name The name of the attribute.
+ * @param value The value of the attribute.
+ * @param expectedHtml The expected html output for this attribute.
+ * E.g. name="value".
+ */
+ public HtmlRenderedAttr(String name, Object value, String expectedHtml) {
+ this.name = name;
+ this.value = value;
+ this.expectedHtml = expectedHtml;
+
+ renderSuccessful = false;
+ expectedOccurrences = 1;
+ }
+
+ public HtmlRenderedAttr(String name, Object value, String expectedHtml, int occurances) {
+ this(name, value, expectedHtml);
+ this.expectedOccurrences = occurances;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+
+ public Object getValue()
+ {
+ return value;
+ }
+
+ public void setValue(Object value)
+ {
+ this.value = value;
+ }
+
+ public String getExpectedHtml()
+ {
+ return expectedHtml;
+ }
+
+ public void setExpectedHtml(String expectedHtml)
+ {
+ this.expectedHtml = expectedHtml;
+ }
+
+ /**
+ * This returns the result of the rendering of the attribute.
+ * @return True if the rendered html output of this attribute is
+ * the same as expectedHtml. False if either the attribute was not
+ * rendered, it was rendered multiple times, or the rendered html
+ * is different from expectedHtml.
+ */
+ public boolean isRenderSuccessful()
+ {
+ return renderSuccessful;
+ }
+
+ public void setRenderSuccessful(boolean renderSuccessful)
+ {
+ this.renderSuccessful = renderSuccessful;
+ }
+
+ public int getErrorCode()
+ {
+ return errorCode;
+ }
+
+ public void setErrorCode(int errorCode)
+ {
+ this.errorCode = errorCode;
+ setRenderSuccessful(false);
+ }
+
+ public void increaseActualOccurrences() {
+ actualOccurrences++;
+ }
+
+ public int getActualOccurrences() {
+ return this.actualOccurrences;
+ }
+
+ public int getExpectedOccurrences() {
+ return this.expectedOccurrences;
+ }
+}
Added: myfaces/html5/trunk/myfaces-html5-core/src/test/java/org/apache/myfaces/html5/test/TestUtils.java
URL: http://svn.apache.org/viewvc/myfaces/html5/trunk/myfaces-html5-core/src/test/java/org/apache/myfaces/html5/test/TestUtils.java?rev=1170312&view=auto
==============================================================================
--- myfaces/html5/trunk/myfaces-html5-core/src/test/java/org/apache/myfaces/html5/test/TestUtils.java (added)
+++ myfaces/html5/trunk/myfaces-html5-core/src/test/java/org/apache/myfaces/html5/test/TestUtils.java Tue Sep 13 19:30:38 2011
@@ -0,0 +1,229 @@
+/*
+ * 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.apache.myfaces.html5.test;
+
+import java.io.IOException;
+
+import javax.faces.FacesException;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.render.RenderKit;
+import javax.faces.render.Renderer;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+public abstract class TestUtils
+{
+ /** Default Logger */
+ private static final Log log = LogFactory.getLog(TestUtils.class);
+
+ /** utility class, do not instantiate */
+ private TestUtils()
+ {
+ // utility class, disable instantiation
+ }
+
+ /**
+ * Add all of Tomahawk's renderers. Currently this is not tied to
+ * faces-config.xml, so all change to the file MUST also be made here.
+ *
+ * @param facesContext
+ * @todo Do not add renderer if renderer is already added.
+ */
+ public static void addDefaultRenderers(FacesContext facesContext)
+ {
+ addRenderer(facesContext, "org.apache.myfaces.Div", "org.apache.myfaces.html5.Div",
+ "org.apache.myfaces.html5.renderkit.panel.DivRenderer");
+
+ addRenderer(facesContext, "javax.faces.Input", "org.apache.myfaces.html5.Text",
+ "org.apache.myfaces.html5.renderkit.input.HtmlInputTextRenderer");
+
+ addRenderer(facesContext, "javax.faces.Input", "org.apache.myfaces.html5.Color",
+ "org.apache.myfaces.html5.renderkit.input.HtmlInputColorRenderer");
+
+ addRenderer(facesContext, "javax.faces.Input", "org.apache.myfaces.html5.DateTime",
+ "org.apache.myfaces.html5.renderkit.input.HtmlInputDateTimeRenderer");
+
+ addRenderer(facesContext, "javax.faces.Input", "org.apache.myfaces.html5.Email",
+ "org.apache.myfaces.html5.renderkit.input.HtmlInputEmailRenderer");
+
+ addRenderer(facesContext, "javax.faces.Input", "org.apache.myfaces.html5.NumberSlider",
+ "org.apache.myfaces.html5.renderkit.input.HtmlInputNumberSliderRenderer");
+
+ addRenderer(facesContext, "javax.faces.Input", "org.apache.myfaces.html5.NumberSpinner",
+ "org.apache.myfaces.html5.renderkit.input.HtmlInputNumberSpinnerRenderer");
+
+ addRenderer(facesContext, "org.apache.myfaces.Media", "org.apache.myfaces.html5.Audio",
+ "org.apache.myfaces.html5.renderkit.media.AudioRenderer");
+
+ addRenderer(facesContext, "org.apache.myfaces.Media", "org.apache.myfaces.html5.Video",
+ "org.apache.myfaces.html5.renderkit.media.VideoRenderer");
+
+ addRenderer(facesContext, "org.apache.myfaces.Meter", "org.apache.myfaces.html5.Meter",
+ "org.apache.myfaces.html5.renderkit.output.MeterRenderer");
+
+ addRenderer(facesContext, "org.apache.myfaces.Progress", "org.apache.myfaces.html5.Progress",
+ "org.apache.myfaces.html5.renderkit.output.ProgressRenderer");
+
+ addRenderer(facesContext, "org.apache.myfaces.SlideView", "org.apache.myfaces.html5.SlideView",
+ "org.apache.myfaces.html5.renderkit.output.SlideViewRenderer");
+
+ addRenderer(facesContext, "org.apache.myfaces.Slide", "org.apache.myfaces.html5.Slide",
+ "org.apache.myfaces.html5.renderkit.output.SlideRenderer");
+
+ }
+
+ /**
+ * Add a renderer to the FacesContext.
+ *
+ * @param facesContext Faces Context
+ * @param family Componenet Family
+ * @param rendererType Component Type
+ * @param renderClassName Class Name of Renderer
+ */
+ public static void addRenderer(FacesContext facesContext, String family,
+ String rendererType, String renderClassName)
+ {
+ Renderer renderer = (javax.faces.render.Renderer) newInstance(renderClassName);
+ RenderKit kit = facesContext.getRenderKit();
+ kit.addRenderer(family, rendererType, renderer);
+ }
+
+ /**
+ * Tries a Class.loadClass with the context class loader of the current thread first and
+ * automatically falls back to the ClassUtils class loader (i.e. the loader of the
+ * myfaces.jar lib) if necessary.
+ *
+ * Note: This was copied from org.apache.myfaces.shared.util.ClassUtils
+ *
+ * @param type fully qualified name of a non-primitive non-array class
+ * @return the corresponding Class
+ * @throws NullPointerException if type is null
+ * @throws ClassNotFoundException
+ */
+ private static Class classForName(String type)
+ throws ClassNotFoundException
+ {
+ if (type == null)
+ throw new NullPointerException("type");
+ try
+ {
+ // Try WebApp ClassLoader first
+ return Class.forName(type, false, // do not initialize for faster startup
+ Thread.currentThread().getContextClassLoader());
+ }
+ catch (ClassNotFoundException ignore)
+ {
+ // fallback: Try ClassLoader for ClassUtils (i.e. the myfaces.jar lib)
+ return Class.forName(type, false, // do not initialize for faster startup
+ TestUtils.class.getClassLoader());
+ }
+ }
+
+ /**
+ * Same as {@link #classForName(String)}, but throws a RuntimeException
+ * (FacesException) instead of a ClassNotFoundException.
+ *
+ * Note: This was copied from org.apache.myfaces.shared.util.ClassUtils
+ *
+ * @return the corresponding Class
+ * @throws NullPointerException if type is null
+ * @throws FacesException if class not found
+ */
+ private static Class simpleClassForName(String type)
+ {
+ try
+ {
+ return classForName(type);
+ }
+ catch (ClassNotFoundException e)
+ {
+ log.error("Class " + type + " not found", e);
+ throw new FacesException(e);
+ }
+ }
+
+ /**
+ * Create an instance of the class with the type of <code>type</code>.
+ *
+ * Note: This was copied from org.apache.myfaces.shared.util.ClassUtils
+ *
+ * @param type Type of new class.
+ * @return Instance of the class <code>type</code>
+ * @throws FacesException
+ */
+ private static Object newInstance(String type) throws FacesException
+ {
+ if (type == null)
+ return null;
+ return newInstance(simpleClassForName(type));
+ }
+
+ /**
+ * Create an instance of the class <code>clazz</code>.
+ *
+ * Note: This was copied from org.apache.myfaces.shared.util.ClassUtils
+ *
+ * @param clazz Class to create an instance of.
+ * @return Instance of the class <code>clazz</code>
+ * @throws FacesException
+ */
+ private static Object newInstance(Class clazz) throws FacesException
+ {
+ try
+ {
+ return clazz.newInstance();
+ }
+ catch (NoClassDefFoundError e)
+ {
+ log.error("Class : " + clazz.getName() + " not found.", e);
+ throw new FacesException(e);
+ }
+ catch (InstantiationException e)
+ {
+ log.error(e.getMessage(), e);
+ throw new FacesException(e);
+ }
+ catch (IllegalAccessException e)
+ {
+ log.error(e.getMessage(), e);
+ throw new FacesException(e);
+ }
+ }
+
+ /**
+ * Renderered a component, including it's children, then complete the reponse.
+ *
+ * @param context Faces Context
+ * @param component Component to be rendered.
+ * @throws IOException Thrown while rendering.
+ */
+ public static void renderComponent(FacesContext context,
+ UIComponent component) throws IOException
+ {
+ Renderer renderer = context.getRenderKit().getRenderer(
+ component.getFamily(), component.getRendererType());
+ renderer.encodeBegin(context, component);
+ renderer.encodeChildren(context, component);
+ renderer.encodeEnd(context, component);
+ context.responseComplete();
+ context.renderResponse();
+ }
+}