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-ico/src/test/java/com/twelvemonkeys/imageio/plugins/ico/CURImageReaderTestCase.java

@@ -1,6 +1,7 @@
 package com.twelvemonkeys.imageio.plugins.ico;
 
 import com.twelvemonkeys.imageio.util.ImageReaderAbstractTestCase;
+import org.junit.Test;
 
 import javax.imageio.ImageReadParam;
 import javax.imageio.spi.ImageReaderSpi;
@@ -10,6 +11,8 @@ import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 
+import static org.junit.Assert.*;
+
 /**
  * CURImageReaderTestCase
  *
@@ -74,19 +77,23 @@ public class CURImageReaderTestCase extends ImageReaderAbstractTestCase<CURImage
         assertEquals(pExpected, reader.getHotSpot(0));
     }
 
+    @Test
     public void testHandHotspot() throws IOException {
         assertHotSpot(getTestData().get(0), null, new Point(15, 15));
     }
 
+    @Test
     public void testZoomHotspot() throws IOException {
         assertHotSpot(getTestData().get(1), null, new Point(13, 11));
     }
 
+    @Test
     public void testHandHotspotWithParam() throws IOException {
         ImageReadParam param = new ImageReadParam();
         assertHotSpot(getTestData().get(0), param, new Point(15, 15));
     }
 
+    @Test
     public void testHandHotspotExplicitDestination() throws IOException {
         CURImageReader reader = createReader();
         reader.setInput(getTestData().get(0).getInputStream());