You are viewing a plain text version of this content. The canonical link for it is here.
Posted to batik-commits@xmlgraphics.apache.org by ga...@apache.org on 2014/11/16 20:46:20 UTC
svn commit: r1640024 [1/2] - in
/xmlgraphics/batik/branches/junit/test/java/org/apache/batik:
apps/rasterizer/ bridge/ gvt/ parser/ script/rhino/ svggen/ test/xml/
transcoder/ transcoder/image/ transcoder/wmf/
Author: gadams
Date: Sun Nov 16 19:46:19 2014
New Revision: 1640024
URL: http://svn.apache.org/r1640024
Log:
Continue converting unit tests.
Added:
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/apps/rasterizer/MainTestCase.java
- copied, changed from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/apps/rasterizer/MainTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/apps/rasterizer/SVGConverterTestCase.java
- copied, changed from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/apps/rasterizer/SVGConverterTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/EcmaLoadTestCase.java
- copied, changed from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/EcmaLoadTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/EcmaNoLoadTestCase.java
- copied, changed from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/EcmaNoLoadTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/ExternalResourcesTestCase.java
- copied, changed from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/ExternalResourcesTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/JarLoadTestCase.java
- copied, changed from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/JarLoadTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/JarNoLoadTestCase.java
- copied, changed from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/JarNoLoadTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/ScriptSelfTestCase.java
- copied, changed from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/ScriptSelfTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/gvt/TextSelectionTestCase.java
- copied, changed from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/gvt/TextSelectionTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/LengthParserFailureTestCase.java
- copied, changed from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/LengthParserFailureTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/LengthParserTestCase.java
- copied, changed from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/LengthParserTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/PathParserFailureTestCase.java
- copied, changed from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/PathParserFailureTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/PathParserTestCase.java
- copied, changed from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/PathParserTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/TransformListParserTestCase.java
- copied, changed from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/TransformListParserTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/script/rhino/ScriptSelfTestCase.java
- copied, changed from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/script/rhino/ScriptSelfTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/svggen/DoubleStringPerformanceTestCase.java
- copied, changed from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/svggen/DoubleStringPerformanceTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/svggen/GetRootTestCase.java
- copied, changed from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/svggen/GetRootTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/svggen/SVGAccuracyTestCase.java
- copied, changed from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/svggen/SVGAccuracyTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/test/xml/DummyValidTestCase.java
- copied, changed from r1640022, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/test/xml/DummyValidTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/TranscoderInputTestCase.java
- copied, changed from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/TranscoderInputTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/AOITestCase.java
- copied, changed from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/AOITest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/AlternateStylesheetTestCase.java
- copied, changed from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/AlternateStylesheetTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/BackgroundColorTestCase.java
- copied, changed from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/BackgroundColorTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/DOMTestCase.java
- copied, changed from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/DOMTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/DefaultFontFamilyTestCase.java
- copied, changed from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/DefaultFontFamilyTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/DimensionTestCase.java
- copied, changed from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/DimensionTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/GenericDocumentTestCase.java
- copied, changed from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/GenericDocumentTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/InputStreamTestCase.java
- copied, changed from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/InputStreamTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/LanguageTestCase.java
- copied, changed from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/LanguageTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/MaxDimensionTestCase.java
- copied, changed from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/MaxDimensionTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/MediaTestCase.java
- copied, changed from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/MediaTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/ParametrizedDOMTestCase.java
- copied, changed from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/ParametrizedDOMTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/PixelToMMTestCase.java
- copied, changed from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/PixelToMMTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/ReaderTestCase.java
- copied, changed from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/ReaderTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/URITestCase.java
- copied, changed from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/URITest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/wmf/WMFAccuracyTestCase.java
- copied, changed from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/wmf/WMFAccuracyTest.java
Removed:
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/apps/rasterizer/MainTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/apps/rasterizer/SVGConverterTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/EcmaLoadTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/EcmaNoLoadTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/ExternalResourcesTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/JarLoadTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/JarNoLoadTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/ScriptSelfTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/gvt/TextSelectionTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/LengthParserFailureTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/LengthParserTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/PathParserFailureTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/PathParserTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/TransformListParserTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/script/rhino/ScriptSelfTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/svggen/DoubleStringPerformanceTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/svggen/GetRootTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/svggen/SVGAccuracyTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/test/xml/DummyValidTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/TranscoderInputTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/AOITest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/AlternateStylesheetTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/BackgroundColorTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/DOMTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/DefaultFontFamilyTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/DimensionTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/GenericDocumentTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/InputStreamTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/LanguageTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/MaxDimensionTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/MediaTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/ParametrizedDOMTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/PixelToMMTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/ReaderTest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/URITest.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/wmf/WMFAccuracyTest.java
Modified:
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/svggen/GeneratorContext.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/svggen/SVGAccuracyTestValidator.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/svggen/SVGGeneratorTests.java
xmlgraphics/batik/branches/junit/test/java/org/apache/batik/test/xml/DummyValidTestSuite.java
Copied: xmlgraphics/batik/branches/junit/test/java/org/apache/batik/apps/rasterizer/MainTestCase.java (from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/apps/rasterizer/MainTest.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/junit/test/java/org/apache/batik/apps/rasterizer/MainTestCase.java?p2=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/apps/rasterizer/MainTestCase.java&p1=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/apps/rasterizer/MainTest.java&r1=1640023&r2=1640024&rev=1640024&view=diff
==============================================================================
--- xmlgraphics/batik/branches/junit/test/java/org/apache/batik/apps/rasterizer/MainTest.java (original)
+++ xmlgraphics/batik/branches/junit/test/java/org/apache/batik/apps/rasterizer/MainTestCase.java Sun Nov 16 19:46:19 2014
@@ -27,19 +27,29 @@ import java.util.List;
import org.apache.batik.test.AbstractTest;
import org.apache.batik.test.DefaultTestSuite;
-import org.apache.batik.test.Test;
import org.apache.batik.test.TestReport;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* Validates the operation of the <code>Main</code> class.
*
* @author <a href="mailto:vhardy@apache.org">Vincent Hardy</a>
* @version $Id$
*/
-public class MainTest extends DefaultTestSuite {
+@Ignore
+public class MainTestCase extends DefaultTestSuite {
+
+ public MainTestCase(){
+ }
- public MainTest(){
- Test t = new MainConfigTest("-d samples") {
+ public void testMain() {
+ org.apache.batik.test.Test t = new MainConfigTest("-d samples") {
public TestReport validate(SVGConverter c){
File dst = c.getDst();
if(dst!= null && dst.equals(new File("samples"))){
Copied: xmlgraphics/batik/branches/junit/test/java/org/apache/batik/apps/rasterizer/SVGConverterTestCase.java (from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/apps/rasterizer/SVGConverterTest.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/junit/test/java/org/apache/batik/apps/rasterizer/SVGConverterTestCase.java?p2=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/apps/rasterizer/SVGConverterTestCase.java&p1=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/apps/rasterizer/SVGConverterTest.java&r1=1640023&r2=1640024&rev=1640024&view=diff
==============================================================================
--- xmlgraphics/batik/branches/junit/test/java/org/apache/batik/apps/rasterizer/SVGConverterTest.java (original)
+++ xmlgraphics/batik/branches/junit/test/java/org/apache/batik/apps/rasterizer/SVGConverterTestCase.java Sun Nov 16 19:46:19 2014
@@ -29,6 +29,13 @@ import java.io.*;
import java.util.*;
import java.util.List;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* Validates the operation of the <code>SVGRasterizer</code>.
* It validates the option setting and the manipulation
@@ -37,8 +44,12 @@ import java.util.List;
* @author <a href="mailto:vhardy@apache.org">Vincent Hardy</a>
* @version $Id$
*/
-public class SVGConverterTest extends DefaultTestSuite {
- public SVGConverterTest(){
+@Ignore
+public class SVGConverterTestCase extends DefaultTestSuite {
+ public SVGConverterTestCase(){
+ }
+
+ public void testSVGConverter() {
///////////////////////////////////////////////////////////////////////
// Add configuration tests
///////////////////////////////////////////////////////////////////////
Copied: xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/EcmaLoadTestCase.java (from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/EcmaLoadTest.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/EcmaLoadTestCase.java?p2=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/EcmaLoadTestCase.java&p1=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/EcmaLoadTest.java&r1=1640023&r2=1640024&rev=1640024&view=diff
==============================================================================
--- xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/EcmaLoadTest.java (original)
+++ xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/EcmaLoadTestCase.java Sun Nov 16 19:46:19 2014
@@ -20,6 +20,13 @@ package org.apache.batik.bridge;
import org.apache.batik.test.*;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* Checks that ECMA Scripts which should be loaded are indeed
* loaded.
@@ -27,8 +34,12 @@ import org.apache.batik.test.*;
* @author <a href="mailto:vincent.hardy@sun.com">Vincent Hardy</a>
* @version $Id$
*/
-public class EcmaLoadTest extends DefaultTestSuite {
- public EcmaLoadTest() {
+@Ignore
+public class EcmaLoadTestCase extends DefaultTestSuite {
+ public EcmaLoadTestCase() {
+ }
+
+ public void testEcmaLoad() {
String scripts = "text/ecmascript";
String[] scriptSource = {"ecmaCheckLoadAny",
"ecmaCheckLoadSameAsDocument",
@@ -56,7 +67,7 @@ public class EcmaLoadTest extends Defaul
for (int i=0; i<scriptSource.length; i++) {
for (int j=0; j<scriptOrigin[i].length; j++) {
for (int k=0; k<secure.length; k++) {
- ScriptSelfTest t= buildTest(scripts, scriptSource[i],
+ ScriptSelfTestCase t= buildTest(scripts, scriptSource[i],
scriptOrigin[i][j],
secure[k]);
addTest(t);
@@ -65,8 +76,8 @@ public class EcmaLoadTest extends Defaul
}
}
- ScriptSelfTest buildTest(String scripts, String id, String origin, boolean secure) {
- ScriptSelfTest t = new ScriptSelfTest();
+ ScriptSelfTestCase buildTest(String scripts, String id, String origin, boolean secure) {
+ ScriptSelfTestCase t = new ScriptSelfTestCase();
String desc =
"(scripts=" + scripts +
")(scriptOrigin=" + origin +
Copied: xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/EcmaNoLoadTestCase.java (from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/EcmaNoLoadTest.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/EcmaNoLoadTestCase.java?p2=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/EcmaNoLoadTestCase.java&p1=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/EcmaNoLoadTest.java&r1=1640023&r2=1640024&rev=1640024&view=diff
==============================================================================
--- xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/EcmaNoLoadTest.java (original)
+++ xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/EcmaNoLoadTestCase.java Sun Nov 16 19:46:19 2014
@@ -22,6 +22,13 @@ import org.apache.batik.test.*;
import org.apache.batik.test.svg.SVGOnLoadExceptionTestCase;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* Checks that ECMA Scripts which should not be loaded are not
* loaded.
@@ -29,8 +36,12 @@ import org.apache.batik.test.svg.SVGOnLo
* @author <a href="mailto:vincent.hardy@sun.com">Vincent Hardy</a>
* @version $Id$
*/
-public class EcmaNoLoadTest extends DefaultTestSuite {
- public EcmaNoLoadTest() {
+@Ignore
+public class EcmaNoLoadTestCase extends DefaultTestSuite {
+ public EcmaNoLoadTestCase() {
+ }
+
+ public void testEcmaNoLoad() {
String scripts = "application/java-archive";
String[] scriptSource = {"bridge/ecmaCheckNoLoadAny",
"bridge/ecmaCheckNoLoadSameAsDocument",
Copied: xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/ExternalResourcesTestCase.java (from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/ExternalResourcesTest.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/ExternalResourcesTestCase.java?p2=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/ExternalResourcesTestCase.java&p1=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/ExternalResourcesTest.java&r1=1640023&r2=1640024&rev=1640024&view=diff
==============================================================================
--- xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/ExternalResourcesTest.java (original)
+++ xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/ExternalResourcesTestCase.java Sun Nov 16 19:46:19 2014
@@ -38,6 +38,13 @@ import org.apache.batik.test.TestReport;
import org.apache.batik.util.ParsedURL;
import org.apache.batik.util.XMLResourceDescriptor;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* This test validates that SecurityExceptions are generated when
* the user is trying the access external resources and the UserAgent
@@ -63,7 +70,8 @@ import org.apache.batik.util.XMLResource
* @version $Id$
*/
-public class ExternalResourcesTest extends AbstractTest
+@Ignore
+public class ExternalResourcesTestCase extends AbstractTest
implements ErrorConstants {
/**
* Error when the input file cannot be loaded into a
Copied: xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/JarLoadTestCase.java (from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/JarLoadTest.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/JarLoadTestCase.java?p2=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/JarLoadTestCase.java&p1=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/JarLoadTest.java&r1=1640023&r2=1640024&rev=1640024&view=diff
==============================================================================
--- xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/JarLoadTest.java (original)
+++ xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/JarLoadTestCase.java Sun Nov 16 19:46:19 2014
@@ -20,6 +20,13 @@ package org.apache.batik.bridge;
import org.apache.batik.test.*;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* Checks that JAR Scripts which should be loaded are indeed
* loaded.
@@ -27,8 +34,12 @@ import org.apache.batik.test.*;
* @author <a href="mailto:vincent.hardy@sun.com">Vincent Hardy</a>
* @version $Id$
*/
-public class JarLoadTest extends DefaultTestSuite {
- public JarLoadTest() {
+@Ignore
+public class JarLoadTestCase extends DefaultTestSuite {
+ public JarLoadTestCase() {
+ }
+
+ public void testJarLoad() {
String scripts = "application/java-archive";
// Note: base64 encoding of jar content is not supported.
String[] scriptSource = {"jarCheckLoadAny",
@@ -50,7 +61,7 @@ public class JarLoadTest extends Default
for (int i=0; i<scriptSource.length; i++) {
for (int j=0; j<=i; j++) {
for (int k=0; k<secure.length; k++) {
- ScriptSelfTest t= buildTest(scripts, scriptSource[i],
+ ScriptSelfTestCase t= buildTest(scripts, scriptSource[i],
scriptOrigin[j],
secure[k]);
addTest(t);
@@ -59,8 +70,8 @@ public class JarLoadTest extends Default
}
}
- ScriptSelfTest buildTest(String scripts, String id, String origin, boolean secure) {
- ScriptSelfTest t = new ScriptSelfTest();
+ ScriptSelfTestCase buildTest(String scripts, String id, String origin, boolean secure) {
+ ScriptSelfTestCase t = new ScriptSelfTestCase();
String desc =
"(scripts=" + scripts +
")(scriptOrigin=" + origin +
Copied: xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/JarNoLoadTestCase.java (from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/JarNoLoadTest.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/JarNoLoadTestCase.java?p2=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/JarNoLoadTestCase.java&p1=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/JarNoLoadTest.java&r1=1640023&r2=1640024&rev=1640024&view=diff
==============================================================================
--- xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/JarNoLoadTest.java (original)
+++ xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/JarNoLoadTestCase.java Sun Nov 16 19:46:19 2014
@@ -22,6 +22,13 @@ import org.apache.batik.test.*;
import org.apache.batik.test.svg.SVGOnLoadExceptionTestCase;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* Checks that JAR Scripts which should not be loaded are not
* loaded.
@@ -29,8 +36,12 @@ import org.apache.batik.test.svg.SVGOnLo
* @author <a href="mailto:vincent.hardy@sun.com">Vincent Hardy</a>
* @version $Id$
*/
-public class JarNoLoadTest extends DefaultTestSuite {
- public JarNoLoadTest() {
+@Ignore
+public class JarNoLoadTestCase extends DefaultTestSuite {
+ public JarNoLoadTestCase() {
+ }
+
+ public void testJarNoLoad() {
String scripts = "text/ecmascript";
String[] scriptSource = {"bridge/jarCheckNoLoadAny",
"bridge/jarCheckNoLoadSameAsDocument",
Copied: xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/ScriptSelfTestCase.java (from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/ScriptSelfTest.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/ScriptSelfTestCase.java?p2=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/ScriptSelfTestCase.java&p1=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/ScriptSelfTest.java&r1=1640023&r2=1640024&rev=1640024&view=diff
==============================================================================
--- xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/ScriptSelfTest.java (original)
+++ xmlgraphics/batik/branches/junit/test/java/org/apache/batik/bridge/ScriptSelfTestCase.java Sun Nov 16 19:46:19 2014
@@ -22,6 +22,13 @@ import org.apache.batik.test.svg.SelfCon
import org.apache.batik.util.ApplicationSecurityEnforcer;
import org.apache.batik.util.ParsedURL;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* Helper class to simplify writing the unitTesting.xml file for
* the bridge.
@@ -30,7 +37,8 @@ import org.apache.batik.util.ParsedURL;
* @version $Id$
*/
-public class ScriptSelfTest extends SelfContainedSVGOnLoadTestCase {
+@Ignore
+public class ScriptSelfTestCase extends SelfContainedSVGOnLoadTestCase {
String scripts = "text/ecmascript, application/java-archive";
boolean secure = true;
String scriptOrigin = "any";
Copied: xmlgraphics/batik/branches/junit/test/java/org/apache/batik/gvt/TextSelectionTestCase.java (from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/gvt/TextSelectionTest.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/junit/test/java/org/apache/batik/gvt/TextSelectionTestCase.java?p2=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/gvt/TextSelectionTestCase.java&p1=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/gvt/TextSelectionTest.java&r1=1640023&r2=1640024&rev=1640024&view=diff
==============================================================================
--- xmlgraphics/batik/branches/junit/test/java/org/apache/batik/gvt/TextSelectionTest.java (original)
+++ xmlgraphics/batik/branches/junit/test/java/org/apache/batik/gvt/TextSelectionTestCase.java Sun Nov 16 19:46:19 2014
@@ -29,6 +29,12 @@ import org.apache.batik.test.DefaultTest
import org.apache.batik.test.TestReport;
import org.apache.batik.test.svg.JSVGRenderingAccuracyTestCase;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
/**
* This test validates that the text selection API's work properly.
@@ -36,7 +42,8 @@ import org.apache.batik.test.svg.JSVGRen
* @author <a href="mailto:deweese@apache.org">Thomas DeWeese</a>
* @version $Id$
*/
-public class TextSelectionTest extends JSVGRenderingAccuracyTestCase {
+@Ignore
+public class TextSelectionTestCase extends JSVGRenderingAccuracyTestCase {
/**
* Directory for reference files
@@ -123,7 +130,7 @@ public class TextSelectionTest extends J
* @param end The last character to select
* @param file The reference file.
*/
- public TextSelectionTest(String file, String textID,
+ public TextSelectionTestCase(String file, String textID,
Integer start, Integer end) {
this.textID = textID;
this.start = start.intValue();
Copied: xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/LengthParserFailureTestCase.java (from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/LengthParserFailureTest.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/LengthParserFailureTestCase.java?p2=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/LengthParserFailureTestCase.java&p1=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/LengthParserFailureTest.java&r1=1640023&r2=1640024&rev=1640024&view=diff
==============================================================================
--- xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/LengthParserFailureTest.java (original)
+++ xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/LengthParserFailureTestCase.java Sun Nov 16 19:46:19 2014
@@ -22,13 +22,21 @@ import java.io.*;
import org.apache.batik.test.*;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* To test the length parser.
*
* @author <a href="mailto:stephane@hillion.org">Stephane Hillion</a>
* @version $Id$
*/
-public class LengthParserFailureTest extends AbstractTest {
+@Ignore
+public class LengthParserFailureTestCase extends AbstractTest {
protected String sourceLength;
@@ -36,7 +44,7 @@ public class LengthParserFailureTest ext
* Creates a new LengthParserFailureTest.
* @param slength The length to parse.
*/
- public LengthParserFailureTest(String slength) {
+ public LengthParserFailureTestCase(String slength) {
sourceLength = slength;
}
Copied: xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/LengthParserTestCase.java (from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/LengthParserTest.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/LengthParserTestCase.java?p2=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/LengthParserTestCase.java&p1=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/LengthParserTest.java&r1=1640023&r2=1640024&rev=1640024&view=diff
==============================================================================
--- xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/LengthParserTest.java (original)
+++ xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/LengthParserTestCase.java Sun Nov 16 19:46:19 2014
@@ -22,13 +22,21 @@ import java.io.*;
import org.apache.batik.test.*;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* To test the length parser.
*
* @author <a href="mailto:stephane@hillion.org">Stephane Hillion</a>
* @version $Id$
*/
-public class LengthParserTest extends AbstractTest {
+@Ignore
+public class LengthParserTestCase extends AbstractTest {
protected String sourceLength;
protected String destinationLength;
@@ -41,7 +49,7 @@ public class LengthParserTest extends Ab
* @param slength The length to parse.
* @param dlength The length after serialization.
*/
- public LengthParserTest(String slength, String dlength) {
+ public LengthParserTestCase(String slength, String dlength) {
sourceLength = slength;
destinationLength = dlength;
}
Copied: xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/PathParserFailureTestCase.java (from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/PathParserFailureTest.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/PathParserFailureTestCase.java?p2=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/PathParserFailureTestCase.java&p1=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/PathParserFailureTest.java&r1=1640023&r2=1640024&rev=1640024&view=diff
==============================================================================
--- xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/PathParserFailureTest.java (original)
+++ xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/PathParserFailureTestCase.java Sun Nov 16 19:46:19 2014
@@ -22,13 +22,21 @@ import java.io.*;
import org.apache.batik.test.*;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* To test the path parser.
*
* @author <a href="mailto:stephane@hillion.org">Stephane Hillion</a>
* @version $Id$
*/
-public class PathParserFailureTest extends AbstractTest {
+@Ignore
+public class PathParserFailureTestCase extends AbstractTest {
protected String sourcePath;
@@ -36,7 +44,7 @@ public class PathParserFailureTest exten
* Creates a new PathParserFailureTest.
* @param spath The path to parse.
*/
- public PathParserFailureTest(String spath) {
+ public PathParserFailureTestCase(String spath) {
sourcePath = spath;
}
Copied: xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/PathParserTestCase.java (from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/PathParserTest.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/PathParserTestCase.java?p2=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/PathParserTestCase.java&p1=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/PathParserTest.java&r1=1640023&r2=1640024&rev=1640024&view=diff
==============================================================================
--- xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/PathParserTest.java (original)
+++ xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/PathParserTestCase.java Sun Nov 16 19:46:19 2014
@@ -22,13 +22,21 @@ import java.io.*;
import org.apache.batik.test.*;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* To test the path parser.
*
* @author <a href="mailto:stephane@hillion.org">Stephane Hillion</a>
* @version $Id$
*/
-public class PathParserTest extends AbstractTest {
+@Ignore
+public class PathParserTestCase extends AbstractTest {
protected String sourcePath;
protected String destinationPath;
@@ -41,7 +49,7 @@ public class PathParserTest extends Abst
* @param spath The path to parse.
* @param dpath The path after serialization.
*/
- public PathParserTest(String spath, String dpath) {
+ public PathParserTestCase(String spath, String dpath) {
sourcePath = spath;
destinationPath = dpath;
}
Copied: xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/TransformListParserTestCase.java (from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/TransformListParserTest.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/TransformListParserTestCase.java?p2=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/TransformListParserTestCase.java&p1=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/TransformListParserTest.java&r1=1640023&r2=1640024&rev=1640024&view=diff
==============================================================================
--- xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/TransformListParserTest.java (original)
+++ xmlgraphics/batik/branches/junit/test/java/org/apache/batik/parser/TransformListParserTestCase.java Sun Nov 16 19:46:19 2014
@@ -21,13 +21,21 @@ import java.io.*;
import org.apache.batik.test.*;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* To test the transform list parser.
*
* @author <a href="mailto:stephane@hillion.org">Stephane Hillion</a>
* @version $Id$
*/
-public class TransformListParserTest extends AbstractTest {
+@Ignore
+public class TransformListParserTestCase extends AbstractTest {
protected String sourceTransform;
protected String destinationTransform;
@@ -40,7 +48,7 @@ public class TransformListParserTest ext
* @param stransform The transform to parse.
* @param dtransform The transform after serialization.
*/
- public TransformListParserTest(String stransform, String dtransform) {
+ public TransformListParserTestCase(String stransform, String dtransform) {
sourceTransform = stransform;
destinationTransform = dtransform;
}
Copied: xmlgraphics/batik/branches/junit/test/java/org/apache/batik/script/rhino/ScriptSelfTestCase.java (from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/script/rhino/ScriptSelfTest.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/junit/test/java/org/apache/batik/script/rhino/ScriptSelfTestCase.java?p2=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/script/rhino/ScriptSelfTestCase.java&p1=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/script/rhino/ScriptSelfTest.java&r1=1640023&r2=1640024&rev=1640024&view=diff
==============================================================================
--- xmlgraphics/batik/branches/junit/test/java/org/apache/batik/script/rhino/ScriptSelfTest.java (original)
+++ xmlgraphics/batik/branches/junit/test/java/org/apache/batik/script/rhino/ScriptSelfTestCase.java Sun Nov 16 19:46:19 2014
@@ -28,6 +28,13 @@ import org.apache.batik.bridge.DefaultSc
import org.apache.batik.bridge.NoLoadScriptSecurity;
import org.apache.batik.bridge.RelaxedScriptSecurity;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* Helper class to simplify writing the unitTesting.xml file for
* scripting. The "id" for the test needs to be the path of the
@@ -37,8 +44,8 @@ import org.apache.batik.bridge.RelaxedSc
* @author <a href="mailto:vhardy@apache.org">Vincent Hardy</a>
* @version $Id$
*/
-
-public class ScriptSelfTest extends SelfContainedSVGOnLoadTestCase {
+@Ignore
+public class ScriptSelfTestCase extends SelfContainedSVGOnLoadTestCase {
boolean secure = true;
boolean constrain = true;
String scripts = "text/ecmascript, application/java-archive";
Copied: xmlgraphics/batik/branches/junit/test/java/org/apache/batik/svggen/DoubleStringPerformanceTestCase.java (from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/svggen/DoubleStringPerformanceTest.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/junit/test/java/org/apache/batik/svggen/DoubleStringPerformanceTestCase.java?p2=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/svggen/DoubleStringPerformanceTestCase.java&p1=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/svggen/DoubleStringPerformanceTest.java&r1=1640023&r2=1640024&rev=1640024&view=diff
==============================================================================
--- xmlgraphics/batik/branches/junit/test/java/org/apache/batik/svggen/DoubleStringPerformanceTest.java (original)
+++ xmlgraphics/batik/branches/junit/test/java/org/apache/batik/svggen/DoubleStringPerformanceTestCase.java Sun Nov 16 19:46:19 2014
@@ -24,6 +24,13 @@ import org.w3c.dom.DOMImplementation;
import org.apache.batik.dom.svg.SVGDOMImplementation;
import org.apache.batik.test.PerformanceTest;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* This test checks that there is no performance degradation in the
* doubleString utility method.
@@ -31,7 +38,8 @@ import org.apache.batik.test.Performance
* @author <a href="mailto:vincent.hardy@sun.com">Vincent Hardy</a>
* @version $Id$
*/
-public class DoubleStringPerformanceTest extends PerformanceTest {
+@Ignore
+public class DoubleStringPerformanceTestCase extends PerformanceTest {
static double[] testValues = { 0,
0.00000000001,
0.2e-14,
Modified: xmlgraphics/batik/branches/junit/test/java/org/apache/batik/svggen/GeneratorContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/junit/test/java/org/apache/batik/svggen/GeneratorContext.java?rev=1640024&r1=1640023&r2=1640024&view=diff
==============================================================================
--- xmlgraphics/batik/branches/junit/test/java/org/apache/batik/svggen/GeneratorContext.java (original)
+++ xmlgraphics/batik/branches/junit/test/java/org/apache/batik/svggen/GeneratorContext.java Sun Nov 16 19:46:19 2014
@@ -39,7 +39,7 @@ import org.apache.batik.util.SVGConstant
* @author <a href="mailto:cjolif@ilog.fr">Christophe Jolif</a>
* @version $Id$
*/
-public class GeneratorContext extends SVGAccuracyTest implements SVGConstants {
+public class GeneratorContext extends SVGAccuracyTestCase implements SVGConstants {
public static class TestIDGenerator extends SVGIDGenerator {
public String generateID(String prefix) {
return "test"+super.generateID(prefix);
Copied: xmlgraphics/batik/branches/junit/test/java/org/apache/batik/svggen/GetRootTestCase.java (from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/svggen/GetRootTest.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/junit/test/java/org/apache/batik/svggen/GetRootTestCase.java?p2=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/svggen/GetRootTestCase.java&p1=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/svggen/GetRootTest.java&r1=1640023&r2=1640024&rev=1640024&view=diff
==============================================================================
--- xmlgraphics/batik/branches/junit/test/java/org/apache/batik/svggen/GetRootTest.java (original)
+++ xmlgraphics/batik/branches/junit/test/java/org/apache/batik/svggen/GetRootTestCase.java Sun Nov 16 19:46:19 2014
@@ -31,6 +31,13 @@ import org.apache.batik.test.AbstractTes
import org.apache.batik.test.TestReport;
import org.apache.batik.util.SVGConstants;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* This test validates that the SVGGraphics2D generates the same result
* with the two versions of its getRoot method.
@@ -38,7 +45,8 @@ import org.apache.batik.util.SVGConstant
* @author <a href="mailto:vhardy@apache.org">Vincent Hardy</a>
* @version $Id$
*/
-public class GetRootTest extends AbstractTest implements SVGConstants {
+@Ignore
+public class GetRootTestCase extends AbstractTest implements SVGConstants {
public static final Dimension CANVAS_SIZE
= new Dimension(300, 400);
Copied: xmlgraphics/batik/branches/junit/test/java/org/apache/batik/svggen/SVGAccuracyTestCase.java (from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/svggen/SVGAccuracyTest.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/junit/test/java/org/apache/batik/svggen/SVGAccuracyTestCase.java?p2=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/svggen/SVGAccuracyTestCase.java&p1=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/svggen/SVGAccuracyTest.java&r1=1640023&r2=1640024&rev=1640024&view=diff
==============================================================================
--- xmlgraphics/batik/branches/junit/test/java/org/apache/batik/svggen/SVGAccuracyTest.java (original)
+++ xmlgraphics/batik/branches/junit/test/java/org/apache/batik/svggen/SVGAccuracyTestCase.java Sun Nov 16 19:46:19 2014
@@ -47,6 +47,13 @@ import org.apache.batik.dom.GenericDOMIm
import org.w3c.dom.Document;
import org.w3c.dom.DOMImplementation;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* This test validates that a given rendering sequence, modeled
* by a <code>Painter</code> is properly converted to an SVG document
@@ -56,7 +63,8 @@ import org.w3c.dom.DOMImplementation;
* @author <a href="mailto:vhardy@apache.org">Vincent Hardy</a>
* @version $Id$
*/
-public class SVGAccuracyTest extends AbstractTest
+@Ignore
+public class SVGAccuracyTestCase extends AbstractTest
implements SVGConstants{
/**
* Error when an error occurs while generating SVG
@@ -143,7 +151,7 @@ public class SVGAccuracyTest extends Abs
* should be exactly identical to that generated
* by the painter.
*/
- public SVGAccuracyTest(Painter painter,
+ public SVGAccuracyTestCase(Painter painter,
URL refURL){
this.painter = painter;
this.refURL = refURL;
Modified: xmlgraphics/batik/branches/junit/test/java/org/apache/batik/svggen/SVGAccuracyTestValidator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/junit/test/java/org/apache/batik/svggen/SVGAccuracyTestValidator.java?rev=1640024&r1=1640023&r2=1640024&view=diff
==============================================================================
--- xmlgraphics/batik/branches/junit/test/java/org/apache/batik/svggen/SVGAccuracyTestValidator.java (original)
+++ xmlgraphics/batik/branches/junit/test/java/org/apache/batik/svggen/SVGAccuracyTestValidator.java Sun Nov 16 19:46:19 2014
@@ -61,11 +61,11 @@ public class SVGAccuracyTestValidator ex
"dummyFile.svg");
Test t
- = new SVGAccuracyTest(painter, refURL);
+ = new SVGAccuracyTestCase(painter, refURL);
setConfig(t,
false,
- SVGAccuracyTest.ERROR_CANNOT_GENERATE_SVG);
+ SVGAccuracyTestCase.ERROR_CANNOT_GENERATE_SVG);
return super.runImpl();
}
@@ -84,11 +84,11 @@ public class SVGAccuracyTestValidator ex
URL refURL = new URL("http",
"dummyHost",
"dummyFile.svg");
- Test t = new SVGAccuracyTest(painter, refURL);
+ Test t = new SVGAccuracyTestCase(painter, refURL);
setConfig(t,
false,
- SVGAccuracyTest.ERROR_CANNOT_GENERATE_SVG);
+ SVGAccuracyTestCase.ERROR_CANNOT_GENERATE_SVG);
return super.runImpl();
}
@@ -105,11 +105,11 @@ public class SVGAccuracyTestValidator ex
static class NullReferenceURL extends ValidPainterTest {
public TestReport runImpl() throws Exception {
- Test t = new SVGAccuracyTest(this, null);
+ Test t = new SVGAccuracyTestCase(this, null);
setConfig(t,
false,
- SVGAccuracyTest.ERROR_CANNOT_OPEN_REFERENCE_SVG_FILE);
+ SVGAccuracyTestCase.ERROR_CANNOT_OPEN_REFERENCE_SVG_FILE);
return super.runImpl();
}
@@ -117,14 +117,14 @@ public class SVGAccuracyTestValidator ex
static class InexistantReferenceURL extends ValidPainterTest {
public TestReport runImpl() throws Exception {
- Test t = new SVGAccuracyTest(this,
+ Test t = new SVGAccuracyTestCase(this,
new URL("http",
"dummyHost",
"dummyFile.svg"));
setConfig(t,
false,
- SVGAccuracyTest.ERROR_CANNOT_OPEN_REFERENCE_SVG_FILE);
+ SVGAccuracyTestCase.ERROR_CANNOT_OPEN_REFERENCE_SVG_FILE);
return super.runImpl();
}
@@ -136,12 +136,12 @@ public class SVGAccuracyTestValidator ex
null);
tmpFile.deleteOnExit();
- Test t = new SVGAccuracyTest(this,
+ Test t = new SVGAccuracyTestCase(this,
tmpFile.toURL());
setConfig(t,
false,
- SVGAccuracyTest.ERROR_GENERATED_SVG_INACCURATE);
+ SVGAccuracyTestCase.ERROR_GENERATED_SVG_INACCURATE);
return super.runImpl();
}
@@ -153,14 +153,14 @@ public class SVGAccuracyTestValidator ex
null);
tmpFile.deleteOnExit();
- SVGAccuracyTest t = new SVGAccuracyTest(this,
+ SVGAccuracyTestCase t = new SVGAccuracyTestCase(this,
tmpFile.toURL());
t.setSaveSVG(tmpFile);
setConfig(t,
false,
- SVGAccuracyTest.ERROR_GENERATED_SVG_INACCURATE);
+ SVGAccuracyTestCase.ERROR_GENERATED_SVG_INACCURATE);
// This first run should fail but it should
// have created the reference image in tmpFile
Modified: xmlgraphics/batik/branches/junit/test/java/org/apache/batik/svggen/SVGGeneratorTests.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/junit/test/java/org/apache/batik/svggen/SVGGeneratorTests.java?rev=1640024&r1=1640023&r2=1640024&view=diff
==============================================================================
--- xmlgraphics/batik/branches/junit/test/java/org/apache/batik/svggen/SVGGeneratorTests.java (original)
+++ xmlgraphics/batik/branches/junit/test/java/org/apache/batik/svggen/SVGGeneratorTests.java Sun Nov 16 19:46:19 2014
@@ -179,8 +179,8 @@ public class SVGGeneratorTests extends D
private Test makeSVGAccuracyTest(Painter painter, String id){
String cl = PLAIN_GENERATION_PREFIX + getNonQualifiedClassName(painter);
- SVGAccuracyTest test
- = new SVGAccuracyTest(painter, getReferenceURL(painter, PLAIN_GENERATION_PREFIX));
+ SVGAccuracyTestCase test
+ = new SVGAccuracyTestCase(painter, getReferenceURL(painter, PLAIN_GENERATION_PREFIX));
test.setSaveSVG(new File(GENERATOR_REFERENCE_BASE + CANDIDATE_REF_DIR + "/" + cl + SVG_EXTENSION));
test.setName(id + "-DefaultContextGeneration");
Copied: xmlgraphics/batik/branches/junit/test/java/org/apache/batik/test/xml/DummyValidTestCase.java (from r1640022, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/test/xml/DummyValidTest.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/junit/test/java/org/apache/batik/test/xml/DummyValidTestCase.java?p2=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/test/xml/DummyValidTestCase.java&p1=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/test/xml/DummyValidTest.java&r1=1640022&r2=1640024&rev=1640024&view=diff
==============================================================================
--- xmlgraphics/batik/branches/junit/test/java/org/apache/batik/test/xml/DummyValidTest.java (original)
+++ xmlgraphics/batik/branches/junit/test/java/org/apache/batik/test/xml/DummyValidTestCase.java Sun Nov 16 19:46:19 2014
@@ -20,6 +20,8 @@ package org.apache.batik.test.xml;
import org.apache.batik.test.AbstractTest;
+import org.junit.Test;
+
/**
* Dummy Test which always passes. Needed for the test infrastructure
* validation.
@@ -27,6 +29,9 @@ import org.apache.batik.test.AbstractTes
* @author <a href="mailto:vhardy@apache.lorg">Vincent Hardy</a>
* @version $Id$
*/
-public class DummyValidTest extends AbstractTest {
+public class DummyValidTestCase extends AbstractTest {
+ @Test
+ public void testDummy() {
+ }
}
Modified: xmlgraphics/batik/branches/junit/test/java/org/apache/batik/test/xml/DummyValidTestSuite.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/junit/test/java/org/apache/batik/test/xml/DummyValidTestSuite.java?rev=1640024&r1=1640023&r2=1640024&view=diff
==============================================================================
--- xmlgraphics/batik/branches/junit/test/java/org/apache/batik/test/xml/DummyValidTestSuite.java (original)
+++ xmlgraphics/batik/branches/junit/test/java/org/apache/batik/test/xml/DummyValidTestSuite.java Sun Nov 16 19:46:19 2014
@@ -29,8 +29,8 @@ import org.apache.batik.test.DefaultTest
*/
public class DummyValidTestSuite extends DefaultTestSuite{
public DummyValidTestSuite(){
- addTest(new DummyValidTest() {{setId("1");}});
- addTest(new DummyValidTest() {{setId("2");}});
+ addTest(new DummyValidTestCase() {{setId("1");}});
+ addTest(new DummyValidTestCase() {{setId("2");}});
}
}
Copied: xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/TranscoderInputTestCase.java (from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/TranscoderInputTest.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/TranscoderInputTestCase.java?p2=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/TranscoderInputTestCase.java&p1=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/TranscoderInputTest.java&r1=1640023&r2=1640024&rev=1640024&view=diff
==============================================================================
--- xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/TranscoderInputTest.java (original)
+++ xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/TranscoderInputTestCase.java Sun Nov 16 19:46:19 2014
@@ -42,6 +42,13 @@ import org.xml.sax.XMLReader;
import org.w3c.dom.DOMImplementation;
import org.w3c.dom.Document;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* This test validates that the various configurations of TranscoderInput
* are supported by the XMLAbstractTranscoder class.
@@ -49,7 +56,8 @@ import org.w3c.dom.Document;
* @author <a href="mailto:vincent.hardy@sun.com">Vincent Hardy</a>
* @version $Id$
*/
-public class TranscoderInputTest extends AbstractTest {
+@Ignore
+public class TranscoderInputTestCase extends AbstractTest {
public TestReport runImpl() throws Exception {
String TEST_URI = (new File("samples/anne.svg")).toURL().toString();
Copied: xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/AOITestCase.java (from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/AOITest.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/AOITestCase.java?p2=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/AOITestCase.java&p1=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/AOITest.java&r1=1640023&r2=1640024&rev=1640024&view=diff
==============================================================================
--- xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/AOITest.java (original)
+++ xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/AOITestCase.java Sun Nov 16 19:46:19 2014
@@ -25,13 +25,21 @@ import java.util.HashMap;
import org.apache.batik.transcoder.TranscoderInput;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* Test the ImageTranscoder with the KEY_AOI transcoding hint.
*
* @author <a href="mailto:Thierry.Kormann@sophia.inria.fr">Thierry Kormann</a>
* @version $Id$
*/
-public class AOITest extends AbstractImageTranscoderTest {
+@Ignore
+public class AOITestCase extends AbstractImageTranscoderTest {
/** The URI of the input image. */
protected String inputURI;
@@ -58,7 +66,7 @@ public class AOITest extends AbstractIma
* @param width the width of the area of interest
* @param height the height of the area of interest
*/
- public AOITest(String inputURI,
+ public AOITestCase(String inputURI,
String refImageURI,
Float x,
Float y,
@@ -86,7 +94,7 @@ public class AOITest extends AbstractIma
* @param imgWidth the width of the image to generate
* @param imgHeight the height of the image to generate
*/
- public AOITest(String inputURI,
+ public AOITestCase(String inputURI,
String refImageURI,
Float x,
Float y,
Copied: xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/AlternateStylesheetTestCase.java (from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/AlternateStylesheetTest.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/AlternateStylesheetTestCase.java?p2=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/AlternateStylesheetTestCase.java&p1=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/AlternateStylesheetTest.java&r1=1640023&r2=1640024&rev=1640024&view=diff
==============================================================================
--- xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/AlternateStylesheetTest.java (original)
+++ xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/AlternateStylesheetTestCase.java Sun Nov 16 19:46:19 2014
@@ -23,13 +23,21 @@ import java.util.HashMap;
import org.apache.batik.transcoder.TranscoderInput;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* Test the ImageTranscoder with the KEY_ALTERNATE_STYLESHEET transcoding hint.
*
* @author <a href="mailto:Thierry.Kormann@sophia.inria.fr">Thierry Kormann</a>
* @version $Id$
*/
-public class AlternateStylesheetTest extends AbstractImageTranscoderTest {
+@Ignore
+public class AlternateStylesheetTestCase extends AbstractImageTranscoderTest {
/** The URI of the input image. */
protected String inputURI;
@@ -47,7 +55,7 @@ public class AlternateStylesheetTest ext
* @param refImageURI the URI of the reference image
* @param alternateStylesheet the alternate stylesheet CSS media
*/
- public AlternateStylesheetTest(String inputURI,
+ public AlternateStylesheetTestCase(String inputURI,
String refImageURI,
String alternateStylesheet) {
this.inputURI = inputURI;
Copied: xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/BackgroundColorTestCase.java (from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/BackgroundColorTest.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/BackgroundColorTestCase.java?p2=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/BackgroundColorTestCase.java&p1=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/BackgroundColorTest.java&r1=1640023&r2=1640024&rev=1640024&view=diff
==============================================================================
--- xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/BackgroundColorTest.java (original)
+++ xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/BackgroundColorTestCase.java Sun Nov 16 19:46:19 2014
@@ -36,18 +36,26 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.DOMImplementation;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* Test the ImageTranscoder with the KEY_BACKGROUND_COLOR transcoding hint.
*
* @author <a href="mailto:Thierry.Kormann@sophia.inria.fr">Thierry Kormann</a>
* @version $Id$
*/
-public class BackgroundColorTest extends AbstractImageTranscoderTest {
+@Ignore
+public class BackgroundColorTestCase extends AbstractImageTranscoderTest {
/**
* Constructs a new <code>BackgroundColorTest</code>.
*/
- public BackgroundColorTest() {
+ public BackgroundColorTestCase() {
}
/**
Copied: xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/DOMTestCase.java (from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/DOMTest.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/DOMTestCase.java?p2=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/DOMTestCase.java&p1=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/DOMTest.java&r1=1640023&r2=1640024&rev=1640024&view=diff
==============================================================================
--- xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/DOMTest.java (original)
+++ xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/DOMTestCase.java Sun Nov 16 19:46:19 2014
@@ -32,18 +32,26 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.DOMImplementation;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* Test the ImageTranscoder input with a DOM tree.
*
* @author <a href="mailto:Thierry.Kormann@sophia.inria.fr">Thierry Kormann</a>
* @version $Id$
*/
-public class DOMTest extends AbstractImageTranscoderTest {
+@Ignore
+public class DOMTestCase extends AbstractImageTranscoderTest {
/**
* Constructs a new <code>DOMTest</code>.
*/
- public DOMTest() {
+ public DOMTestCase() {
}
/**
Copied: xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/DefaultFontFamilyTestCase.java (from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/DefaultFontFamilyTest.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/DefaultFontFamilyTestCase.java?p2=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/DefaultFontFamilyTestCase.java&p1=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/DefaultFontFamilyTest.java&r1=1640023&r2=1640024&rev=1640024&view=diff
==============================================================================
--- xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/DefaultFontFamilyTest.java (original)
+++ xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/DefaultFontFamilyTestCase.java Sun Nov 16 19:46:19 2014
@@ -23,13 +23,21 @@ import java.util.Map;
import org.apache.batik.transcoder.TranscoderInput;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* Test the ImageTranscoder with the KEY_DEFAULT_FONT_FAMILY transcoding hint.
*
* @author <a href="mailto:vincent.hardy@sun.com">Vincent Hardy</a>
* @version $Id$
*/
-public class DefaultFontFamilyTest extends AbstractImageTranscoderTest {
+@Ignore
+public class DefaultFontFamilyTestCase extends AbstractImageTranscoderTest {
/** The URI of the input image. */
protected String inputURI;
@@ -47,7 +55,7 @@ public class DefaultFontFamilyTest exten
* @param refImageURI the URI of the reference image
* @param defaultFontFamily the default font-family to use
*/
- public DefaultFontFamilyTest(String inputURI,
+ public DefaultFontFamilyTestCase(String inputURI,
String refImageURI,
String defaultFontFamily) {
this.inputURI = inputURI;
Copied: xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/DimensionTestCase.java (from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/DimensionTest.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/DimensionTestCase.java?p2=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/DimensionTestCase.java&p1=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/DimensionTest.java&r1=1640023&r2=1640024&rev=1640024&view=diff
==============================================================================
--- xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/DimensionTest.java (original)
+++ xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/DimensionTestCase.java Sun Nov 16 19:46:19 2014
@@ -23,6 +23,13 @@ import java.util.Map;
import org.apache.batik.transcoder.TranscoderInput;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* Test the ImageTranscoder with the KEY_WIDTH and/or the KEY_HEIGHT transcoding
* hint.
@@ -30,7 +37,8 @@ import org.apache.batik.transcoder.Trans
* @author <a href="mailto:Thierry.Kormann@sophia.inria.fr">Thierry Kormann</a>
* @version $Id$
*/
-public class DimensionTest extends AbstractImageTranscoderTest {
+@Ignore
+public class DimensionTestCase extends AbstractImageTranscoderTest {
/** The URI of the input image. */
protected String inputURI;
@@ -52,7 +60,7 @@ public class DimensionTest extends Abstr
* @param width the image width
* @param height the image height
*/
- public DimensionTest(String inputURI,
+ public DimensionTestCase(String inputURI,
String refImageURI,
Float width,
Float height) {
Copied: xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/GenericDocumentTestCase.java (from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/GenericDocumentTest.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/GenericDocumentTestCase.java?p2=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/GenericDocumentTestCase.java&p1=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/GenericDocumentTest.java&r1=1640023&r2=1640024&rev=1640024&view=diff
==============================================================================
--- xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/GenericDocumentTest.java (original)
+++ xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/GenericDocumentTestCase.java Sun Nov 16 19:46:19 2014
@@ -29,13 +29,21 @@ import org.apache.batik.dom.util.SAXDocu
import org.apache.batik.transcoder.TranscoderInput;
import org.apache.batik.util.XMLResourceDescriptor;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* Test the ImageTranscoder input with a GenericDocument.
*
* @author <a href="mailto:Thierry.Kormann@sophia.inria.fr">Thierry Kormann</a>
* @version $Id$
*/
-public class GenericDocumentTest extends AbstractImageTranscoderTest {
+@Ignore
+public class GenericDocumentTestCase extends AbstractImageTranscoderTest {
/** The URI of the input image. */
protected String inputURI;
@@ -49,7 +57,7 @@ public class GenericDocumentTest extends
* @param inputURI the URI of the input image
* @param refImageURI the URI of the reference image
*/
- public GenericDocumentTest(String inputURI, String refImageURI) {
+ public GenericDocumentTestCase(String inputURI, String refImageURI) {
this.inputURI = inputURI;
this.refImageURI = refImageURI;
}
Copied: xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/InputStreamTestCase.java (from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/InputStreamTest.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/InputStreamTestCase.java?p2=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/InputStreamTestCase.java&p1=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/InputStreamTest.java&r1=1640023&r2=1640024&rev=1640024&view=diff
==============================================================================
--- xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/InputStreamTest.java (original)
+++ xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/InputStreamTestCase.java Sun Nov 16 19:46:19 2014
@@ -24,13 +24,21 @@ import java.net.URL;
import org.apache.batik.transcoder.TranscoderInput;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* Test the ImageTranscoder input with a InputStream.
*
* @author <a href="mailto:Thierry.Kormann@sophia.inria.fr">Thierry Kormann</a>
* @version $Id$
*/
-public class InputStreamTest extends AbstractImageTranscoderTest {
+@Ignore
+public class InputStreamTestCase extends AbstractImageTranscoderTest {
/** The URI of the input image. */
protected String inputURI;
@@ -44,7 +52,7 @@ public class InputStreamTest extends Abs
* @param inputURI the URI of the input image
* @param refImageURI the URI of the reference image
*/
- public InputStreamTest(String inputURI, String refImageURI) {
+ public InputStreamTestCase(String inputURI, String refImageURI) {
this.inputURI = inputURI;
this.refImageURI = refImageURI;
}
Copied: xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/LanguageTestCase.java (from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/LanguageTest.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/LanguageTestCase.java?p2=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/LanguageTestCase.java&p1=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/LanguageTest.java&r1=1640023&r2=1640024&rev=1640024&view=diff
==============================================================================
--- xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/LanguageTest.java (original)
+++ xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/LanguageTestCase.java Sun Nov 16 19:46:19 2014
@@ -23,13 +23,21 @@ import java.util.Map;
import org.apache.batik.transcoder.TranscoderInput;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* Test the ImageTranscoder with the KEY_LANGUAGE transcoding hint.
*
* @author <a href="mailto:Thierry.Kormann@sophia.inria.fr">Thierry Kormann</a>
* @version $Id$
*/
-public class LanguageTest extends AbstractImageTranscoderTest {
+@Ignore
+public class LanguageTestCase extends AbstractImageTranscoderTest {
/**
* Constructs a new <code>LanguageTest</code>.
@@ -50,7 +58,7 @@ public class LanguageTest extends Abstra
* @param refImageURI the URI of the reference image
* @param language the preferred language
*/
- public LanguageTest(String inputURI,
+ public LanguageTestCase(String inputURI,
String refImageURI,
String language) {
this.inputURI = inputURI;
Copied: xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/MaxDimensionTestCase.java (from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/MaxDimensionTest.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/MaxDimensionTestCase.java?p2=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/MaxDimensionTestCase.java&p1=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/MaxDimensionTest.java&r1=1640023&r2=1640024&rev=1640024&view=diff
==============================================================================
--- xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/MaxDimensionTest.java (original)
+++ xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/MaxDimensionTestCase.java Sun Nov 16 19:46:19 2014
@@ -23,6 +23,13 @@ import java.util.HashMap;
import org.apache.batik.transcoder.TranscoderInput;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* Test the ImageTranscoder with the KEY_MAX_WIDTH and/or the KEY_MAX_HEIGHT
* transcoding hint.
@@ -30,7 +37,8 @@ import org.apache.batik.transcoder.Trans
* @author <a href="mailto:ruini@iki.fi">Henri Ruini</a>
* @version $Id$
*/
-public class MaxDimensionTest extends AbstractImageTranscoderTest {
+@Ignore
+public class MaxDimensionTestCase extends AbstractImageTranscoderTest {
//-- Variables -----------------------------------------------------------
/** The URI of the input image. */
@@ -56,7 +64,7 @@ public class MaxDimensionTest extends Ab
* @param maxWidth Maximum image width (KEY_MAX_WIDTH value).
* @param maxHeight Maximum image height (KEY_MAX_HEIGHT value).
*/
- public MaxDimensionTest(String inputURI, String refImageURI, Float maxWidth, Float maxHeight) {
+ public MaxDimensionTestCase(String inputURI, String refImageURI, Float maxWidth, Float maxHeight) {
this.inputURI = inputURI;
this.refImageURI = refImageURI;
this.maxWidth = maxWidth;
@@ -73,7 +81,7 @@ public class MaxDimensionTest extends Ab
* @param width Image width (KEY_WIDTH value).
* @param height Image height (KEY_HEIGH value).
*/
- public MaxDimensionTest(String inputURI, String refImageURI, Float maxWidth, Float maxHeight, Float width, Float height) {
+ public MaxDimensionTestCase(String inputURI, String refImageURI, Float maxWidth, Float maxHeight, Float width, Float height) {
this.inputURI = inputURI;
this.refImageURI = refImageURI;
this.maxWidth = maxWidth;
Copied: xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/MediaTestCase.java (from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/MediaTest.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/MediaTestCase.java?p2=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/MediaTestCase.java&p1=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/MediaTest.java&r1=1640023&r2=1640024&rev=1640024&view=diff
==============================================================================
--- xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/MediaTest.java (original)
+++ xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/MediaTestCase.java Sun Nov 16 19:46:19 2014
@@ -23,13 +23,21 @@ import java.util.Map;
import org.apache.batik.transcoder.TranscoderInput;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* Test the ImageTranscoder with the KEY_MEDIA transcoding hint.
*
* @author <a href="mailto:Thierry.Kormann@sophia.inria.fr">Thierry Kormann</a>
* @version $Id$
*/
-public class MediaTest extends AbstractImageTranscoderTest {
+@Ignore
+public class MediaTestCase extends AbstractImageTranscoderTest {
/** The URI of the input image. */
protected String inputURI;
@@ -47,7 +55,7 @@ public class MediaTest extends AbstractI
* @param refImageURI the URI of the reference image
* @param media the CSS media
*/
- public MediaTest(String inputURI, String refImageURI, String media) {
+ public MediaTestCase(String inputURI, String refImageURI, String media) {
this.inputURI = inputURI;
this.refImageURI = refImageURI;
this.media = media;
Copied: xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/ParametrizedDOMTestCase.java (from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/ParametrizedDOMTest.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/ParametrizedDOMTestCase.java?p2=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/ParametrizedDOMTestCase.java&p1=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/ParametrizedDOMTest.java&r1=1640023&r2=1640024&rev=1640024&view=diff
==============================================================================
--- xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/ParametrizedDOMTest.java (original)
+++ xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/ParametrizedDOMTestCase.java Sun Nov 16 19:46:19 2014
@@ -26,13 +26,21 @@ import org.apache.batik.dom.svg.SAXSVGDo
import org.apache.batik.transcoder.TranscoderInput;
import org.apache.batik.util.XMLResourceDescriptor;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* Test the ImageTranscoder input with a DOM tree.
*
* @author <a href="mailto:Thierry.Kormann@sophia.inria.fr">Thierry Kormann</a>
* @version $Id$
*/
-public class ParametrizedDOMTest extends AbstractImageTranscoderTest {
+@Ignore
+public class ParametrizedDOMTestCase extends AbstractImageTranscoderTest {
/** The URI of the input image. */
protected String inputURI;
@@ -46,7 +54,7 @@ public class ParametrizedDOMTest extends
* @param inputURI the URI of the input image
* @param refImageURI the URI of the reference image
*/
- public ParametrizedDOMTest(String inputURI, String refImageURI) {
+ public ParametrizedDOMTestCase(String inputURI, String refImageURI) {
this.inputURI = inputURI;
this.refImageURI = refImageURI;
}
Copied: xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/PixelToMMTestCase.java (from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/PixelToMMTest.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/PixelToMMTestCase.java?p2=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/PixelToMMTestCase.java&p1=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/PixelToMMTest.java&r1=1640023&r2=1640024&rev=1640024&view=diff
==============================================================================
--- xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/PixelToMMTest.java (original)
+++ xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/PixelToMMTestCase.java Sun Nov 16 19:46:19 2014
@@ -23,13 +23,21 @@ import java.util.Map;
import org.apache.batik.transcoder.TranscoderInput;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* Test the ImageTranscoder with the KEY_PIXEL_UNIT_TO_MILLIMETER
* transcoding hint.
*
* @author <a href="mailto:Thierry.Kormann@sophia.inria.fr">Thierry Kormann</a>
* @version $Id$ */
-public class PixelToMMTest extends AbstractImageTranscoderTest {
+@Ignore
+public class PixelToMMTestCase extends AbstractImageTranscoderTest {
/** The URI of the input image. */
protected String inputURI;
@@ -47,7 +55,7 @@ public class PixelToMMTest extends Abstr
* @param refImageURI the URI of the reference image
* @param px2mm the pixel to mm conversion factor
*/
- public PixelToMMTest(String inputURI,
+ public PixelToMMTestCase(String inputURI,
String refImageURI,
Float px2mm) {
this.inputURI = inputURI;
Copied: xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/ReaderTestCase.java (from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/ReaderTest.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/ReaderTestCase.java?p2=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/ReaderTestCase.java&p1=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/ReaderTest.java&r1=1640023&r2=1640024&rev=1640024&view=diff
==============================================================================
--- xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/ReaderTest.java (original)
+++ xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/ReaderTestCase.java Sun Nov 16 19:46:19 2014
@@ -25,13 +25,21 @@ import java.net.URL;
import org.apache.batik.transcoder.TranscoderInput;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* Test the ImageTranscoder input with a Reader.
*
* @author <a href="mailto:Thierry.Kormann@sophia.inria.fr">Thierry Kormann</a>
* @version $Id$
*/
-public class ReaderTest extends AbstractImageTranscoderTest {
+@Ignore
+public class ReaderTestCase extends AbstractImageTranscoderTest {
/** The URI of the input image. */
protected String inputURI;
@@ -45,7 +53,7 @@ public class ReaderTest extends Abstract
* @param inputURI the URI of the input image
* @param refImageURI the URI of the reference image
*/
- public ReaderTest(String inputURI, String refImageURI) {
+ public ReaderTestCase(String inputURI, String refImageURI) {
this.inputURI = inputURI;
this.refImageURI = refImageURI;
}
Copied: xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/URITestCase.java (from r1640023, xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/URITest.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/URITestCase.java?p2=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/URITestCase.java&p1=xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/URITest.java&r1=1640023&r2=1640024&rev=1640024&view=diff
==============================================================================
--- xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/URITest.java (original)
+++ xmlgraphics/batik/branches/junit/test/java/org/apache/batik/transcoder/image/URITestCase.java Sun Nov 16 19:46:19 2014
@@ -19,13 +19,21 @@ package org.apache.batik.transcoder.imag
import org.apache.batik.transcoder.TranscoderInput;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* Test the ImageTranscoder input with a URI.
*
* @author <a href="mailto:Thierry.Kormann@sophia.inria.fr">Thierry Kormann</a>
* @version $Id$
*/
-public class URITest extends AbstractImageTranscoderTest {
+@Ignore
+public class URITestCase extends AbstractImageTranscoderTest {
/** The URI of the input image. */
protected String inputURI;
@@ -39,7 +47,7 @@ public class URITest extends AbstractIma
* @param inputURI the URI of the input image
* @param refImageURI the URI of the reference image
*/
- public URITest(String inputURI, String refImageURI) {
+ public URITestCase(String inputURI, String refImageURI) {
this.inputURI = inputURI;
this.refImageURI = refImageURI;
}