incubator-adffaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From awi...@apache.org
Subject svn commit: r413774 - in /incubator/adffaces/trunk/adf-faces: adf-faces-api/src/test/java/org/apache/myfaces/adf/context/ adf-faces-impl/src/test/java/org/apache/myfaces/adfinternal/renderkit/
Date Tue, 13 Jun 2006 00:30:47 GMT
Author: awiner
Date: Mon Jun 12 17:30:46 2006
New Revision: 413774

URL: http://svn.apache.org/viewvc?rev=413774&view=rev
Log:
Split CoreRenderKitTest into a base class that can be used across multiple renderkits, and
a subclass that provides the config needed specifically for the "core" RenderKit.  Add missing
MockAdfFacesContext file too.

Added:
    incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/context/
    incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/context/MockAdfFacesContext.java
    incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/test/java/org/apache/myfaces/adfinternal/renderkit/RenderKitTestCase.java
Modified:
    incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/test/java/org/apache/myfaces/adfinternal/renderkit/CoreRenderKitTest.java

Added: incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/context/MockAdfFacesContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/context/MockAdfFacesContext.java?rev=413774&view=auto
==============================================================================
--- incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/context/MockAdfFacesContext.java
(added)
+++ incubator/adffaces/trunk/adf-faces/adf-faces-api/src/test/java/org/apache/myfaces/adf/context/MockAdfFacesContext.java
Mon Jun 12 17:30:46 2006
@@ -0,0 +1,247 @@
+/*
+* Copyright 2006 The Apache Software Foundation.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package org.apache.myfaces.adf.context;
+
+import java.util.Map;
+import java.util.TimeZone;
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIViewRoot;
+import org.apache.myfaces.adf.change.ChangeManager;
+import org.apache.myfaces.adf.config.RegionManager;
+import org.apache.myfaces.adf.webapp.UploadedFileProcessor;
+
+
+public class MockAdfFacesContext extends AdfFacesContext
+{
+  public MockAdfFacesContext()
+  {
+    attach();
+  }
+
+  // Support setting the agent so we can create one AdfFacesContext
+  // and mutate it
+
+  public void setAgent(Agent agent)
+  {
+    _agent = agent;
+  }
+
+  public Agent getAgent()
+  {
+    return _agent;
+  }
+
+  public PageResolver getPageResolver()
+  {
+    throw new UnsupportedOperationException("Not implemented yet");
+  }
+
+  public PageFlowScopeProvider getPageFlowScopeProvider()
+  {
+    throw new UnsupportedOperationException("Not implemented yet");
+  }
+
+
+  public DialogService getDialogService()
+  {
+    throw new UnsupportedOperationException("Not implemented yet");
+  }
+
+  public Map getPageFlowScope()
+  {
+    throw new UnsupportedOperationException("Not implemented yet");
+  }
+
+  public void returnFromDialog(Object returnValue, Map returnParam)
+  {
+    throw new UnsupportedOperationException("Should not be called during rendering");
+  }
+
+  public void launchDialog(UIViewRoot dialogRoot, Map dialogParameters, UIComponent source,
boolean useWindow, Map windowProperties)
+  {
+    throw new UnsupportedOperationException("Should not be called during rendering");
+  }
+
+  public boolean isPostback()
+  {
+    return false;
+  }
+
+  public boolean isDebugOutput()
+  {
+    return false;
+  }
+
+  public boolean isClientValidationDisabled()
+  {
+    return false;
+  }
+
+  public String getOutputMode()
+  {
+    return null;
+  }
+
+  public void setSkinFamily(String skin)
+  {
+    _skin = skin;
+  }
+
+  public String getSkinFamily()
+  {
+    return _skin;
+  }
+
+  public String getAccessibilityMode()
+  {
+    return _accMode;
+  }
+
+  public void setAccessibilityMode(String accMode)
+  {
+    _accMode = accMode;
+  }
+
+  public boolean isRightToLeft()
+  {
+    return _rtl;
+  }
+
+  public void setRightToLeft(boolean rtl)
+  {
+    _rtl = rtl;
+  }
+
+  public char getNumberGroupingSeparator()
+  {
+    return _numberGroupingSeparator;
+  }
+
+  public void setNumberGroupingSeparator(char sep)
+  {
+    _numberGroupingSeparator = sep;
+  }
+
+  public char getDecimalSeparator()
+  {
+    return _decimalSeparator;
+  }
+
+  public void setDecimalSeparator(char sep)
+  {
+    _decimalSeparator = sep;
+  }
+
+  public String getCurrencyCode()
+  {
+    return _currencyCode;
+  }
+
+  public void setCurrencyCode(String code)
+  {
+    _currencyCode = code;
+  }
+
+  public int getTwoDigitYearStart()
+  {
+    return _twoDigitYearStart;
+  }
+
+  public void setTwoDigitYearStart(int start)
+  {
+    _twoDigitYearStart = start;
+  }
+
+  public String getOracleHelpServletUrl()
+  {
+    throw new UnsupportedOperationException("Not implemented yet");
+  }
+
+  public Map getHelpTopic()
+  {
+    throw new UnsupportedOperationException("Not implemented yet");
+  }
+
+  public Map getHelpSystem()
+  {
+    throw new UnsupportedOperationException("Not implemented yet");
+  }
+
+  public TimeZone getTimeZone()
+  {
+    return _timeZone;
+  }
+
+  public void setTimeZone(TimeZone timeZone)
+  {
+    _timeZone = timeZone;
+  }
+
+  public void addPartialTarget(UIComponent newTarget)
+  {
+    // throw new UnsupportedOperationException("Not implemented yet");
+  }
+
+  public void addPartialTriggerListeners(UIComponent listener, String[] trigger)
+  {
+    throw new UnsupportedOperationException("Should not be called during rendering");
+  }
+
+  public void partialUpdateNotify(UIComponent updated)
+  {
+    throw new UnsupportedOperationException("Should not be called during rendering");
+  }
+
+  public UploadedFileProcessor getUploadedFileProcessor()
+  {
+    throw new UnsupportedOperationException("Should not be called during rendering");
+  }
+
+  public Map getColorPalette()
+  {
+    throw new UnsupportedOperationException("Not implemented yet");
+  }
+
+  public Map getFormatter()
+  {
+    throw new UnsupportedOperationException("Not implemented yet");
+  }
+
+  public ChangeManager getChangeManager()
+  {
+    throw new UnsupportedOperationException("Not implemented yet");
+  }
+
+  public RegionManager getRegionManager()
+  {
+    throw new UnsupportedOperationException("Not implemented yet");
+  }
+
+  static private final TimeZone _FIXED_TIME_ZONE =
+    TimeZone.getTimeZone("America/Los_Angeles");
+
+  private char _numberGroupingSeparator = ',';
+  private char _decimalSeparator = '.';
+  private String _currencyCode = null;
+  private int _twoDigitYearStart = 1950;
+  private TimeZone _timeZone = _FIXED_TIME_ZONE;
+
+  private String _skin;
+  private String _accMode;
+  private Agent _agent;
+  private boolean _rtl = false;
+}
+

Modified: incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/test/java/org/apache/myfaces/adfinternal/renderkit/CoreRenderKitTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/test/java/org/apache/myfaces/adfinternal/renderkit/CoreRenderKitTest.java?rev=413774&r1=413773&r2=413774&view=diff
==============================================================================
--- incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/test/java/org/apache/myfaces/adfinternal/renderkit/CoreRenderKitTest.java
(original)
+++ incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/test/java/org/apache/myfaces/adfinternal/renderkit/CoreRenderKitTest.java
Mon Jun 12 17:30:46 2006
@@ -13,540 +13,82 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.myfaces.adfinternal.renderkit;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.io.Writer;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.logging.Handler;
-import java.util.logging.Level;
-import java.util.logging.LogRecord;
-import java.util.logging.Logger;
-import java.util.logging.SimpleFormatter;
-
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIViewRoot;
-import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
-import javax.faces.render.RenderKit;
-
-import org.apache.myfaces.adf.context.Agent;
-import org.apache.myfaces.adf.component.core.CoreDocument;
-import org.apache.myfaces.adf.component.core.CoreForm;
-import org.apache.myfaces.adf.component.html.HtmlHtml;
-import org.apache.myfaces.adf.render.ExtendedRenderKitService;
-import org.apache.myfaces.adf.util.Service;
-
-import org.apache.myfaces.adfinternal.io.XhtmlResponseWriter;
-import org.apache.myfaces.adfinternal.renderkit.core.CoreRenderKit;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestResult;
-import junit.framework.TestSuite;
-
-import org.xml.sax.SAXException;
-
-public class CoreRenderKitTest extends TestSuite
-{
-  public static Test suite() throws Throwable
-  {
-    CoreRenderKitTest suite =
-      new CoreRenderKitTest(CoreRenderKitTest.class.getName());
-    return suite;
-  }
-
-  public CoreRenderKitTest(String testName) throws IOException, SAXException
-  {
-    super(testName);
-    _initTests();
-  }
-
-  static public class RendererTest extends TestCase
-  {
-    public RendererTest(String name,
-                        String categoryName,
-                        String skin,
-                        Agent agent,
-                        String accMode,
-                        boolean rightToLeft,
-                        // If lenient, we only diff against the golden file,
-                        // and ignore the rest
-                        boolean lenient) throws IOException, SAXException
-    {
-      super(name + "-" + categoryName);
-      _scriptName = name + ".xml";
-      File scriptFile = new File(_scriptDir, _scriptName);
-
-      _script =
-        TestScriptParser.getTestScript(scriptFile, _facesConfigInfo);
-      _skin = skin;
-      _agent = agent;
-      _accMode = accMode;
-      _rightToLeft = rightToLeft;
-      _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
-      // of each subtest against the base, and verify that startComponent()
-      // is correctly called
-      if (lenient)
-        _testCaseCount = 1;
-      else
-      _testCaseCount = (_script.getTests().size() * 3) + 1;
-    }
-
-    public int countTestCases()
-    {
-      return _testCaseCount;
-    }
-
-    public void run(TestResult result)
-    {
-      if (!_script.isSupportedAgentType(_agent.getType()))
-      {
-        /*
-        System.out.println("SKIPPING UNSUPPORTED SCRIPT: " + _scriptName);
-        System.out.println("AGENT IS " + _agent);
-        System.out.println("AGENT TYPE IS " + _agent.getType());
-        */
-        return;
-      }
-
-      // Cache the TestResult so we can directly add failure without
-      // aborting the run
-      _result = result;
-      CatchSevere catchSevere = new CatchSevere();
-      Logger oracleLogger = Logger.getLogger("oracle");
-      oracleLogger.addHandler(catchSevere);
-
-      try
-      {
-        RenderKitBootstrap.setFactories(_facesConfigInfo);
-        super.run(result);
-      }
-      finally
-      {
-        oracleLogger.removeHandler(catchSevere);
-        RenderKitBootstrap.clearFactories();
-      }
-    }
-
-    protected void setUp() throws IOException  
-    {
-      _facesContext = new MFacesContext(true);
-      _adfFacesContext = new MAdfFacesContext();
-      _adfFacesContext.setSkinFamily(_skin);
-      _adfFacesContext.setAgent(_agent);
-      _adfFacesContext.setRightToLeft(_rightToLeft);
-      _adfFacesContext.setAccessibilityMode(_accMode);
-
-      UIViewRoot root = RenderKitBootstrap.createUIViewRoot(_facesContext);
-      _facesContext.setViewRoot(root);
-
-      ExtendedRenderKitService service =
-        _getExtendedRenderKitService(_facesContext);
-
-      if (service != null)
-        service.encodeBegin(_facesContext);
-        
-    }
-
-    protected void tearDown() throws IOException  
-    {
-      ExtendedRenderKitService service =
-        _getExtendedRenderKitService(_facesContext);
-      if (service != null)
-      {
-        service.encodeEnd(_facesContext);
-        service.encodeFinally(_facesContext);
-      }
-
-      MFacesContext.clearContext();
-      _adfFacesContext.release();
-
-      _facesContext = null;
-      _adfFacesContext = null;
-      _result = null;
-      _script = null;
-      _result = null;
-    }
-
-    protected void runTest() throws Throwable
-    {
-      UIViewRoot root = _facesContext.getViewRoot();
-
-      _initializeContext(new NullWriter());
-
-      UIComponent docRoot = _createDocumentRoot(root);
-
-      StringWriter first = new StringWriter();
-      docRoot.getChildren().add(new GatherContent(first,
-                                               _createComponent(),
-                                               _result,
-                                               this,
-                                               _lenient));
-
-      StringWriter base = new StringWriter();
-      docRoot.getChildren().add(new GatherContent(base,
-                                               _createComponent(),
-                                               _result,
-                                               this,
-                                               _lenient));
-
-      Iterator tests = _script.getTests().iterator();
-      while (tests.hasNext())
-      {
-        TestScript.Test test = (TestScript.Test) tests.next();
-
-        UIComponent testComponent = _createComponent();
-
-        test.apply(_facesContext, testComponent);
-        docRoot.getChildren().add(new GatherContent(test.getOutput(),
-                                                 testComponent,
-                                                 _result,
-                                                 this,
-                                                 _lenient));
-      }
-
-      
-
-      _renderRoot(root);
-
-      File goldenFile = new File(_goldenDir, getName() + "-golden.xml");
-      String golden = null;
-      if (goldenFile.exists())
-      {
-        StringBuffer buffer = new StringBuffer((int) goldenFile.length());
-        BufferedReader in = new BufferedReader(new FileReader(goldenFile));
-        while (true)
-        {
-          String line = in.readLine();
-          if (line == null)
-            break;
-          buffer.append(line);
-          buffer.append('\n');
-        }
-
-        golden = buffer.toString();
-        in.close();
-      }
-
-      boolean forceGolden = "true".equals(
-         System.getProperty("org.apache.myfaces.adf.ForceGolden"));
-
-      Writer out = new StringWriter(golden == null ? 1000 : golden.length());
-      out.write("<results>");
-      String baseResults = base.toString();
-      out.write(baseResults);
-
-
-      tests = _script.getTests().iterator();
-      while (tests.hasNext())
-      {
-        TestScript.Test test = (TestScript.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!");
-          _result.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!");
-          _result.addError(this, failure);
-        }
-      }
-
-      out.write("\n</results>\n");
-      out.close();
-
-      String results = out.toString();
-      if ((golden == null) || !golden.equals(results))
-      {
-        File failureFile;
-        // Set the "org.apache.myfaces.adf.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)
-        {
-          // 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);
-          }
-        }
-        else
-        {
-          throw new AssertionFailedError(
-               "Golden file for test "+ _scriptName + " did not match");
-        }
-      }
-    }
-
-    private UIComponent _createComponent()
-    {
-        return _script.getDefinition().createComponent(_facesContext);
-    }
-
-    private void _renderRoot(UIViewRoot root) throws IOException
-    {
-      RenderUtils.encodeRecursive(_facesContext, root);
-    }
-
-
-    private UIComponent _createDocumentRoot(UIViewRoot root)
-    {
-      String componentType = 
-             _script.getDefinition().getComponentInfo().componentType;
-      
-      if ("org.apache.myfaces.adf.HtmlHtml".equals(componentType))
-      {
-        return root;
-      }
-      
-      if (_sHtmlComponents.contains(componentType))
-      {
-        HtmlHtml html = new HtmlHtml();
-        html.setId("htmlId");
-        root.getChildren().add(html);
-        return html;
-      }
-      else
-      {
-        CoreDocument doc = new CoreDocument();
-        doc.setId("docId");
-        root.getChildren().add(doc);
-        CoreForm form = new CoreForm();
-        form.setId("formId");
-        if (_script.getDefinition().isUsesUpload())
-          form.setUsesUpload(true);
-        doc.getChildren().add(form);
-        return form;
-      }
-    }
-    
-    private void _initializeContext(Writer out) throws IOException
-    {
-      _facesContext.getExternalContext().getRequestMap().clear();
-      _facesContext.setResponseWriter(_createResponseWriter(out));
-    }
-
-    private ResponseWriter _createResponseWriter(Writer out) throws IOException
-    {
-      return new TestResponseWriter(out,
-                                    XhtmlResponseWriter.XHTML_CONTENT_TYPE,
-                                    "UTF-8",
-                                    this,
-                                    _result);
-    }
-
-    // Severe errors should count as a test failure
-    private class CatchSevere extends Handler
-    {
-      public void publish(LogRecord record)
-      {
-        if (record.getLevel() == Level.SEVERE)
-        {
-          String message = (new SimpleFormatter()).format(record);
-          _result.addError(RendererTest.this,
-                           new AssertionFailedError(message));
-        }
-      }
-
-      public void flush() { }
-
-      public void close() { }
-    }
-
-    private int           _testCaseCount;
-    private TestResult    _result;
-    private MFacesContext _facesContext;
-    private MAdfFacesContext _adfFacesContext;
-    private String           _scriptName;
-    private TestScript       _script;
-    private String           _skin;
-    private Agent            _agent;
-    private String           _accMode;
-    private boolean          _rightToLeft;
-    private boolean          _lenient;
-  }
-
-
-  static private void _initGlobal() throws IOException, SAXException
-  {
-    RenderKitBootstrap bootstrap = new RenderKitBootstrap();
-    bootstrap.init();
-
-    _facesConfigInfo = bootstrap.getFacesConfigInfo();
-
-    String scripts = System.getProperty("adf.renderkit.scripts");
-    String golden = System.getProperty("adf.renderkit.golden");
-    String failures = System.getProperty("adf.renderkit.failures");
-
-    _scriptDir = new File(scripts);
-    _goldenDir = new File(golden);
-    _failureDir = new File(failures);
-    
-    _sHtmlComponents = new HashSet(5);
-    _sHtmlComponents.add("org.apache.myfaces.adf.HtmlBody");
-    _sHtmlComponents.add("org.apache.myfaces.adf.HtmlFrame");
-    _sHtmlComponents.add("org.apache.myfaces.adf.HtmlFrameBorderLayout");
-    _sHtmlComponents.add("org.apache.myfaces.adf.HtmlHead");
-    _sHtmlComponents.add("org.apache.myfaces.adf.CoreStyleSheet");
-
-    // Force the CoreRenderKit logger level to SEVERE, to bypass the
-    // warnings about not finding the Basic HTML RenderKit.
-    Logger logger = Logger.getLogger(CoreRenderKit.class.getName());
-    logger.setLevel(Level.SEVERE);
-    logger.setUseParentHandlers(false);
-  }
-
-  private void _initTests() throws IOException, SAXException
-  {
-    String script = System.getProperty("adf.renderkit.script");
-    Set includedScripts = null;
-    if (script != null)
-    {
-      String[] scripts = script.split(",");
-      includedScripts = new HashSet();
-      for (int i = 0; i < scripts.length; i++)
-      {
-        System.out.println("Including " + scripts[i]);
-        includedScripts.add(scripts[i]);
-      }
-    }
-
-    // See if we want to run the full test suite (by default, no)
-    String fulltests = System.getProperty("adf.renderkit.fulltests");
-    // We can run the full test suite in two modes:  strict, and lenient.
-    // We should go to "strict" all the time, but "lenient" simply
-    // diffs against the golden files
-    boolean runAllTests = ("lenient".equals(fulltests) ||
-                           "strict".equals(fulltests));
-    boolean lenient = "lenient".equals(fulltests);
-
-    String[] scriptArray = _scriptDir.list();
-    for (int i = 0; i < scriptArray.length; i++)
-    {
-      String name = scriptArray[i];
-      if ((includedScripts != null) && !includedScripts.contains(name))
-        continue;
-
-      if (name.endsWith(".xml"))
-      {
-        addTest(new RendererTest(name.substring(0, name.length() - 4),
-                                 "minimal",
-                                 "minimal",
-                                 RenderKitBootstrap.getGeckoAgent(),
-                                 null,
-                                 false,
-                                 false));
-        if (runAllTests)
-        {
-          addTest(new RendererTest(name.substring(0, name.length() - 4),
-                                   "minimalIE",
-                                   "minimal",
-                                   RenderKitBootstrap.getIEAgent(),
-                                   null,
-                                   false,
-                                   lenient));
-          addTest(new RendererTest(name.substring(0, name.length() - 4),
-                                   "minimalIERtl",
-                                   "minimal",
-                                   RenderKitBootstrap.getIEAgent(),
-                                   null,
-                                   true,
-                                   lenient));
-          addTest(new RendererTest(name.substring(0, name.length() - 4),
-                                   "minimalPPC",
-                                   "minimal",
-                                   RenderKitBootstrap.getPocketPCAgent(),
-                                   null,
-                                   false,
-                                   lenient));
-          addTest(new RendererTest(name.substring(0, name.length() - 4),
-                                   "minimalSaf",
-                                   "minimal",
-                                   RenderKitBootstrap.getSafariAgent(),
-                                   null,
-                                   false,
-                                   lenient));
-          addTest(new RendererTest(name.substring(0, name.length() - 4),
-                                   "minimalScrRdr",
-                                   "minimal",
-                                   RenderKitBootstrap.getGeckoAgent(),
-                                   "screenReader",
-                                   false,
-                                   lenient));
-          addTest(new RendererTest(name.substring(0, name.length() - 4),
-                                   "minimalInacc",
-                                   "minimal",
-                                   RenderKitBootstrap.getGeckoAgent(),
-                                   "inaccessible",
-                                   false,
-                                   lenient));
-      }
-    }
-    }
-  }
-
-  static
-  {
-    try
-    {
-      _initGlobal();
-  }
-    catch (Exception e)
-    {
-      e.printStackTrace();
-    }
-  }
-
-  static private ExtendedRenderKitService _getExtendedRenderKitService(
-    FacesContext context)
-  {
-    return Service.getService(context.getRenderKit(),
-                              ExtendedRenderKitService.class);
-  }
-
-
-  static private FacesConfigInfo _facesConfigInfo;
-  static private File _scriptDir;
-  static private File _goldenDir;
-  static private File _failureDir;
-  private static HashSet _sHtmlComponents;
-}
+package org.apache.myfaces.adfinternal.renderkit;
+
+import java.io.IOException;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import junit.framework.Test;
+
+import org.xml.sax.SAXException;
+
+
+public class CoreRenderKitTest extends RenderKitTestCase
+{
+  public static Test suite() throws Throwable
+  {
+    CoreRenderKitTest suite =
+      new CoreRenderKitTest(CoreRenderKitTest.class.getName());
+    return suite;
+  }
+
+  public CoreRenderKitTest(String testName) throws IOException, SAXException
+  {
+    super(testName);
+  }
+
+
+  protected Iterable<SuiteDefinition> getSuiteDefinitions()
+  {
+    return _definitions;
+  }
+
+  protected String getRenderKitId()
+  {
+    return "org.apache.myfaces.adf.core";
+  }
+
+  static private List<SuiteDefinition> _definitions =
+    new ArrayList<SuiteDefinition>();
+
+  static
+  {
+    _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",
+                                         "screenReader",
+                                         RenderKitBootstrap.getGeckoAgent(),
+                                         false));
+    _definitions.add(new SuiteDefinition("minimalInacc",
+                                         "minimal",
+                                         "inaccessible",
+                                         RenderKitBootstrap.getGeckoAgent(),
+                                         false));
+  }
+}

Added: incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/test/java/org/apache/myfaces/adfinternal/renderkit/RenderKitTestCase.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/test/java/org/apache/myfaces/adfinternal/renderkit/RenderKitTestCase.java?rev=413774&view=auto
==============================================================================
--- incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/test/java/org/apache/myfaces/adfinternal/renderkit/RenderKitTestCase.java
(added)
+++ incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/test/java/org/apache/myfaces/adfinternal/renderkit/RenderKitTestCase.java
Mon Jun 12 17:30:46 2006
@@ -0,0 +1,577 @@
+/*
+* Copyright 2006 The Apache Software Foundation.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package org.apache.myfaces.adfinternal.renderkit;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.io.Writer;
+
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.logging.Handler;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+import java.util.logging.Logger;
+import java.util.logging.SimpleFormatter;
+
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIViewRoot;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+import javax.faces.render.RenderKit;
+
+import org.apache.myfaces.adf.context.Agent;
+import org.apache.myfaces.adf.component.core.CoreDocument;
+import org.apache.myfaces.adf.component.core.CoreForm;
+import org.apache.myfaces.adf.component.html.HtmlHtml;
+import org.apache.myfaces.adf.render.ExtendedRenderKitService;
+import org.apache.myfaces.adf.util.Service;
+
+import org.apache.myfaces.adfinternal.io.XhtmlResponseWriter;
+import org.apache.myfaces.adfinternal.renderkit.core.CoreRenderKit;
+
+import junit.framework.AssertionFailedError;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestResult;
+import junit.framework.TestSuite;
+
+import org.xml.sax.SAXException;
+
+abstract public class RenderKitTestCase extends TestSuite
+{
+
+  public RenderKitTestCase(String testName) throws IOException, SAXException
+  {
+    super(testName);
+    _initTests();
+  }
+
+  public class RendererTest extends TestCase
+  {
+    public RendererTest(String name,
+                        SuiteDefinition definition,
+                        boolean lenient) throws IOException, SAXException
+    {
+      this(name,
+           definition.getCategory(),
+           definition.getSkin(),
+           definition.getAgent(),
+           definition.getAccessibilityMode(),
+           definition.isRightToLeft(),
+           lenient);
+    }
+
+    public RendererTest(String name,
+                        String categoryName,
+                        String skin,
+                        Agent agent,
+                        String accMode,
+                        boolean rightToLeft,
+                        // If lenient, we only diff against the golden file,
+                        // and ignore the rest
+                        boolean lenient) throws IOException, SAXException
+    {
+      super(name + "-" + categoryName);
+      _scriptName = name + ".xml";
+      File scriptFile = new File(_scriptDir, _scriptName);
+
+      _script =
+        TestScriptParser.getTestScript(scriptFile, _facesConfigInfo);
+      _skin = skin;
+      _agent = agent;
+      _accMode = accMode;
+      _rightToLeft = rightToLeft;
+      _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
+      // of each subtest against the base, and verify that startComponent()
+      // is correctly called
+      if (lenient)
+        _testCaseCount = 1;
+      else
+      _testCaseCount = (_script.getTests().size() * 3) + 1;
+    }
+
+    public int countTestCases()
+    {
+      return _testCaseCount;
+    }
+
+    public void run(TestResult result)
+    {
+      if (!_script.isSupportedAgentType(_agent.getType()))
+      {
+        /*
+        System.out.println("SKIPPING UNSUPPORTED SCRIPT: " + _scriptName);
+        System.out.println("AGENT IS " + _agent);
+        System.out.println("AGENT TYPE IS " + _agent.getType());
+        */
+        return;
+      }
+
+      // Cache the TestResult so we can directly add failure without
+      // aborting the run
+      _result = result;
+      CatchSevere catchSevere = new CatchSevere();
+      Logger oracleLogger = Logger.getLogger("oracle");
+      oracleLogger.addHandler(catchSevere);
+
+      try
+      {
+        RenderKitBootstrap.setFactories(_facesConfigInfo);
+        super.run(result);
+      }
+      finally
+      {
+        oracleLogger.removeHandler(catchSevere);
+        RenderKitBootstrap.clearFactories();
+      }
+    }
+
+    protected void setUp() throws IOException  
+    {
+      _facesContext = new MFacesContext(true);
+      _adfFacesContext = new MAdfFacesContext();
+      _adfFacesContext.setSkinFamily(_skin);
+      _adfFacesContext.setAgent(_agent);
+      _adfFacesContext.setRightToLeft(_rightToLeft);
+      _adfFacesContext.setAccessibilityMode(_accMode);
+
+      UIViewRoot root = RenderKitBootstrap.createUIViewRoot(_facesContext);
+      root.setRenderKitId(getRenderKitId());
+      _facesContext.setViewRoot(root);
+
+      ExtendedRenderKitService service =
+        _getExtendedRenderKitService(_facesContext);
+
+      if (service != null)
+        service.encodeBegin(_facesContext);
+        
+    }
+
+    protected void tearDown() throws IOException  
+    {
+      ExtendedRenderKitService service =
+        _getExtendedRenderKitService(_facesContext);
+      if (service != null)
+      {
+        service.encodeEnd(_facesContext);
+        service.encodeFinally(_facesContext);
+      }
+
+      MFacesContext.clearContext();
+      _adfFacesContext.release();
+
+      _facesContext = null;
+      _adfFacesContext = null;
+      _result = null;
+      _script = null;
+      _result = null;
+    }
+
+    protected void runTest() throws Throwable
+    {
+      UIViewRoot root = _facesContext.getViewRoot();
+
+      _initializeContext(new NullWriter());
+
+      UIComponent docRoot = _createDocumentRoot(root);
+
+      StringWriter first = new StringWriter();
+      docRoot.getChildren().add(new GatherContent(first,
+                                               _createComponent(),
+                                               _result,
+                                               this,
+                                               _lenient));
+
+      StringWriter base = new StringWriter();
+      docRoot.getChildren().add(new GatherContent(base,
+                                               _createComponent(),
+                                               _result,
+                                               this,
+                                               _lenient));
+
+      Iterator tests = _script.getTests().iterator();
+      while (tests.hasNext())
+      {
+        TestScript.Test test = (TestScript.Test) tests.next();
+
+        UIComponent testComponent = _createComponent();
+
+        test.apply(_facesContext, testComponent);
+        docRoot.getChildren().add(new GatherContent(test.getOutput(),
+                                                 testComponent,
+                                                 _result,
+                                                 this,
+                                                 _lenient));
+      }
+
+      
+
+      _renderRoot(root);
+
+      File goldenFile = new File(_goldenDir, getName() + "-golden.xml");
+      String golden = null;
+      if (goldenFile.exists())
+      {
+        StringBuffer buffer = new StringBuffer((int) goldenFile.length());
+        BufferedReader in = new BufferedReader(new FileReader(goldenFile));
+        while (true)
+        {
+          String line = in.readLine();
+          if (line == null)
+            break;
+          buffer.append(line);
+          buffer.append('\n');
+        }
+
+        golden = buffer.toString();
+        in.close();
+      }
+
+      boolean forceGolden = "true".equals(
+         System.getProperty("org.apache.myfaces.adf.ForceGolden"));
+
+      Writer out = new StringWriter(golden == null ? 1000 : golden.length());
+      out.write("<results>");
+      String baseResults = base.toString();
+      out.write(baseResults);
+
+
+      tests = _script.getTests().iterator();
+      while (tests.hasNext())
+      {
+        TestScript.Test test = (TestScript.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!");
+          _result.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!");
+          _result.addError(this, failure);
+        }
+      }
+
+      out.write("\n</results>\n");
+      out.close();
+
+      String results = out.toString();
+      if ((golden == null) || !golden.equals(results))
+      {
+        File failureFile;
+        // Set the "org.apache.myfaces.adf.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)
+        {
+          // 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);
+          }
+        }
+        else
+        {
+          throw new AssertionFailedError(
+               "Golden file for test "+ _scriptName + " did not match");
+        }
+      }
+    }
+
+    private UIComponent _createComponent()
+    {
+        return _script.getDefinition().createComponent(_facesContext);
+    }
+
+    private void _renderRoot(UIViewRoot root) throws IOException
+    {
+      RenderUtils.encodeRecursive(_facesContext, root);
+    }
+
+
+    private UIComponent _createDocumentRoot(UIViewRoot root)
+    {
+      String componentType = 
+             _script.getDefinition().getComponentInfo().componentType;
+      
+      if ("org.apache.myfaces.adf.HtmlHtml".equals(componentType))
+      {
+        return root;
+      }
+      
+      if (_sHtmlComponents.contains(componentType))
+      {
+        HtmlHtml html = new HtmlHtml();
+        html.setId("htmlId");
+        root.getChildren().add(html);
+        return html;
+      }
+      else
+      {
+        CoreDocument doc = new CoreDocument();
+        doc.setId("docId");
+        root.getChildren().add(doc);
+        CoreForm form = new CoreForm();
+        form.setId("formId");
+        if (_script.getDefinition().isUsesUpload())
+          form.setUsesUpload(true);
+        doc.getChildren().add(form);
+        return form;
+      }
+    }
+    
+    private void _initializeContext(Writer out) throws IOException
+    {
+      _facesContext.getExternalContext().getRequestMap().clear();
+      _facesContext.setResponseWriter(_createResponseWriter(out));
+    }
+
+    private ResponseWriter _createResponseWriter(Writer out) throws IOException
+    {
+      return new TestResponseWriter(out,
+                                    XhtmlResponseWriter.XHTML_CONTENT_TYPE,
+                                    "UTF-8",
+                                    this,
+                                    _result);
+    }
+
+    // Severe errors should count as a test failure
+    private class CatchSevere extends Handler
+    {
+      public void publish(LogRecord record)
+      {
+        if (record.getLevel() == Level.SEVERE)
+        {
+          String message = (new SimpleFormatter()).format(record);
+          _result.addError(RendererTest.this,
+                           new AssertionFailedError(message));
+        }
+      }
+
+      public void flush() { }
+
+      public void close() { }
+    }
+
+    private int           _testCaseCount;
+    private TestResult    _result;
+    private MFacesContext _facesContext;
+    private MAdfFacesContext _adfFacesContext;
+    private String           _scriptName;
+    private TestScript       _script;
+    private String           _skin;
+    private Agent            _agent;
+    private String           _accMode;
+    private boolean          _rightToLeft;
+    private boolean          _lenient;
+  }
+
+
+  static private void _initGlobal() throws IOException, SAXException
+  {
+    RenderKitBootstrap bootstrap = new RenderKitBootstrap();
+    bootstrap.init();
+
+    _facesConfigInfo = bootstrap.getFacesConfigInfo();
+
+    String scripts = System.getProperty("adf.renderkit.scripts");
+    String golden = System.getProperty("adf.renderkit.golden");
+    String failures = System.getProperty("adf.renderkit.failures");
+
+    _scriptDir = new File(scripts);
+    _goldenDir = new File(golden);
+    _failureDir = new File(failures);
+    
+    _sHtmlComponents = new HashSet(5);
+    _sHtmlComponents.add("org.apache.myfaces.adf.HtmlBody");
+    _sHtmlComponents.add("org.apache.myfaces.adf.HtmlFrame");
+    _sHtmlComponents.add("org.apache.myfaces.adf.HtmlFrameBorderLayout");
+    _sHtmlComponents.add("org.apache.myfaces.adf.HtmlHead");
+    _sHtmlComponents.add("org.apache.myfaces.adf.CoreStyleSheet");
+
+    // Force the CoreRenderKit logger level to SEVERE, to bypass the
+    // warnings about not finding the Basic HTML RenderKit.
+    Logger logger = Logger.getLogger(CoreRenderKit.class.getName());
+    logger.setLevel(Level.SEVERE);
+    logger.setUseParentHandlers(false);
+  }
+
+  private void _initTests() throws IOException, SAXException
+  {
+    String script = System.getProperty("adf.renderkit.script");
+    Set includedScripts = null;
+    if (script != null)
+    {
+      String[] scripts = script.split(",");
+      includedScripts = new HashSet();
+      for (int i = 0; i < scripts.length; i++)
+      {
+        System.out.println("Including " + scripts[i]);
+        includedScripts.add(scripts[i]);
+      }
+    }
+
+    // See if we want to run the full test suite (by default, no)
+    String fulltests = System.getProperty("adf.renderkit.fulltests");
+    // We can run the full test suite in two modes:  strict, and lenient.
+    // We should go to "strict" all the time, but "lenient" simply
+    // diffs against the golden files
+    boolean runAllTests = ("lenient".equals(fulltests) ||
+                           "strict".equals(fulltests));
+    boolean lenient = "lenient".equals(fulltests);
+
+    String[] scriptArray = _scriptDir.list();
+    for (int i = 0; i < scriptArray.length; i++)
+    {
+      String name = scriptArray[i];
+      if ((includedScripts != null) && !includedScripts.contains(name))
+        continue;
+
+      if (name.endsWith(".xml"))
+      {
+        boolean first = true;
+        name = name.substring(0, name.length() - 4);
+        for (SuiteDefinition definition : getSuiteDefinitions())
+        {
+          if (first)
+          {
+            addTest(new RendererTest(name,
+                                     definition,
+                                     false));
+            first = false;
+          }
+          else
+          {
+            addTest(new RendererTest(name, definition, lenient));
+          }
+        }
+      }
+    }
+  }
+
+  protected abstract Iterable<SuiteDefinition> getSuiteDefinitions();
+  protected abstract String getRenderKitId();
+
+  static public class SuiteDefinition
+  {
+    public SuiteDefinition(
+      String category,
+      String skin,
+      String accessibilityMode,
+      Agent  agent,
+      boolean rightToLeft)
+    {
+      _category = category;
+      _skin     = skin;
+      _accessibilityMode  = accessibilityMode;
+      _agent    = agent;
+      _rightToLeft = rightToLeft;
+    }
+
+    public String getCategory()
+    {
+      return _category;
+    }
+
+    public String getSkin()
+    {
+      return _skin;
+    }
+
+    public String getAccessibilityMode()
+    {
+      return _accessibilityMode;
+    }
+
+    public Agent getAgent()
+    {
+      return _agent;
+    }
+
+
+    public boolean isRightToLeft()
+    {
+      return _rightToLeft;
+    }
+
+    private String _category;
+    private String _skin;
+    private String _accessibilityMode;
+    private Agent _agent;
+    private boolean _rightToLeft;
+  }
+
+  
+  static
+  {
+    try
+    {
+      _initGlobal();
+  }
+    catch (Exception e)
+    {
+      e.printStackTrace();
+    }
+  }
+
+  static private ExtendedRenderKitService _getExtendedRenderKitService(
+    FacesContext context)
+  {
+    return Service.getService(context.getRenderKit(),
+                              ExtendedRenderKitService.class);
+  }
+
+
+  static private FacesConfigInfo _facesConfigInfo;
+  static private File _scriptDir;
+  static private File _goldenDir;
+  static private File _failureDir;
+  private static HashSet _sHtmlComponents;
+}



Mime
View raw message