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

@@ -16,6 +16,8 @@ import java.util.List;
 import java.util.ArrayList;
 import java.io.IOException;
 
+import static org.junit.Assert.*;
+
 /**
  * PSDImageReaderTestCase
  *