From f2635b5f907dec8d4aa6c55794e2374e17cbda14 Mon Sep 17 00:00:00 2001
From: dsyer <dsyer@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Mon, 28 Jul 2008 16:25:25 +0000
Subject: [PATCH] OPEN - issue BATCH-748: Fix EasyMock warnings in
 Infrastructure

ItemTransfromerWriterTests
---
 .../ItemTransformerItemWriterTests.java       | 36 +++++++++----------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/transform/ItemTransformerItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/transform/ItemTransformerItemWriterTests.java
index 1dc81b8c5..cabaca8b0 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/transform/ItemTransformerItemWriterTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/transform/ItemTransformerItemWriterTests.java
@@ -1,8 +1,10 @@
 package org.springframework.batch.item.transform;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.fail;
 
-import org.easymock.MockControl;
+import org.easymock.EasyMock;
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.batch.item.ItemWriter;
 
 /**
@@ -10,20 +12,17 @@ import org.springframework.batch.item.ItemWriter;
  * 
  * @author Robert Kasanicky
  */
-public class ItemTransformerItemWriterTests extends TestCase {
+public class ItemTransformerItemWriterTests {
 
 	private ItemTransformerItemWriter<Object, Object> processor = new ItemTransformerItemWriter<Object, Object>();
 
-	private ItemTransformer<Object, Object> transformer;
-	private ItemWriter<Object> itemWriter;
+	@SuppressWarnings("unchecked")
+	private ItemTransformer<Object, Object> transformer = EasyMock.createMock(ItemTransformer.class);
+	@SuppressWarnings("unchecked")
+	private ItemWriter<Object> itemWriter = EasyMock.createMock(ItemWriter.class);
 
-	private MockControl<ItemTransformer> tControl = MockControl.createControl(ItemTransformer.class);
-	private MockControl<ItemWriter> outControl = MockControl.createControl(ItemWriter.class);
-
-	protected void setUp() throws Exception {
-		transformer = tControl.getMock();
-		itemWriter = outControl.getMock();
-		
+	@Before
+	public void setUp() throws Exception {		
 		processor.setItemTransformer(transformer);
 		processor.setDelegate(itemWriter);
 		processor.afterPropertiesSet();
@@ -33,28 +32,27 @@ public class ItemTransformerItemWriterTests extends TestCase {
 	 * Regular usage scenario - item is passed to transformer
 	 * and the result of transformation is passed to output source.
 	 */
+	@Test
 	public void testProcess() throws Exception {
 		Object item = new Object();
 		Object itemAfterTransformation = new Object();
 
-		transformer.transform(item);
-		tControl.setReturnValue(itemAfterTransformation);
+		EasyMock.expect(transformer.transform(item)).andReturn(itemAfterTransformation);
 		
 		itemWriter.write(itemAfterTransformation);
-		outControl.setVoidCallable();
+		EasyMock.expectLastCall();
 		
-		tControl.replay();
-		outControl.replay();
+		EasyMock.replay(itemWriter, transformer);
 
 		processor.write(item);
 
-		tControl.verify();
-		outControl.verify();
+		EasyMock.verify(itemWriter, transformer);
 	}
 	
 	/**
 	 * Item transformer must be set.
 	 */
+	@Test
 	public void testAfterPropertiesSet() throws Exception {
 		
 		// value not set