You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bs...@apache.org on 2014/08/05 04:15:59 UTC
svn commit: r1615840 [1/2] - in /myfaces/trinidad/trunk: ./
trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/
trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/
trinidad-impl/src/test/resource...
Author: bsullivan
Date: Tue Aug 5 02:15:58 2014
New Revision: 1615840
URL: http://svn.apache.org/r1615840
Log:
Trinidad-2501 Renderkit Test Improvements
Improve RenderKit Tests by:
1) Allowing the set of SuiteDefinition environment tests to be passed on the command line
2) Allowing the set of testScripts to be passed on the command line
3) Allowing test scripts to specify the set of accessibility modes they don't execute in
4) Allowing test cases to specify the set of accessibility modes that they don't execute in
5) Cleaning up the code
6) Fixing up the test scripts to set the unsupported accessibility modes so only the tests are aren't supported on a particular accessibility mode are skipped, rather than relying on the shotgun approach of running all of the tests in lenient mode
7) Fixing up the golden files to remove the test cases that shouldn't run
8) Make it easier to run the CoreRenderkitTestCase directly from an IDE with JUnit support without setting the system properties for the golden file directories
Modified:
myfaces/trinidad/trunk/ (props changed)
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PollRenderer.java
myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/CoreRenderKitTest.java
myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/GatherContent.java
myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitTestCase.java
myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/TestScript.java
myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/TestScriptParser.java
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandButton-minimalScrRdr-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandLink-minimalScrRdr-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandNavigationItem-minimalScrRdr-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/goButton-minimalScrRdr-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/goLink-minimalScrRdr-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputColor-simple-minimalInacc-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputDate-simple-minimalInacc-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/outputLabel-minimalScrRdr-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/outputText-minimalInacc-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/poll-minimalScrRdr-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/resetButton-minimalScrRdr-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanCheckbox-minimalScrRdr-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanCheckbox-simple-minimalInacc-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanCheckbox-simple-minimalScrRdr-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanRadio-simple-minimalInacc-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyCheckbox-minimalScrRdr-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyListbox-simple-minimalInacc-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneChoice-simple-minimalInacc-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneListbox-simple-minimalInacc-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimalInacc-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/chooseDate.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/commandButton.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/commandLink.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/commandNavigationItem.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/goButton.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/goLink.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/inputColor-simple.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/inputDate-simple.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/outputLabel.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/outputText.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/panelSideBar.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/poll.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/resetButton.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/selectBooleanCheckbox-simple.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/selectBooleanCheckbox.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/selectBooleanRadio-simple.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/selectManyCheckbox.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/selectManyListbox-simple.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/selectOneChoice-simple.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/selectOneListbox-simple.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/table.xml
Propchange: myfaces/trinidad/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Aug 5 02:15:58 2014
@@ -23,3 +23,4 @@ relative mtr2 - jetty on demo.app
.data
trin2493_2.1.diff
trinTrunk2.jws
+trin-2501-2_1_1.patch
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PollRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PollRenderer.java?rev=1615840&r1=1615839&r2=1615840&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PollRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PollRenderer.java Tue Aug 5 02:15:58 2014
@@ -175,15 +175,15 @@ public class PollRenderer extends XhtmlR
FacesBean bean)
{
Object o = bean.getProperty(_intervalKey);
- if (o == null)
- {
- o = _intervalKey.getDefault();
- }
-
+
+ Number interval;
+
if (o instanceof Number)
- return ((Number) o).intValue();
-
- return _POLL_INTERVAL_DEFAULT;
+ interval = ((Number)o).intValue();
+ else
+ interval = (Number)_intervalKey.getDefault();
+
+ return interval.intValue();
}
/**
@@ -239,8 +239,7 @@ public class PollRenderer extends XhtmlR
isAutoRefreshMode,
elementID);
String argumentString = _getArgumentString(elementID,
- rc.getFormData().getName(),
- isPartial);
+ rc.getFormData().getName());
int length = _getScriptBufferLength(startScript,
argumentString,
pollInterval,
@@ -344,9 +343,7 @@ public class PollRenderer extends XhtmlR
*/
private static String _getArgumentString(
String elementID,
- String formName,
- boolean isPartial
- )
+ String formName)
{
StringBuilder buffer = new StringBuilder(60);
buffer.append("'");
@@ -388,7 +385,5 @@ public class PollRenderer extends XhtmlR
private static final String _END_SCRIPT = ");";
private static final String _MIDDLE_SCRIPT_AUTO_REFRESH = ")\", ";
- private static final int _POLL_INTERVAL_DEFAULT = 5000;
-
private static final TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(PollRenderer.class);
}
Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/CoreRenderKitTest.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/CoreRenderKitTest.java?rev=1615840&r1=1615839&r2=1615840&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/CoreRenderKitTest.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/CoreRenderKitTest.java Tue Aug 5 02:15:58 2014
@@ -21,9 +21,13 @@ package org.apache.myfaces.trinidadinter
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -36,8 +40,11 @@ import org.apache.myfaces.trinidad.compo
import org.apache.myfaces.trinidad.component.core.CoreForm;
import org.apache.myfaces.trinidad.component.html.HtmlHtml;
import org.apache.myfaces.trinidad.context.RequestContext;
+import org.apache.myfaces.trinidad.logging.TrinidadLogger;
import org.apache.myfaces.trinidad.render.RenderUtils;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderKitTestCase.RendererTest;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderKitTestCase.SuiteDefinition;
import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRenderKit;
import org.xml.sax.SAXException;
@@ -52,14 +59,37 @@ public class CoreRenderKitTest extends R
return suite;
}
+ /**
+ * To limit the set of allowed SuiteDefinition variants that the tests are run against,
+ * pass the parameter:<code>definitions=<i><comma-delimited list of defintions><i></code>, such
+ * as <code>definitions=minimal,minimalScrRdr</code>
+ * To limit the set test scripts run, pass the parameter
+ * <code>tests=<i><comma-delimited list of test script names without .xml extension><i></code>,
+ * such as <code>tests=inputText,media</code>
+ * @param args
+ * @throws Throwable
+ */
+ public static void main(String[] args) throws Throwable
+ {
+ _parseAllowedDefinitions(args);
+ _parseAllowedTests(args);
+
+ junit.textui.TestRunner.run(suite());
+ }
+
public CoreRenderKitTest(String testName) throws IOException, SAXException
{
super(testName);
}
@Override
- protected Iterable<SuiteDefinition> getSuiteDefinitions()
+ protected List<SuiteDefinition> getSuiteDefinitions()
{
+ if (_definitions == null)
+ {
+ _definitions = _filterDefinitions();
+ }
+
return _definitions;
}
@@ -83,7 +113,7 @@ public class CoreRenderKitTest extends R
return root;
}
- if (_sHtmlComponents.contains(componentType))
+ if (_HTML_COMPONENTS.contains(componentType))
{
HtmlHtml html = new HtmlHtml();
html.setId("htmlId");
@@ -104,9 +134,107 @@ public class CoreRenderKitTest extends R
}
}
- private static final List<SuiteDefinition> _definitions =
- new ArrayList<SuiteDefinition>();
- private static final HashSet<String> _sHtmlComponents;
+ /**
+ * Override to filter which component tests to add
+ * @param name
+ * @param definition
+ * @param lenient
+ * @throws IOException
+ * @throws SAXException
+ */
+ @Override
+ protected void addRendererTest(
+ String name,
+ SuiteDefinition definition,
+ boolean lenient) throws IOException, SAXException
+ {
+ if (_ALLOWED_TEST_NAMES.isEmpty() || _ALLOWED_TEST_NAMES.contains(name))
+ {
+ super.addRendererTest(name, definition, lenient);
+ }
+ else
+ {
+ _LOG.info("Suppress running RenderKitTest:" + name + " " + definition);
+ }
+ }
+
+ private static List<String> _parseListParameter(String[] args, String parameterPrefix)
+ {
+ for (String arg : args)
+ {
+ if (arg.startsWith(parameterPrefix))
+ {
+ String definitionsString = arg.substring(parameterPrefix.length());
+ return Arrays.asList(definitionsString.split(","));
+ }
+ }
+
+ return Collections.emptyList();
+ }
+
+ private static void _parseAllowedDefinitions(String[] args)
+ {
+ _ALLOWED_DEFINITIONS_CATEGORIES.addAll(_parseListParameter(args, "definitions="));
+ }
+
+ private static void _parseAllowedTests(String[] args)
+ {
+ _ALLOWED_TEST_NAMES.addAll(_parseListParameter(args, "tests="));
+ }
+
+ private static SuiteDefinition _getSuitedDefinitionByCategory(
+ Iterable<SuiteDefinition> suitedDefinitions, String category)
+ {
+ for (SuiteDefinition def : suitedDefinitions)
+ {
+ if (category.equals(def.getCategory()))
+ {
+ return def;
+ }
+ }
+
+ return null;
+ }
+
+ private static List<SuiteDefinition> _filterDefinitions()
+ {
+ if (_ALLOWED_DEFINITIONS_CATEGORIES.isEmpty())
+ {
+ return _DEFINITIONS;
+ }
+ else
+ {
+ ArrayList<SuiteDefinition> definitions = new ArrayList<SuiteDefinition>();
+
+ for (String category : _ALLOWED_DEFINITIONS_CATEGORIES)
+ {
+ SuiteDefinition allowedDefinition = _getSuitedDefinitionByCategory(_DEFINITIONS, category);
+
+ if (allowedDefinition != null)
+ {
+ definitions.add(allowedDefinition);
+ }
+ else
+ {
+ _LOG.warning("Unabled to find test category named:" + category);
+ }
+ }
+
+ definitions.trimToSize();
+ return Collections.unmodifiableList(definitions);
+ }
+ }
+
+
+ private static final Set<String> _ALLOWED_TEST_NAMES = new HashSet<String>();
+ private static final Set<String> _ALLOWED_DEFINITIONS_CATEGORIES = new HashSet<String>();
+
+ private static final List<SuiteDefinition> _DEFINITIONS;
+ private static final Set<String> _HTML_COMPONENTS;
+
+ private static final Logger _LOG = Logger.getLogger(CoreRenderKitTest.class.getName());
+
+ private List<SuiteDefinition> _definitions;
static
{
@@ -115,6 +243,7 @@ public class CoreRenderKitTest extends R
Logger logger = Logger.getLogger(CoreRenderKit.class.getName());
logger.setLevel(Level.SEVERE);
logger.setUseParentHandlers(false);
+
// Force the RenderUtils logger level to SEVERE to bypass the
// warnings in getRelativeId method when the component
// with the relativeId could not be found which is the case in our
@@ -123,47 +252,54 @@ public class CoreRenderKitTest extends R
loggerTwo.setLevel(Level.SEVERE);
loggerTwo.setUseParentHandlers(false);
- _definitions.add(new SuiteDefinition("minimal",
- "minimal",
- null,
- RenderKitBootstrap.getGeckoAgent(),
- false));
- _definitions.add(new SuiteDefinition("minimalIE",
- "minimal",
- null,
- RenderKitBootstrap.getIEAgent(),
- false));
- _definitions.add(new SuiteDefinition("minimalIERtl",
- "minimal",
- null,
- RenderKitBootstrap.getIEAgent(),
- true));
- _definitions.add(new SuiteDefinition("minimalPPC",
- "minimal",
- null,
- RenderKitBootstrap.getPocketPCAgent(),
- false));
- _definitions.add(new SuiteDefinition("minimalSaf",
- "minimal",
- null,
- RenderKitBootstrap.getSafariAgent(),
- false));
- _definitions.add(new SuiteDefinition("minimalScrRdr",
- "minimal",
- RequestContext.Accessibility.SCREEN_READER,
- RenderKitBootstrap.getGeckoAgent(),
- false));
- _definitions.add(new SuiteDefinition("minimalInacc",
- "minimal",
- RequestContext.Accessibility.INACCESSIBLE,
- RenderKitBootstrap.getGeckoAgent(),
- false));
-
- _sHtmlComponents = new HashSet<String>(8);
- _sHtmlComponents.add("org.apache.myfaces.trinidad.HtmlBody");
- _sHtmlComponents.add("org.apache.myfaces.trinidad.HtmlFrame");
- _sHtmlComponents.add("org.apache.myfaces.trinidad.HtmlFrameBorderLayout");
- _sHtmlComponents.add("org.apache.myfaces.trinidad.HtmlHead");
- _sHtmlComponents.add("org.apache.myfaces.trinidad.CoreStyleSheet");
+ // order is apparently important
+ ArrayList<SuiteDefinition> definitions = new ArrayList<SuiteDefinition>();
+
+ definitions.add(new SuiteDefinition("minimal",
+ "minimal",
+ null,
+ RenderKitBootstrap.getGeckoAgent(),
+ false));
+ definitions.add(new SuiteDefinition("minimalIE",
+ "minimal",
+ null,
+ RenderKitBootstrap.getIEAgent(),
+ false));
+ definitions.add(new SuiteDefinition("minimalIERtl",
+ "minimal",
+ null,
+ RenderKitBootstrap.getIEAgent(),
+ true));
+ definitions.add(new SuiteDefinition("minimalPPC",
+ "minimal",
+ null,
+ RenderKitBootstrap.getPocketPCAgent(),
+ false));
+ definitions.add(new SuiteDefinition("minimalSaf",
+ "minimal",
+ null,
+ RenderKitBootstrap.getSafariAgent(),
+ false));
+ definitions.add(new SuiteDefinition("minimalScrRdr",
+ "minimal",
+ RequestContext.Accessibility.SCREEN_READER,
+ RenderKitBootstrap.getGeckoAgent(),
+ false));
+ definitions.add(new SuiteDefinition("minimalInacc",
+ "minimal",
+ RequestContext.Accessibility.INACCESSIBLE,
+ RenderKitBootstrap.getGeckoAgent(),
+ false));
+
+ definitions.trimToSize();
+ _DEFINITIONS = Collections.unmodifiableList(definitions);
+
+ String[] htmlComponents = {"org.apache.myfaces.trinidad.HtmlBody",
+ "org.apache.myfaces.trinidad.HtmlFrame",
+ "org.apache.myfaces.trinidad.HtmlFrameBorderLayout",
+ "org.apache.myfaces.trinidad.HtmlHead",
+ "org.apache.myfaces.trinidad.CoreStyleSheet"};
+
+ _HTML_COMPONENTS = Collections.unmodifiableSet(new HashSet<String>(Arrays.asList(htmlComponents)));
}
}
Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/GatherContent.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/GatherContent.java?rev=1615840&r1=1615839&r2=1615840&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/GatherContent.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/GatherContent.java Tue Aug 5 02:15:58 2014
@@ -38,11 +38,12 @@ import org.apache.myfaces.trinidadintern
public class GatherContent extends UIComponentBase
{
@SuppressWarnings("unchecked")
- public GatherContent(Writer writer,
- UIComponent child,
- TestResult result,
- Test test,
- boolean lenient)
+ public GatherContent(
+ Writer writer,
+ UIComponent child,
+ TestResult result,
+ Test test,
+ boolean lenient)
{
_writer = writer;
_result = result;
@@ -59,20 +60,57 @@ public class GatherContent extends UICom
}
@Override
+ public void encodeAll(FacesContext context)
+ {
+ try
+ {
+ super.encodeAll(context);
+ }
+ catch (Throwable t)
+ {
+ Throwable failure = new Throwable("Exception during rendering", t);
+ _result.addError(_test, failure);
+
+ }
+ }
+
+ @Override
public void encodeBegin(FacesContext context)
{
_savedWriter = context.getResponseWriter();
- if (_lenient)
- context.setResponseWriter(_savedWriter.cloneWithWriter(_writer));
- else
- context.setResponseWriter(
- new CheckUIComponent(_savedWriter.cloneWithWriter(_writer)));
+
+ ResponseWriter wrappedWriter = _savedWriter.cloneWithWriter(_writer);
+
+ if (!_lenient)
+ wrappedWriter = new CheckUIComponent(wrappedWriter);
+
+ context.setResponseWriter(wrappedWriter);
}
@Override
public void encodeEnd(FacesContext context)
{
+ // check that we have balanced elements in the CheckUIComponent
+ if (!_lenient)
+ {
+ ResponseWriter wrappedWriter = context.getResponseWriter();
+
+ if (wrappedWriter instanceof CheckUIComponent)
+ {
+ int finishingDepth = ((CheckUIComponent)wrappedWriter).getDepth();
+
+ if (finishingDepth != 0)
+ {
+ AssertionFailedError failure = new AssertionFailedError("Elements not completely popped during rendering");
+
+ _result.addError(_test, failure);
+ }
+ }
+ }
+
context.setResponseWriter(_savedWriter);
+ _savedWriter = null;
+
RenderingContext arc = RenderingContext.getCurrentInstance();
// Our hidden label utility code makes sure it never writes out
@@ -88,6 +126,11 @@ public class GatherContent extends UICom
super(out);
}
+ public int getDepth()
+ {
+ return _depth;
+ }
+
@Override
public void startElement(String name,
UIComponent component) throws IOException
@@ -133,10 +176,10 @@ public class GatherContent extends UICom
private int _depth = 0;
}
- private UIComponent _child;
- private TestResult _result;
- private Test _test;
- private boolean _lenient;
- private Writer _writer;
+ private final UIComponent _child;
+ private final TestResult _result;
+ private final Test _test;
+ private final boolean _lenient;
+ private final Writer _writer;
private ResponseWriter _savedWriter;
}
Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitTestCase.java?rev=1615840&r1=1615839&r2=1615840&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitTestCase.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitTestCase.java Tue Aug 5 02:15:58 2014
@@ -28,6 +28,7 @@ import java.io.Writer;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.logging.Handler;
@@ -48,6 +49,7 @@ import org.apache.commons.lang.StringUti
import org.apache.myfaces.trinidad.context.Agent;
import org.apache.myfaces.trinidad.context.RequestContext;
+import org.apache.myfaces.trinidad.context.RequestContext.Accessibility;
import org.apache.myfaces.trinidad.render.ExtendedRenderKitService;
import org.apache.myfaces.trinidad.skin.SkinProvider;
import org.apache.myfaces.trinidad.util.Service;
@@ -63,6 +65,8 @@ import junit.framework.AssertionFailedEr
import junit.framework.TestResult;
import junit.framework.TestSuite;
+import org.apache.myfaces.trinidad.logging.TrinidadLogger;
+
import org.xml.sax.SAXException;
abstract public class RenderKitTestCase extends TestSuite
@@ -138,6 +142,11 @@ abstract public class RenderKitTestCase
_rightToLeft = rightToLeft;
_outputMode = outputMode;
}
+
+ public Accessibility getAccMode()
+ {
+ return _accMode;
+ }
@Override
public void run(TestResult result)
@@ -361,24 +370,20 @@ abstract public class RenderKitTestCase
this,
_lenient));
- Iterator<TestScript.Test> tests = _script.getTests().iterator();
- while (tests.hasNext())
- {
- TestScript.Test test = tests.next();
-
- UIComponent testComponent = _createComponent();
-
- test.apply(getFacesContext(), testComponent);
- docRoot.getChildren().add(new GatherContent(test.getOutput(),
- testComponent,
- getResult(),
- this,
- _lenient));
- }
-
+ // add the GatherContent components for the different test cases
+ _addTestComponents(docRoot);
renderRoot(root);
+ String golden = _loadGoldenFile();
+
+ String baseResults = base.toString();
+
+ _processResults(golden, baseResults);
+ }
+
+ private String _loadGoldenFile() throws IOException
+ {
File goldenFile = new File(_goldenDir, getName() + "-golden.xml");
String golden = null;
if (goldenFile.exists())
@@ -397,88 +402,150 @@ abstract public class RenderKitTestCase
golden = buffer.toString();
in.close();
}
+
+ return golden;
+ }
- boolean forceGolden = "true".equals(
- System.getProperty("org.apache.myfaces.trinidad.ForceGolden"));
+ private void _addTestComponents(UIComponent docRoot)
+ {
+ Iterator<TestScript.Test> tests = _script.getTests().iterator();
+ Accessibility accMode = getAccMode();
+
+ while (tests.hasNext())
+ {
+ TestScript.Test test = tests.next();
- Writer out = new StringWriter(golden == null ? 1000 : golden.length());
- out.write("<results>");
- String baseResults = base.toString();
- out.write(baseResults);
+ if (test.supportsAccessibilityMode(accMode))
+ {
+ UIComponent testComponent = _createComponent();
+
+ test.apply(getFacesContext(), testComponent);
+ docRoot.getChildren().add(new GatherContent(test.getOutput(),
+ testComponent,
+ getResult(),
+ this,
+ _lenient));
+ }
+ }
+ }
+ private void _processTest(TestScript.Test test, Writer out, String baseResults) throws IOException
+ {
+ Accessibility accMode = getAccMode();
- tests = _script.getTests().iterator();
- while (tests.hasNext())
+ if (test.supportsAccessibilityMode(accMode))
{
- TestScript.Test test = tests.next();
out.write("\n<!--");
out.write(test.toString());
out.write("-->\n");
String testResults = test.getOutput().toString();
out.write(testResults);
-
- if (_lenient)
- continue;
- if (!test.shouldMatchBase() &&
- baseResults.equals(testResults))
- {
- AssertionFailedError failure = new AssertionFailedError(
- "Result of " + test.toString() + " were identical to " +
- "base, but should not have been!");
- getResult().addError(this, failure);
- }
- else if (test.shouldMatchBase() &&
- !baseResults.equals(testResults))
+
+ if (!_lenient)
{
- AssertionFailedError failure = new AssertionFailedError(
- "Result of " + test.toString() + " were not identical to " +
- "base, but should have been!");
- getResult().addError(this, failure);
+ if (!test.shouldMatchBase() &&
+ baseResults.equals(testResults))
+ {
+ AssertionFailedError failure = new AssertionFailedError(
+ "In " + getName() + ", result of " + test.toString() + " were identical to " +
+ "base, but should not have been!");
+ getResult().addError(this, failure);
+ }
+ else if (test.shouldMatchBase() &&
+ !baseResults.equals(testResults))
+ {
+ AssertionFailedError failure = new AssertionFailedError(
+ "Result of " + test.toString() + " were not identical to " +
+ "base, but should have been!");
+ getResult().addError(this, failure);
+ }
}
}
+ }
- out.write("\n</results>\n");
- out.close();
+ private String _processTests(String golden, String baseResults) throws IOException
+ {
+ Writer out = new StringWriter(golden == null ? 1000 : golden.length());
- String results = out.toString();
- if ((golden == null) || !golden.equals(results))
+ try
{
- File failureFile;
- // Set the "org.apache.myfaces.trinidad.ForceGolden" property to true to
- // force failures to be directly copied into the target directory
- if (forceGolden)
- failureFile = new File(_goldenDir, getName() + "-golden.xml");
- else
- failureFile = new File(_failureDir, getName() + "-golden.xml");
- failureFile.getParentFile().mkdirs();
- FileWriter failureOut = new FileWriter(failureFile);
- failureOut.write(results);
- failureOut.close();
-
- if (golden == null)
+ out.write("<results>");
+ out.write(baseResults);
+
+ Iterator<TestScript.Test> tests = _script.getTests().iterator();
+ while (tests.hasNext())
{
- // Don't report "no golden file" as an error when
- // forceGolden is on; but do report diffs as errors
- if (!forceGolden)
- {
- throw new AssertionFailedError("No golden file for test " +
- _scriptName);
- }
+ TestScript.Test test = tests.next();
+
+ _processTest(test, out, baseResults);
}
- else
+
+ out.write("\n</results>\n");
+ }
+ finally
+ {
+ out.close();
+ }
+
+ return out.toString();
+ }
+
+ private void _writeFailureGoldenFile(String results, boolean forceGolden) throws IOException
+ {
+ File failureFile;
+ // Set the "org.apache.myfaces.trinidad.ForceGolden" property to true to
+ // force failures to be directly copied into the target directory
+ if (forceGolden)
+ failureFile = new File(_goldenDir, getName() + "-golden.xml");
+ else
+ failureFile = new File(_failureDir, getName() + "-golden.xml");
+
+ failureFile.getParentFile().mkdirs();
+ FileWriter failureOut = new FileWriter(failureFile);
+ failureOut.write(results);
+ failureOut.close();
+ }
+
+ private void _throwAssertionFailure(String golden, String results, boolean forceGolden)
+ {
+ if (golden == null)
+ {
+ // Don't report "no golden file" as an error when
+ // forceGolden is on; but do report diffs as errors
+ if (!forceGolden)
{
- int index = StringUtils.indexOfDifference(golden, results);
- String difference = StringUtils.difference(golden, results);
- int diffLength = difference.length();
- if (diffLength > 50)
- difference = StringUtils.abbreviate(difference, 50);
- throw new AssertionFailedError(
- "Golden file for test "+ _scriptName + " did not match; " +
- "first difference at " + index + ", difference of length " +
- diffLength + ", \"" + difference + "\"");
+ throw new AssertionFailedError("No golden file for test " +
+ _scriptName);
}
}
+ else
+ {
+ int index = StringUtils.indexOfDifference(golden, results);
+ String difference = StringUtils.difference(golden, results);
+ int diffLength = difference.length();
+ if (diffLength > 50)
+ difference = StringUtils.abbreviate(difference, 50);
+ throw new AssertionFailedError(
+ "Golden file for test "+ _scriptName + " did not match; " +
+ "first difference at " + index + ", difference of length " +
+ diffLength + ", \"" + difference + "\"");
+ }
}
+
+ private void _processResults(String golden, String baseResults) throws IOException
+ {
+ String results = _processTests(golden, baseResults);
+
+ if ((golden == null) || !golden.equals(results))
+ {
+ boolean forceGolden = "true".equals(
+ System.getProperty("org.apache.myfaces.trinidad.ForceGolden"));
+
+ _writeFailureGoldenFile(results, forceGolden);
+
+ _throwAssertionFailure(golden, results, forceGolden);
+ }
+ }
private UIComponent _createComponent()
{
@@ -499,9 +566,11 @@ abstract public class RenderKitTestCase
_facesConfigInfo = bootstrap.getFacesConfigInfo();
- String scripts = System.getProperty("trinidad.renderkit.scripts");
- String golden = System.getProperty("trinidad.renderkit.golden");
- String failures = System.getProperty("trinidad.renderkit.failures");
+ String projectPath = System.getProperty("user.dir");
+
+ String scripts = System.getProperty("trinidad.renderkit.scripts", projectPath + "/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/");
+ String golden = System.getProperty("trinidad.renderkit.golden", projectPath + "/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/");
+ String failures = System.getProperty("trinidad.renderkit.failures", projectPath + "/target/test-failures/");
_scriptDir = new File(scripts);
_goldenDir = new File(golden);
@@ -518,7 +587,7 @@ abstract public class RenderKitTestCase
includedScripts = new HashSet<String>();
for (int i = 0; i < scripts.length; i++)
{
- System.out.println("Including " + scripts[i]);
+ _LOG.info("Including " + scripts[i]);
includedScripts.add(scripts[i]);
}
}
@@ -563,17 +632,37 @@ abstract public class RenderKitTestCase
boolean lenient) throws IOException, SAXException
{
RendererTest test = new RendererTest(name, definition, lenient);
- if (test._script.isSupportedAgentType(test.getAgent().getType()))
+ TestScript script = test._script;
+
+ Object agentType = test.getAgent().getType();
+ RequestContext.Accessibility mode = definition.getAccessibilityMode();
+
+ boolean allowedAgent = script.isSupportedAgentType(agentType);
+ boolean allowedMode = script.isSupportedAccessibilityMode(mode);
+
+ if (allowedAgent && allowedMode)
{
addTest(test);
}
+ else
+ {
+ if (!allowedAgent)
+ {
+ _LOG.info("Suppress " + name + " on agent " + agentType);
+ }
+
+ if (!allowedMode)
+ {
+ _LOG.info("Suppress " + name + " on accessibility mode " + mode);
+ }
+ }
}
protected abstract UIComponent populateDefaultComponentTree(
UIViewRoot root,
TestScript script);
- protected abstract Iterable<SuiteDefinition> getSuiteDefinitions();
+ protected abstract List<SuiteDefinition> getSuiteDefinitions();
protected abstract String getRenderKitId();
@@ -656,4 +745,7 @@ abstract public class RenderKitTestCase
static private File _scriptDir;
static private File _goldenDir;
static private File _failureDir;
+
+ static private final TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(RenderKitTestCase.class);
+
}
Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/TestScript.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/TestScript.java?rev=1615840&r1=1615839&r2=1615840&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/TestScript.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/TestScript.java Tue Aug 5 02:15:58 2014
@@ -21,6 +21,7 @@ package org.apache.myfaces.trinidadinter
import java.io.StringWriter;
import java.util.ArrayList;
+import java.util.EnumSet;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.Iterator;
@@ -36,6 +37,8 @@ import org.apache.myfaces.trinidad.compo
import org.apache.myfaces.trinidad.model.SortCriterion;
import org.apache.myfaces.trinidad.context.Agent;
+import org.apache.myfaces.trinidad.context.RequestContext;
+import org.apache.myfaces.trinidad.context.RequestContext.Accessibility;
public class TestScript
{
@@ -50,11 +53,21 @@ public class TestScript
return _agentTypes.contains(agentType);
}
+ public boolean isSupportedAccessibilityMode(Accessibility mode)
+ {
+ return _accessibleModes.contains(mode);
+ }
+
public void removeAgentType(Object agentType)
{
_agentTypes.remove(agentType);
}
+ public void removeAccessibleModes(Set<Accessibility> unsupportedModes)
+ {
+ _accessibleModes.removeAll(unsupportedModes);
+ }
+
public void setDefinition(ComponentDefinition cd)
{
_definition = cd;
@@ -74,8 +87,13 @@ public class TestScript
static abstract public class Test
{
- abstract public void apply(FacesContext context, UIComponent component);
- abstract public boolean shouldMatchBase();
+ public abstract void apply(FacesContext context, UIComponent component);
+ public abstract boolean shouldMatchBase();
+ public boolean supportsAccessibilityMode(RequestContext.Accessibility mode)
+ {
+ return true;
+ }
+
public StringWriter getOutput()
{
return _output;
@@ -170,7 +188,7 @@ public class TestScript
{
public AttributeTest(String name, Object value, boolean matchesBase)
{
- this(name, value, matchesBase, null, null);
+ this(name, value, matchesBase, null, null, null);
}
public AttributeTest(String name,
@@ -178,18 +196,22 @@ public class TestScript
boolean matchesBase,
Test delegateTest)
{
- this(name, value, matchesBase, delegateTest, null);
+ this(name, value, matchesBase, delegateTest, null, null);
}
public AttributeTest(String name,
Object value,
boolean matchesBase,
Test delegateTest,
- String componentId)
+ String componentId,
+ Set<Accessibility> unsupportedModes)
{
_name = name;
_value = value;
_testComponentId = componentId;
+ _unsupportedModes = (unsupportedModes != null)
+ ? unsupportedModes
+ : EnumSet.noneOf(Accessibility.class);
if (delegateTest != null)
{
@@ -200,6 +222,22 @@ public class TestScript
_matchesBase = matchesBase;
}
+ @Override
+ public boolean supportsAccessibilityMode(RequestContext.Accessibility mode)
+ {
+ /*
+ if (_unsupportedModes.contains(mode))
+ {
+ return true;
+ }
+ else
+ {
+ return true;
+ }
+ */
+ return !_unsupportedModes.contains(mode);
+ }
+
public void addDelegate(Test delegateTest)
{
_delegateTests.add(delegateTest);
@@ -238,20 +276,20 @@ public class TestScript
}
else
{
- if ((value instanceof String) &&
- ComponentDefinition.isValueExpression(value.toString()))
- {
- ValueBinding binding = context.getApplication().
- createValueBinding(value.toString());
- component.setValueBinding(_name, binding);
- }
- else
- {
- if (value == null)
- value = "test-" + _name;
-
- component.getAttributes().put(_name, value);
- }
+ if ((value instanceof String) &&
+ ComponentDefinition.isValueExpression(value.toString()))
+ {
+ ValueBinding binding = context.getApplication().
+ createValueBinding(value.toString());
+ component.setValueBinding(_name, binding);
+ }
+ else
+ {
+ if (value == null)
+ value = "test-" + _name;
+
+ component.getAttributes().put(_name, value);
+ }
}
}
@@ -325,14 +363,16 @@ public class TestScript
}
}
- private String _name;
- private Object _value;
- private String _testComponentId;
- private boolean _matchesBase;
- private List<Test> _delegateTests = new ArrayList<Test>();
+ private final String _name;
+ private final Object _value;
+ private final String _testComponentId;
+ private final boolean _matchesBase;
+ private final List<Test> _delegateTests = new ArrayList<Test>();
+ private final Set<Accessibility> _unsupportedModes;
}
private Set<Object> _agentTypes = new HashSet<Object>();
+ private Set<Accessibility> _accessibleModes = EnumSet.allOf(Accessibility.class);
private List<Test> _tests = new ArrayList<Test>();
private ComponentDefinition _definition;
Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/TestScriptParser.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/TestScriptParser.java?rev=1615840&r1=1615839&r2=1615840&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/TestScriptParser.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/TestScriptParser.java Tue Aug 5 02:15:58 2014
@@ -24,10 +24,13 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
+import java.util.EnumSet;
import java.util.Iterator;
import java.util.List;
+import java.util.Set;
import java.util.StringTokenizer;
+import org.apache.myfaces.trinidad.context.RequestContext.Accessibility;
import org.apache.myfaces.trinidadinternal.share.expl.Coercions;
import org.apache.myfaces.trinidadinternal.share.xml.BaseNodeParser;
import org.apache.myfaces.trinidadinternal.share.xml.NodeParser;
@@ -86,6 +89,29 @@ class TestScriptParser extends BaseNodeP
_script.removeAgentType(tokens.nextToken());
}
}
+
+ Set<Accessibility> unsupportedModes = _parseUnsupportedAccessibilityModes(attrs);
+ _script.removeAccessibleModes(unsupportedModes);
+ }
+
+ private static Set<Accessibility> _parseUnsupportedAccessibilityModes(Attributes attrs)
+ {
+ String accessibilityNotSupported = attrs.getValue(_ACCESSIBILITY_MODE_NOT_SUPPORTED_ATTR_NAME);
+
+ Set<Accessibility> unsupportedModes = EnumSet.noneOf(Accessibility.class);
+
+ if (accessibilityNotSupported != null)
+ {
+ StringTokenizer tokens = new StringTokenizer(accessibilityNotSupported);
+ while (tokens.hasMoreTokens())
+ {
+ Accessibility unsupportedMode = Accessibility.valueOf(tokens.nextToken());
+
+ unsupportedModes.add(unsupportedMode);
+ }
+ }
+
+ return unsupportedModes;
}
public NodeParser createTestParser(
@@ -282,11 +308,14 @@ class TestScriptParser extends BaseNodeP
else
value = valueStr;
+ Set<Accessibility> unsupportedModes = _parseUnsupportedAccessibilityModes(attrs);
+
_test = new TestScript.AttributeTest(name,
value,
matchesBase,
null,
- _componentId);
+ _componentId,
+ unsupportedModes);
}
@Override
@@ -360,7 +389,7 @@ class TestScriptParser extends BaseNodeP
_defaultValue = _propertyInfo.defaultValue;
/* No default presumably means that null is legit, and that
none of the values should "match base"
- if (defaultValue == null)
+ if (defaultValue == null)i
logError(context, "Property \"" + _name + "\" does not have a " +
"default value",
null);
@@ -635,6 +664,8 @@ class TestScriptParser extends BaseNodeP
private TestScript.Test _test;
}
+ private static final String _ACCESSIBILITY_MODE_NOT_SUPPORTED_ATTR_NAME = "accessibilityModeNotSupported";
+
private FacesConfigInfo _info;
private TestScript _script;
private FacesConfigInfo.ComponentInfo _componentInfo;
Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandButton-minimalScrRdr-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandButton-minimalScrRdr-golden.xml?rev=1615840&r1=1615839&r2=1615840&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandButton-minimalScrRdr-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandButton-minimalScrRdr-golden.xml Tue Aug 5 02:15:58 2014
@@ -8,17 +8,6 @@
>
ButtonText
</button>
-<!--AttributeTest[accessKey,u]-->
-
- <button
- class="af_commandButton"
- onclick="submitForm('formId',1,{source:'mainId'});return false;"
- type="button"
- id="uri-attr:mainId"
- name="uri-attr:mainId"
- >
- ButtonText
- </button>
<!--AttributeTest[disabled,false]-->
<button
Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandLink-minimalScrRdr-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandLink-minimalScrRdr-golden.xml?rev=1615840&r1=1615839&r2=1615840&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandLink-minimalScrRdr-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandLink-minimalScrRdr-golden.xml Tue Aug 5 02:15:58 2014
@@ -8,17 +8,6 @@
>
LinkText
</a>
-<!--AttributeTest[accessKey,i]-->
-
- <a
- class="OraLink"
- onclick="submitForm('formId',1,{source:'mainId'});return false;"
- href="uri-attr:encoded-action-url:#"
- id="uri-attr:mainId"
- name="uri-attr:mainId"
- >
- LinkText
- </a>
<!--AttributeTest[disabled,false]-->
<a
Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandNavigationItem-minimalScrRdr-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandNavigationItem-minimalScrRdr-golden.xml?rev=1615840&r1=1615839&r2=1615840&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandNavigationItem-minimalScrRdr-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandNavigationItem-minimalScrRdr-golden.xml Tue Aug 5 02:15:58 2014
@@ -8,17 +8,6 @@
>
CommandMenuItemText
</a>
-<!--AttributeTest[accessKey,o]-->
-
- <a
- class="OraLink"
- onclick="submitForm('formId',1,{source:'mainId'});return false;"
- href="uri-attr:encoded-action-url:#"
- id="uri-attr:mainId"
- name="uri-attr:mainId"
- >
- CommandMenuItemText
- </a>
<!--AttributeTest[destination,http://www.oracle.com]-->
<a
Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/goButton-minimalScrRdr-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/goButton-minimalScrRdr-golden.xml?rev=1615840&r1=1615839&r2=1615840&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/goButton-minimalScrRdr-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/goButton-minimalScrRdr-golden.xml Tue Aug 5 02:15:58 2014
@@ -8,17 +8,6 @@
>
ButtonText
</button>
-<!--AttributeTest[accessKey,u]-->
-
- <button
- class="af_goButton"
- onclick="document.location='encoded-action-url:http://www.oracle.com'"
- type="button"
- id="uri-attr:mainId"
- name="uri-attr:mainId"
- >
- ButtonText
- </button>
<!--AttributeTest[disabled,false]-->
<button
Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/goLink-minimalScrRdr-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/goLink-minimalScrRdr-golden.xml?rev=1615840&r1=1615839&r2=1615840&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/goLink-minimalScrRdr-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/goLink-minimalScrRdr-golden.xml Tue Aug 5 02:15:58 2014
@@ -27,16 +27,6 @@
>
Text
</a>
-<!--AttributeTest[accessKey,e]-->
-
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- id="uri-attr:mainId"
- name="uri-attr:mainId"
- >
- Text
- </a>
<!--AttributeTest[disabled,false]-->
<a
Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputColor-simple-minimalInacc-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputColor-simple-minimalInacc-golden.xml?rev=1615840&r1=1615839&r2=1615840&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputColor-simple-minimalInacc-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputColor-simple-minimalInacc-golden.xml Tue Aug 5 02:15:58 2014
@@ -271,58 +271,6 @@
</img>
</span>
-<!--AttributeTest[label,null]-->
-
- <span
- class="af_inputColor"
- >
-
- <input
- class="af_inputColor_content"
- id="mainId"
- name="mainId"
- onblur="_fixCFF(this);_cfsw(this);"
- size="11"
- type="text"
- >
-
- </input>
- <img
- height="1"
- width="8"
- src="uri-attr:encoded-resource-url:/test-context-path/adf/images/t.gif"
- >
-
- </img>
- <a
- onclick="_lcp('formId','mainId'); return false"
- href="uri-attr:#"
- >
-
- <img
- align="absmiddle"
- class="p_OraColorFieldSwatch"
- height="15"
- id="mainId$sw"
- title="Select to access color picker"
- width="15"
- src="uri-attr:encoded-resource-url:/test-context-path/adf/images/t.gif"
- >
-
- </img>
- <img
- align="middle"
- alt=""
- border="0"
- class="af_inputColor_swatch-overlay"
- height="12"
- width="12"
- src="uri-attr:encoded-resource-url:/test-context-path/adf/images/cfso.gif"
- >
-
- </img>
- </a>
- </span>
<!--AttributeTest[readOnly,false]-->
<span
Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputDate-simple-minimalInacc-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputDate-simple-minimalInacc-golden.xml?rev=1615840&r1=1615839&r2=1615840&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputDate-simple-minimalInacc-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputDate-simple-minimalInacc-golden.xml Tue Aug 5 02:15:58 2014
@@ -115,45 +115,6 @@
</input>
</span>
-<!--AttributeTest[label,null]-->
-
- <span
- class="af_inputDate"
- >
-
- <input
- class="af_inputDate_content"
- id="mainId"
- name="mainId"
- onblur="_dfb(this)"
- size="10"
- type="text"
- >
-
- </input>
- <img
- height="1"
- width="8"
- src="uri-attr:encoded-resource-url:/test-context-path/adf/images/t.gif"
- >
-
- </img>
- <a
- onclick="_ldp('formId','mainId',false); return false"
- href="uri-attr:#"
- >
-
- <img
- align="middle"
- border="0"
- height="24"
- width="19"
- src="uri-attr:encoded-resource-url:/test-context-path/adf/images/dfb.gif"
- >
-
- </img>
- </a>
- </span>
<!--AttributeTest[readOnly,false]-->
<span
Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/outputLabel-minimalScrRdr-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/outputLabel-minimalScrRdr-golden.xml?rev=1615840&r1=1615839&r2=1615840&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/outputLabel-minimalScrRdr-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/outputLabel-minimalScrRdr-golden.xml Tue Aug 5 02:15:58 2014
@@ -10,19 +10,6 @@
label-noaccess
</label>
</span>
-<!--AttributeTest[accessKey,a]-->
-
- <span
- class="af_outputLabel"
- id="mainId"
- >
-
- <label
- for="input"
- >
- label-noaccess
- </label>
- </span>
<!--AttributeTest[showRequired,false]-->
<span
Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/outputText-minimalInacc-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/outputText-minimalInacc-golden.xml?rev=1615840&r1=1615839&r2=1615840&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/outputText-minimalInacc-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/outputText-minimalInacc-golden.xml Tue Aug 5 02:15:58 2014
@@ -1,150 +1,143 @@
-<results>
- <span
- id="mainId"
- >
- This is some <Text>
- </span>
-<!--AttributeTest[description,null]-->
-
- <span
- id="mainId"
- >
- This is some <Text>
- </span>
-<!--AttributeTest[escape,false]-->
-This is some <Text>
-<!--AttributeTest[escape,true]-->
-
- <span
- id="mainId"
- >
- This is some <Text>
- </span>
-<!--AttributeTest[truncateAt,13]-->
-
- <span
- id="mainId"
- >
- This is so...
- </span>
-<!--AttributeTest[id,null]-->
-
- <span
- id="test-id"
- >
- This is some <Text>
- </span>
-<!--AttributeTest[inlineStyle,null]-->
-
- <span
- id="mainId"
- style="test-inlineStyle"
- >
- This is some <Text>
- </span>
-<!--AttributeTest[rendered,false]-->
-
-<!--AttributeTest[rendered,true]-->
-
- <span
- id="mainId"
- >
- This is some <Text>
- </span>
-<!--AttributeTest[shortDesc,null]-->
-
- <span
- id="mainId"
- title="test-shortDesc"
- >
- This is some <Text>
- </span>
-<!--AttributeTest[styleClass,null]-->
-
- <span
- class="test-styleClass"
- id="mainId"
- >
- This is some <Text>
- </span>
-<!--AttributeTest[onclick,null]-->
-
- <span
- id="mainId"
- onclick="test-onclick"
- >
- This is some <Text>
- </span>
-<!--AttributeTest[ondblclick,null]-->
-
- <span
- id="mainId"
- ondblclick="test-ondblclick"
- >
- This is some <Text>
- </span>
-<!--AttributeTest[onkeydown,null]-->
-
- <span
- id="mainId"
- onkeydown="test-onkeydown"
- >
- This is some <Text>
- </span>
-<!--AttributeTest[onkeypress,null]-->
-
- <span
- id="mainId"
- onkeypress="test-onkeypress"
- >
- This is some <Text>
- </span>
-<!--AttributeTest[onkeyup,null]-->
-
- <span
- id="mainId"
- onkeyup="test-onkeyup"
- >
- This is some <Text>
- </span>
-<!--AttributeTest[onmousedown,null]-->
-
- <span
- id="mainId"
- onmousedown="test-onmousedown"
- >
- This is some <Text>
- </span>
-<!--AttributeTest[onmousemove,null]-->
-
- <span
- id="mainId"
- onmousemove="test-onmousemove"
- >
- This is some <Text>
- </span>
-<!--AttributeTest[onmouseout,null]-->
-
- <span
- id="mainId"
- onmouseout="test-onmouseout"
- >
- This is some <Text>
- </span>
-<!--AttributeTest[onmouseover,null]-->
-
- <span
- id="mainId"
- onmouseover="test-onmouseover"
- >
- This is some <Text>
- </span>
-<!--AttributeTest[onmouseup,null]-->
-
- <span
- id="mainId"
- onmouseup="test-onmouseup"
- >
- This is some <Text>
- </span>
-</results>
+<results>
+ <span
+ id="mainId"
+ >
+ This is some <Text>
+ </span>
+<!--AttributeTest[escape,false]-->
+This is some <Text>
+<!--AttributeTest[escape,true]-->
+
+ <span
+ id="mainId"
+ >
+ This is some <Text>
+ </span>
+<!--AttributeTest[truncateAt,13]-->
+
+ <span
+ id="mainId"
+ >
+ This is so...
+ </span>
+<!--AttributeTest[id,null]-->
+
+ <span
+ id="test-id"
+ >
+ This is some <Text>
+ </span>
+<!--AttributeTest[inlineStyle,null]-->
+
+ <span
+ id="mainId"
+ style="test-inlineStyle"
+ >
+ This is some <Text>
+ </span>
+<!--AttributeTest[rendered,false]-->
+
+<!--AttributeTest[rendered,true]-->
+
+ <span
+ id="mainId"
+ >
+ This is some <Text>
+ </span>
+<!--AttributeTest[shortDesc,null]-->
+
+ <span
+ id="mainId"
+ title="test-shortDesc"
+ >
+ This is some <Text>
+ </span>
+<!--AttributeTest[styleClass,null]-->
+
+ <span
+ class="test-styleClass"
+ id="mainId"
+ >
+ This is some <Text>
+ </span>
+<!--AttributeTest[onclick,null]-->
+
+ <span
+ id="mainId"
+ onclick="test-onclick"
+ >
+ This is some <Text>
+ </span>
+<!--AttributeTest[ondblclick,null]-->
+
+ <span
+ id="mainId"
+ ondblclick="test-ondblclick"
+ >
+ This is some <Text>
+ </span>
+<!--AttributeTest[onkeydown,null]-->
+
+ <span
+ id="mainId"
+ onkeydown="test-onkeydown"
+ >
+ This is some <Text>
+ </span>
+<!--AttributeTest[onkeypress,null]-->
+
+ <span
+ id="mainId"
+ onkeypress="test-onkeypress"
+ >
+ This is some <Text>
+ </span>
+<!--AttributeTest[onkeyup,null]-->
+
+ <span
+ id="mainId"
+ onkeyup="test-onkeyup"
+ >
+ This is some <Text>
+ </span>
+<!--AttributeTest[onmousedown,null]-->
+
+ <span
+ id="mainId"
+ onmousedown="test-onmousedown"
+ >
+ This is some <Text>
+ </span>
+<!--AttributeTest[onmousemove,null]-->
+
+ <span
+ id="mainId"
+ onmousemove="test-onmousemove"
+ >
+ This is some <Text>
+ </span>
+<!--AttributeTest[onmouseout,null]-->
+
+ <span
+ id="mainId"
+ onmouseout="test-onmouseout"
+ >
+ This is some <Text>
+ </span>
+<!--AttributeTest[onmouseover,null]-->
+
+ <span
+ id="mainId"
+ onmouseover="test-onmouseover"
+ >
+ This is some <Text>
+ </span>
+<!--AttributeTest[onmouseup,null]-->
+
+ <span
+ id="mainId"
+ onmouseup="test-onmouseup"
+ >
+ This is some <Text>
+ </span>
+</results>
Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/poll-minimalScrRdr-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/poll-minimalScrRdr-golden.xml?rev=1615840&r1=1615839&r2=1615840&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/poll-minimalScrRdr-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/poll-minimalScrRdr-golden.xml Tue Aug 5 02:15:58 2014
@@ -39,18 +39,4 @@
Poll Server
</button>
</span>
-<!--AttributeTest[interval,7000]-->
-
- <span
- id="mainId"
- >
-
- <button
- class="af_goButton"
- onclick="_submitPartialChange('formId',0,{event:'poll',source:'mainId'});"
- type="button"
- >
- Poll Server
- </button>
- </span>
</results>
Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/resetButton-minimalScrRdr-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/resetButton-minimalScrRdr-golden.xml?rev=1615840&r1=1615839&r2=1615840&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/resetButton-minimalScrRdr-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/resetButton-minimalScrRdr-golden.xml Tue Aug 5 02:15:58 2014
@@ -127,17 +127,6 @@
>
ButtonText
</button>
-<!--AttributeTest[accessKey,u]-->
-
- <button
- class="af_resetButton"
- onclick="resetForm('formId');return false;"
- type="reset"
- id="uri-attr:mainId"
- name="uri-attr:mainId"
- >
- ButtonText
- </button>
<!--AttributeTest[id,myid]-->
<button
Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanCheckbox-minimalScrRdr-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanCheckbox-minimalScrRdr-golden.xml?rev=1615840&r1=1615839&r2=1615840&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanCheckbox-minimalScrRdr-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanCheckbox-minimalScrRdr-golden.xml Tue Aug 5 02:15:58 2014
@@ -41,50 +41,6 @@
</td>
</tr>
</table>
-<!--AttributeTest[accessKey,a]-->
-
- <table
- border="0"
- cellpadding="0"
- cellspacing="0"
- class="af_selectBooleanCheckbox"
- id="mainId__xc_"
- role="presentation"
- summary=""
- >
-
- <tr
- >
-
- <td
- class="af_selectBooleanCheckbox_label"
- nowrap="nowrap"
- >
-
- </td>
- <td
- class="AFContentCell"
- nowrap="nowrap"
- valign="top"
- >
-
- <span
- class="af_selectBooleanCheckbox_content"
- id="mainId__xc_c"
- >
-
- <input
- id="mainId"
- name="mainId"
- type="checkbox"
- value="t"
- >
-
- </input>
- </span>
- </td>
- </tr>
- </table>
<!--AttributeTest[autoSubmit,false]-->
<table
Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanCheckbox-simple-minimalInacc-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanCheckbox-simple-minimalInacc-golden.xml?rev=1615840&r1=1615839&r2=1615840&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanCheckbox-simple-minimalInacc-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanCheckbox-simple-minimalInacc-golden.xml Tue Aug 5 02:15:58 2014
@@ -152,27 +152,6 @@
</input>
</span>
</span>
-<!--AttributeTest[label,null]-->
-
- <span
- class="af_selectBooleanCheckbox"
- id="mainId__xc_c"
- >
-
- <span
- class="af_selectBooleanCheckbox_content"
- >
-
- <input
- id="mainId"
- name="mainId"
- type="checkbox"
- value="t"
- >
-
- </input>
- </span>
- </span>
<!--AttributeTest[readOnly,false]-->
<span
Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanCheckbox-simple-minimalScrRdr-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanCheckbox-simple-minimalScrRdr-golden.xml?rev=1615840&r1=1615839&r2=1615840&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanCheckbox-simple-minimalScrRdr-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanCheckbox-simple-minimalScrRdr-golden.xml Tue Aug 5 02:15:58 2014
@@ -18,27 +18,6 @@
</input>
</span>
</span>
-<!--AttributeTest[accessKey,a]-->
-
- <span
- class="af_selectBooleanCheckbox"
- id="mainId__xc_c"
- >
-
- <span
- class="af_selectBooleanCheckbox_content"
- >
-
- <input
- id="mainId"
- name="mainId"
- type="checkbox"
- value="t"
- >
-
- </input>
- </span>
- </span>
<!--AttributeTest[autoSubmit,false]-->
<span
Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanRadio-simple-minimalInacc-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanRadio-simple-minimalInacc-golden.xml?rev=1615840&r1=1615839&r2=1615840&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanRadio-simple-minimalInacc-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanRadio-simple-minimalInacc-golden.xml Tue Aug 5 02:15:58 2014
@@ -130,27 +130,6 @@
</input>
</span>
</span>
-<!--AttributeTest[label,null]-->
-
- <span
- class="af_selectBooleanRadio"
- id="mainId__xc_r"
- >
-
- <span
- class="af_selectBooleanRadio_content"
- >
-
- <input
- id="mainId"
- name="groupTest"
- type="radio"
- value="mainId"
- >
-
- </input>
- </span>
- </span>
<!--AttributeTest[group,secondGroup]-->
<span
Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyCheckbox-minimalScrRdr-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyCheckbox-minimalScrRdr-golden.xml?rev=1615840&r1=1615839&r2=1615840&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyCheckbox-minimalScrRdr-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyCheckbox-minimalScrRdr-golden.xml Tue Aug 5 02:15:58 2014
@@ -966,90 +966,6 @@
</td>
</tr>
</table>
-<!--AttributeTest[accessKey,a]-->
-
- <table
- border="0"
- cellpadding="0"
- cellspacing="0"
- class="af_selectManyCheckbox"
- id="mainId__xc_"
- role="presentation"
- summary=""
- >
-
- <tr
- >
-
- <td
- class="af_selectManyCheckbox_label"
- nowrap="nowrap"
- valign="top"
- >
- Label
- </td>
- <td
- class="AFContentCell"
- nowrap="nowrap"
- valign="top"
- >
-
- <span
- class="af_selectManyCheckbox_content"
- id="mainId"
- >
-
- <input
- id="mainId:_0"
- name="mainId"
- type="checkbox"
- value="0"
- >
-
- </input>
- <label
- for="mainId:_0"
- >
- item2
- </label>
- <br
- >
-
- </br>
- <input
- id="mainId:_1"
- name="mainId"
- type="checkbox"
- value="1"
- >
-
- </input>
- <label
- for="mainId:_1"
- >
- item4
- </label>
- <br
- >
-
- </br>
- <input
- id="mainId:_2"
- name="mainId"
- type="checkbox"
- value="2"
- >
-
- </input>
- <label
- for="mainId:_2"
- >
- item8
- </label>
- </span>
- </td>
- </tr>
- </table>
<!--AttributeTest[readOnly,false]-->
<table
Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyListbox-simple-minimalInacc-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyListbox-simple-minimalInacc-golden.xml?rev=1615840&r1=1615839&r2=1615840&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyListbox-simple-minimalInacc-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyListbox-simple-minimalInacc-golden.xml Tue Aug 5 02:15:58 2014
@@ -264,37 +264,6 @@
</option>
</select>
</span>
-<!--AttributeTest[label,null]-->
-
- <span
- class="af_selectManyListbox"
- >
-
- <select
- class="af_selectManyListbox_content"
- id="mainId"
- multiple="multiple"
- name="mainId"
- size="3"
- >
-
- <option
- value="0"
- >
- item2
- </option>
- <option
- value="1"
- >
- item4
- </option>
- <option
- value="2"
- >
- item8
- </option>
- </select>
- </span>
<!--AttributeTest[readOnly,false]-->
<span
Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneChoice-simple-minimalInacc-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneChoice-simple-minimalInacc-golden.xml?rev=1615840&r1=1615839&r2=1615840&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneChoice-simple-minimalInacc-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneChoice-simple-minimalInacc-golden.xml Tue Aug 5 02:15:58 2014
@@ -271,40 +271,6 @@
</option>
</select>
</span>
-<!--AttributeTest[label,null]-->
-
- <span
- class="af_selectOneChoice"
- >
-
- <select
- class="af_selectOneChoice_content"
- id="mainId"
- name="mainId"
- >
-
- <option
- value=""
- >
-
- </option>
- <option
- value="0"
- >
- item2
- </option>
- <option
- value="1"
- >
- item4
- </option>
- <option
- value="2"
- >
- item8
- </option>
- </select>
- </span>
<!--AttributeTest[readOnly,false]-->
<span
Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneListbox-simple-minimalInacc-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneListbox-simple-minimalInacc-golden.xml?rev=1615840&r1=1615839&r2=1615840&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneListbox-simple-minimalInacc-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneListbox-simple-minimalInacc-golden.xml Tue Aug 5 02:15:58 2014
@@ -244,36 +244,6 @@
</option>
</select>
</span>
-<!--AttributeTest[label,null]-->
-
- <span
- class="af_selectOneListbox"
- >
-
- <select
- class="af_selectOneListbox_content"
- id="mainId"
- name="mainId"
- size="3"
- >
-
- <option
- value="0"
- >
- item2
- </option>
- <option
- value="1"
- >
- item4
- </option>
- <option
- value="2"
- >
- item8
- </option>
- </select>
- </span>
<!--AttributeTest[readOnly,false]-->
<span