review: Fix issue with isOverriding #1407 #1411
Conversation
|
There were two problems
|
|
There is another problem ... I have added test GenericsTest#testGetExecDeclarationOfEnumSetOf <E extends Enum> EnumSet#of(E) has different depth of boundingTypes in their CtTypeParameterReference ... Please have a look at this problem. I have no idea how to solve it... |
…dd a new convention in ReferenceBuilder to only check 2 levels in case of reflexive type parameter like E extends Enum<E>: it will only get E -> Enum -> E.
I agree, I changed the convention to solve problems like However to fix your test I also had to change the |
| if (typeRefAdapted instanceof CtTypeParameterReference) { | ||
| return adaptTypeParameterReferenceBoundingType((CtTypeParameterReference) typeRefAdapted, typeParamRef.getBoundingType()); | ||
| } | ||
| //Do not adapt bounding type of TypeParameterReference. That bounding type is already adapted as part of typeParamRef adaptation |
surli
changed the title
|
it's ok for you @pvojtechovsky ? |
|
I will check it in the evening |
| @@ -145,7 +146,16 @@ public boolean isConstructor() { | |||
| @SuppressWarnings("unchecked") | |||
| public CtExecutable<T> getDeclaration() { | |||
| final CtTypeReference<?> typeRef = getDeclaringType(); | |||
| return typeRef == null ? null : getCtExecutable(typeRef.getDeclaration()); | |||
| if (typeRef == null) { | |||
There was a problem hiding this comment.
add a test typeRef.getDeclaration() == null (not in source path)
|
|
||
| CtInvocation invocation = ctClass.getMethodsByName("m").get(0).getBody().getStatement(0); | ||
| CtExecutable<?> decl = invocation.getExecutable().getDeclaration(); | ||
| assertNotNull(decl); |
There was a problem hiding this comment.
This assert should be null (getDeclaration without the source for java.util). Add a new assert with getExecutableDeclaration
| assertTrue(ctc.isOverriding(methods.get(0), methodsItf.get(0))); | ||
| assertTrue(ctc.isSubSignature(methods.get(0), methodsItf.get(0))); | ||
|
|
||
| // assertTrue(ctc.isSameSignature(methods.get(0), methodsItf.get(0))); |
|
It is mainly Simon's work. It should be merged under his name. |
|
thanks! |
This PR is based on #1408 and should fix the problem of #1407.