From 6822f39e3bf04c3b0f220b5bbf7f29d1d8553c4b Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Wed, 22 Jan 2014 17:46:37 +0100 Subject: [PATCH] DATACMNS-422 - Remove workaround in test cases after recent fix for generic component types. Build should be fine on Spring 4 now. --- .../data/util/ClassTypeInformationUnitTests.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/test/java/org/springframework/data/util/ClassTypeInformationUnitTests.java b/src/test/java/org/springframework/data/util/ClassTypeInformationUnitTests.java index 508754b50..9975d097f 100644 --- a/src/test/java/org/springframework/data/util/ClassTypeInformationUnitTests.java +++ b/src/test/java/org/springframework/data/util/ClassTypeInformationUnitTests.java @@ -28,7 +28,6 @@ import java.util.Set; import org.hamcrest.Matchers; import org.junit.Test; -import org.springframework.core.SpringVersion; import org.springframework.data.mapping.Person; /** @@ -106,14 +105,7 @@ public class ClassTypeInformationUnitTests { property = information.getProperty("rawSet"); assertEquals(Set.class, property.getType()); - - // Spring 4 returns null for component types of raw types - if (SpringVersion.getVersion().startsWith("4")) { - assertThat(property.getComponentType(), nullValue()); - } else { - assertThat(property.getComponentType().getType(), is(Matchers.> equalTo(Object.class))); - } - + assertThat(property.getComponentType().getType(), is(Matchers.> equalTo(Object.class))); assertNull(property.getMapValueType()); }