From d7cb39ba252220605a40e856222622aa2a279f83 Mon Sep 17 00:00:00 2001 From: robokaso Date: Mon, 22 Sep 2008 12:22:53 +0000 Subject: [PATCH] RESOLVED - BATCH-813: SingleColumnJdbcKeyGeneratorIntegrationTests fails in Eclipse removed TransactionSynchronizationManager.initSynchronization() call --- .../batch/item/ExecutionContextTests.java | 172 ------------------ .../database/DrivingQueryItemReaderTests.java | 5 - 2 files changed, 177 deletions(-) delete mode 100644 spring-batch-infrastructure/src/test/java/org/springframework/batch/item/ExecutionContextTests.java diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/ExecutionContextTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/ExecutionContextTests.java deleted file mode 100644 index a8854e203..000000000 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/ExecutionContextTests.java +++ /dev/null @@ -1,172 +0,0 @@ -/* - * Copyright 2006-2008 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.batch.item; - -import java.io.Serializable; - -import junit.framework.TestCase; - -import org.apache.commons.lang.SerializationUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; - -/** - * @author Lucas Ward - * - */ -public class ExecutionContextTests extends TestCase { - - ExecutionContext context; - - protected void setUp() throws Exception { - super.setUp(); - - context = new ExecutionContext(); - } - - public void testNormalUsage() { - - context.putString("1", "testString1"); - context.putString("2", "testString2"); - context.putLong("3", 3); - context.putDouble("4", 4.4); - - assertEquals("testString1", context.getString("1")); - assertEquals("testString2", context.getString("2")); - assertEquals("defaultString", context.getString("5", "defaultString")); - assertEquals(4.4, context.getDouble("4"), 0); - assertEquals(5.5, context.getDouble("5", 5.5), 0); - assertEquals(3, context.getLong("3")); - assertEquals(5, context.getLong("5", 5)); - } - - public void testInvalidCast() { - - context.putLong("1", 1); - try { - context.getDouble("1"); - fail(); - } - catch (ClassCastException ex) { - // expected - } - } - - public void testIsEmpty() { - assertTrue(context.isEmpty()); - context.putString("1", "test"); - assertFalse(context.isEmpty()); - } - - public void testDirtyFlag() { - assertFalse(context.isDirty()); - context.putString("1", "test"); - assertTrue(context.isDirty()); - context.clearDirtyFlag(); - assertFalse(context.isDirty()); - } - - public void testContains() { - context.putString("1", "testString"); - assertTrue(context.containsKey("1")); - assertTrue(context.containsValue("testString")); - } - - public void testEquals() { - context.putString("1", "testString"); - ExecutionContext tempContext = new ExecutionContext(); - assertFalse(tempContext.equals(context)); - tempContext.putString("1", "testString"); - assertTrue(tempContext.equals(context)); - } - - public void testSerializationCheck() { - // adding a non serializable object should cause an error. - try { - context.put("1", new Object()); - fail(); - } - catch (IllegalArgumentException ex) { - // expected - } - } - - public void testPutNull() { - // putting null should work - context.put("1", null); - } - - public void testSerialization() { - - TestSerializable s = new TestSerializable(); - s.value = 7; - - context.putString("1", "testString1"); - context.putString("2", "testString2"); - context.putLong("3", 3); - context.putDouble("4", 4.4); - context.put("5", s); - - byte[] serialized = SerializationUtils.serialize(context); - - ExecutionContext deserialized = (ExecutionContext) SerializationUtils.deserialize(serialized); - - assertEquals(context, deserialized); - assertEquals(7, ((TestSerializable) deserialized.get("5")).value); - } - - public void testCopyConstructor() throws Exception { - ExecutionContext context = new ExecutionContext(); - context.put("foo", "bar"); - ExecutionContext copy = new ExecutionContext(context); - assertEquals(copy, context); - } - - public void testCopyConstructorNullnNput() throws Exception { - ExecutionContext context = new ExecutionContext((ExecutionContext) null); - assertTrue(context.isEmpty()); - } - - public void testRemove() throws Exception { - ExecutionContext context = new ExecutionContext(); - context.put("foo", "bar"); - - assertTrue(context.containsKey("foo")); - assertTrue(context.containsValue("bar")); - - Object value = context.remove("foo"); - assertFalse(context.containsKey("foo")); - assertEquals("bar", value); - } - - /** - * Value object for testing serialization - */ - private static class TestSerializable implements Serializable { - - int value; - - public boolean equals(Object obj) { - return EqualsBuilder.reflectionEquals(this, obj); - } - - public int hashCode() { - return HashCodeBuilder.reflectionHashCode(this); - } - - } - -} diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/DrivingQueryItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/DrivingQueryItemReaderTests.java index 76ccba837..4043c590f 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/DrivingQueryItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/DrivingQueryItemReaderTests.java @@ -10,17 +10,12 @@ import org.springframework.batch.item.ItemReader; import org.springframework.batch.item.ItemStream; import org.springframework.batch.item.sample.Foo; import org.springframework.beans.factory.InitializingBean; -import org.springframework.transaction.support.TransactionSynchronizationManager; @SuppressWarnings("deprecation") public class DrivingQueryItemReaderTests extends TestCase { DrivingQueryItemReader itemReader; - static { - TransactionSynchronizationManager.initSynchronization(); - } - protected void setUp() throws Exception { super.setUp();