Introduce Mockito instead of EasyMock.

Author: stefanhen83

.classpath

@@ -4,9 +4,7 @@
   <classpathentry kind="src" path="src/main/resources/dll" including="**/*.dll" excluding="**/*.java"/>
   <classpathentry kind="src" path="src/main/resources/images" including="**/*.*" excluding="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.2/cglib-nodep-2.2.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/easymock/easymock/2.5.2/easymock-2.5.2.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/easymock/easymockclassextension/2.5.2/easymockclassextension-2.5.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/com/cokeandcode/hiero/1.1/hiero-1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/com/cokeandcode/ibxm/1.1/ibxm-1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/com/cokeandcode/jinput/1.1/jinput-1.1.jar"/>
@@ -15,10 +13,11 @@
   <classpathentry kind="var" path="M2_REPO/com/cokeandcode/jorbis-0.0.15/1.1/jorbis-0.0.15-1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/junit/junit/4.7/junit-4.7.jar"/>
   <classpathentry kind="var" path="M2_REPO/com/cokeandcode/lwjgl/1.1/lwjgl-1.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar"/>
   <classpathentry kind="var" path="M2_REPO/com/cokeandcode/natives-linux/1.1/natives-linux-1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/com/cokeandcode/natives-mac/1.1/natives-mac-1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/com/cokeandcode/natives-win32/1.1/natives-win32-1.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.2/objenesis-1.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
   <classpathentry kind="var" path="M2_REPO/com/cokeandcode/packulike/1.1/packulike-1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/com/cokeandcode/pedigree/1.1/pedigree-1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/com/cokeandcode/scalar/1.1/scalar-1.1.jar"/>

.settings/org.eclipse.jdt.core.prefs

@@ -1,4 +1,4 @@
-#Sun Mar 27 20:27:24 CEST 2011
+#Sun Mar 27 21:11:42 CEST 2011
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.source=1.5

pom.xml

@@ -52,15 +52,15 @@
 		</plugins>
 
 		<resources>
-			<!--  native libraries -->
+			<!-- native libraries -->
 			<resource>
 				<directory>src\main\resources\dll</directory>
 				<includes>
 					<include>**/*.dll</include>
 				</includes>
 			</resource>
 
-			<!--  other -->
+			<!-- other -->
 			<resource>
 				<directory>src\main\resources\images</directory>
 				<includes>
@@ -74,35 +74,23 @@
 
 	<dependencies>
 
-		<!--  unit testing -->
+		<!-- unit testing -->
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<version>4.7</version>
 			<scope>test</scope>
 		</dependency>
 
-		<!--  easymock class extension makes it easier to unit test behavior -->
 		<dependency>
-			<groupId>org.easymock</groupId>
-			<artifactId>easymockclassextension</artifactId>
-			<version>2.5.2</version>
-			<scope>test</scope>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+			<version>1.8.5</version>
 		</dependency>
 
-		<!--  log4j for loggin purposes -->
-		<!-- 
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.15</version>
-		</dependency>
-		 -->
-		 
-		<!--
-			slick and its dependencies, installed using the install.bat
-			http://maven.apache.org/guides/mini/guide-3rd-party-jars-local.html
-		-->
+		<!-- log4j for loggin purposes -->
+		
+		<!-- slick and its dependencies, installed using the install.bat http://maven.apache.org/guides/mini/guide-3rd-party-jars-local.html -->
 		<dependency>
 			<groupId>com.cokeandcode</groupId>
 			<artifactId>hiero</artifactId>

src/test/java/com/fundynamic/dune2themaker/stubs/slick/ImageStub.java

@@ -0,0 +1,7 @@
+package com.fundynamic.dune2themaker.stubs.slick;
+
+import org.newdawn.slick.Image;
+
+public class ImageStub extends Image {
+
+}

src/test/java/com/fundynamic/dune2themaker/system/drawers/ImageDrawerTest.java

@@ -1,11 +1,12 @@
 package com.fundynamic.dune2themaker.system.drawers;
 
-import org.easymock.classextension.EasyMock;
 import org.junit.Test;
+import org.mockito.Mockito;
 import org.newdawn.slick.Graphics;
 import org.newdawn.slick.Image;
 import org.newdawn.slick.SlickException;
 
+import com.fundynamic.dune2themaker.stubs.slick.ImageStub;
 import com.fundynamic.dune2themaker.system.repositories.ImageRepository;
 
 public class ImageDrawerTest {
@@ -22,16 +23,15 @@ public void mustThrowIllegalArgumentExceptionImageRepositoryIsNull() {
 
 	@Test
 	public void mustDrawWithProperDrawMethodFromCanvas() throws SlickException {
-		final Image myImage = EasyMock.createMock(Image.class);
-		Graphics stub = new Graphics() {
-			public void drawImage(Image image, float x, float y) {
-				if (!(x == 1 && y == 1 && image == myImage)) {
-					throw new IllegalArgumentException("Call failed");
-				}
-			}
-		};
-		ImageDrawer drawer = new ImageDrawer(stub, new ImageRepository());
-		drawer.drawImage(myImage, 1, 1);
+		Image image = new ImageStub();
+		Graphics graphics = Mockito.mock(Graphics.class);
+		ImageDrawer drawer = new ImageDrawer(graphics, new ImageRepository());
+		
+		// Act
+		drawer.drawImage(image, 1, 1);
+		
+		// Verify
+		Mockito.verify(graphics).drawImage(image, 1, 1);
 	}
 
 }