github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

#997 - TypeReflectHelper does not resolve type variables correctly in non-trivial cases

Browse Source 
Part 2 - Fix the failing test, swap in use of TypeResolver and remove all the unused features.
This commit is contained in:
Rob Bygrave
2018-02-16 12:47:10 +13:00
parent 1829c74694
commit ac36172cc6
3 changed files with 75 additions and 391 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java
-21
View File
@@ -20,57 +20,36 @@ public class TypeReflectHelperTest {
@Test
public void getParams_MoneyTypeConverter() {
Class<?>[] params0 = TypeResolver.resolveRawArgs(AttributeConverter.class, MoneyTypeConverter.class);
Class<?>[] params = TypeReflectHelper.getParams(MoneyTypeConverter.class, AttributeConverter.class);
assertThat(params.length).isEqualTo(2);
assertThat(params[0]).isEqualTo(Money.class);
assertThat(params[1]).isEqualTo(BigDecimal.class);
assertThat(params0[0]).isEqualTo(Money.class);
assertThat(params0[1]).isEqualTo(BigDecimal.class);
}
@Test
public void getParams_OidTypeConverter() {
Class<?>[] params0 = TypeResolver.resolveRawArgs(ScalarTypeConverter.class, OidTypeConverter.class);
Class<?>[] params = TypeReflectHelper.getParams(OidTypeConverter.class, ScalarTypeConverter.class);
assertThat(params.length).isEqualTo(2);
assertThat(params[0]).isEqualTo(Oid.class);
assertThat(params[1]).isEqualTo(Long.class);
assertThat(params0[0]).isEqualTo(Oid.class);
assertThat(params0[1]).isEqualTo(Long.class);
}
@Test
public void getParams_SysTimeConverter() {
Class<?>[] params0 = TypeResolver.resolveRawArgs(ScalarTypeConverter.class, SysTimeConverter.class);
Class<?>[] params = TypeReflectHelper.getParams(SysTimeConverter.class, ScalarTypeConverter.class);
assertThat(params.length).isEqualTo(2);
assertThat(params[0]).isEqualTo(SysTime.class);
assertThat(params[1]).isEqualTo(Timestamp.class);
assertThat(params0[0]).isEqualTo(SysTime.class);
assertThat(params0[1]).isEqualTo(Timestamp.class);
}
@Test
public void getParams_RichTextConverter() {
Class<?>[] params0 = TypeResolver.resolveRawArgs(ScalarTypeConverter.class, RichTextConverter.class);
assertThat(params0.length).isEqualTo(2);
assertThat(params0[0]).isEqualTo(RichText.class);
assertThat(params0[1]).isEqualTo(byte[].class);
// failing test here with NPE
Class<?>[] params = TypeReflectHelper.getParams(RichTextConverter.class, ScalarTypeConverter.class);
assertThat(params.length).isEqualTo(2);