conor 01/03/01 03:30:52
Modified: src/main/org/apache/tools/ant/taskdefs/optional/junit Tag:
ANT_13_BRANCH AggregateTransformer.java
src/main/org/apache/tools/ant/taskdefs/optional/junit/html
Tag: ANT_13_BRANCH stylesheet.css
Log:
JUnit Report changes
Fixed some format-number that might crash under versions of Xalan
prior to 1.2.2. Don't crash anymore however the resulting format
is incorrect but that's obviouslly a Xalan problem. So don't use
Xalan prior to 1.2.2
Fixed a crash that was occurring only when Xalan 2 compatibility
jar (the wrapped exception was masking the SAXException). It was
due to a tag that was not closed in an XSL, but I had to debug
xalan2 to find this one.
JUnitReport is still crashing when using the compatibility jar
of Xalan2 official release.
Building the Xalan2 from the latest CVS sources works fine.
Fixed minor cosmetics problems as suggested by Martin
Andrews [martin@oopl.com.au]
Fixed bug reported in ant-user by Martin
Andrews [martin@oopl.com.au], the stylesheet(css) and html
index were not copied from the styledir
Submitted by: Stephane Bailliez <sbailliez@imediation.com>
including suggestions of Martin Andrews <martin@oopl.com.au>
Revision Changes Path
No revision
No revision
1.1.2.2 +12 -6 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java
Index: AggregateTransformer.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- AggregateTransformer.java 2001/02/11 12:28:45 1.1.2.1
+++ AggregateTransformer.java 2001/03/01 11:30:50 1.1.2.2
@@ -281,19 +281,25 @@
}
protected void createCascadingStyleSheet() throws IOException, SAXException {
+ InputStream in = null;
if (styleDir == null) {
- InputStream in = getResourceAsStream("html/stylesheet.css");
- OutputStream out = new FileOutputStream( new File(toDir, "stylesheet.css"));
- copy(in, out);
+ in = getResourceAsStream("html/stylesheet.css");
+ } else {
+ in = new FileInputStream(new File(styleDir, "stylesheet.css"));
}
+ OutputStream out = new FileOutputStream( new File(toDir, "stylesheet.css"));
+ copy(in, out);
}
protected void createFrameStructure() throws IOException, SAXException{
+ InputStream in = null;
if (styleDir == null) {
- InputStream in = getResourceAsStream("html/index.html");
- OutputStream out = new FileOutputStream( new File(toDir, "index.html") );
- copy(in, out);
+ in = getResourceAsStream("html/index.html");
+ } else {
+ in = new FileInputStream(new File(styleDir, "index.html"));
}
+ OutputStream out = new FileOutputStream( new File(toDir, "index.html") );
+ copy(in, out);
}
/**
No revision
No revision
1.1.2.1 +5 -2 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/html/stylesheet.css
Index: stylesheet.css
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/html/stylesheet.css,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- stylesheet.css 2001/02/02 17:03:57 1.1
+++ stylesheet.css 2001/03/01 11:30:51 1.1.2.1
@@ -28,8 +28,11 @@
MARGIN-BOTTOM: 0.5em; FONT: bold 100% verdana,arial,helvetica
}
.Error {
- font-weight:bold; color:red;
+ font-weight:bold; background:#EEEEE0; color:purple;
}
.Failure {
- font-weight:bold; color:purple;
+ font-weight:bold; background:#EEEEE0; color:red;
+}
+.Pass {
+ background:#EEEEE0;
}
|