DATACMNS-867 - Adapt codebase after rebase on forward ports.

This commit is contained in:
Oliver Gierke
2016-12-20 13:47:18 +01:00
parent 9b3dd05baa
commit 2210f2e8e9
12 changed files with 60 additions and 102 deletions

View File

@@ -393,7 +393,9 @@ public class ClassTypeInformationUnitTests {
ClassTypeInformation<SampleTraversable> information = ClassTypeInformation.from(SampleTraversable.class);
assertThat(information.getComponentType().getType(), is(typeCompatibleWith(Integer.class)));
assertThat(information.getComponentType()).hasValueSatisfying(it -> {
assertThat(it.getType()).isAssignableFrom(Integer.class);
});
}
@Test // DATACMNS-940
@@ -401,8 +403,13 @@ public class ClassTypeInformationUnitTests {
ClassTypeInformation<SampleMap> information = ClassTypeInformation.from(SampleMap.class);
assertThat(information.getComponentType().getType(), is(typeCompatibleWith(String.class)));
assertThat(information.getMapValueType().getType(), is(typeCompatibleWith(Integer.class)));
assertThat(information.getComponentType()).hasValueSatisfying(it -> {
assertThat(it.getType()).isAssignableFrom(String.class);
});
assertThat(information.getMapValueType()).hasValueSatisfying(it -> {
assertThat(it.getType()).isAssignableFrom(Integer.class);
});
}
static class StringMapContainer extends MapContainer<String> {