You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by cu...@apache.org on 2001/02/05 17:50:57 UTC
cvs commit: xml-xalan/test/java/src/org/apache/qetest/xsl XHTFileCheckService.java
curcuru 01/02/05 08:50:57
Modified: test/java/src/org/apache/qetest/xsl XHTFileCheckService.java
Log:
Add setFeature("allow-whitespace-diff", "true") for current testing;
needs review and should be folded up into CheckService
Revision Changes Path
1.4 +41 -4 xml-xalan/test/java/src/org/apache/qetest/xsl/XHTFileCheckService.java
Index: XHTFileCheckService.java
===================================================================
RCS file: /home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/XHTFileCheckService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XHTFileCheckService.java 2001/01/24 15:59:53 1.3
+++ XHTFileCheckService.java 2001/02/05 16:50:54 1.4
@@ -74,7 +74,7 @@
* Uses an XML/HTML/Text diff comparator to check or diff two files.
* @see #check(Reporter reporter, Object actual, Object reference, String msg, String id)
* @author Shane_Curcuru@lotus.com
- * @version $Id: XHTFileCheckService.java,v 1.3 2001/01/24 15:59:53 curcuru Exp $
+ * @version $Id: XHTFileCheckService.java,v 1.4 2001/02/05 16:50:54 curcuru Exp $
*/
public class XHTFileCheckService implements CheckService
{
@@ -195,9 +195,18 @@
{
pw.println("XHTFileCheckService whitespace diff warning!");
pw.flush();
- reporter.checkFail(msg, id);
-
- return Reporter.FAIL_RESULT;
+ if (allowWhitespaceDiff)
+ {
+ reporter.logMsg(Logger.TRACEMSG, "XHTFileCheckService whitespace diff warning, passing!");
+ reporter.checkPass(msg, id);
+ return Reporter.PASS_RESULT;
+ }
+ else
+ {
+ reporter.logMsg(Logger.TRACEMSG, "XHTFileCheckService whitespace diff warning, failing!");
+ reporter.checkFail(msg, id);
+ return Reporter.FAIL_RESULT;
+ }
}
else
{
@@ -252,6 +261,34 @@
public String getDescription()
{
return ("Uses an XML/HTML/Text diff comparator to check or diff two files.");
+ }
+
+ /**
+ * Whether whitespace differences will cause a fail or not.
+ * setFeature("allow-whitespace-diff", "true"|"false")
+ * true=whitespace-only diff will pass;
+ * false, whitespace-only diff will fail
+ */
+ protected boolean allowWhitespaceDiff = false; // default; backwards compatible
+
+ /**
+ * Set a custom option or feature.
+ * @param feature name
+ * @param feature value
+ */
+ public void setFeature(String name, String value)
+ {
+ if ("allow-whitespace-diff".equals(name))
+ {
+ if ("true".equals(value) || "yes".equals(value))
+ {
+ allowWhitespaceDiff = true;
+ }
+ else if ("false".equals(value) || "no".equals(value))
+ {
+ allowWhitespaceDiff = false;
+ }
+ }
}
} // end of class XHTFileCheckService