hillion 01/10/11 12:22:13
Modified: sources/org/apache/batik/apps/svgbrowser
JSVGViewerFrame.java
test-resources/org/apache/batik/test samplesRendering.xml
Added: test-sources/org/apache/batik/test/svg
SVGAlternateStyleSheetRenderingAccuracyTest.java
SVGMediaRenderingAccuracyTest.java
Log:
Committed tests for alternate stylesheets and media.
Revision Changes Path
1.56 +2 -2
xml-batik/sources/org/apache/batik/apps/svgbrowser/JSVGViewerFrame.java
Index: JSVGViewerFrame.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/apps/svgbrowser/JSVGViewerFrame.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- JSVGViewerFrame.java 2001/10/11 18:37:33 1.55
+++ JSVGViewerFrame.java 2001/10/11 19:22:13 1.56
@@ -157,7 +157,7 @@
* This class represents a SVG viewer swing frame.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Stephane Hillion</a>
- * @version $Id: JSVGViewerFrame.java,v 1.55 2001/10/11 18:37:33 hillion Exp $
+ * @version $Id: JSVGViewerFrame.java,v 1.56 2001/10/11 19:22:13 hillion Exp $
*/
public class JSVGViewerFrame
extends JFrame
@@ -1198,7 +1198,7 @@
TreeWalker tw;
tw = ((DocumentTraversal)doc).createTreeWalker
(doc,
- NodeFilter.SHOW_PROCESSING_INSTRUCTION,
+ NodeFilter.SHOW_ALL,
null,
true);
1.28 +70 -1
xml-batik/test-resources/org/apache/batik/test/samplesRendering.xml
Index: samplesRendering.xml
===================================================================
RCS file:
/home/cvs/xml-batik/test-resources/org/apache/batik/test/samplesRendering.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- samplesRendering.xml 2001/10/08 08:29:38 1.27
+++ samplesRendering.xml 2001/10/11 19:22:13 1.28
@@ -8,7 +8,7 @@
<!-- ========================================================================= -->
<!-- @author [EMAIL PROTECTED] -->
-<!-- @version $Id: samplesRendering.xml,v 1.27 2001/10/08 08:29:38 tkormann Exp $
-->
+<!-- @version $Id: samplesRendering.xml,v 1.28 2001/10/11 19:22:13 hillion Exp $ -->
<!-- ========================================================================= -->
<testSuite id="samplesRendering" name="samples and samples/test Rendering">
<!-- ==========================================================================
-->
@@ -817,5 +817,74 @@
<property name="VariationURL" class="java.lang.String"
value="test-references/samples/accepted-variation/anneTransform2.png" />
<property name="SaveVariation" class="java.io.File"
value="test-references/samples/candidate-variation/anneTransform2.png" />
</test>
+
+ <!-- Sample tests, alternate stylesheets test -->
+ <test id="samples/tests/alternateStylesheet.svg-Hot"
class="org.apache.batik.test.svg.SVGAlternateStyleSheetRenderingAccuracyTest">
+ <arg class="java.lang.String" value="samples/tests/alternateStylesheet.svg"
/>
+ <arg class="java.lang.String"
value="test-references/samples/tests/alternateStylesheetHot.png" />
+ <arg class="java.lang.String" value="Hot"/>
+ <property name="VariationURL" class="java.lang.String"
value="test-references/samples/accepted-variation/alternateStylesheetHot.png" />
+ <property name="SaveVariation" class="java.io.File"
value="test-references/samples/candidate-variation/alternateStylesheetHot.png" />
+ </test>
+
+ <test id="samples/tests/alternateStylesheet.svg-Cold"
class="org.apache.batik.test.svg.SVGAlternateStyleSheetRenderingAccuracyTest">
+ <arg class="java.lang.String" value="samples/tests/alternateStylesheet.svg"
/>
+ <arg class="java.lang.String"
value="test-references/samples/tests/alternateStylesheetCold.png" />
+ <arg class="java.lang.String" value="Cold"/>
+ <property name="VariationURL" class="java.lang.String"
value="test-references/samples/accepted-variation/alternateStylesheetCold.png" />
+ <property name="SaveVariation" class="java.io.File"
value="test-references/samples/candidate-variation/alternateStylesheetCold.png" />
+ </test>
+
+ <test id="samples/tests/smiley.svg-Smiling"
class="org.apache.batik.test.svg.SVGAlternateStyleSheetRenderingAccuracyTest">
+ <arg class="java.lang.String" value="samples/tests/smiley.svg"/>
+ <arg class="java.lang.String"
value="test-references/samples/tests/smileySmiling.png"/>
+ <arg class="java.lang.String" value="Smiling"/>
+ <property name="VariationURL" class="java.lang.String"
value="test-references/samples/accepted-variation/smileySmiling.png"/>
+ <property name="SaveVariation" class="java.io.File"
value="test-references/samples/candidate-variation/smileySmiling.png"/>
+ </test>
+
+ <test id="samples/tests/smiley.svg-BasicSad"
class="org.apache.batik.test.svg.SVGAlternateStyleSheetRenderingAccuracyTest">
+ <arg class="java.lang.String" value="samples/tests/smiley.svg"/>
+ <arg class="java.lang.String"
value="test-references/samples/tests/smileyBasicSad.png"/>
+ <arg class="java.lang.String" value="Basic Sad"/>
+ <property name="VariationURL" class="java.lang.String"
value="test-references/samples/accepted-variation/smileyBasicSad.png"/>
+ <property name="SaveVariation" class="java.io.File"
value="test-references/samples/candidate-variation/smileyBasicSad.png"/>
+ </test>
+
+
+ <test id="samples/tests/smiley.svg-Wow!"
class="org.apache.batik.test.svg.SVGAlternateStyleSheetRenderingAccuracyTest">
+ <arg class="java.lang.String" value="samples/tests/smiley.svg"/>
+ <arg class="java.lang.String"
value="test-references/samples/tests/smileyWow!.png"/>
+ <arg class="java.lang.String" value="Wow!"/>
+ <property name="VariationURL" class="java.lang.String"
value="test-references/samples/accepted-variation/smileyWow!.png"/>
+ <property name="SaveVariation" class="java.io.File"
value="test-references/samples/candidate-variation/smileyWow!.png"/>
+ </test>
+
+
+ <test id="samples/tests/smiley.svg-Grim"
class="org.apache.batik.test.svg.SVGAlternateStyleSheetRenderingAccuracyTest">
+ <arg class="java.lang.String" value="samples/tests/smiley.svg"/>
+ <arg class="java.lang.String"
value="test-references/samples/tests/smileyGrim.png"/>
+ <arg class="java.lang.String" value="Grim"/>
+ <property name="VariationURL" class="java.lang.String"
value="test-references/samples/accepted-variation/smileyGrim.png"/>
+ <property name="SaveVariation" class="java.io.File"
value="test-references/samples/candidate-variation/smileyGrim.png"/>
+ </test>
+
+ <test id="samples/tests/smiley.svg-Oups"
class="org.apache.batik.test.svg.SVGAlternateStyleSheetRenderingAccuracyTest">
+ <arg class="java.lang.String" value="samples/tests/smiley.svg"/>
+ <arg class="java.lang.String"
value="test-references/samples/tests/smileyOups.png"/>
+ <arg class="java.lang.String" value="Oups"/>
+ <property name="VariationURL" class="java.lang.String"
value="test-references/samples/accepted-variation/smileyOups.png"/>
+ <property name="SaveVariation" class="java.io.File"
value="test-references/samples/candidate-variation/smileyOups.png"/>
+ </test>
+
+ <!-- Sample tests, media test -->
+ <test id="samples/tests/smiley.svg-Smiling"
class="org.apache.batik.test.svg.SVGAlternateStyleSheetRenderingAccuracyTest">
+ <arg class="java.lang.String" value="samples/tests/smiley.svg"/>
+ <arg class="java.lang.String"
value="test-references/samples/tests/smileySmiling.png"/>
+ <arg class="java.lang.String" value="Smiling"/>
+ <property name="VariationURL" class="java.lang.String"
value="test-references/samples/accepted-variation/smileySmiling.png"/>
+ <property name="SaveVariation" class="java.io.File"
value="test-references/samples/candidate-variation/smileySmiling.png"/>
+ </test>
+
</testSuite>
1.1
xml-batik/test-sources/org/apache/batik/test/svg/SVGAlternateStyleSheetRenderingAccuracyTest.java
Index: SVGAlternateStyleSheetRenderingAccuracyTest.java
===================================================================
/*****************************************************************************
* Copyright (C) The Apache Software Foundation. All rights reserved. *
* ------------------------------------------------------------------------- *
* This software is published under the terms of the Apache Software License *
* version 1.1, a copy of which has been included with this distribution in *
* the LICENSE file. *
*****************************************************************************/
package org.apache.batik.test.svg;
import org.apache.batik.dom.svg.SVGOMDocument;
import org.w3c.dom.Document;
/**
* Checks for regressions in rendering of a document with a given
* alternate stylesheet label.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Stephane Hillion</a>
* @version $Id: SVGAlternateStyleSheetRenderingAccuracyTest.java,v 1.1 2001/10/11
19:22:13 hillion Exp $
*/
public class SVGAlternateStyleSheetRenderingAccuracyTest
extends SVGRenderingAccuracyTest {
/**
* The stylesheet to use for rendering.
*/
protected String title;
/**
* Constructor.
* @param svgURL the URL String for the SVG document being tested.
* @param refImgURL the URL for the reference image.
* @param t The stylesheet title to use.
*/
public SVGMediaRenderingAccuracyTest(String svgURL,
String refImgURL,
String t) {
super(svgURL, refImgURL);
title = t;
}
/**
* Template method which subclasses can override if they
* need to manipulate the DOM in some way before running
* the accuracy test. For example, this can be useful to
* test the alternate stylesheet support.
*/
protected Document manipulateSVGDocument(Document doc) {
// enable the stylesheet
((SVGOMDocument)doc).enableAlternateStyleSheet(title);
return doc;
}
}
1.1
xml-batik/test-sources/org/apache/batik/test/svg/SVGMediaRenderingAccuracyTest.java
Index: SVGMediaRenderingAccuracyTest.java
===================================================================
/*****************************************************************************
* Copyright (C) The Apache Software Foundation. All rights reserved. *
* ------------------------------------------------------------------------- *
* This software is published under the terms of the Apache Software License *
* version 1.1, a copy of which has been included with this distribution in *
* the LICENSE file. *
*****************************************************************************/
package org.apache.batik.test.svg;
import org.apache.batik.css.AbstractViewCSS;
import org.w3c.dom.Document;
import org.w3c.dom.views.DocumentView;
/**
* Checks for regressions in rendering of a document with a given
* media.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Stephane Hillion</a>
* @version $Id: SVGMediaRenderingAccuracyTest.java,v 1.1 2001/10/11 19:22:13
hillion Exp $
*/
public class SVGMediaRenderingAccuracyTest extends SVGRenderingAccuracyTest {
/**
* The media to use for rendering.
*/
protected String media;
/**
* Constructor.
* @param svgURL the URL String for the SVG document being tested.
* @param refImgURL the URL for the reference image.
* @param m The media to use.
*/
public SVGMediaRenderingAccuracyTest(String svgURL,
String refImgURL,
String m) {
super(svgURL, refImgURL);
media = m;
}
/**
* Template method which subclasses can override if they
* need to manipulate the DOM in some way before running
* the accuracy test. For example, this can be useful to
* test the alternate stylesheet support.
*/
protected Document manipulateSVGDocument(Document doc) {
// set the media type
AbstractViewCSS view;
view = (AbstractViewCSS)((DocumentView)document).getDefaultView();
view.setMedia(media);
return doc;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
