Continue converting unit tests.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/batik/branches/junit@1640024 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/test/java/org/apache/batik/apps/rasterizer/MainTest.java b/test/java/org/apache/batik/apps/rasterizer/MainTestCase.java
similarity index 98%
rename from test/java/org/apache/batik/apps/rasterizer/MainTest.java
rename to test/java/org/apache/batik/apps/rasterizer/MainTestCase.java
index 315733c..b17c87a 100644
--- a/test/java/org/apache/batik/apps/rasterizer/MainTest.java
+++ b/test/java/org/apache/batik/apps/rasterizer/MainTestCase.java
@@ -27,19 +27,29 @@
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 MainTest(){
- Test t = new MainConfigTest("-d samples") {
+ public MainTestCase(){
+ }
+
+ 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"))){
diff --git a/test/java/org/apache/batik/apps/rasterizer/SVGConverterTest.java b/test/java/org/apache/batik/apps/rasterizer/SVGConverterTestCase.java
similarity index 98%
rename from test/java/org/apache/batik/apps/rasterizer/SVGConverterTest.java
rename to test/java/org/apache/batik/apps/rasterizer/SVGConverterTestCase.java
index b145a71..852b207 100644
--- a/test/java/org/apache/batik/apps/rasterizer/SVGConverterTest.java
+++ b/test/java/org/apache/batik/apps/rasterizer/SVGConverterTestCase.java
@@ -29,6 +29,13 @@
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 @@
* @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
///////////////////////////////////////////////////////////////////////
diff --git a/test/java/org/apache/batik/bridge/EcmaLoadTest.java b/test/java/org/apache/batik/bridge/EcmaLoadTestCase.java
similarity index 83%
rename from test/java/org/apache/batik/bridge/EcmaLoadTest.java
rename to test/java/org/apache/batik/bridge/EcmaLoadTestCase.java
index cce1d44..dd8634f 100644
--- a/test/java/org/apache/batik/bridge/EcmaLoadTest.java
+++ b/test/java/org/apache/batik/bridge/EcmaLoadTestCase.java
@@ -20,6 +20,13 @@
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 @@
* @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 @@
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 @@
}
}
- 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 +
diff --git a/test/java/org/apache/batik/bridge/EcmaNoLoadTest.java b/test/java/org/apache/batik/bridge/EcmaNoLoadTestCase.java
similarity index 93%
rename from test/java/org/apache/batik/bridge/EcmaNoLoadTest.java
rename to test/java/org/apache/batik/bridge/EcmaNoLoadTestCase.java
index 610d7d3..22fc424 100644
--- a/test/java/org/apache/batik/bridge/EcmaNoLoadTest.java
+++ b/test/java/org/apache/batik/bridge/EcmaNoLoadTestCase.java
@@ -22,6 +22,13 @@
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 @@
* @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",
diff --git a/test/java/org/apache/batik/bridge/ExternalResourcesTest.java b/test/java/org/apache/batik/bridge/ExternalResourcesTestCase.java
similarity index 98%
rename from test/java/org/apache/batik/bridge/ExternalResourcesTest.java
rename to test/java/org/apache/batik/bridge/ExternalResourcesTestCase.java
index a1fc5b8..cca80ff 100644
--- a/test/java/org/apache/batik/bridge/ExternalResourcesTest.java
+++ b/test/java/org/apache/batik/bridge/ExternalResourcesTestCase.java
@@ -38,6 +38,13 @@
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 @@
* @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
diff --git a/test/java/org/apache/batik/bridge/JarLoadTest.java b/test/java/org/apache/batik/bridge/JarLoadTestCase.java
similarity index 81%
rename from test/java/org/apache/batik/bridge/JarLoadTest.java
rename to test/java/org/apache/batik/bridge/JarLoadTestCase.java
index 105501b..3ff4bae 100644
--- a/test/java/org/apache/batik/bridge/JarLoadTest.java
+++ b/test/java/org/apache/batik/bridge/JarLoadTestCase.java
@@ -20,6 +20,13 @@
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 @@
* @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 @@
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 @@
}
}
- 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 +
diff --git a/test/java/org/apache/batik/bridge/JarNoLoadTest.java b/test/java/org/apache/batik/bridge/JarNoLoadTestCase.java
similarity index 91%
rename from test/java/org/apache/batik/bridge/JarNoLoadTest.java
rename to test/java/org/apache/batik/bridge/JarNoLoadTestCase.java
index bb3f985..c59911b 100644
--- a/test/java/org/apache/batik/bridge/JarNoLoadTest.java
+++ b/test/java/org/apache/batik/bridge/JarNoLoadTestCase.java
@@ -22,6 +22,13 @@
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 @@
* @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",
diff --git a/test/java/org/apache/batik/bridge/ScriptSelfTest.java b/test/java/org/apache/batik/bridge/ScriptSelfTestCase.java
similarity index 94%
rename from test/java/org/apache/batik/bridge/ScriptSelfTest.java
rename to test/java/org/apache/batik/bridge/ScriptSelfTestCase.java
index ae3b639..9c9bf87 100644
--- a/test/java/org/apache/batik/bridge/ScriptSelfTest.java
+++ b/test/java/org/apache/batik/bridge/ScriptSelfTestCase.java
@@ -22,6 +22,13 @@
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 @@
* @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";
diff --git a/test/java/org/apache/batik/gvt/TextSelectionTest.java b/test/java/org/apache/batik/gvt/TextSelectionTestCase.java
similarity index 95%
rename from test/java/org/apache/batik/gvt/TextSelectionTest.java
rename to test/java/org/apache/batik/gvt/TextSelectionTestCase.java
index 514586d..8e27b41 100644
--- a/test/java/org/apache/batik/gvt/TextSelectionTest.java
+++ b/test/java/org/apache/batik/gvt/TextSelectionTestCase.java
@@ -29,6 +29,12 @@
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 @@
* @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 @@
* @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();
diff --git a/test/java/org/apache/batik/parser/LengthParserFailureTest.java b/test/java/org/apache/batik/parser/LengthParserFailureTestCase.java
similarity index 84%
rename from test/java/org/apache/batik/parser/LengthParserFailureTest.java
rename to test/java/org/apache/batik/parser/LengthParserFailureTestCase.java
index 7b67923..15f811a 100644
--- a/test/java/org/apache/batik/parser/LengthParserFailureTest.java
+++ b/test/java/org/apache/batik/parser/LengthParserFailureTestCase.java
@@ -22,13 +22,21 @@
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 @@
* Creates a new LengthParserFailureTest.
* @param slength The length to parse.
*/
- public LengthParserFailureTest(String slength) {
+ public LengthParserFailureTestCase(String slength) {
sourceLength = slength;
}
diff --git a/test/java/org/apache/batik/parser/LengthParserTest.java b/test/java/org/apache/batik/parser/LengthParserTestCase.java
similarity index 91%
rename from test/java/org/apache/batik/parser/LengthParserTest.java
rename to test/java/org/apache/batik/parser/LengthParserTestCase.java
index 59cd765..4a36e8d 100644
--- a/test/java/org/apache/batik/parser/LengthParserTest.java
+++ b/test/java/org/apache/batik/parser/LengthParserTestCase.java
@@ -22,13 +22,21 @@
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 @@
* @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;
}
diff --git a/test/java/org/apache/batik/parser/PathParserFailureTest.java b/test/java/org/apache/batik/parser/PathParserFailureTestCase.java
similarity index 84%
rename from test/java/org/apache/batik/parser/PathParserFailureTest.java
rename to test/java/org/apache/batik/parser/PathParserFailureTestCase.java
index 91077ed..c07edba 100644
--- a/test/java/org/apache/batik/parser/PathParserFailureTest.java
+++ b/test/java/org/apache/batik/parser/PathParserFailureTestCase.java
@@ -22,13 +22,21 @@
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 @@
* Creates a new PathParserFailureTest.
* @param spath The path to parse.
*/
- public PathParserFailureTest(String spath) {
+ public PathParserFailureTestCase(String spath) {
sourcePath = spath;
}
diff --git a/test/java/org/apache/batik/parser/PathParserTest.java b/test/java/org/apache/batik/parser/PathParserTestCase.java
similarity index 96%
rename from test/java/org/apache/batik/parser/PathParserTest.java
rename to test/java/org/apache/batik/parser/PathParserTestCase.java
index 7eae624..c8263e8 100644
--- a/test/java/org/apache/batik/parser/PathParserTest.java
+++ b/test/java/org/apache/batik/parser/PathParserTestCase.java
@@ -22,13 +22,21 @@
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 @@
* @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;
}
diff --git a/test/java/org/apache/batik/parser/TransformListParserTest.java b/test/java/org/apache/batik/parser/TransformListParserTestCase.java
similarity index 94%
rename from test/java/org/apache/batik/parser/TransformListParserTest.java
rename to test/java/org/apache/batik/parser/TransformListParserTestCase.java
index 9e5f93d..4f9b534 100644
--- a/test/java/org/apache/batik/parser/TransformListParserTest.java
+++ b/test/java/org/apache/batik/parser/TransformListParserTestCase.java
@@ -21,13 +21,21 @@
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 @@
* @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;
}
diff --git a/test/java/org/apache/batik/script/rhino/ScriptSelfTest.java b/test/java/org/apache/batik/script/rhino/ScriptSelfTestCase.java
similarity index 93%
rename from test/java/org/apache/batik/script/rhino/ScriptSelfTest.java
rename to test/java/org/apache/batik/script/rhino/ScriptSelfTestCase.java
index 61db4e8..21dfe72 100644
--- a/test/java/org/apache/batik/script/rhino/ScriptSelfTest.java
+++ b/test/java/org/apache/batik/script/rhino/ScriptSelfTestCase.java
@@ -28,6 +28,13 @@
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 @@
* @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";
diff --git a/test/java/org/apache/batik/svggen/DoubleStringPerformanceTest.java b/test/java/org/apache/batik/svggen/DoubleStringPerformanceTestCase.java
similarity index 89%
rename from test/java/org/apache/batik/svggen/DoubleStringPerformanceTest.java
rename to test/java/org/apache/batik/svggen/DoubleStringPerformanceTestCase.java
index 563f981..95afd24 100644
--- a/test/java/org/apache/batik/svggen/DoubleStringPerformanceTest.java
+++ b/test/java/org/apache/batik/svggen/DoubleStringPerformanceTestCase.java
@@ -24,6 +24,13 @@
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 @@
* @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,
diff --git a/test/java/org/apache/batik/svggen/GeneratorContext.java b/test/java/org/apache/batik/svggen/GeneratorContext.java
index b3c8558..8f92556 100644
--- a/test/java/org/apache/batik/svggen/GeneratorContext.java
+++ b/test/java/org/apache/batik/svggen/GeneratorContext.java
@@ -39,7 +39,7 @@
* @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);
diff --git a/test/java/org/apache/batik/svggen/GetRootTest.java b/test/java/org/apache/batik/svggen/GetRootTestCase.java
similarity index 93%
rename from test/java/org/apache/batik/svggen/GetRootTest.java
rename to test/java/org/apache/batik/svggen/GetRootTestCase.java
index 09b371b..5b80d93 100644
--- a/test/java/org/apache/batik/svggen/GetRootTest.java
+++ b/test/java/org/apache/batik/svggen/GetRootTestCase.java
@@ -31,6 +31,13 @@
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 @@
* @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);
diff --git a/test/java/org/apache/batik/svggen/SVGAccuracyTest.java b/test/java/org/apache/batik/svggen/SVGAccuracyTestCase.java
similarity index 97%
rename from test/java/org/apache/batik/svggen/SVGAccuracyTest.java
rename to test/java/org/apache/batik/svggen/SVGAccuracyTestCase.java
index b16c47a..4b67f03 100644
--- a/test/java/org/apache/batik/svggen/SVGAccuracyTest.java
+++ b/test/java/org/apache/batik/svggen/SVGAccuracyTestCase.java
@@ -47,6 +47,13 @@
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 @@
* @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 @@
* 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;
diff --git a/test/java/org/apache/batik/svggen/SVGAccuracyTestValidator.java b/test/java/org/apache/batik/svggen/SVGAccuracyTestValidator.java
index 3d26274..8a0af02 100644
--- a/test/java/org/apache/batik/svggen/SVGAccuracyTestValidator.java
+++ b/test/java/org/apache/batik/svggen/SVGAccuracyTestValidator.java
@@ -61,11 +61,11 @@
"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 @@
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 @@
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 @@
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 @@
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 @@
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
diff --git a/test/java/org/apache/batik/svggen/SVGGeneratorTests.java b/test/java/org/apache/batik/svggen/SVGGeneratorTests.java
index dcb0430..8e97d42 100644
--- a/test/java/org/apache/batik/svggen/SVGGeneratorTests.java
+++ b/test/java/org/apache/batik/svggen/SVGGeneratorTests.java
@@ -179,8 +179,8 @@
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");
diff --git a/test/java/org/apache/batik/test/xml/DummyValidTest.java b/test/java/org/apache/batik/test/xml/DummyValidTestCase.java
similarity index 89%
rename from test/java/org/apache/batik/test/xml/DummyValidTest.java
rename to test/java/org/apache/batik/test/xml/DummyValidTestCase.java
index ceaecea..35007e6 100644
--- a/test/java/org/apache/batik/test/xml/DummyValidTest.java
+++ b/test/java/org/apache/batik/test/xml/DummyValidTestCase.java
@@ -20,6 +20,8 @@
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 @@
* @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() {
+ }
}
diff --git a/test/java/org/apache/batik/test/xml/DummyValidTestSuite.java b/test/java/org/apache/batik/test/xml/DummyValidTestSuite.java
index fa8b1c1..b4e20a9 100644
--- a/test/java/org/apache/batik/test/xml/DummyValidTestSuite.java
+++ b/test/java/org/apache/batik/test/xml/DummyValidTestSuite.java
@@ -29,8 +29,8 @@
*/
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");}});
}
}
diff --git a/test/java/org/apache/batik/transcoder/TranscoderInputTest.java b/test/java/org/apache/batik/transcoder/TranscoderInputTestCase.java
similarity index 95%
rename from test/java/org/apache/batik/transcoder/TranscoderInputTest.java
rename to test/java/org/apache/batik/transcoder/TranscoderInputTestCase.java
index dc83917..a66d7b5 100644
--- a/test/java/org/apache/batik/transcoder/TranscoderInputTest.java
+++ b/test/java/org/apache/batik/transcoder/TranscoderInputTestCase.java
@@ -42,6 +42,13 @@
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 @@
* @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();
diff --git a/test/java/org/apache/batik/transcoder/image/AOITest.java b/test/java/org/apache/batik/transcoder/image/AOITestCase.java
similarity index 92%
rename from test/java/org/apache/batik/transcoder/image/AOITest.java
rename to test/java/org/apache/batik/transcoder/image/AOITestCase.java
index 07d2de2..7d1af10 100644
--- a/test/java/org/apache/batik/transcoder/image/AOITest.java
+++ b/test/java/org/apache/batik/transcoder/image/AOITestCase.java
@@ -25,13 +25,21 @@
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 @@
* @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 @@
* @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,
diff --git a/test/java/org/apache/batik/transcoder/image/AlternateStylesheetTest.java b/test/java/org/apache/batik/transcoder/image/AlternateStylesheetTestCase.java
similarity index 88%
rename from test/java/org/apache/batik/transcoder/image/AlternateStylesheetTest.java
rename to test/java/org/apache/batik/transcoder/image/AlternateStylesheetTestCase.java
index 0cd8094..6b49135 100644
--- a/test/java/org/apache/batik/transcoder/image/AlternateStylesheetTest.java
+++ b/test/java/org/apache/batik/transcoder/image/AlternateStylesheetTestCase.java
@@ -23,13 +23,21 @@
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 @@
* @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;
diff --git a/test/java/org/apache/batik/transcoder/image/BackgroundColorTest.java b/test/java/org/apache/batik/transcoder/image/BackgroundColorTestCase.java
similarity index 91%
rename from test/java/org/apache/batik/transcoder/image/BackgroundColorTest.java
rename to test/java/org/apache/batik/transcoder/image/BackgroundColorTestCase.java
index b0bd9c7..cf89cc4 100644
--- a/test/java/org/apache/batik/transcoder/image/BackgroundColorTest.java
+++ b/test/java/org/apache/batik/transcoder/image/BackgroundColorTestCase.java
@@ -36,18 +36,26 @@
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() {
}
/**
diff --git a/test/java/org/apache/batik/transcoder/image/DOMTest.java b/test/java/org/apache/batik/transcoder/image/DOMTestCase.java
similarity index 92%
rename from test/java/org/apache/batik/transcoder/image/DOMTest.java
rename to test/java/org/apache/batik/transcoder/image/DOMTestCase.java
index d7b1682..e448bad 100644
--- a/test/java/org/apache/batik/transcoder/image/DOMTest.java
+++ b/test/java/org/apache/batik/transcoder/image/DOMTestCase.java
@@ -32,18 +32,26 @@
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() {
}
/**
diff --git a/test/java/org/apache/batik/transcoder/image/DefaultFontFamilyTest.java b/test/java/org/apache/batik/transcoder/image/DefaultFontFamilyTestCase.java
similarity index 88%
rename from test/java/org/apache/batik/transcoder/image/DefaultFontFamilyTest.java
rename to test/java/org/apache/batik/transcoder/image/DefaultFontFamilyTestCase.java
index f17c5a0..9cca701 100644
--- a/test/java/org/apache/batik/transcoder/image/DefaultFontFamilyTest.java
+++ b/test/java/org/apache/batik/transcoder/image/DefaultFontFamilyTestCase.java
@@ -23,13 +23,21 @@
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 @@
* @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;
diff --git a/test/java/org/apache/batik/transcoder/image/DimensionTest.java b/test/java/org/apache/batik/transcoder/image/DimensionTestCase.java
similarity index 89%
rename from test/java/org/apache/batik/transcoder/image/DimensionTest.java
rename to test/java/org/apache/batik/transcoder/image/DimensionTestCase.java
index 3d0bb1f..0622beb 100644
--- a/test/java/org/apache/batik/transcoder/image/DimensionTest.java
+++ b/test/java/org/apache/batik/transcoder/image/DimensionTestCase.java
@@ -23,6 +23,13 @@
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 @@
* @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 @@
* @param width the image width
* @param height the image height
*/
- public DimensionTest(String inputURI,
+ public DimensionTestCase(String inputURI,
String refImageURI,
Float width,
Float height) {
diff --git a/test/java/org/apache/batik/transcoder/image/GenericDocumentTest.java b/test/java/org/apache/batik/transcoder/image/GenericDocumentTestCase.java
similarity index 88%
rename from test/java/org/apache/batik/transcoder/image/GenericDocumentTest.java
rename to test/java/org/apache/batik/transcoder/image/GenericDocumentTestCase.java
index 3da79fc..158af79 100644
--- a/test/java/org/apache/batik/transcoder/image/GenericDocumentTest.java
+++ b/test/java/org/apache/batik/transcoder/image/GenericDocumentTestCase.java
@@ -29,13 +29,21 @@
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 @@
* @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;
}
diff --git a/test/java/org/apache/batik/transcoder/image/InputStreamTest.java b/test/java/org/apache/batik/transcoder/image/InputStreamTestCase.java
similarity index 87%
rename from test/java/org/apache/batik/transcoder/image/InputStreamTest.java
rename to test/java/org/apache/batik/transcoder/image/InputStreamTestCase.java
index b573cec..202a5a8 100644
--- a/test/java/org/apache/batik/transcoder/image/InputStreamTest.java
+++ b/test/java/org/apache/batik/transcoder/image/InputStreamTestCase.java
@@ -24,13 +24,21 @@
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 @@
* @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;
}
diff --git a/test/java/org/apache/batik/transcoder/image/LanguageTest.java b/test/java/org/apache/batik/transcoder/image/LanguageTestCase.java
similarity index 88%
rename from test/java/org/apache/batik/transcoder/image/LanguageTest.java
rename to test/java/org/apache/batik/transcoder/image/LanguageTestCase.java
index 47fa26b..fc8d374 100644
--- a/test/java/org/apache/batik/transcoder/image/LanguageTest.java
+++ b/test/java/org/apache/batik/transcoder/image/LanguageTestCase.java
@@ -23,13 +23,21 @@
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 @@
* @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;
diff --git a/test/java/org/apache/batik/transcoder/image/MaxDimensionTest.java b/test/java/org/apache/batik/transcoder/image/MaxDimensionTestCase.java
similarity index 88%
rename from test/java/org/apache/batik/transcoder/image/MaxDimensionTest.java
rename to test/java/org/apache/batik/transcoder/image/MaxDimensionTestCase.java
index 56e29a3..c746404 100644
--- a/test/java/org/apache/batik/transcoder/image/MaxDimensionTest.java
+++ b/test/java/org/apache/batik/transcoder/image/MaxDimensionTestCase.java
@@ -23,6 +23,13 @@
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 @@
* @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 @@
* @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 @@
* @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;
diff --git a/test/java/org/apache/batik/transcoder/image/MediaTest.java b/test/java/org/apache/batik/transcoder/image/MediaTestCase.java
similarity index 87%
rename from test/java/org/apache/batik/transcoder/image/MediaTest.java
rename to test/java/org/apache/batik/transcoder/image/MediaTestCase.java
index 7dabab4..2de1520 100644
--- a/test/java/org/apache/batik/transcoder/image/MediaTest.java
+++ b/test/java/org/apache/batik/transcoder/image/MediaTestCase.java
@@ -23,13 +23,21 @@
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 @@
* @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;
diff --git a/test/java/org/apache/batik/transcoder/image/ParametrizedDOMTest.java b/test/java/org/apache/batik/transcoder/image/ParametrizedDOMTestCase.java
similarity index 87%
rename from test/java/org/apache/batik/transcoder/image/ParametrizedDOMTest.java
rename to test/java/org/apache/batik/transcoder/image/ParametrizedDOMTestCase.java
index a849bf7..27006fd 100644
--- a/test/java/org/apache/batik/transcoder/image/ParametrizedDOMTest.java
+++ b/test/java/org/apache/batik/transcoder/image/ParametrizedDOMTestCase.java
@@ -26,13 +26,21 @@
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 @@
* @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;
}
diff --git a/test/java/org/apache/batik/transcoder/image/PixelToMMTest.java b/test/java/org/apache/batik/transcoder/image/PixelToMMTestCase.java
similarity index 88%
rename from test/java/org/apache/batik/transcoder/image/PixelToMMTest.java
rename to test/java/org/apache/batik/transcoder/image/PixelToMMTestCase.java
index f5bcaaf..1b10fbd 100644
--- a/test/java/org/apache/batik/transcoder/image/PixelToMMTest.java
+++ b/test/java/org/apache/batik/transcoder/image/PixelToMMTestCase.java
@@ -23,13 +23,21 @@
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 @@
* @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;
diff --git a/test/java/org/apache/batik/transcoder/image/ReaderTest.java b/test/java/org/apache/batik/transcoder/image/ReaderTestCase.java
similarity index 87%
rename from test/java/org/apache/batik/transcoder/image/ReaderTest.java
rename to test/java/org/apache/batik/transcoder/image/ReaderTestCase.java
index 7664217..761c83a 100644
--- a/test/java/org/apache/batik/transcoder/image/ReaderTest.java
+++ b/test/java/org/apache/batik/transcoder/image/ReaderTestCase.java
@@ -25,13 +25,21 @@
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 @@
* @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;
}
diff --git a/test/java/org/apache/batik/transcoder/image/URITest.java b/test/java/org/apache/batik/transcoder/image/URITestCase.java
similarity index 85%
rename from test/java/org/apache/batik/transcoder/image/URITest.java
rename to test/java/org/apache/batik/transcoder/image/URITestCase.java
index eedc672..3df3073 100644
--- a/test/java/org/apache/batik/transcoder/image/URITest.java
+++ b/test/java/org/apache/batik/transcoder/image/URITestCase.java
@@ -19,13 +19,21 @@
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 @@
* @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;
}
diff --git a/test/java/org/apache/batik/transcoder/wmf/WMFAccuracyTest.java b/test/java/org/apache/batik/transcoder/wmf/WMFAccuracyTestCase.java
similarity index 97%
rename from test/java/org/apache/batik/transcoder/wmf/WMFAccuracyTest.java
rename to test/java/org/apache/batik/transcoder/wmf/WMFAccuracyTestCase.java
index d161f81..de1336e 100644
--- a/test/java/org/apache/batik/transcoder/wmf/WMFAccuracyTest.java
+++ b/test/java/org/apache/batik/transcoder/wmf/WMFAccuracyTestCase.java
@@ -41,6 +41,13 @@
import org.apache.batik.transcoder.wmf.tosvg.WMFTranscoder;
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 a given WMF file is properly converted to
* an SVG document by comparing the generated SVG document to a known,
@@ -49,7 +56,8 @@
* @author <a href="mailto:deweese@apache.org">Thomas DeWeese</a>
* @version $Id$
*/
-public class WMFAccuracyTest extends AbstractTest
+@Ignore
+public class WMFAccuracyTestCase extends AbstractTest
implements SVGConstants {
public static final String GENERATOR_REFERENCE_BASE
@@ -166,7 +174,7 @@
return ret;
}
- public WMFAccuracyTest(){
+ public WMFAccuracyTestCase(){
}
public void setId(String id){
