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 09:50:09 UTC
svn commit: r1615878 [1/4] - in /myfaces/trinidad/trunk/trinidad-impl: ./
src/main/java/org/apache/myfaces/trinidadinternal/agent/
src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/
src/main/java/org/apache/myfaces/trinidadinternal/r...
Author: bsullivan
Date: Tue Aug 5 07:50:07 2014
New Revision: 1615878
URL: http://svn.apache.org/r1615878
Log:
Trinidad-2502 Finish RenderKit Test Improvements so we can always run all tests
Finish adding per-test switches for right-to-left support and agent support so that the tests pass when run in strict mode and then change the build default to strict from lenient
Modified:
myfaces/trinidad/trunk/trinidad-impl/pom.xml
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/TrainRenderer.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.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/MRequestContext.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/cellFormat-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandButton-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandLink-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandNavigationItem-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/frame-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/frameBorderLayout-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/goButton-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/goLink-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputColor-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputColor-simple-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputDate-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputDate-simple-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputFile-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputNumberSpinbox-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-rows-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/media-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/outputLabel-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/outputText-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelButtonBar-minimalIERtl-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelButtonBar-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelChoice-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelFormLayout-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelHorizontalLayout-minimalIERtl-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelHorizontalLayout-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelHorizontalLayout-separator-minimalIERtl-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelHorizontalLayout-separator-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPageHeader-chromeType-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelSideBar-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelTabbed-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/resetButton-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanCheckbox-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanCheckbox-simple-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectBooleanRadio-simple-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyCheckbox-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyListbox-simple-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneChoice-simple-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneListbox-simple-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneRadio-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/table-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/train-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/cellFormat.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/frame.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/frameBorderLayout.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/inputColor.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/inputDate.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/inputFile.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/inputNumberSpinbox.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/inputText-rows.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/inputText.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/media.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/panelButtonBar.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/panelChoice.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/panelFormLayout.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/panelHorizontalLayout-separator.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/panelHorizontalLayout.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/panelLabelAndMessage.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/panelPageHeader-chromeType.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/panelRadio.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/panelTabbed.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/selectBooleanRadio.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/selectOneRadio.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/table.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/train.xml
Modified: myfaces/trinidad/trunk/trinidad-impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/pom.xml?rev=1615878&r1=1615877&r2=1615878&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/pom.xml (original)
+++ myfaces/trinidad/trunk/trinidad-impl/pom.xml Tue Aug 5 07:50:07 2014
@@ -206,7 +206,7 @@
</property>
<property>
<name>trinidad.renderkit.fulltests</name>
- <value>lenient</value>
+ <value>strict</value> <!-- the other value is "lenient" -->
</property>
<property>
<name>trinidad.renderkit.scripts</name>
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.java?rev=1615878&r1=1615877&r2=1615878&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.java Tue Aug 5 07:50:07 2014
@@ -21,6 +21,8 @@ package org.apache.myfaces.trinidadinter
import java.util.HashMap;
import java.util.Map;
+import javax.faces.context.FacesContext;
+
import org.apache.myfaces.trinidad.context.Agent;
import org.apache.myfaces.trinidad.context.Version;
@@ -787,6 +789,20 @@ public abstract class TrinidadAgent impl
public static final String SKIN_WINDOWS_MOBILE = "windowsmobile";
/**
+ * Returns the agent as a TrinidadAgent
+ */
+ public static TrinidadAgent asTrinidadAgent(FacesContext context, Agent agent)
+ {
+ if (agent instanceof TrinidadAgent)
+ {
+ return (TrinidadAgent)agent;
+ }
+ else
+ {
+ return new TrinidadAgentImpl(context, agent);
+ }
+ }
+ /**
* Returns the type of agent to which we're rendering. Currently,
* only web browsers are understood.
*/
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/TrainRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/TrainRenderer.java?rev=1615878&r1=1615877&r2=1615878&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/TrainRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/TrainRenderer.java Tue Aug 5 07:50:07 2014
@@ -101,7 +101,7 @@ public class TrainRenderer
}
ResponseWriter writer = context.getResponseWriter();
- writer.startElement("span", null);
+ writer.startElement("span", component);
renderInlineStyle(context, rc, component, bean);
String outputText = XhtmlUtils.getFormattedString(pattern, parameters);
writer.writeText(outputText, null);
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.java?rev=1615878&r1=1615877&r2=1615878&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.java Tue Aug 5 07:50:07 2014
@@ -387,7 +387,7 @@ public class SimpleInputTextRenderer ext
// can do is turn on "pre"formatted mode.
if (!renderAsElement)
{
- rw.startElement("pre", null);
+ rw.startElement("pre", component);
renderId(context, component);
rw.writeAttribute("title", getShortDesc(component, bean), "shortDesc");
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=1615878&r1=1615877&r2=1615878&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 07:50:07 2014
@@ -154,7 +154,7 @@ public class CoreRenderKitTest extends R
}
else
{
- _LOG.info("Suppress running RenderKitTest:" + name + " " + definition);
+ _LOG.info("Suppress running RenderKitTest:" + name + " " + definition.getCategory());
}
}
@@ -257,27 +257,27 @@ public class CoreRenderKitTest extends R
definitions.add(new SuiteDefinition("minimal",
"minimal",
- null,
+ RequestContext.Accessibility.DEFAULT,
RenderKitBootstrap.getGeckoAgent(),
false));
definitions.add(new SuiteDefinition("minimalIE",
"minimal",
- null,
+ RequestContext.Accessibility.DEFAULT,
RenderKitBootstrap.getIEAgent(),
false));
definitions.add(new SuiteDefinition("minimalIERtl",
"minimal",
- null,
+ RequestContext.Accessibility.DEFAULT,
RenderKitBootstrap.getIEAgent(),
true));
definitions.add(new SuiteDefinition("minimalPPC",
"minimal",
- null,
+ RequestContext.Accessibility.DEFAULT,
RenderKitBootstrap.getPocketPCAgent(),
false));
definitions.add(new SuiteDefinition("minimalSaf",
"minimal",
- null,
+ RequestContext.Accessibility.DEFAULT,
RenderKitBootstrap.getSafariAgent(),
false));
definitions.add(new SuiteDefinition("minimalScrRdr",
Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MRequestContext.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MRequestContext.java?rev=1615878&r1=1615877&r2=1615878&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MRequestContext.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MRequestContext.java Tue Aug 5 07:50:07 2014
@@ -42,6 +42,7 @@ import org.apache.myfaces.trinidad.conte
import org.apache.myfaces.trinidad.context.PageFlowScopeProvider;
import org.apache.myfaces.trinidad.context.PageResolver;
import org.apache.myfaces.trinidad.context.RequestContext;
+import org.apache.myfaces.trinidad.context.RequestContext.OutputMode;
import org.apache.myfaces.trinidad.webapp.UploadedFileProcessor;
import org.apache.myfaces.trinidadinternal.context.PageFlowScopeProviderImpl;
import org.apache.myfaces.trinidadinternal.context.PageResolverDefaultImpl;
@@ -72,6 +73,9 @@ public class MRequestContext extends Req
// Support setting outputMode so we can render content for an output mode other than 'default'.
public void setOutputMode(String outputMode)
{
+ // validate the outputMode
+ OutputMode.fromId(outputMode);
+
_outputMode = outputMode;
}
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=1615878&r1=1615877&r2=1615878&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 07:50:07 2014
@@ -67,6 +67,8 @@ import junit.framework.TestSuite;
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
+import org.apache.myfaces.trinidad.util.Args;
+
import org.xml.sax.SAXException;
abstract public class RenderKitTestCase extends TestSuite
@@ -318,7 +320,7 @@ abstract public class RenderKitTestCase
_script = TestScriptParser.getTestScript(scriptFile, _facesConfigInfo);
_lenient = lenient;
-
+
// We run golden-file checks on each subtest - though all differences
// get counted only as a single diff. We also do a comparison
@@ -410,12 +412,17 @@ abstract public class RenderKitTestCase
{
Iterator<TestScript.Test> tests = _script.getTests().iterator();
Accessibility accMode = getAccMode();
+ Agent agent = getAgent();
while (tests.hasNext())
{
TestScript.Test test = tests.next();
- if (test.supportsAccessibilityMode(accMode))
+ boolean supportsAccessibilityMode = test.supportsAccessibilityMode(accMode);
+ boolean supportsAgent = test.supportsAgent(agent);
+ boolean supportsLocale = test.supportsLocale(RequestContext.getCurrentInstance());
+
+ if (supportsAccessibilityMode && supportsAgent && supportsLocale)
{
UIComponent testComponent = _createComponent();
@@ -432,14 +439,33 @@ abstract public class RenderKitTestCase
private void _processTest(TestScript.Test test, Writer out, String baseResults) throws IOException
{
Accessibility accMode = getAccMode();
+ Agent agent = getAgent();
+
+ boolean supportsAccessibilityMode = test.supportsAccessibilityMode(accMode);
+ boolean supportsAgent = test.supportsAgent(agent);
+ boolean supportsLocale = test.supportsLocale(RequestContext.getCurrentInstance());
- if (test.supportsAccessibilityMode(accMode))
+ if (supportsAccessibilityMode && supportsAgent && supportsLocale)
{
+ // write out test name
out.write("\n<!--");
out.write(test.toString());
out.write("-->\n");
- String testResults = test.getOutput().toString();
- out.write(testResults);
+
+ // surround content in a CDATA block to make it more likely to be valid XML
+ //out.write("<![CDATA[\n");
+
+ String testResults;
+
+ try
+ {
+ testResults = test.getOutput().toString();
+ out.write(testResults);
+ }
+ finally
+ {
+ //out.write("\n]]>");
+ }
if (!_lenient)
{
@@ -471,7 +497,21 @@ abstract public class RenderKitTestCase
{
out.write("<results>");
out.write(baseResults);
-
+/*
+ out.write("<results>\n");
+
+ // surround content in a CDATA block to make it more likely to be valid XML
+ out.write("<![CDATA[\n");
+
+ try
+ {
+ out.write(baseResults);
+ }
+ finally
+ {
+ out.write("\n]]>");
+ }
+*/
Iterator<TestScript.Test> tests = _script.getTests().iterator();
while (tests.hasNext())
{
@@ -525,6 +565,34 @@ abstract public class RenderKitTestCase
int diffLength = difference.length();
if (diffLength > 50)
difference = StringUtils.abbreviate(difference, 50);
+ /*
+ int resultsLength = results.length();
+ int goldenLength = golden.length();
+
+ if (resultsLength != goldenLength)
+ {
+ if (resultsLength < goldenLength)
+ {
+ throw new AssertionFailedError("golden file longer by:" + (goldenLength - resultsLength) + " char='" + ((int)golden.charAt(index)) + "'");
+ }
+ else
+ {
+ throw new AssertionFailedError("results file longer by:" + (resultsLength - goldenLength));
+ }
+ }
+
+ if (index >= resultsLength)
+ throw new AssertionFailedError("golden file longer by:" + (goldenLength - resultsLength));
+
+ if (results.length() < 50)
+ {
+ throw new AssertionFailedError(
+ "Golden file for test "+ _scriptName + " did not match; " +
+ "first difference at " + index + ", difference of length " +
+ diffLength + ", \"" + difference + "\"" + "\ngolden:\n" + golden + "\nnew:\n" + results + "\ndiffChars g='" + golden.charAt(index) + "' r='" + results.charAt(index) + "'");
+
+ }
+ */
throw new AssertionFailedError(
"Golden file for test "+ _scriptName + " did not match; " +
"first difference at " + index + ", difference of length " +
@@ -675,7 +743,7 @@ abstract public class RenderKitTestCase
Agent agent,
boolean rightToLeft)
{
- this(category, skin, accessibilityMode, agent, rightToLeft, null);
+ this(category, skin, accessibilityMode, agent, rightToLeft, "default");
}
public SuiteDefinition(
@@ -686,12 +754,12 @@ abstract public class RenderKitTestCase
boolean rightToLeft,
String outputMode)
{
- _category = category;
- _skin = skin;
- _accessibilityMode = accessibilityMode;
- _agent = agent;
- _rightToLeft = rightToLeft;
- _outputMode = outputMode;
+ _category = Args.notNull(category, "category");
+ _skin = Args.notNull(skin, "skin");
+ _accessibilityMode = Args.notNull(accessibilityMode, "accessibilityMode");
+ _agent = Args.notNull(agent, "agent");
+ _rightToLeft = Args.notNull(rightToLeft, "rightToLeft");
+ _outputMode = Args.notNull(outputMode, "outputMode");
}
public String getCategory()
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=1615878&r1=1615877&r2=1615878&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 07:50:07 2014
@@ -21,6 +21,7 @@ package org.apache.myfaces.trinidadinter
import java.io.StringWriter;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.EnumSet;
import java.util.HashSet;
import java.util.LinkedHashMap;
@@ -39,6 +40,10 @@ import org.apache.myfaces.trinidad.model
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.util.Args;
+import org.apache.myfaces.trinidadinternal.agent.AgentUtil;
+import org.apache.myfaces.trinidadinternal.agent.CapabilityKey;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
public class TestScript
{
@@ -93,7 +98,17 @@ public class TestScript
{
return true;
}
-
+
+ public boolean supportsAgent(@SuppressWarnings("unused") Agent agent)
+ {
+ return true;
+ }
+
+ public boolean supportsLocale(@SuppressWarnings("unused") RequestContext trinContext)
+ {
+ return true;
+ }
+
public StringWriter getOutput()
{
return _output;
@@ -186,32 +201,30 @@ public class TestScript
static public class AttributeTest extends Test
{
- public AttributeTest(String name, Object value, boolean matchesBase)
- {
- this(name, value, matchesBase, null, null, null);
- }
-
- public AttributeTest(String name,
- Object value,
- boolean matchesBase,
- Test delegateTest)
- {
- this(name, value, matchesBase, delegateTest, null, null);
- }
-
public AttributeTest(String name,
Object value,
boolean matchesBase,
Test delegateTest,
String componentId,
- Set<Accessibility> unsupportedModes)
- {
+ Set<? extends Accessibility> unsupportedModes,
+ Set<? extends String> unsupportedDevices,
+ Set<? extends CapabilityKey> requiredCapabilities,
+ boolean noRTL)
+ {
+
+ if (unsupportedDevices == null)
+ unsupportedDevices = Collections.emptySet();
+
+ if (requiredCapabilities == null)
+ requiredCapabilities = Collections.emptySet();
+
_name = name;
_value = value;
_testComponentId = componentId;
- _unsupportedModes = (unsupportedModes != null)
- ? unsupportedModes
- : EnumSet.noneOf(Accessibility.class);
+ _unsupportedModes = Args.notNull(unsupportedModes, "unsupportedModes");
+ _unsupportedDevices = Args.notNull(unsupportedDevices, "unsupportedDevices");
+ _requiredCapabilities = Args.notNull(requiredCapabilities, "requiredCapabilities");
+ _noRTL = noRTL;
if (delegateTest != null)
{
@@ -225,17 +238,36 @@ public class TestScript
@Override
public boolean supportsAccessibilityMode(RequestContext.Accessibility mode)
{
- /*
- if (_unsupportedModes.contains(mode))
- {
- return true;
- }
- else
+ return !_unsupportedModes.contains(mode);
+ }
+
+ @Override
+ public boolean supportsAgent(Agent agent)
+ {
+ // check agent device is suppoorted
+ if (_unsupportedDevices.contains(agent.getType()))
+ return false;
+
+ // check agent has capabilities
+ TrinidadAgent trinAgent = TrinidadAgent.asTrinidadAgent(FacesContext.getCurrentInstance(), agent);
+
+ for (CapabilityKey requiredCapability : _requiredCapabilities)
{
- return true;
+ Object capValue = trinAgent.getCapability(requiredCapability);
+
+ if (!Boolean.TRUE.equals(capValue))
+ {
+ return false;
+ }
}
- */
- return !_unsupportedModes.contains(mode);
+
+ return true;
+ }
+
+ @Override
+ public boolean supportsLocale(RequestContext trinContext)
+ {
+ return !(_noRTL && trinContext.isRightToLeft());
}
public void addDelegate(Test delegateTest)
@@ -368,7 +400,10 @@ public class TestScript
private final String _testComponentId;
private final boolean _matchesBase;
private final List<Test> _delegateTests = new ArrayList<Test>();
- private final Set<Accessibility> _unsupportedModes;
+ private final Set<? extends Accessibility> _unsupportedModes;
+ private final Set<? extends String> _unsupportedDevices;
+ private final Set<? extends CapabilityKey> _requiredCapabilities;
+ private final boolean _noRTL;
}
private Set<Object> _agentTypes = new HashSet<Object>();
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=1615878&r1=1615877&r2=1615878&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 07:50:07 2014
@@ -24,13 +24,16 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.EnumSet;
+import java.util.HashSet;
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.agent.CapabilityKey;
import org.apache.myfaces.trinidadinternal.share.expl.Coercions;
import org.apache.myfaces.trinidadinternal.share.xml.BaseNodeParser;
import org.apache.myfaces.trinidadinternal.share.xml.NodeParser;
@@ -114,6 +117,70 @@ class TestScriptParser extends BaseNodeP
return unsupportedModes;
}
+
+ private static Set<CapabilityKey> _parseRequiredCapabilities(Attributes attrs)
+ {
+ String requiredCapabilitiesString = attrs.getValue(_REQUIRED_CAPABILITIES_ATTR_NAME);
+
+ Set<CapabilityKey> requiredCapabilities;
+
+ if (requiredCapabilitiesString != null)
+ {
+ requiredCapabilities = new HashSet<CapabilityKey>();
+
+ StringTokenizer tokens = new StringTokenizer(requiredCapabilitiesString);
+ while (tokens.hasMoreTokens())
+ {
+ String capabilityName = tokens.nextToken();
+
+ CapabilityKey key = CapabilityKey.getCapabilityKey(capabilityName);
+
+ requiredCapabilities.add(key);
+ }
+ }
+ else
+ {
+ requiredCapabilities = Collections.emptySet();
+ }
+
+ return requiredCapabilities;
+ }
+
+ private static Set<String> _parseUnsupportedDevices(Attributes attrs)
+ {
+ String unsupportedDevicesString = attrs.getValue(_UNSUPPORTED_DEVICES_ATTR_NAME);
+
+ Set<String> unsupportedDevices;
+
+ if (unsupportedDevicesString != null)
+ {
+ unsupportedDevices = new HashSet<String>();
+
+ StringTokenizer tokens = new StringTokenizer(unsupportedDevicesString);
+ while (tokens.hasMoreTokens())
+ {
+ String deviceType = tokens.nextToken();
+
+ unsupportedDevices.add(deviceType);
+ }
+ }
+ else
+ {
+ unsupportedDevices = Collections.emptySet();
+ }
+
+ return unsupportedDevices;
+ }
+
+ private static boolean _parseNoRTL(Attributes attrs)
+ {
+ String noRTLString = attrs.getValue(_NO_RTL_ATTR_NAME);
+
+ return Boolean.parseBoolean(noRTLString);
+ }
+
+
+
public NodeParser createTestParser(
FacesConfigInfo.ComponentInfo componentInfo,
String localName,
@@ -308,14 +375,20 @@ class TestScriptParser extends BaseNodeP
else
value = valueStr;
- Set<Accessibility> unsupportedModes = _parseUnsupportedAccessibilityModes(attrs);
+ Set<Accessibility> unsupportedModes = _parseUnsupportedAccessibilityModes(attrs);
+ Set<String> unsupportedDevices = _parseUnsupportedDevices(attrs);
+ Set<CapabilityKey> requiredCapabilities = _parseRequiredCapabilities(attrs);
+ boolean noRTL = _parseNoRTL(attrs);
_test = new TestScript.AttributeTest(name,
value,
matchesBase,
null,
_componentId,
- unsupportedModes);
+ unsupportedModes,
+ unsupportedDevices,
+ requiredCapabilities,
+ noRTL);
}
@Override
@@ -395,6 +468,11 @@ class TestScriptParser extends BaseNodeP
null);
*/
}
+
+ _unsupportedModes = _parseUnsupportedAccessibilityModes(attrs);
+ _unsupportedDevices = _parseUnsupportedDevices(attrs);
+ _requiredCapabilities = _parseRequiredCapabilities(attrs);
+ _noRTL = _parseNoRTL(attrs);
}
@Override
@@ -441,7 +519,13 @@ class TestScriptParser extends BaseNodeP
boolean isDefault = value.equals(_defaultValue);
allTests.add(new TestScript.AttributeTest(_name,
value,
- isDefault));
+ isDefault,
+ null,
+ null,
+ _unsupportedModes,
+ _unsupportedDevices,
+ _requiredCapabilities,
+ _noRTL));
Iterator<TestScript.Test> childTests = _childTests.iterator();
while (childTests.hasNext())
{
@@ -449,7 +533,12 @@ class TestScriptParser extends BaseNodeP
allTests.add(new TestScript.AttributeTest(_name,
value,
isDefault,
- childTest));
+ childTest,
+ null,
+ _unsupportedModes,
+ _unsupportedDevices,
+ _requiredCapabilities,
+ _noRTL));
}
}
@@ -461,6 +550,10 @@ class TestScriptParser extends BaseNodeP
private String _name;
private Object _defaultValue;
private List<TestScript.Test> _childTests = new ArrayList<TestScript.Test>();
+ private Set<Accessibility> _unsupportedModes;
+ private Set<String> _unsupportedDevices;
+ private Set<CapabilityKey> _requiredCapabilities;
+ private boolean _noRTL;
}
private class JavascriptTestParser extends BaseNodeParser
@@ -477,13 +570,22 @@ class TestScriptParser extends BaseNodeP
String localName,
Attributes attrs) throws SAXParseException
{
+ Set<Accessibility> unsupportedModes = _parseUnsupportedAccessibilityModes(attrs);
+ Set<String> unsupportedDevices = _parseUnsupportedDevices(attrs);
+ Set<CapabilityKey> requiredCapabilities = _parseRequiredCapabilities(attrs);
+ boolean noRTL = _parseNoRTL(attrs);
+
Iterator<String> properties = _componentInfo.properties.keySet().iterator();
while (properties.hasNext())
{
String name = properties.next();
if (name.startsWith("on"))
{
- _tests.add(new TestScript.AttributeTest(name, null, false));
+ _tests.add(new TestScript.AttributeTest(name, null, false,null, null,
+ unsupportedModes,
+ unsupportedDevices,
+ requiredCapabilities,
+ noRTL));
}
}
}
@@ -545,6 +647,10 @@ class TestScriptParser extends BaseNodeP
"\"matchesBase\" is not an attribute of <boolean-test>",
null);
+ _unsupportedModes = _parseUnsupportedAccessibilityModes(attrs);
+ _unsupportedDevices = _parseUnsupportedDevices(attrs);
+ _requiredCapabilities = _parseRequiredCapabilities(attrs);
+ _noRTL = _parseNoRTL(attrs);
}
@Override
@@ -590,7 +696,16 @@ class TestScriptParser extends BaseNodeP
{
boolean matchesBase = (value == _defaultValue);
Boolean valueObj = value ? Boolean.TRUE : Boolean.FALSE;
- _tests.add(new TestScript.AttributeTest(_name, valueObj, matchesBase));
+ _tests.add(new TestScript.AttributeTest(_name,
+ valueObj,
+ matchesBase,
+ null,
+ null,
+ _unsupportedModes,
+ _unsupportedDevices,
+ _requiredCapabilities,
+ _noRTL));
+
Iterator<TestScript.Test> iter = _childTests.iterator();
while (iter.hasNext())
{
@@ -603,13 +718,23 @@ class TestScriptParser extends BaseNodeP
_tests.add(new TestScript.AttributeTest(_name,
valueObj,
false,
- test));
+ test,
+ null,
+ _unsupportedModes,
+ _unsupportedDevices,
+ _requiredCapabilities,
+ _noRTL));
}
}
private String _name;
private boolean _defaultValue;
private FacesConfigInfo.ComponentInfo _componentInfo;
+ private Set<Accessibility> _unsupportedModes;
+ private Set<String> _unsupportedDevices;
+ private Set<CapabilityKey> _requiredCapabilities;
+ private boolean _noRTL;
+
private List<TestScript.Test> _tests = new ArrayList<TestScript.Test>();
private List<TestScript.Test> _childTests = new ArrayList<TestScript.Test>();
}
@@ -665,6 +790,9 @@ class TestScriptParser extends BaseNodeP
}
private static final String _ACCESSIBILITY_MODE_NOT_SUPPORTED_ATTR_NAME = "accessibilityModeNotSupported";
+ private static final String _REQUIRED_CAPABILITIES_ATTR_NAME = "requiredCapabilities";
+ private static final String _UNSUPPORTED_DEVICES_ATTR_NAME = "unsupportedDevices";
+ private static final String _NO_RTL_ATTR_NAME = "noRTL";
private FacesConfigInfo _info;
private TestScript _script;
Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/cellFormat-minimalPPC-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/cellFormat-minimalPPC-golden.xml?rev=1615878&r1=1615877&r2=1615878&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/cellFormat-minimalPPC-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/cellFormat-minimalPPC-golden.xml Tue Aug 5 07:50:07 2014
@@ -1,258 +1,244 @@
-<results>
- <td
- id="mainId"
- >
- Text
- </td>
-<!--AttributeTest[columnSpan,2]-->
-
- <td
- colspan="2"
- id="mainId"
- >
- Text
- </td>
-<!--AttributeTest[halign,right]-->
-
- <td
- align="right"
- id="mainId"
- >
- Text
- </td>
-<!--AttributeTest[halign,start]-->
-
- <td
- align="left"
- id="mainId"
- >
- Text
- </td>
-<!--AttributeTest[halign,left]-->
-
- <td
- align="left"
- id="mainId"
- >
- Text
- </td>
-<!--AttributeTest[halign,end]-->
-
- <td
- align="right"
- id="mainId"
- >
- Text
- </td>
-<!--AttributeTest[halign,center]-->
-
- <td
- align="center"
- id="mainId"
- >
- Text
- </td>
-<!--AttributeTest[header,false]-->
-
- <td
- id="mainId"
- >
- Text
- </td>
-<!--AttributeTest[header,true]-->
-
- <th
- id="mainId"
- >
- Text
- </th>
-<!--AttributeTest[headers,hid1 hid2]-->
-
- <td
- headers="hid1 hid2"
- id="mainId"
- >
- Text
- </td>
-<!--AttributeTest[height,50px]-->
-
- <td
- height="50px"
- id="mainId"
- >
- Text
- </td>
-<!--AttributeTest[rowSpan,2]-->
-
- <td
- id="mainId"
- rowspan="2"
- >
- Text
- </td>
-<!--AttributeTest[shortText,myShortText]-->
-
- <td
- abbr="myShortText"
- id="mainId"
- >
- Text
- </td>
-<!--AttributeTest[valign,middle]-->
-
- <td
- id="mainId"
- valign="middle"
- >
- Text
- </td>
-<!--AttributeTest[valign,top]-->
-
- <td
- id="mainId"
- valign="top"
- >
- Text
- </td>
-<!--AttributeTest[valign,bottom]-->
-
- <td
- id="mainId"
- valign="bottom"
- >
- Text
- </td>
-<!--AttributeTest[width,75%]-->
-
- <td
- id="mainId"
- width="75%"
- >
- Text
- </td>
-<!--AttributeTest[wrappingDisabled,false]-->
-
- <td
- id="mainId"
- >
- Text
- </td>
-<!--AttributeTest[wrappingDisabled,true]-->
-
- <td
- id="mainId"
- >
- Text
- </td>
-<!--AttributeTest[id,myCellId]-->
-
- <td
- id="myCellId"
- >
- Text
- </td>
-<!--AttributeTest[inlineStyle,background-color:blue]-->
-
- <td
- id="mainId"
- style="background-color:blue"
- >
- Text
- </td>
-<!--AttributeTest[shortDesc,myShortDesc]-->
-
- <td
- id="mainId"
- title="myShortDesc"
- >
- Text
- </td>
-<!--AttributeTest[styleClass,myStyle]-->
-
- <td
- class="myStyle"
- id="mainId"
- >
- Text
- </td>
-<!--AttributeTest[onclick,null]-->
-
- <td
- id="mainId"
- onclick="test-onclick"
- >
- Text
- </td>
-<!--AttributeTest[ondblclick,null]-->
-
- <td
- id="mainId"
- ondblclick="test-ondblclick"
- >
- Text
- </td>
-<!--AttributeTest[onkeydown,null]-->
-
- <td
- id="mainId"
- onkeydown="test-onkeydown"
- >
- Text
- </td>
-<!--AttributeTest[onkeypress,null]-->
-
- <td
- id="mainId"
- onkeypress="test-onkeypress"
- >
- Text
- </td>
-<!--AttributeTest[onkeyup,null]-->
-
- <td
- id="mainId"
- onkeyup="test-onkeyup"
- >
- Text
- </td>
-<!--AttributeTest[onmousedown,null]-->
-
- <td
- id="mainId"
- onmousedown="test-onmousedown"
- >
- Text
- </td>
-<!--AttributeTest[onmousemove,null]-->
-
- <td
- id="mainId"
- onmousemove="test-onmousemove"
- >
- Text
- </td>
-<!--AttributeTest[onmouseout,null]-->
-
- <td
- id="mainId"
- onmouseout="test-onmouseout"
- >
- Text
- </td>
-<!--AttributeTest[onmouseover,null]-->
-
- <td
- id="mainId"
- onmouseover="test-onmouseover"
- >
- Text
- </td>
-<!--AttributeTest[onmouseup,null]-->
-
- <td
- id="mainId"
- onmouseup="test-onmouseup"
- >
- Text
- </td>
-</results>
+<results>
+ <td
+ id="mainId"
+ >
+ Text
+ </td>
+<!--AttributeTest[columnSpan,2]-->
+
+ <td
+ colspan="2"
+ id="mainId"
+ >
+ Text
+ </td>
+<!--AttributeTest[halign,right]-->
+
+ <td
+ align="right"
+ id="mainId"
+ >
+ Text
+ </td>
+<!--AttributeTest[halign,start]-->
+
+ <td
+ align="left"
+ id="mainId"
+ >
+ Text
+ </td>
+<!--AttributeTest[halign,left]-->
+
+ <td
+ align="left"
+ id="mainId"
+ >
+ Text
+ </td>
+<!--AttributeTest[halign,end]-->
+
+ <td
+ align="right"
+ id="mainId"
+ >
+ Text
+ </td>
+<!--AttributeTest[halign,center]-->
+
+ <td
+ align="center"
+ id="mainId"
+ >
+ Text
+ </td>
+<!--AttributeTest[header,false]-->
+
+ <td
+ id="mainId"
+ >
+ Text
+ </td>
+<!--AttributeTest[header,true]-->
+
+ <th
+ id="mainId"
+ >
+ Text
+ </th>
+<!--AttributeTest[headers,hid1 hid2]-->
+
+ <td
+ headers="hid1 hid2"
+ id="mainId"
+ >
+ Text
+ </td>
+<!--AttributeTest[height,50px]-->
+
+ <td
+ height="50px"
+ id="mainId"
+ >
+ Text
+ </td>
+<!--AttributeTest[rowSpan,2]-->
+
+ <td
+ id="mainId"
+ rowspan="2"
+ >
+ Text
+ </td>
+<!--AttributeTest[shortText,myShortText]-->
+
+ <td
+ abbr="myShortText"
+ id="mainId"
+ >
+ Text
+ </td>
+<!--AttributeTest[valign,middle]-->
+
+ <td
+ id="mainId"
+ valign="middle"
+ >
+ Text
+ </td>
+<!--AttributeTest[valign,top]-->
+
+ <td
+ id="mainId"
+ valign="top"
+ >
+ Text
+ </td>
+<!--AttributeTest[valign,bottom]-->
+
+ <td
+ id="mainId"
+ valign="bottom"
+ >
+ Text
+ </td>
+<!--AttributeTest[width,75%]-->
+
+ <td
+ id="mainId"
+ width="75%"
+ >
+ Text
+ </td>
+<!--AttributeTest[id,myCellId]-->
+
+ <td
+ id="myCellId"
+ >
+ Text
+ </td>
+<!--AttributeTest[inlineStyle,background-color:blue]-->
+
+ <td
+ id="mainId"
+ style="background-color:blue"
+ >
+ Text
+ </td>
+<!--AttributeTest[shortDesc,myShortDesc]-->
+
+ <td
+ id="mainId"
+ title="myShortDesc"
+ >
+ Text
+ </td>
+<!--AttributeTest[styleClass,myStyle]-->
+
+ <td
+ class="myStyle"
+ id="mainId"
+ >
+ Text
+ </td>
+<!--AttributeTest[onclick,null]-->
+
+ <td
+ id="mainId"
+ onclick="test-onclick"
+ >
+ Text
+ </td>
+<!--AttributeTest[ondblclick,null]-->
+
+ <td
+ id="mainId"
+ ondblclick="test-ondblclick"
+ >
+ Text
+ </td>
+<!--AttributeTest[onkeydown,null]-->
+
+ <td
+ id="mainId"
+ onkeydown="test-onkeydown"
+ >
+ Text
+ </td>
+<!--AttributeTest[onkeypress,null]-->
+
+ <td
+ id="mainId"
+ onkeypress="test-onkeypress"
+ >
+ Text
+ </td>
+<!--AttributeTest[onkeyup,null]-->
+
+ <td
+ id="mainId"
+ onkeyup="test-onkeyup"
+ >
+ Text
+ </td>
+<!--AttributeTest[onmousedown,null]-->
+
+ <td
+ id="mainId"
+ onmousedown="test-onmousedown"
+ >
+ Text
+ </td>
+<!--AttributeTest[onmousemove,null]-->
+
+ <td
+ id="mainId"
+ onmousemove="test-onmousemove"
+ >
+ Text
+ </td>
+<!--AttributeTest[onmouseout,null]-->
+
+ <td
+ id="mainId"
+ onmouseout="test-onmouseout"
+ >
+ Text
+ </td>
+<!--AttributeTest[onmouseover,null]-->
+
+ <td
+ id="mainId"
+ onmouseover="test-onmouseover"
+ >
+ Text
+ </td>
+<!--AttributeTest[onmouseup,null]-->
+
+ <td
+ id="mainId"
+ onmouseup="test-onmouseup"
+ >
+ Text
+ </td>
+</results>
Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandButton-minimalPPC-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandButton-minimalPPC-golden.xml?rev=1615878&r1=1615877&r2=1615878&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandButton-minimalPPC-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandButton-minimalPPC-golden.xml Tue Aug 5 07:50:07 2014
@@ -9,18 +9,6 @@
>
</input>
-<!--AttributeTest[accessKey,u]-->
-
- <input
- class="af_commandButton"
- onclick="submitForm('formId',1,{source:'mainId'});return false;"
- type="submit"
- value="ButtonText"
- id="uri-attr:mainId"
- name="uri-attr:mainId"
- >
-
- </input>
<!--AttributeTest[disabled,false]-->
<input
Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandLink-minimalPPC-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandLink-minimalPPC-golden.xml?rev=1615878&r1=1615877&r2=1615878&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandLink-minimalPPC-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandLink-minimalPPC-golden.xml Tue Aug 5 07:50:07 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-minimalPPC-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandNavigationItem-minimalPPC-golden.xml?rev=1615878&r1=1615877&r2=1615878&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandNavigationItem-minimalPPC-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandNavigationItem-minimalPPC-golden.xml Tue Aug 5 07:50:07 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/frame-minimalPPC-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/frame-minimalPPC-golden.xml?rev=1615878&r1=1615877&r2=1615878&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/frame-minimalPPC-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/frame-minimalPPC-golden.xml Tue Aug 5 07:50:07 2014
@@ -117,126 +117,6 @@
</br>
</div>
-<!--AttributeTest[longDescURL,http://bali.us.oracle.com]-->
-
- <div
- id="mainId"
- >
-
- <a
- class="OraLink"
- id="topId"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- <a
- class="OraLink"
- id="bottomId"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- <a
- class="OraLink"
- id="centerId"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- </div>
-<!--AttributeTest[marginHeight,50]-->
-
- <div
- id="mainId"
- >
-
- <a
- class="OraLink"
- id="topId"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- <a
- class="OraLink"
- id="bottomId"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- <a
- class="OraLink"
- id="centerId"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- </div>
-<!--AttributeTest[marginWidth,50]-->
-
- <div
- id="mainId"
- >
-
- <a
- class="OraLink"
- id="topId"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- <a
- class="OraLink"
- id="bottomId"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- <a
- class="OraLink"
- id="centerId"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- </div>
<!--AttributeTest[name,myName]-->
<div
@@ -277,166 +157,6 @@
</br>
</div>
-<!--AttributeTest[scrolling,yes]-->
-
- <div
- id="mainId"
- >
-
- <a
- class="OraLink"
- id="topId"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- <a
- class="OraLink"
- id="bottomId"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- <a
- class="OraLink"
- id="centerId"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- </div>
-<!--AttributeTest[scrolling,no]-->
-
- <div
- id="mainId"
- >
-
- <a
- class="OraLink"
- id="topId"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- <a
- class="OraLink"
- id="bottomId"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- <a
- class="OraLink"
- id="centerId"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- </div>
-<!--AttributeTest[scrolling,auto]-->
-
- <div
- id="mainId"
- >
-
- <a
- class="OraLink"
- id="topId"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- <a
- class="OraLink"
- id="bottomId"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- <a
- class="OraLink"
- id="centerId"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- </div>
-<!--AttributeTest[inlineStyle,background-color:blue]-->
-
- <div
- id="mainId"
- >
-
- <a
- class="OraLink"
- id="topId"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- <a
- class="OraLink"
- id="bottomId"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- <a
- class="OraLink"
- id="centerId"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- </div>
<!--AttributeTest[shortDesc,myShortDesc]-->
<div
@@ -477,46 +197,6 @@
</br>
</div>
-<!--AttributeTest[styleClass,myStyle]-->
-
- <div
- id="mainId"
- >
-
- <a
- class="OraLink"
- id="topId"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- <a
- class="OraLink"
- id="bottomId"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- <a
- class="OraLink"
- id="centerId"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- </div>
<!--AttributeTest[height,30pt]-->
<div
Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/frameBorderLayout-minimalPPC-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/frameBorderLayout-minimalPPC-golden.xml?rev=1615878&r1=1615877&r2=1615878&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/frameBorderLayout-minimalPPC-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/frameBorderLayout-minimalPPC-golden.xml Tue Aug 5 07:50:07 2014
@@ -605,609 +605,4 @@
</br>
</div>
-<!--AttributeTest[frameSpacing,2]-->
-
- <div
- id="mainId"
- >
-
- <div
- >
-
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- </div>
- <br
- >
-
- </br>
- <div
- >
-
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- </div>
- <br
- >
-
- </br>
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- <div
- >
-
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- </div>
- <br
- >
-
- </br>
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- </div>
-<!--AttributeTest[borderWidth,3]-->
-
- <div
- id="mainId"
- >
-
- <div
- >
-
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- </div>
- <br
- >
-
- </br>
- <div
- >
-
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- </div>
- <br
- >
-
- </br>
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- <div
- >
-
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- </div>
- <br
- >
-
- </br>
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- </div>
-<!--AttributeTest[frameBorderWidth,4]-->
-
- <div
- id="mainId"
- >
-
- <div
- >
-
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- </div>
- <br
- >
-
- </br>
- <div
- >
-
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- </div>
- <br
- >
-
- </br>
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- <div
- >
-
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- </div>
- <br
- >
-
- </br>
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- </div>
-<!--AttributeTest[onload,null]-->
-
- <div
- id="mainId"
- >
-
- <div
- >
-
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- </div>
- <br
- >
-
- </br>
- <div
- >
-
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- </div>
- <br
- >
-
- </br>
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- <div
- >
-
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- </div>
- <br
- >
-
- </br>
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- </div>
-<!--AttributeTest[onunload,null]-->
-
- <div
- id="mainId"
- >
-
- <div
- >
-
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- </div>
- <br
- >
-
- </br>
- <div
- >
-
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- </div>
- <br
- >
-
- </br>
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- <div
- >
-
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- </div>
- <br
- >
-
- </br>
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- >
- http://www.oracle.com
- </a>
- <br
- >
-
- </br>
- </div>
</results>
Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/goButton-minimalPPC-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/goButton-minimalPPC-golden.xml?rev=1615878&r1=1615877&r2=1615878&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/goButton-minimalPPC-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/goButton-minimalPPC-golden.xml Tue Aug 5 07:50:07 2014
@@ -9,18 +9,6 @@
>
</input>
-<!--AttributeTest[accessKey,u]-->
-
- <input
- class="af_goButton"
- onclick="document.location='encoded-action-url:http://www.oracle.com'"
- type="button"
- value="ButtonText"
- id="uri-attr:mainId"
- name="uri-attr:mainId"
- >
-
- </input>
<!--AttributeTest[disabled,false]-->
<input
@@ -45,18 +33,6 @@
>
</input>
-<!--AttributeTest[targetFrame,mytarget]-->
-
- <input
- class="af_goButton"
- onclick="top[mytarget].location='encoded-action-url:http://www.oracle.com'"
- type="button"
- value="ButtonText"
- id="uri-attr:mainId"
- name="uri-attr:mainId"
- >
-
- </input>
<!--AttributeTest[id,myid]-->
<input
Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/goLink-minimalPPC-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/goLink-minimalPPC-golden.xml?rev=1615878&r1=1615877&r2=1615878&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/goLink-minimalPPC-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/goLink-minimalPPC-golden.xml Tue Aug 5 07:50:07 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
@@ -66,16 +56,6 @@
>
Text
</a>
-<!--AttributeTest[targetFrame,mytarget]-->
-
- <a
- class="OraLink"
- href="uri-attr:encoded-action-url:http://www.oracle.com"
- id="uri-attr:mainId"
- name="uri-attr:mainId"
- >
- Text
- </a>
<!--AttributeTest[textAndAccessKey,T&ext]-->
<a
Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputColor-minimalPPC-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputColor-minimalPPC-golden.xml?rev=1615878&r1=1615877&r2=1615878&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputColor-minimalPPC-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputColor-minimalPPC-golden.xml Tue Aug 5 07:50:07 2014
@@ -52,171 +52,6 @@
</tr>
</table>
</div>
-<!--AttributeTest[chooseId,null]-->
-
- <div
- id="mainId__xc_"
- >
-
- <table
- border="0"
- cellpadding="0"
- cellspacing="0"
- class="af_inputColor"
- role="presentation"
- summary=""
- width="100%"
- >
-
- <tr
- >
-
- <td
- class="af_inputColor_label"
- >
-
- </td>
- <td
- class="AFContentCell"
- valign="top"
- >
-
- <input
- class="af_inputColor_content"
- id="mainId"
- name="mainId"
- onblur="_fixCFF(this);"
- size="11"
- type="text"
- >
-
- </input>
- <div
- >
-
- <img
- alt=""
- height="0"
- width="1"
- src="uri-attr:encoded-resource-url:/test-context-path/adf/images/t.gif"
- >
-
- </img>
- </div>
- </td>
- </tr>
- </table>
- </div>
-<!--AttributeTest[compact,false]-->
-
- <div
- id="mainId__xc_"
- >
-
- <table
- border="0"
- cellpadding="0"
- cellspacing="0"
- class="af_inputColor"
- role="presentation"
- summary=""
- width="100%"
- >
-
- <tr
- >
-
- <td
- class="af_inputColor_label"
- >
-
- </td>
- <td
- class="AFContentCell"
- valign="top"
- >
-
- <input
- class="af_inputColor_content"
- id="mainId"
- name="mainId"
- onblur="_fixCFF(this);"
- size="11"
- type="text"
- >
-
- </input>
- <div
- >
-
- <img
- alt=""
- height="0"
- width="1"
- src="uri-attr:encoded-resource-url:/test-context-path/adf/images/t.gif"
- >
-
- </img>
- </div>
- </td>
- </tr>
- </table>
- </div>
-<!--AttributeTest[compact,true]-->
-
- <div
- id="mainId__xc_"
- >
-
- <table
- border="0"
- cellpadding="0"
- cellspacing="0"
- class="af_inputColor"
- role="presentation"
- summary=""
- width="100%"
- >
-
- <tr
- >
-
- <td
- class="af_inputColor_label"
- >
-
- </td>
- <td
- class="AFContentCell"
- valign="top"
- >
-
- <input
- class="af_inputColor_content"
- id="mainId"
- name="mainId"
- onblur="_fixCFF(this);"
- size="11"
- type="text"
- >
-
- </input>
- <div
- >
-
- <img
- alt=""
- height="0"
- width="1"
- src="uri-attr:encoded-resource-url:/test-context-path/adf/images/t.gif"
- >
-
- </img>
- </div>
- </td>
- </tr>
- </table>
- </div>
<!--AttributeTest[disabled,false]-->
<div
Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputColor-simple-minimalPPC-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputColor-simple-minimalPPC-golden.xml?rev=1615878&r1=1615877&r2=1615878&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputColor-simple-minimalPPC-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputColor-simple-minimalPPC-golden.xml Tue Aug 5 07:50:07 2014
@@ -14,57 +14,6 @@
</input>
</span>
-<!--AttributeTest[chooseId,null]-->
-
- <span
- class="af_inputColor"
- >
-
- <input
- class="af_inputColor_content"
- id="mainId"
- name="mainId"
- onblur="_fixCFF(this);"
- size="11"
- type="text"
- >
-
- </input>
- </span>
-<!--AttributeTest[compact,false]-->
-
- <span
- class="af_inputColor"
- >
-
- <input
- class="af_inputColor_content"
- id="mainId"
- name="mainId"
- onblur="_fixCFF(this);"
- size="11"
- type="text"
- >
-
- </input>
- </span>
-<!--AttributeTest[compact,true]-->
-
- <span
- class="af_inputColor"
- >
-
- <input
- class="af_inputColor_content"
- id="mainId"
- name="mainId"
- onblur="_fixCFF(this);"
- size="11"
- type="text"
- >
-
- </input>
- </span>
<!--AttributeTest[disabled,false]-->
<span
@@ -100,23 +49,6 @@
</input>
</span>
-<!--AttributeTest[label,null]-->
-
- <span
- class="af_inputColor"
- >
-
- <input
- class="af_inputColor_content"
- id="mainId"
- name="mainId"
- onblur="_fixCFF(this);"
- size="11"
- type="text"
- >
-
- </input>
- </span>
<!--AttributeTest[readOnly,false]-->
<span