Bugzilla #51928: Upgraded all tests to JUnit 4

Patch by Mehdi Houshmand, applied with minor cosmetics and error fixes


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1178747 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 8 insertions, 16 deletions

diff --git a/test/java/org/apache/fop/BasicTranscoderTestSuite.java b/test/java/org/apache/fop/BasicTranscoderTestSuite.java
index ed70afd82..a372f737a 100644
--- a/test/java/org/apache/fop/BasicTranscoderTestSuite.java
+++ b/test/java/org/apache/fop/BasicTranscoderTestSuite.java
@@ -19,25 +19,17 @@
 
 package org.apache.fop;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
 
 /**
  * Test suite for basic functionality of FOP's transcoders.
  */
+@RunWith(Suite.class)
+@SuiteClasses({
+    BasicPDFTranscoderTestCase.class,
+    BasicPSTranscoderTestCase.class
+})
 public class BasicTranscoderTestSuite {
-
-    /**
-     * Builds the test suite
-     * @return the test suite
-     */
-    public static Test suite() {
-        TestSuite suite = new TestSuite(
-            "Basic functionality test suite for FOP's transcoders");
-        //$JUnit-BEGIN$
-        suite.addTest(new TestSuite(BasicPDFTranscoderTestCase.class));
-        suite.addTest(new TestSuite(BasicPSTranscoderTestCase.class));
-        //$JUnit-END$
-        return suite;
-    }
 }