Skip to content

Commit

Permalink
feat(assertions): add reorder for changed parameter order
Browse files Browse the repository at this point in the history
  • Loading branch information
@MartinWitt
MartinWitt committed Jan 2, 2022
1 parent f0f4e2e commit 7a3429e
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 12 deletions.
35 changes: 30 additions & 5 deletions ...n/java/xyz/keksdose/spoon/code_solver/transformations/junit/AssertionsTransformation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@
import java.util.List;

import spoon.experimental.CtUnresolvedImport;
import spoon.reflect.code.CtExpression;
import spoon.reflect.code.CtInvocation;
import spoon.reflect.code.CtTypeAccess;
import spoon.reflect.declaration.CtImport;
import spoon.reflect.declaration.CtMethod;
import spoon.reflect.declaration.CtParameter;
import spoon.reflect.declaration.CtType;
import spoon.reflect.reference.CtExecutableReference;
import spoon.reflect.reference.CtReference;
Expand Down Expand Up @@ -56,6 +58,24 @@ private void convertToJunit5(List<CtInvocation<?>> junit4Asserts) {
junit4Assert.setTarget(null);
junit4Assert.getExecutable()
.setDeclaringType(getFactory().Type().createReference("org.junit.jupiter.api.Assertions"));
List<CtExpression<?>> parameters = junit4Assert.getArguments();
if (parameters.size() == 3) {
if (parameters.get(0).getType().getSimpleName().equals("String")) {
List<CtExpression<?>> newParameters = new ArrayList<>();
newParameters.add(parameters.get(1));
newParameters.add(parameters.get(2));
newParameters.add(parameters.get(0));
junit4Assert.setArguments(newParameters);
}
}
if (parameters.size() == 2 && junit4Assert.getExecutable().getSimpleName().equals("assertTrue")) {
if (parameters.get(0).getType().getSimpleName().equals("String")) {
List<CtExpression<?>> newParameters = new ArrayList<>();
newParameters.add(parameters.get(1));
newParameters.add(parameters.get(0));
junit4Assert.setArguments(newParameters);
}
}
}
}

Expand All @@ -68,6 +88,7 @@ private List<CtInvocation<?>> getJunit4Asserts(CtMethod<?> method) {
.filter(v -> ((CtTypeAccess<?>) v.getTarget()).getAccessedType()
.getQualifiedName()
.equals("org.junit.Assert"))
.filter(v -> !v.getExecutable().getSimpleName().equals("assertThat"))
.toList();
}

Expand All @@ -81,18 +102,22 @@ private void adjustImports(CtMethod<?> method) {
public <T> void visitUnresolvedImport(CtUnresolvedImport ctUnresolvedImport) {
if (ctUnresolvedImport.getUnresolvedReference().startsWith("org.junit.Assert.")) {
imports.add(ctUnresolvedImport);
newImports.add(getFactory().createUnresolvedImport(ctUnresolvedImport.getUnresolvedReference()
.replace("org.junit.Assert.", "org.junit.jupiter.api.Assertions."),
true));
if (!ctUnresolvedImport.getUnresolvedReference().endsWith("assertThat")) {
newImports.add(getFactory().createUnresolvedImport(ctUnresolvedImport.getUnresolvedReference()
.replace("org.junit.Assert.", "org.junit.jupiter.api.Assertions."),
true));
}
}
}

@Override
public <T> void visitMethodImport(CtExecutableReference<T> executableReference) {
if (executableReference.getDeclaringType().getQualifiedName().equals("org.junit.Assert")) {
references.add(executableReference);
newImports.add(getFactory().createUnresolvedImport(
"org.junit.jupiter.api.Assertions." + executableReference.getSimpleName(), true));
if (!executableReference.getSimpleName().equals("assertThat")) {
newImports.add(getFactory().createUnresolvedImport(
"org.junit.jupiter.api.Assertions." + executableReference.getSimpleName(), true));
}
}
}
}));
Expand Down
12 changes: 5 additions & 7 deletions ...n/java/xyz/keksdose/spoon/code_solver/transformations/junit/ExpectedExceptionRemoval.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,11 @@ public void process(CtMethod<?> method) {
}

private void removeExpectedValue(CtAnnotation<?> testAnnotation) {
testAnnotation
.setValues(testAnnotation
.getValues()
.entrySet()
.stream()
.filter(v -> !v.getKey().equals("expected"))
.collect(Collectors.toMap(Entry::getKey, Entry::getValue)));
testAnnotation.setValues(testAnnotation.getValues()
.entrySet()
.stream()
.filter(v -> !v.getKey().equals("expected"))
.collect(Collectors.toMap(Entry::getKey, Entry::getValue)));
}

private CtInvocation<?> createAssertThrows(CtExpression<?> exceptionClass, CtStatement body) {
Expand Down
12 changes: 12 additions & 0 deletions ...xyz/keksdose/spoon/code_solver/transformations/junit/Junit4AnnotationsTransformation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import spoon.reflect.declaration.CtType;
import xyz.keksdose.spoon.code_solver.history.Change;
import xyz.keksdose.spoon.code_solver.history.ChangeListener;
import xyz.keksdose.spoon.code_solver.transformations.ImportHelper;
import xyz.keksdose.spoon.code_solver.transformations.TransformationProcessor;

public class Junit4AnnotationsTransformation extends TransformationProcessor<CtMethod<?>> {
Expand All @@ -27,6 +28,8 @@ public void process(CtMethod<?> method) {
private void refactorBeforeClass(CtMethod<?> method) {
Optional<CtAnnotation<?>> beforeClassAnnotation = JunitHelper.getJunit4BeforeClassAnnotation(method);
if (beforeClassAnnotation.isPresent()) {
ImportHelper.removeImport("org.junit.BeforeClass", method.getPosition().getCompilationUnit());
ImportHelper.addImport("org.junit.jupiter.api.BeforeAll", false, method.getPosition().getCompilationUnit());
method.removeAnnotation(beforeClassAnnotation.get());
method.addAnnotation(JunitHelper.createBeforeAllAnnotation(getFactory()));
setChanged(method.getParent(CtType.class),
Expand All @@ -38,6 +41,9 @@ private void refactorBeforeClass(CtMethod<?> method) {
private void refactorBefore(CtMethod<?> method) {
Optional<CtAnnotation<?>> beforeAnnotation = JunitHelper.getJunit4BeforeAnnotation(method);
if (beforeAnnotation.isPresent()) {
ImportHelper.removeImport("org.junit.Before", method.getPosition().getCompilationUnit());
ImportHelper.addImport("org.junit.jupiter.api.BeforeEach", false,
method.getPosition().getCompilationUnit());
method.removeAnnotation(beforeAnnotation.get());
method.addAnnotation(JunitHelper.createBeforeEachAnnotation(getFactory()));
setChanged(method.getParent(CtType.class), new Change(
Expand All @@ -49,6 +55,8 @@ private void refactorBefore(CtMethod<?> method) {
private void refactorAfter(CtMethod<?> method) {
Optional<CtAnnotation<?>> afterAnnotation = JunitHelper.getJunit4AfterAnnotation(method);
if (afterAnnotation.isPresent()) {
ImportHelper.removeImport("org.junit.After", method.getPosition().getCompilationUnit());
ImportHelper.addImport("org.junit.jupiter.api.AfterEach", false, method.getPosition().getCompilationUnit());
method.removeAnnotation(afterAnnotation.get());
method.addAnnotation(JunitHelper.createAfterEachAnnotation(getFactory()));
setChanged(method.getParent(CtType.class),
Expand All @@ -61,6 +69,8 @@ private void refactorAfter(CtMethod<?> method) {
private void refactorAfterClass(CtMethod<?> method) {
Optional<CtAnnotation<?>> afterAnnotation = JunitHelper.getJunit4AfterClassAnnotation(method);
if (afterAnnotation.isPresent()) {
ImportHelper.removeImport("org.junit.AfterClass", method.getPosition().getCompilationUnit());
ImportHelper.addImport("org.junit.jupiter.api.AfterAll", false, method.getPosition().getCompilationUnit());
method.removeAnnotation(afterAnnotation.get());
method.addAnnotation(JunitHelper.createAfterAllAnnotation(getFactory()));
setChanged(method.getParent(CtType.class), new Change(
Expand All @@ -72,6 +82,8 @@ private void refactorAfterClass(CtMethod<?> method) {
private void refactorIgnore(CtMethod<?> method) {
Optional<CtAnnotation<?>> ignoreAnnotation = JunitHelper.getIgnoreAnnotation(method);
if (ignoreAnnotation.isPresent()) {
ImportHelper.removeImport("org.junit.Ignore", method.getPosition().getCompilationUnit());
ImportHelper.addImport("org.junit.jupiter.api.Disabled", false, method.getPosition().getCompilationUnit());
method.removeAnnotation(ignoreAnnotation.get());
method.addAnnotation(JunitHelper.createDisableAnnotation(getFactory()));
setChanged(method.getParent(CtType.class),
Expand Down

0 comments on commit 7a3429e

Please sign in to comment.