Major test-case cleanup.

- Removed JMock dependency, tests rewritten to use Mockito for stub/mock
- All test should now be using JUnit annotation-style tests
- All modules should now depend on same JUnit version
- Rewrote a few tests to better utilize JUnit annotations
- Fixed a few broken tests
- Code style changes

imageio/imageio-jmagick/src/test/java/com/twelvemonkeys/imageio/plugins/jmagick/BMPImageReaderTestCase.java

@@ -34,7 +34,7 @@ import java.util.Arrays;
 import java.util.List;
 
 public class BMPImageReaderTestCase extends JMagickImageReaderAbstractTestCase<BMPImageReader> {
-    private BMPImageReaderSpi mProvider = new BMPImageReaderSpi();
+    private BMPImageReaderSpi provider = new BMPImageReaderSpi();
 
     protected List<TestData> getTestData() {
         return Arrays.asList(
@@ -63,7 +63,7 @@ public class BMPImageReaderTestCase extends JMagickImageReaderAbstractTestCase<B
     }
 
     protected BMPImageReader createReader() {
-        return new BMPImageReader(mProvider);
+        return new BMPImageReader(provider);
     }
 
     protected ImageReaderSpi createProvider() {

imageio/imageio-jmagick/src/test/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickImageReaderAbstractTestCase.java

@@ -29,6 +29,10 @@
 package com.twelvemonkeys.imageio.plugins.jmagick;
 
 import com.twelvemonkeys.imageio.util.ImageReaderAbstractTestCase;
+import org.junit.Rule;
+import org.junit.rules.MethodRule;
+import org.junit.runners.model.FrameworkMethod;
+import org.junit.runners.model.Statement;
 
 import javax.imageio.ImageReader;
 
@@ -40,14 +44,20 @@ import javax.imageio.ImageReader;
  * @version $Id: JMagickImageReaderAbstractTestCase.java,v 1.0 Apr 1, 2008 2:59:05 PM haraldk Exp$
  */
 public abstract class JMagickImageReaderAbstractTestCase<T extends ImageReader> extends ImageReaderAbstractTestCase<T> {
-
-    @Override
-    protected void runTest() throws Throwable {
-        if (JMagickImageReaderSpiSupport.AVAILABLE) {
-            super.runTest();
+    @Rule
+    public MethodRule rule = new MethodRule() {
+        public Statement apply(final Statement base, final FrameworkMethod method, final Object target) {
+            if (JMagickImageReaderSpiSupport.AVAILABLE) {
+                return base;
+            }
+            
+            return new Statement() {
+                @Override
+                public void evaluate() throws Throwable {
+                    // TODO: Make this increase "skipped" count, rather than run/success
+                    System.err.println("WARNING: JMagick not installed. Skipping test " + method.getName());
+                }
+            };
         }
-        else {
-            System.err.println("WARNING: JMagick not installed. Skipping test " + getName());
-        }
-    }
+    };
 }

imageio/imageio-jmagick/todo.txt

@@ -1,5 +1,5 @@
 - These readers/writers could probably benefit alot from using JNI with nio
     bytechannel buffers... RFE to JMagick guys?
-- Create stream providers and allow creatig a ImageInputStream from a
+- Create stream providers and allow creating an ImageInputStream from a
     MagickImage? Does that even make sense? Or maybe create File based streams
     that exposes the file name for JMagick to write directly.