Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex

private J.ClassDeclaration maybeRemoveExtension(J.ClassDeclaration classDecl, String extensionFQN) {
TypeTree extension = classDecl.getExtends();
if (extension != null && TypeUtils.isAssignableTo(extensionFQN, extension.getType())) {
if (extension != null && TypeUtils.isOfClassType(extension.getType(), extensionFQN)) {
classDecl = classDecl.withExtends(null);
maybeRemoveImport(extensionFQN);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,45 @@ public class MyPowerMockConfiguration {}
"""
));
}

@Test
void subclassOfOwnBaseClassKeepsExtension() {
//language=java
rewriteRun(
java(
"""
package org.powermock.modules.testng;

public class PowerMockTestCase {}
"""
),
java(
"""
import org.powermock.modules.testng.PowerMockTestCase;

abstract class MyBaseTest extends PowerMockTestCase {
protected int helper() {
return 1;
}
}
""",
"""
abstract class MyBaseTest {
protected int helper() {
return 1;
}
}
"""
),
java(
"""
class FooTest extends MyBaseTest {
void test() {
helper();
}
}
"""
)
);
}
}
Loading