Cleanup tests
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/beabacef Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/beabacef Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/beabacef Branch: refs/heads/master Commit: beabacefa5464dbfda353461ad6306bb8aafba64 Parents: cf12122 Author: Nikita Timofeev <stari...@gmail.com> Authored: Fri Oct 13 14:43:57 2017 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Fri Oct 13 14:43:57 2017 +0300 ---------------------------------------------------------------------- .../types/ValueObjectTypeFactoryOrderTest.java | 37 +++++++-------- .../types/ValueObjectTypeFactoryTest.java | 50 ++++++++------------ 2 files changed, 36 insertions(+), 51 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/beabacef/cayenne-server/src/test/java/org/apache/cayenne/access/types/ValueObjectTypeFactoryOrderTest.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/types/ValueObjectTypeFactoryOrderTest.java b/cayenne-server/src/test/java/org/apache/cayenne/access/types/ValueObjectTypeFactoryOrderTest.java index 94ed3b7..41843a9 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/types/ValueObjectTypeFactoryOrderTest.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/types/ValueObjectTypeFactoryOrderTest.java @@ -1,6 +1,5 @@ package org.apache.cayenne.access.types; -import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -13,30 +12,30 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; public class ValueObjectTypeFactoryOrderTest { - ExtendedTypeMap map; - DefaultValueObjectTypeRegistry registry; - ValueObjectTypeFactory factory; + ExtendedTypeMap extendedTypeMap; ValueObjectType valueObjectType1, valueObjectType2; ExtendedType tstType1, tstType2; @Before public void setUpRegistry(){ - valueObjectType1 = mock(ValueObjectType.class); - when(valueObjectType1.getValueType()).thenReturn(UUID.class); - when(valueObjectType1.getTargetType()).thenReturn(byte[].class); + valueObjectType1 = createMockValueType(UUID.class, byte[].class); + valueObjectType2 = createMockValueType(UUID.class, String.class); - valueObjectType2 = mock(ValueObjectType.class); - when(valueObjectType2.getValueType()).thenReturn(UUID.class); - when(valueObjectType2.getTargetType()).thenReturn(String.class); - - map = new ExtendedTypeMap(); + extendedTypeMap = new ExtendedTypeMap(); tstType1 = mock(ExtendedType.class); when(tstType1.getClassName()).thenReturn("byte[]"); - map.registerType(tstType1); + extendedTypeMap.registerType(tstType1); tstType2 = new MockExtendedType(String.class); - map.registerType(tstType2); + extendedTypeMap.registerType(tstType2); + } + + private ValueObjectType createMockValueType(Class<?> valueClass, Class<?> targetClass) { + ValueObjectType valueObjectType = mock(ValueObjectType.class); + when(valueObjectType.getValueType()).thenReturn(valueClass); + when(valueObjectType.getTargetType()).thenReturn(targetClass); + return valueObjectType; } @Test @@ -45,9 +44,8 @@ public class ValueObjectTypeFactoryOrderTest { list.add(valueObjectType1); list.add(valueObjectType2); - registry = new DefaultValueObjectTypeRegistry(list); - - factory = new ValueObjectTypeFactory(map,registry); + DefaultValueObjectTypeRegistry registry = new DefaultValueObjectTypeRegistry(list); + ValueObjectTypeFactory factory = new ValueObjectTypeFactory(extendedTypeMap,registry); ValueObjectTypeFactory.ExtendedTypeConverter converter = (ValueObjectTypeFactory.ExtendedTypeConverter) factory.getType(UUID.class); assertNotNull(converter); @@ -61,9 +59,8 @@ public class ValueObjectTypeFactoryOrderTest { list.add(valueObjectType2); list.add(valueObjectType1); - registry = new DefaultValueObjectTypeRegistry(list); - - factory = new ValueObjectTypeFactory(map,registry); + DefaultValueObjectTypeRegistry registry = new DefaultValueObjectTypeRegistry(list); + ValueObjectTypeFactory factory = new ValueObjectTypeFactory(extendedTypeMap,registry); ValueObjectTypeFactory.ExtendedTypeConverter converter = (ValueObjectTypeFactory.ExtendedTypeConverter) factory.getType(UUID.class); assertNotNull(converter); http://git-wip-us.apache.org/repos/asf/cayenne/blob/beabacef/cayenne-server/src/test/java/org/apache/cayenne/access/types/ValueObjectTypeFactoryTest.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/types/ValueObjectTypeFactoryTest.java b/cayenne-server/src/test/java/org/apache/cayenne/access/types/ValueObjectTypeFactoryTest.java index caf4d59..463bf76 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/types/ValueObjectTypeFactoryTest.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/types/ValueObjectTypeFactoryTest.java @@ -14,56 +14,44 @@ import static org.mockito.Mockito.when; public class ValueObjectTypeFactoryTest { - ExtendedTypeMap map; - DefaultValueObjectTypeRegistry registry; - ValueObjectType valueObjectType1, valueObjectType2, valueObjectType3, valueObjectType4; ExtendedType tstType1, tstType2, tstType3, tstType4; + ValueObjectTypeFactory factory; @Before public void setUpRegistry(){ - valueObjectType1 = mock(ValueObjectType.class); - when(valueObjectType1.getValueType()).thenReturn(UUID.class); - when(valueObjectType1.getTargetType()).thenReturn(byte[].class); - - valueObjectType2 = mock(ValueObjectType.class); - when(valueObjectType2.getValueType()).thenReturn(String.class); - when(valueObjectType2.getTargetType()).thenReturn(String.class); - - valueObjectType3 = mock(ValueObjectType.class); - when(valueObjectType3.getValueType()).thenReturn(int.class); - when(valueObjectType3.getTargetType()).thenReturn(int.class); - - valueObjectType4 = mock(ValueObjectType.class); - when(valueObjectType4.getValueType()).thenReturn(String[].class); - when(valueObjectType4.getTargetType()).thenReturn(String[].class); - List<ValueObjectType<?, ?>> list = new ArrayList<>(); - list.add(valueObjectType1); - list.add(valueObjectType2); - list.add(valueObjectType3); - list.add(valueObjectType4); - + list.add(createMockValueType(UUID.class, byte[].class)); + list.add(createMockValueType(String.class, String.class)); + list.add(createMockValueType(int.class, int.class)); + list.add(createMockValueType(String[].class, String[].class)); - registry = new DefaultValueObjectTypeRegistry(list); + DefaultValueObjectTypeRegistry registry = new DefaultValueObjectTypeRegistry(list); - map = new ExtendedTypeMap(); + ExtendedTypeMap extendedTypeMap = new ExtendedTypeMap(); tstType1 = mock(ExtendedType.class); when(tstType1.getClassName()).thenReturn("byte[]"); - map.registerType(tstType1); + extendedTypeMap.registerType(tstType1); tstType2 = new MockExtendedType(String.class); - map.registerType(tstType2); + extendedTypeMap.registerType(tstType2); tstType3 = new MockExtendedType(int.class); - map.registerType(tstType3); + extendedTypeMap.registerType(tstType3); tstType4 = mock(ExtendedType.class); when(tstType4.getClassName()).thenReturn(String[].class.getCanonicalName()); - map.registerType(tstType4); + extendedTypeMap.registerType(tstType4); + + factory = new ValueObjectTypeFactory(extendedTypeMap,registry); + } - factory = new ValueObjectTypeFactory(map,registry); + private ValueObjectType createMockValueType(Class<?> valueClass, Class<?> targetClass) { + ValueObjectType valueObjectType = mock(ValueObjectType.class); + when(valueObjectType.getValueType()).thenReturn(valueClass); + when(valueObjectType.getTargetType()).thenReturn(targetClass); + return valueObjectType; } @Test
