vhardy 01/10/19 04:37:13
Modified: test-sources/org/apache/batik/svggen SVGAccuracyTest.java
SVGGeneratorTests.java
test-sources/org/apache/batik/test/svg
SVGRenderingAccuracyTest.java
Log:
Improved test naming.
Revision Changes Path
1.10 +1 -9
xml-batik/test-sources/org/apache/batik/svggen/SVGAccuracyTest.java
Index: SVGAccuracyTest.java
===================================================================
RCS file:
/home/cvs/xml-batik/test-sources/org/apache/batik/svggen/SVGAccuracyTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SVGAccuracyTest.java 2001/10/12 12:34:35 1.9
+++ SVGAccuracyTest.java 2001/10/19 11:37:13 1.10
@@ -45,7 +45,7 @@
* SVG reference.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Hardy</a>
- * @version $Id: SVGAccuracyTest.java,v 1.9 2001/10/12 12:34:35 vhardy Exp $
+ * @version $Id: SVGAccuracyTest.java,v 1.10 2001/10/19 11:37:13 vhardy Exp $
*/
public class SVGAccuracyTest extends AbstractTest
implements SVGConstants{
@@ -301,14 +301,6 @@
}
return i;
- }
-
- /**
- * Returns this Test's name
- */
- public String getName(){
- String painterInfo = painter != null ? painter.getClass().getName() :
"null";
- return painterInfo + " -- " + super.getName();
}
/**
1.3 +28 -11
xml-batik/test-sources/org/apache/batik/svggen/SVGGeneratorTests.java
Index: SVGGeneratorTests.java
===================================================================
RCS file:
/home/cvs/xml-batik/test-sources/org/apache/batik/svggen/SVGGeneratorTests.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SVGGeneratorTests.java 2001/10/16 15:47:44 1.2
+++ SVGGeneratorTests.java 2001/10/19 11:37:13 1.3
@@ -26,7 +26,7 @@
* SVG for various configurations.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Hardy</a>
- * @version $Id: SVGGeneratorTests.java,v 1.2 2001/10/16 15:47:44 vhardy Exp $
+ * @version $Id: SVGGeneratorTests.java,v 1.3 2001/10/19 11:37:13 vhardy Exp $
*/
public class SVGGeneratorTests extends DefaultTestSuite {
public static final String GENERATOR_REFERENCE_BASE
@@ -66,6 +66,7 @@
* getPackageName
*/
public void setId(String id){
+ super.setId(id);
String clName = getPackageName() + "." + id;
Class cl = null;
@@ -89,19 +90,27 @@
Painter painter = (Painter)o;
- addTest(makeSVGAccuracyTest(painter));
- addTest(makeGeneratorContext(painter));
- addTest(makeSVGRenderingAccuracyTest(painter, PLAIN_GENERATION_PREFIX));
- addTest(makeSVGRenderingAccuracyTest(painter,
CUSTOM_CONTEXT_GENERATION_PREFIX));
- addTest(makeImageCompareTest(painter, PLAIN_GENERATION_PREFIX,
+ addTest(makeSVGAccuracyTest(painter, id));
+ addTest(makeGeneratorContext(painter, id));
+ addTest(makeSVGRenderingAccuracyTest(painter, id, PLAIN_GENERATION_PREFIX));
+ addTest(makeSVGRenderingAccuracyTest(painter, id,
CUSTOM_CONTEXT_GENERATION_PREFIX));
+ addTest(makeImageCompareTest(painter, id, PLAIN_GENERATION_PREFIX,
CUSTOM_CONTEXT_GENERATION_PREFIX));
}
+ /**
+ * For the Generator test, the relevant name is the id
+ */
+ public String getName(){
+ return "SVGGeneratorTest - " + getId();
+ }
+
protected String getPackageName(){
return "org.apache.batik.svggen";
}
private Test makeImageCompareTest(Painter painter,
+ String id,
String prefixA,
String prefixB){
String cl = getNonQualifiedClassName(painter);
@@ -109,10 +118,13 @@
String clB = prefixB + cl;
String testReferenceA = GENERATOR_REFERENCE_BASE + RENDERING_DIR + "/" +
clA + PNG_EXTENSION;
String testReferenceB = GENERATOR_REFERENCE_BASE + RENDERING_DIR + "/" +
clB + PNG_EXTENSION;
- return new ImageCompareTest(testReferenceA, testReferenceB);
+ ImageCompareTest t = new ImageCompareTest(testReferenceA, testReferenceB);
+ t.setName(id + "-RenderingComparison");
+ t.setId(id + ".renderingComparison");
+ return t;
}
- private Test makeSVGRenderingAccuracyTest(Painter painter, String prefix){
+ private Test makeSVGRenderingAccuracyTest(Painter painter, String id, String
prefix){
String cl = prefix + getNonQualifiedClassName(painter);
String testSource = GENERATOR_REFERENCE_BASE + cl + SVG_EXTENSION;
String testReference = GENERATOR_REFERENCE_BASE + RENDERING_DIR + "/" + cl
+ PNG_EXTENSION;
@@ -122,27 +134,32 @@
SVGRenderingAccuracyTest test = new SVGRenderingAccuracyTest(testSource,
testReference);
test.setVariationURL(variationURL);
test.setSaveVariation(new File(saveVariation));
+ test.setName(id + "-" + prefix + "RenderingCheck");
+ test.setId(id + "." + prefix + "renderingCheck");
return test;
}
- private Test makeGeneratorContext(Painter painter){
+ private Test makeGeneratorContext(Painter painter, String id){
String cl = CUSTOM_CONTEXT_GENERATION_PREFIX +
getNonQualifiedClassName(painter);
GeneratorContext test
= new GeneratorContext(painter, makeURL(painter,
CUSTOM_CONTEXT_GENERATION_PREFIX));
test.setSaveSVG(new File(GENERATOR_REFERENCE_BASE + CANDIDATE_REF_DIR + "/"
+ cl + SVG_EXTENSION));
+ test.setName(id + "-ConfiguredContextGeneration");
+ test.setId(id + ".configuredContextGeneration");
return test;
}
- private Test makeSVGAccuracyTest(Painter painter){
+ private Test makeSVGAccuracyTest(Painter painter, String id){
String cl = PLAIN_GENERATION_PREFIX + getNonQualifiedClassName(painter);
SVGAccuracyTest test
= new SVGAccuracyTest(painter, makeURL(painter,
PLAIN_GENERATION_PREFIX));
test.setSaveSVG(new File(GENERATOR_REFERENCE_BASE + CANDIDATE_REF_DIR + "/"
+ cl + SVG_EXTENSION));
-
+ test.setName(id + "-DefaultContextGeneration");
+ test.setId(id + ".defaultContextGeneration");
return test;
}
1.17 +5 -2
xml-batik/test-sources/org/apache/batik/test/svg/SVGRenderingAccuracyTest.java
Index: SVGRenderingAccuracyTest.java
===================================================================
RCS file:
/home/cvs/xml-batik/test-sources/org/apache/batik/test/svg/SVGRenderingAccuracyTest.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- SVGRenderingAccuracyTest.java 2001/10/17 08:52:27 1.16
+++ SVGRenderingAccuracyTest.java 2001/10/19 11:37:13 1.17
@@ -64,7 +64,7 @@
* all pixel values are the same).
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Hardy</a>
- * @version $Id: SVGRenderingAccuracyTest.java,v 1.16 2001/10/17 08:52:27 vhardy
Exp $
+ * @version $Id: SVGRenderingAccuracyTest.java,v 1.17 2001/10/19 11:37:13 vhardy
Exp $
*/
public class SVGRenderingAccuracyTest extends AbstractTest {
/**
@@ -360,7 +360,10 @@
* URL of the SVG being rendered.
*/
public String getName(){
- return svgURL.toString();
+ if(this.name == null){
+ return svgURL.toString();
+ }
+ return name;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
