Skip to content

Commit

Permalink
DATACMNS-422 - Remove workaround in test cases after recent fix for g…
Browse files Browse the repository at this point in the history
…eneric component types.

Build should be fine on Spring 4 now.
  • Loading branch information
odrotbohm committed Jan 22, 2014
1 parent 0ce214c commit 6822f39
Showing 1 changed file with 1 addition and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@

import org.hamcrest.Matchers;
import org.junit.Test;
import org.springframework.core.SpringVersion;
import org.springframework.data.mapping.Person;

/**
Expand Down Expand Up @@ -106,14 +105,7 @@ public void discoversArraysAndCollections() {

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.<Class<?>> equalTo(Object.class)));
}

assertThat(property.getComponentType().getType(), is(Matchers.<Class<?>> equalTo(Object.class)));
assertNull(property.getMapValueType());
}

Expand Down

0 comments on commit 6822f39

Please sign in to comment.