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/08/20 15:58:38 UTC
cvs commit: xml-xalan/test/java/src/org/apache/qetest/xsl StylesheetTestlet.java XHTFileCheckService.java
curcuru 01/08/20 06:58:38
Modified: test/java/src/org/apache/qetest/xsl StylesheetTestlet.java
XHTFileCheckService.java
Log:
XHTFileCheckService now escapeString's it's element content automatically;
remove now extraneous call from StylesheetTestlet since failure data
is now automatically logged by the common checkService
Revision Changes Path
1.5 +3 -4 xml-xalan/test/java/src/org/apache/qetest/xsl/StylesheetTestlet.java
Index: StylesheetTestlet.java
===================================================================
RCS file: /home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/StylesheetTestlet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StylesheetTestlet.java 2001/06/25 14:37:42 1.4
+++ StylesheetTestlet.java 2001/08/20 13:58:38 1.5
@@ -89,7 +89,7 @@
* as different processing models, like SAX, DOM or Streams).
*
* @author Shane_Curcuru@lotus.com
- * @version $Id: StylesheetTestlet.java,v 1.4 2001/06/25 14:37:42 curcuru Exp $
+ * @version $Id: StylesheetTestlet.java,v 1.5 2001/08/20 13:58:38 curcuru Exp $
*/
public class StylesheetTestlet extends TestletImpl
{
@@ -231,9 +231,8 @@
attrs.put("outputName", datalet.outputName);
attrs.put("goldName", datalet.goldName);
logger.logElement(Logger.STATUSMSG, "fileref", attrs, "Conformance test file references");
- // Then log the failure reason
- logger.logArbitrary(Logger.STATUSMSG, (new File(datalet.inputName)).getName()
- + " failure reason: " + fileChecker.getExtendedInfo());
+ // No longer need to log failure reason, this kind
+ // of functionality should be kept in checkServices
}
}
// Note that this class can only validate positive test
1.7 +7 -1 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XHTFileCheckService.java 2001/08/03 19:07:17 1.6
+++ XHTFileCheckService.java 2001/08/20 13:58:38 1.7
@@ -75,7 +75,7 @@
* Uses an XML/HTML/Text diff comparator to check or diff two files.
* @see #check(Logger logger, Object actual, Object reference, String msg, String id)
* @author Shane_Curcuru@lotus.com
- * @version $Id: XHTFileCheckService.java,v 1.6 2001/08/03 19:07:17 curcuru Exp $
+ * @version $Id: XHTFileCheckService.java,v 1.7 2001/08/20 13:58:38 curcuru Exp $
*/
public class XHTFileCheckService implements CheckService
{
@@ -199,6 +199,12 @@
attrs.put("reference", referenceFile.toString());
attrs.put("reportedBy", "XHTFileCheckService");
String elementBody = msg + "(" + id + ") \n" + sw.toString();
+ // HACK: escapeString(elementBody) so that it's legal XML
+ // for cases where we have XML output. This isn't
+ // necessarily a 'hack', I'm just not sure what the
+ // cleanest place to put this is (here or some sort
+ // of intelligent logic in XMLFileLogger)
+ elementBody = XMLFileLogger.escapeString(elementBody);
logger.logElement(Logger.STATUSMSG, "fileCheck", attrs, elementBody);
logger.checkFail(msg, id);
return Logger.FAIL_RESULT;
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org